diff --git a/client/src/main/java/AnimFrameset.java b/client/src/main/java/AnimFrameset.java index 648b5c6..32e82e9 100644 --- a/client/src/main/java/AnimFrameset.java +++ b/client/src/main/java/AnimFrameset.java @@ -16,7 +16,7 @@ public final class AnimFrameset extends SecondaryNode { this.aClass104Array1 = new AnimFrame[local10]; @Pc(19) int[] local19 = arg0.method4503(arg2); for (@Pc(21) int local21 = 0; local21 < local19.length; local21++) { - @Pc(37) byte[] local37 = arg0.method4495(arg2, local19[local21]); + @Pc(37) byte[] local37 = arg0.getFile(arg2, local19[local21]); @Pc(51) int local51 = local37[1] & 0xFF | (local37[0] & 0xFF) << 8; @Pc(56) AnimBase local56 = (AnimBase) local5.method2289(); @Pc(58) AnimBase local58 = null; diff --git a/client/src/main/java/Class165.java b/client/src/main/java/Class165.java index 0a04698..701adf6 100644 --- a/client/src/main/java/Class165.java +++ b/client/src/main/java/Class165.java @@ -22,7 +22,7 @@ public final class Class165 { private GlVertexBufferObject aClass155_7; @OriginalMember(owner = "client!wm", name = "b", descriptor = "Z") - public boolean aBoolean313 = true; + public boolean outputToSprite = true; @OriginalMember(owner = "client!wm", name = "h", descriptor = "I") private int anInt5902 = -1; diff --git a/client/src/main/java/ClientScript.java b/client/src/main/java/ClientScript.java index f94da60..e5c5298 100644 --- a/client/src/main/java/ClientScript.java +++ b/client/src/main/java/ClientScript.java @@ -14,7 +14,7 @@ public final class ClientScript extends SecondaryNode { public int anInt4669; @OriginalMember(owner = "client!qc", name = "O", descriptor = "[I") - public int[] anIntArray415; + public int[] opcodes; @OriginalMember(owner = "client!qc", name = "Q", descriptor = "[Lclient!sc;") public HashTable[] aClass133Array1; @@ -26,8 +26,8 @@ public final class ClientScript extends SecondaryNode { public int anInt4671; @OriginalMember(owner = "client!qc", name = "T", descriptor = "[Lclient!na;") - public JagString[] aClass100Array140; + public JagString[] stringOperands; @OriginalMember(owner = "client!qc", name = "W", descriptor = "[I") - public int[] anIntArray416; + public int[] intOperands; } diff --git a/client/src/main/java/CollisionMap.java b/client/src/main/java/CollisionMap.java index cd073d3..11e7640 100644 --- a/client/src/main/java/CollisionMap.java +++ b/client/src/main/java/CollisionMap.java @@ -28,7 +28,7 @@ public final class CollisionMap { this.anInt3912 = 0; this.anInt3899 = arg0; this.anIntArrayArray30 = new int[this.anInt3899][this.anInt3904]; - this.method3050(); + this.resetFlags(); } @OriginalMember(owner = "client!mj", name = "a", descriptor = "(IZIIII)V") @@ -759,7 +759,7 @@ public final class CollisionMap { } @OriginalMember(owner = "client!mj", name = "a", descriptor = "(I)V") - public final void method3050() { + public final void resetFlags() { for (@Pc(3) int local3 = 0; local3 < this.anInt3899; local3++) { for (@Pc(13) int local13 = 0; local13 < this.anInt3904; local13++) { if (local3 == 0 || local13 == 0 || local3 >= this.anInt3899 - 5 || this.anInt3904 - 5 <= local13) { @@ -772,7 +772,7 @@ public final class CollisionMap { } @OriginalMember(owner = "client!mj", name = "a", descriptor = "(III)V") - public final void method3051(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) { + public final void addRangeableFlag(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) { @Pc(12) int local12 = arg0 - this.anInt3907; @Pc(17) int local17 = arg1 - this.anInt3912; this.anIntArrayArray30[local17][local12] |= 0x200000; diff --git a/client/src/main/java/Class3_Sub14.java b/client/src/main/java/GlTile.java similarity index 98% rename from client/src/main/java/Class3_Sub14.java rename to client/src/main/java/GlTile.java index c51832f..9092fa6 100644 --- a/client/src/main/java/Class3_Sub14.java +++ b/client/src/main/java/GlTile.java @@ -7,7 +7,7 @@ import org.openrs2.deob.annotation.OriginalMember; import org.openrs2.deob.annotation.Pc; @OriginalClass("client!hg") -public final class Class3_Sub14 extends Node { +public final class GlTile extends Node { @OriginalMember(owner = "client!hg", name = "s", descriptor = "Ljava/nio/ByteBuffer;") private ByteBuffer aByteBuffer3; @@ -94,7 +94,7 @@ public final class Class3_Sub14 extends Node { public final int anInt2486; @OriginalMember(owner = "client!hg", name = "", descriptor = "(IFZZI)V") - public Class3_Sub14(@OriginalArg(0) int arg0, @OriginalArg(1) float arg1, @OriginalArg(2) boolean arg2, @OriginalArg(3) boolean arg3, @OriginalArg(4) int arg4) { + public GlTile(@OriginalArg(0) int arg0, @OriginalArg(1) float arg1, @OriginalArg(2) boolean arg2, @OriginalArg(3) boolean arg3, @OriginalArg(4) int arg4) { this.anInt2485 = arg0; this.aFloat12 = arg1; this.aBoolean140 = arg2; diff --git a/client/src/main/java/GoSubFrame.java b/client/src/main/java/GoSubFrame.java index ac1a919..30fee6a 100644 --- a/client/src/main/java/GoSubFrame.java +++ b/client/src/main/java/GoSubFrame.java @@ -5,14 +5,14 @@ import org.openrs2.deob.annotation.OriginalMember; public final class GoSubFrame { @OriginalMember(owner = "client!hj", name = "b", descriptor = "[I") - public int[] anIntArray237; + public int[] intLocals; @OriginalMember(owner = "client!hj", name = "f", descriptor = "[Lclient!na;") - public JagString[] aClass100Array79; + public JagString[] stringLocals; @OriginalMember(owner = "client!hj", name = "h", descriptor = "Lclient!qc;") - public ClientScript aClass3_Sub2_Sub17_1; + public ClientScript script; @OriginalMember(owner = "client!hj", name = "k", descriptor = "I") - public int anInt2515 = -1; + public int pc = -1; } diff --git a/client/src/main/java/HookRequest.java b/client/src/main/java/HookRequest.java index 6d908c9..79789c1 100644 --- a/client/src/main/java/HookRequest.java +++ b/client/src/main/java/HookRequest.java @@ -29,7 +29,7 @@ public final class HookRequest extends Node { public int anInt3102; @OriginalMember(owner = "client!jl", name = "E", descriptor = "[Ljava/lang/Object;") - public Object[] anObjectArray31; + public Object[] arguments; @OriginalMember(owner = "client!jl", name = "F", descriptor = "Lclient!be;") public Component source; diff --git a/client/src/main/java/JavaMouseWheel.java b/client/src/main/java/JavaMouseWheel.java index f34e72d..df0b75b 100644 --- a/client/src/main/java/JavaMouseWheel.java +++ b/client/src/main/java/JavaMouseWheel.java @@ -20,7 +20,7 @@ public final class JavaMouseWheel extends MouseWheel implements MouseWheelListen @OriginalMember(owner = "client!o", name = "a", descriptor = "(I)I") @Override - public final synchronized int method3287() { + public final synchronized int getRotation() { @Pc(2) int local2 = this.anInt4233; this.anInt4233 = 0; return local2; diff --git a/client/src/main/java/Js5.java b/client/src/main/java/Js5.java index 6f3470e..c6ac78f 100644 --- a/client/src/main/java/Js5.java +++ b/client/src/main/java/Js5.java @@ -141,7 +141,7 @@ public final class Js5 { @Pc(28) int local28 = this.aClass70_2.aClass76_1.method2405(local15.method3154()); if (this.method4492(local28)) { @Pc(53) int local53 = this.aClass70_2.aClass76Array1[local28].method2405(local19.method3154()); - return this.method4495(local28, local53); + return this.getFile(local28, local53); } else { return null; } @@ -173,7 +173,7 @@ public final class Js5 { } @OriginalMember(owner = "client!ve", name = "a", descriptor = "(I[III)[B") - public final byte[] method4488(@OriginalArg(0) int arg0, @OriginalArg(1) int[] arg1, @OriginalArg(3) int arg2) { + public final byte[] getFileXTEA(@OriginalArg(0) int arg0, @OriginalArg(1) int[] arg1, @OriginalArg(3) int arg2) { if (!this.method4501(arg0, arg2)) { return null; } @@ -198,7 +198,7 @@ public final class Js5 { } @OriginalMember(owner = "client!ve", name = "a", descriptor = "(BLclient!na;)Z") - public final boolean method4489(@OriginalArg(1) JagString arg0) { + public final boolean allFilesComplete(@OriginalArg(1) JagString arg0) { if (this.method4484()) { @Pc(14) JagString local14 = arg0.toLowerCase(); @Pc(25) int local25 = this.aClass70_2.aClass76_1.method2405(local14.method3154()); @@ -360,8 +360,8 @@ public final class Js5 { } @OriginalMember(owner = "client!ve", name = "a", descriptor = "(IBI)[B") - public final byte[] method4495(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) { - return this.method4488(arg0, null, arg1); + public final byte[] getFile(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) { + return this.getFileXTEA(arg0, null, arg1); } @OriginalMember(owner = "client!ve", name = "b", descriptor = "(ZI)V") @@ -418,11 +418,11 @@ public final class Js5 { if (!this.method4484()) { return null; } else if (this.aClass70_2.anIntArray270.length == 1) { - return this.method4495(0, arg0); + return this.getFile(0, arg0); } else if (!this.method4492(arg0)) { return null; } else if (this.aClass70_2.anIntArray270[arg0] == 1) { - return this.method4495(arg0, 0); + return this.getFile(arg0, 0); } else { throw new RuntimeException(); } diff --git a/client/src/main/java/Js5GlTextureProvider.java b/client/src/main/java/Js5GlTextureProvider.java index b0be3d1..130de28 100644 --- a/client/src/main/java/Js5GlTextureProvider.java +++ b/client/src/main/java/Js5GlTextureProvider.java @@ -66,7 +66,7 @@ public final class Js5GlTextureProvider implements TextureProvider { } else { this.aClass54_11 = null; } - @Pc(51) Buffer local51 = new Buffer(arg1.method4495(0, 0)); + @Pc(51) Buffer local51 = new Buffer(arg1.getFile(0, 0)); @Pc(55) int local55 = local51.g2(); this.aByteArray61 = new byte[local55]; this.aByteArray60 = new byte[local55]; @@ -167,7 +167,7 @@ public final class Js5GlTextureProvider implements TextureProvider { if (local14 != null) { return local14; } - @Pc(30) byte[] local30 = this.aClass153_73.method4495(arg0, 0); + @Pc(30) byte[] local30 = this.aClass153_73.getFile(arg0, 0); if (local30 == null) { return null; } else { diff --git a/client/src/main/java/LinkedList.java b/client/src/main/java/LinkedList.java index 5957edc..11002c7 100644 --- a/client/src/main/java/LinkedList.java +++ b/client/src/main/java/LinkedList.java @@ -77,7 +77,7 @@ public final class LinkedList { } @OriginalMember(owner = "client!ih", name = "a", descriptor = "(B)Lclient!ab;") - public final Node method2287() { + public final Node removeHead() { @Pc(3) Node local3 = this.aClass3_109.aClass3_222; if (this.aClass3_109 == local3) { return null; diff --git a/client/src/main/java/Loc.java b/client/src/main/java/Loc.java index 3f930ad..e4658da 100644 --- a/client/src/main/java/Loc.java +++ b/client/src/main/java/Loc.java @@ -100,7 +100,7 @@ public final class Loc extends Entity { this.anInt1304 = 1; } this.anInt1317 = 1; - this.anInt1320 = Static83.anInt372 - 1; + this.anInt1320 = Static83.loop - 1; if (this.aClass144_2.anInt5347 == 0 && arg8 != null && arg8 instanceof Loc) { @Pc(142) Loc local142 = (Loc) arg8; if (this.aClass144_2 == local142.aClass144_2) { @@ -121,7 +121,7 @@ public final class Loc extends Entity { } } this.anInt1317 = (int) (Math.random() * (double) this.aClass144_2.anIntArray474[this.anInt1297]) + 1; - this.anInt1320 = Static83.anInt372 - this.anInt1317; + this.anInt1320 = Static83.loop - this.anInt1317; } } if (GlRenderer.enabled && arg8 != null) { @@ -174,7 +174,7 @@ public final class Loc extends Entity { if (this.aClass144_2 == null) { return; } - @Pc(10) int local10 = Static83.anInt372 - this.anInt1320; + @Pc(10) int local10 = Static83.loop - this.anInt1320; if (local10 > 100 && this.aClass144_2.anInt5362 > 0) { @Pc(29) int local29 = this.aClass144_2.anIntArray473.length - this.aClass144_2.anInt5362; while (this.anInt1297 < local29 && this.aClass144_2.anIntArray474[this.anInt1297] < local10) { @@ -216,12 +216,12 @@ public final class Loc extends Entity { } } this.anInt1317 = local10; - this.anInt1320 = Static83.anInt372 - local10; + this.anInt1320 = Static83.loop - local10; } @OriginalMember(owner = "client!dc", name = "a", descriptor = "(ZI)Lclient!th;") private Entity method1048(@OriginalArg(0) boolean arg0) { - @Pc(12) boolean local12 = Static107.anIntArrayArrayArray10 != Static83.anIntArrayArrayArray4; + @Pc(12) boolean local12 = Static107.surfaceTileHeightMap != Static83.activeTileHeightMap; @Pc(19) LocType local19 = Static271.method4601(this.anInt1299); @Pc(22) int local22 = local19.anInt4430; if (local19.anIntArray380 != null) { @@ -250,7 +250,7 @@ public final class Loc extends Entity { this.anInt1320 -= (int) (Math.random() * (double) this.aClass144_2.anIntArray474[this.anInt1297]); } else { this.anInt1297 = 0; - this.anInt1320 = Static83.anInt372 - 1; + this.anInt1320 = Static83.loop - 1; } } } @@ -273,15 +273,15 @@ public final class Loc extends Entity { if (arg0 && !local256) { return null; } - @Pc(267) int[][] local267 = Static83.anIntArrayArrayArray4[this.anInt1303]; + @Pc(267) int[][] local267 = Static83.activeTileHeightMap[this.anInt1303]; @Pc(293) int local293 = local267[local178][local201] + local267[local185][local201] + local267[local185][local192] + local267[local178][local192] >> 2; @Pc(302) int local302 = (local160 << 6) + (this.anInt1308 << 7); @Pc(311) int local311 = (local157 << 6) + (this.anInt1300 << 7); @Pc(314) int[][] local314 = null; if (local12) { - local314 = Static107.anIntArrayArrayArray10[0]; + local314 = Static107.surfaceTileHeightMap[0]; } else if (this.anInt1303 < 3) { - local314 = Static83.anIntArrayArrayArray4[this.anInt1303 + 1]; + local314 = Static83.activeTileHeightMap[this.anInt1303 + 1]; } if (GlRenderer.enabled && local256) { Static242.method4207(this.aClass36_Sub1_2, this.anInt1296, this.anInt1294, this.anInt1319); @@ -302,7 +302,7 @@ public final class Loc extends Entity { } @Pc(429) int local429 = 0; if (this.anInt1303 != 0) { - @Pc(439) int[][] local439 = Static83.anIntArrayArrayArray4[0]; + @Pc(439) int[][] local439 = Static83.activeTileHeightMap[0]; local429 = local293 - (local439[local178][local192] + local439[local185][local192] + local439[local185][local201] + local439[local178][local201] >> 2); } @Pc(471) SoftwareIndexedSprite local471 = local389.aClass36_Sub1_3; diff --git a/client/src/main/java/LocType.java b/client/src/main/java/LocType.java index 0a6a911..781f8d3 100644 --- a/client/src/main/java/LocType.java +++ b/client/src/main/java/LocType.java @@ -209,9 +209,9 @@ public final class LocType { public final LocType method3417() { @Pc(26) int local26 = -1; if (this.anInt4425 != -1) { - local26 = Static155.method2945(this.anInt4425); + local26 = Static155.getVarbit(this.anInt4425); } else if (this.anInt4431 != -1) { - local26 = Static7.anIntArray75[this.anInt4431]; + local26 = Static7.varps[this.anInt4431]; } if (local26 < 0 || local26 >= this.anIntArray380.length - 1 || this.anIntArray380[local26] == -1) { @Pc(84) int local84 = this.anIntArray380[this.anIntArray380.length - 1]; diff --git a/client/src/main/java/MouseWheel.java b/client/src/main/java/MouseWheel.java index fb50b33..69fb220 100644 --- a/client/src/main/java/MouseWheel.java +++ b/client/src/main/java/MouseWheel.java @@ -7,7 +7,7 @@ import org.openrs2.deob.annotation.OriginalMember; public abstract class MouseWheel { @OriginalMember(owner = "client!uc", name = "a", descriptor = "(I)I") - public abstract int method3287(); + public abstract int getRotation(); @OriginalMember(owner = "client!uc", name = "a", descriptor = "(ZLjava/awt/Component;)V") public abstract void method3291(@OriginalArg(1) Component arg0); diff --git a/client/src/main/java/NpcType.java b/client/src/main/java/NpcType.java index 3244475..c6732a6 100644 --- a/client/src/main/java/NpcType.java +++ b/client/src/main/java/NpcType.java @@ -157,9 +157,9 @@ public final class NpcType { public final NpcType method2932() { @Pc(5) int local5 = -1; if (this.anInt3723 != -1) { - local5 = Static155.method2945(this.anInt3723); + local5 = Static155.getVarbit(this.anInt3723); } else if (this.anInt3749 != -1) { - local5 = Static7.anIntArray75[this.anInt3749]; + local5 = Static7.varps[this.anInt3749]; } if (local5 < 0 || local5 >= this.anIntArray357.length - 1 || this.anIntArray357[local5] == -1) { @Pc(55) int local55 = this.anIntArray357[this.anIntArray357.length - 1]; @@ -176,9 +176,9 @@ public final class NpcType { } @Pc(16) int local16 = -1; if (this.anInt3723 != -1) { - local16 = Static155.method2945(this.anInt3723); + local16 = Static155.getVarbit(this.anInt3723); } else if (this.anInt3749 != -1) { - local16 = Static7.anIntArray75[this.anInt3749]; + local16 = Static7.varps[this.anInt3749]; } if (local16 < 0 || local16 >= this.anIntArray357.length - 1 || this.anIntArray357[local16] == -1) { @Pc(62) int local62 = this.anIntArray357[this.anIntArray357.length - 1]; diff --git a/client/src/main/java/Player.java b/client/src/main/java/Player.java index 506fda8..21f5768 100644 --- a/client/src/main/java/Player.java +++ b/client/src/main/java/Player.java @@ -262,10 +262,10 @@ public final class Player extends PathingEntity { } @Pc(515) Model local515 = null; if (!this.aBoolean98 && this.anObject5 != null) { - if (Static83.anInt372 >= this.anInt3375) { + if (Static83.loop >= this.anInt3375) { this.anObject5 = null; } - if (this.anInt3390 <= Static83.anInt372 && this.anInt3375 > Static83.anInt372) { + if (this.anInt3390 <= Static83.loop && this.anInt3375 > Static83.loop) { if (this.anObject5 instanceof Loc) { local515 = (Model) ((Loc) this.anObject5).method1049(); } else { diff --git a/client/src/main/java/Static1.java b/client/src/main/java/Static1.java index 5f11e9f..649174a 100644 --- a/client/src/main/java/Static1.java +++ b/client/src/main/java/Static1.java @@ -28,7 +28,7 @@ public final class Static1 { } @OriginalMember(owner = "client!a", name = "a", descriptor = "([[F[[F[[II[[F[[B[[II[[B[[B[[B[[[B)[Lclient!hg;") - public static Class3_Sub14[] method2(@OriginalArg(0) float[][] arg0, @OriginalArg(1) float[][] arg1, @OriginalArg(2) int[][] arg2, @OriginalArg(3) int arg3, @OriginalArg(4) float[][] arg4, @OriginalArg(5) byte[][] arg5, @OriginalArg(6) int[][] arg6, @OriginalArg(8) byte[][] arg7, @OriginalArg(9) byte[][] arg8, @OriginalArg(10) byte[][] arg9, @OriginalArg(11) byte[][][] arg10) { + public static GlTile[] method2(@OriginalArg(0) float[][] arg0, @OriginalArg(1) float[][] arg1, @OriginalArg(2) int[][] arg2, @OriginalArg(3) int arg3, @OriginalArg(4) float[][] arg4, @OriginalArg(5) byte[][] arg5, @OriginalArg(6) int[][] arg6, @OriginalArg(8) byte[][] arg7, @OriginalArg(9) byte[][] arg8, @OriginalArg(10) byte[][] arg9, @OriginalArg(11) byte[][][] arg10) { @Pc(10) HashTable local10 = new HashTable(128); @Pc(12) int local12; @Pc(17) int local17; @@ -63,7 +63,7 @@ public final class Static1 { if (local50.anInt5899 == -1) { continue; } - @Pc(61) Class3_Sub14 local61 = Static243.method4212(local10, local50); + @Pc(61) GlTile local61 = Static243.method4212(local10, local50); @Pc(67) byte local67 = arg7[local12][local17]; @Pc(71) int[] local71 = Static228.anIntArrayArray35[local67]; local61.anInt2482 += local71.length / 2; @@ -238,7 +238,7 @@ public final class Static1 { @Pc(1077) boolean[] local1077 = Static277.aBooleanArrayArray4[local143 == local777 ? local129 : 0]; local1086 = Static277.aBooleanArrayArray4[local190 == local777 ? local168 : 0]; @Pc(1092) FloType local1092 = Static256.method4395(local777 - 1); - @Pc(1097) Class3_Sub14 local1097 = Static243.method4212(local10, local1092); + @Pc(1097) GlTile local1097 = Static243.method4212(local10, local1092); local1097.anInt2482 += 5; local1097.anInt2482 += local1077.length - 2; local1097.anInt2482 += local1055.length - 2; @@ -249,8 +249,8 @@ public final class Static1 { } } } - @Pc(1161) Class3_Sub14 local1161; - for (local1161 = (Class3_Sub14) local10.method3859(); local1161 != null; local1161 = (Class3_Sub14) local10.method3861()) { + @Pc(1161) GlTile local1161; + for (local1161 = (GlTile) local10.method3859(); local1161 != null; local1161 = (GlTile) local10.method3861()) { local1161.method1940(); } for (local12 = 1; local12 <= 102; local12++) { @@ -269,7 +269,7 @@ public final class Static1 { if (local1250.anInt5899 == -1) { continue; } - @Pc(1261) Class3_Sub14 local1261 = Static243.method4212(local10, local1250); + @Pc(1261) GlTile local1261 = Static243.method4212(local10, local1250); @Pc(1267) byte local1267 = arg7[local12][local17]; @Pc(1273) byte local1273 = arg5[local12][local17]; local168 = Static19.method588(local1250.anInt5892, local1250.anInt5899, arg6[local12][local17]); @@ -469,7 +469,7 @@ public final class Static1 { local1086 = Static277.aBooleanArrayArray4[local2003 == local190 ? local168 : 0]; @Pc(2318) boolean[] local2318 = Static277.aBooleanArrayArray4[local2003 == local180 ? local143 : 0]; @Pc(2324) FloType local2324 = Static256.method4395(local2003 - 1); - @Pc(2329) Class3_Sub14 local2329 = Static243.method4212(local10, local2324); + @Pc(2329) GlTile local2329 = Static243.method4212(local10, local2324); @Pc(2345) int local2345 = Static19.method588(local2324.anInt5892, local2324.anInt5899, arg6[local12][local17]) << 8 | 0xFF; @Pc(2365) int local2365 = Static19.method588(local2324.anInt5892, local2324.anInt5899, arg6[local12 + 1][local17]) << 8 | 0xFF; @Pc(2385) int local2385 = Static19.method588(local2324.anInt5892, local2324.anInt5899, arg6[local12 + 1][local17 + 1]) << 8 | 0xFF; @@ -515,7 +515,7 @@ public final class Static1 { } } } - for (local1161 = (Class3_Sub14) local10.method3859(); local1161 != null; local1161 = (Class3_Sub14) local10.method3861()) { + for (local1161 = (GlTile) local10.method3859(); local1161 != null; local1161 = (GlTile) local10.method3861()) { if (local1161.anInt2483 == 0) { local1161.method4658(); } else { @@ -523,7 +523,7 @@ public final class Static1 { } } local12 = local10.method3864(); - @Pc(2823) Class3_Sub14[] local2823 = new Class3_Sub14[local12]; + @Pc(2823) GlTile[] local2823 = new GlTile[local12]; @Pc(2826) long[] local2826 = new long[local12]; local10.method3865(local2823); for (local38 = 0; local38 < local12; local38++) { diff --git a/client/src/main/java/Static10.java b/client/src/main/java/Static10.java index 1da171b..7fea019 100644 --- a/client/src/main/java/Static10.java +++ b/client/src/main/java/Static10.java @@ -84,7 +84,7 @@ public final class Static10 { local61 = local61 + Static57.aClass3_Sub15_Sub1_3.data[local63] + ","; } Static89.report(local61, local19); - Static278.method4653(); + Static278.processLogout(); return true; } } diff --git a/client/src/main/java/Static103.java b/client/src/main/java/Static103.java index 314a4fb..1a004d2 100644 --- a/client/src/main/java/Static103.java +++ b/client/src/main/java/Static103.java @@ -192,7 +192,7 @@ public final class Static103 { } else if (Static102.method2075(Static173.self.movementQueueZ[0], 0, 0, true, 0, local15, 0, 0, 1, local19, Static173.self.movementQueueX[0])) { Static6.outboundBuffer.p1(Static1.anInt5); Static6.outboundBuffer.p1(Static107.anInt2878); - Static6.outboundBuffer.p2(Static57.anInt1747); + Static6.outboundBuffer.p2(Static57.yawTarget); Static6.outboundBuffer.p1(57); Static6.outboundBuffer.p1(Static59.anInt1814); Static6.outboundBuffer.p1(Static273.anInt4130); @@ -437,8 +437,8 @@ public final class Static103 { local693 = Static5.getComponent(local19); if (local693.anIntArrayArray4 != null && local693.anIntArrayArray4[0][0] == 5) { local1955 = local693.anIntArrayArray4[0][1]; - if (Static7.anIntArray75[local1955] != local693.anIntArray48[0]) { - Static7.anIntArray75[local1955] = local693.anIntArray48[0]; + if (Static7.varps[local1955] != local693.anIntArray48[0]) { + Static7.varps[local1955] = local693.anIntArray48[0]; Static85.method1775(local1955); } } @@ -464,7 +464,7 @@ public final class Static103 { local693 = Static5.getComponent(local19); if (local693.anIntArrayArray4 != null && local693.anIntArrayArray4[0][0] == 5) { local1955 = local693.anIntArrayArray4[0][1]; - Static7.anIntArray75[local1955] = 1 - Static7.anIntArray75[local1955]; + Static7.varps[local1955] = 1 - Static7.varps[local1955]; Static85.method1775(local1955); } } diff --git a/client/src/main/java/Static105.java b/client/src/main/java/Static105.java index 20404db..b88e2e3 100644 --- a/client/src/main/java/Static105.java +++ b/client/src/main/java/Static105.java @@ -108,12 +108,12 @@ public final class Static105 { @OriginalMember(owner = "client!ib", name = "a", descriptor = "(IIIIIIIILclient!th;IZJ)Z") public static boolean method2256(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7, @OriginalArg(8) Entity arg8, @OriginalArg(9) int arg9, @OriginalArg(10) boolean arg10, @OriginalArg(11) long arg11) { - @Pc(6) boolean local6 = Static83.anIntArrayArrayArray4 == Static80.anIntArrayArrayArray19; + @Pc(6) boolean local6 = Static83.activeTileHeightMap == Static80.underWaterTileHeightMap; @Pc(8) int local8 = 0; @Pc(17) int local17; for (@Pc(10) int local10 = arg1; local10 < arg1 + arg3; local10++) { for (local17 = arg2; local17 < arg2 + arg4; local17++) { - if (local10 < 0 || local17 < 0 || local10 >= Static152.anInt3594 || local17 >= Static99.anInt2550) { + if (local10 < 0 || local17 < 0 || local10 >= Static152.mapSizeX || local17 >= Static99.mapSizeZ) { return false; } @Pc(42) Tile local42 = Static130.aClass3_Sub5ArrayArrayArray1[arg0][local10][local17]; diff --git a/client/src/main/java/Static107.java b/client/src/main/java/Static107.java index dd7c520..aee6073 100644 --- a/client/src/main/java/Static107.java +++ b/client/src/main/java/Static107.java @@ -4,7 +4,7 @@ import org.openrs2.deob.annotation.OriginalMember; public final class Static107 { @OriginalMember(owner = "client!id", name = "i", descriptor = "[[[I") - public static int[][][] anIntArrayArrayArray10; + public static int[][][] surfaceTileHeightMap; @OriginalMember(owner = "client!id", name = "k", descriptor = "I") public static int anInt2878; diff --git a/client/src/main/java/Static110.java b/client/src/main/java/Static110.java index 7f1589f..c132620 100644 --- a/client/src/main/java/Static110.java +++ b/client/src/main/java/Static110.java @@ -25,7 +25,7 @@ public final class Static110 { if (local6 != null) { return local6; } - @Pc(30) byte[] local30 = Static39.aClass153_23.method4495(11, arg0); + @Pc(30) byte[] local30 = Static39.aClass153_23.getFile(11, arg0); local6 = new Class3_Sub2_Sub12(); if (local30 != null) { local6.method2076(new Buffer(local30)); @@ -35,7 +35,7 @@ public final class Static110 { } @OriginalMember(owner = "client!ih", name = "a", descriptor = "(I[Lclient!hg;)V") - public static void method2280(@OriginalArg(0) int arg0, @OriginalArg(1) Class3_Sub14[] arg1) { + public static void method2280(@OriginalArg(0) int arg0, @OriginalArg(1) GlTile[] arg1) { Static182.aClass3_Sub14ArrayArray2[arg0] = arg1; } diff --git a/client/src/main/java/Static111.java b/client/src/main/java/Static111.java index 6b01337..e47ea98 100644 --- a/client/src/main/java/Static111.java +++ b/client/src/main/java/Static111.java @@ -63,7 +63,7 @@ public final class Static111 { } @OriginalMember(owner = "client!ii", name = "b", descriptor = "(I)V") - public static void method2292() { + public static void handleMouse() { @Pc(2) Mouse local2 = Static93.aClass150_1; synchronized (Static93.aClass150_1) { Static22.anInt723 = Static57.anInt1759; diff --git a/client/src/main/java/Static114.java b/client/src/main/java/Static114.java index 38eb527..d524e11 100644 --- a/client/src/main/java/Static114.java +++ b/client/src/main/java/Static114.java @@ -43,7 +43,7 @@ public final class Static114 { } @OriginalMember(owner = "client!j", name = "a", descriptor = "(BZLclient!na;)V") - public static void method4636(@OriginalArg(1) boolean arg0, @OriginalArg(2) JagString arg1) { + public static void drawTextOnScreen(@OriginalArg(1) boolean arg0, @OriginalArg(2) JagString arg1) { @Pc(24) int local24 = Static215.aClass3_Sub2_Sub9_32.method2856(arg1, 250); @Pc(31) int local31 = Static215.aClass3_Sub2_Sub9_32.method2860(arg1, 250) * 13; if (GlRenderer.enabled) { diff --git a/client/src/main/java/Static115.java b/client/src/main/java/Static115.java index 676102c..092303c 100644 --- a/client/src/main/java/Static115.java +++ b/client/src/main/java/Static115.java @@ -8,7 +8,7 @@ public final class Static115 { public static int anInt2940; @OriginalMember(owner = "client!ja", name = "f", descriptor = "Lclient!ih;") - public static final LinkedList aClass69_70 = new LinkedList(); + public static final LinkedList mediumPriorityRequests = new LinkedList(); @OriginalMember(owner = "client!ja", name = "j", descriptor = "I") public static int anInt2937 = 0; diff --git a/client/src/main/java/Static117.java b/client/src/main/java/Static117.java index e5bc071..389539f 100644 --- a/client/src/main/java/Static117.java +++ b/client/src/main/java/Static117.java @@ -81,7 +81,7 @@ public final class Static117 { @OriginalMember(owner = "client!jc", name = "a", descriptor = "(Lclient!ve;)Z") private static boolean method2344(@OriginalArg(0) Js5 arg0) { if (!aBoolean149) { - @Pc(7) byte[] local7 = arg0.method4495(0, 0); + @Pc(7) byte[] local7 = arg0.getFile(0, 0); if (local7 == null) { return false; } @@ -94,7 +94,7 @@ public final class Static117 { @OriginalMember(owner = "client!jc", name = "a", descriptor = "(Lclient!ve;II)Lclient!jc;") public static VorbisSound method2345(@OriginalArg(0) Js5 arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) { if (method2344(arg0)) { - @Pc(16) byte[] local16 = arg0.method4495(arg1, arg2); + @Pc(16) byte[] local16 = arg0.getFile(arg1, arg2); return local16 == null ? null : new VorbisSound(local16); } else { arg0.method4491(arg2, arg1); diff --git a/client/src/main/java/Static12.java b/client/src/main/java/Static12.java index 204880b..c10194b 100644 --- a/client/src/main/java/Static12.java +++ b/client/src/main/java/Static12.java @@ -7,7 +7,7 @@ public final class Static12 { public static int anInt406; @OriginalMember(owner = "client!bb", name = "g", descriptor = "[[[B") - public static final byte[][][] aByteArrayArrayArray2 = new byte[4][104][104]; + public static final byte[][][] tileSettings = new byte[4][104][104]; @OriginalMember(owner = "client!bb", name = "m", descriptor = "Lclient!na;") public static final JagString aClass100_73 = Static28.parse("runes"); diff --git a/client/src/main/java/Static122.java b/client/src/main/java/Static122.java index 438e076..05ed271 100644 --- a/client/src/main/java/Static122.java +++ b/client/src/main/java/Static122.java @@ -88,6 +88,6 @@ public final class Static122 { @OriginalMember(owner = "client!jh", name = "a", descriptor = "(IILclient!ve;Lclient!ve;I)Lclient!dd;") public static SoftwareFont method2412(@OriginalArg(0) int arg0, @OriginalArg(2) Js5 arg1, @OriginalArg(3) Js5 arg2) { - return Static234.method4016(arg2, 0, arg0) ? Static114.method4635(arg1.method4495(arg0, 0)) : null; + return Static234.method4016(arg2, 0, arg0) ? Static114.method4635(arg1.getFile(arg0, 0)) : null; } } diff --git a/client/src/main/java/Static123.java b/client/src/main/java/Static123.java index 11974e1..a8adf25 100644 --- a/client/src/main/java/Static123.java +++ b/client/src/main/java/Static123.java @@ -25,7 +25,7 @@ public final class Static123 { if (local10 != null) { return local10; } - @Pc(26) byte[] local26 = Static23.aClass153_11.method4495(26, arg0); + @Pc(26) byte[] local26 = Static23.aClass153_11.getFile(26, arg0); local10 = new StructType(); if (local26 != null) { local10.method2806(new Buffer(local26)); @@ -35,7 +35,7 @@ public final class Static123 { } @OriginalMember(owner = "client!jj", name = "a", descriptor = "(Z)V") - public static void method2418() { + public static void topBannerRefresh() { if (!Static249.aBoolean282 && Static83.modeWhere != 2) { try { Static206.aClass100_900.method3157(Static215.aClient1); @@ -62,15 +62,15 @@ public final class Static123 { @Pc(158) int local158; @Pc(137) boolean local137; if (local10.anInt4453 == 1) { - local14 = local10.anInt4452 + Static277.anInt5855 - Static167.anInt4069; - if (local14 >= 0 && local14 <= Static277.anInt5855 + Static277.anInt5855) { - local115 = local10.anInt4461 + Static277.anInt5855 - Static193.anInt4539; + local14 = local10.anInt4452 + Static277.tileVisibilityDistance - Static167.anInt4069; + if (local14 >= 0 && local14 <= Static277.tileVisibilityDistance + Static277.tileVisibilityDistance) { + local115 = local10.anInt4461 + Static277.tileVisibilityDistance - Static193.anInt4539; if (local115 < 0) { local115 = 0; } - local126 = local10.anInt4464 + Static277.anInt5855 - Static193.anInt4539; - if (local126 > Static277.anInt5855 + Static277.anInt5855) { - local126 = Static277.anInt5855 + Static277.anInt5855; + local126 = local10.anInt4464 + Static277.tileVisibilityDistance - Static193.anInt4539; + if (local126 > Static277.tileVisibilityDistance + Static277.tileVisibilityDistance) { + local126 = Static277.tileVisibilityDistance + Static277.tileVisibilityDistance; } local137 = false; while (local115 <= local126) { @@ -98,15 +98,15 @@ public final class Static123 { } } } else if (local10.anInt4453 == 2) { - local14 = local10.anInt4461 + Static277.anInt5855 - Static193.anInt4539; - if (local14 >= 0 && local14 <= Static277.anInt5855 + Static277.anInt5855) { - local115 = local10.anInt4452 + Static277.anInt5855 - Static167.anInt4069; + local14 = local10.anInt4461 + Static277.tileVisibilityDistance - Static193.anInt4539; + if (local14 >= 0 && local14 <= Static277.tileVisibilityDistance + Static277.tileVisibilityDistance) { + local115 = local10.anInt4452 + Static277.tileVisibilityDistance - Static167.anInt4069; if (local115 < 0) { local115 = 0; } - local126 = local10.anInt4446 + Static277.anInt5855 - Static167.anInt4069; - if (local126 > Static277.anInt5855 + Static277.anInt5855) { - local126 = Static277.anInt5855 + Static277.anInt5855; + local126 = local10.anInt4446 + Static277.tileVisibilityDistance - Static167.anInt4069; + if (local126 > Static277.tileVisibilityDistance + Static277.tileVisibilityDistance) { + local126 = Static277.tileVisibilityDistance + Static277.tileVisibilityDistance; } local137 = false; while (local115 <= local126) { @@ -136,22 +136,22 @@ public final class Static123 { } else if (local10.anInt4453 == 4) { local14 = local10.anInt4444 - Static162.anInt3947; if (local14 > 128) { - local115 = local10.anInt4461 + Static277.anInt5855 - Static193.anInt4539; + local115 = local10.anInt4461 + Static277.tileVisibilityDistance - Static193.anInt4539; if (local115 < 0) { local115 = 0; } - local126 = local10.anInt4464 + Static277.anInt5855 - Static193.anInt4539; - if (local126 > Static277.anInt5855 + Static277.anInt5855) { - local126 = Static277.anInt5855 + Static277.anInt5855; + local126 = local10.anInt4464 + Static277.tileVisibilityDistance - Static193.anInt4539; + if (local126 > Static277.tileVisibilityDistance + Static277.tileVisibilityDistance) { + local126 = Static277.tileVisibilityDistance + Static277.tileVisibilityDistance; } if (local115 <= local126) { - @Pc(408) int local408 = local10.anInt4452 + Static277.anInt5855 - Static167.anInt4069; + @Pc(408) int local408 = local10.anInt4452 + Static277.tileVisibilityDistance - Static167.anInt4069; if (local408 < 0) { local408 = 0; } - local158 = local10.anInt4446 + Static277.anInt5855 - Static167.anInt4069; - if (local158 > Static277.anInt5855 + Static277.anInt5855) { - local158 = Static277.anInt5855 + Static277.anInt5855; + local158 = local10.anInt4446 + Static277.tileVisibilityDistance - Static167.anInt4069; + if (local158 > Static277.tileVisibilityDistance + Static277.tileVisibilityDistance) { + local158 = Static277.tileVisibilityDistance + Static277.tileVisibilityDistance; } @Pc(430) boolean local430 = false; label166: for (@Pc(432) int local432 = local408; local432 <= local158; local432++) { diff --git a/client/src/main/java/Static124.java b/client/src/main/java/Static124.java index ea850ed..99497b8 100644 --- a/client/src/main/java/Static124.java +++ b/client/src/main/java/Static124.java @@ -72,7 +72,7 @@ public final class Static124 { @Pc(90) CollisionMap local90 = null; if (!arg1) { @Pc(95) int local95 = local50; - if ((Static12.aByteArrayArrayArray2[1][local72][local76] & 0x2) == 2) { + if ((Static12.tileSettings[1][local72][local76] & 0x2) == 2) { local95 = local50 - 1; } if (local95 >= 0) { diff --git a/client/src/main/java/Static125.java b/client/src/main/java/Static125.java index e3d6995..b92804f 100644 --- a/client/src/main/java/Static125.java +++ b/client/src/main/java/Static125.java @@ -39,7 +39,7 @@ public final class Static125 { Static6.outboundBuffer.p2(arg1); Static226.anInt5079 = 0; Static57.anInt1758 = 0; - Static179.anInt4261 = 1; + Static179.accountCreationStep = 1; Static223.anInt5034 = -3; } @@ -49,7 +49,7 @@ public final class Static125 { if (local10 != null) { return local10; } - @Pc(31) byte[] local31 = Static172.aClass153_69.method4495(Static254.method4349(arg0), Static274.method3845(arg0)); + @Pc(31) byte[] local31 = Static172.aClass153_69.getFile(Static254.method4349(arg0), Static274.method3845(arg0)); local10 = new Class85(); if (local31 != null) { local10.method2651(new Buffer(local31)); @@ -59,19 +59,19 @@ public final class Static125 { } @OriginalMember(owner = "client!jl", name = "c", descriptor = "(I)V") - public static void method2450() { + public static void updateLockedCamera() { @Pc(9) int local9 = Static248.anInt4232 * 128 + 64; @Pc(15) int local15 = Static245.anInt5375 * 128 + 64; @Pc(23) int local23 = Static207.method3685(Static55.level, local15, local9) - Static231.anInt5203; if (Static113.anInt4612 >= 100) { - Static138.anInt3439 = Static245.anInt5375 * 128 + 64; - Static134.anInt3302 = Static248.anInt4232 * 128 + 64; - Static5.anInt40 = Static207.method3685(Static55.level, Static138.anInt3439, Static134.anInt3302) - Static231.anInt5203; + Static138.renderX = Static245.anInt5375 * 128 + 64; + Static134.renderZ = Static248.anInt4232 * 128 + 64; + Static5.anInt40 = Static207.method3685(Static55.level, Static138.renderX, Static134.renderZ) - Static231.anInt5203; } else { - if (Static138.anInt3439 < local15) { - Static138.anInt3439 += Static233.anInt5225 + Static113.anInt4612 * (local15 - Static138.anInt3439) / 1000; - if (Static138.anInt3439 > local15) { - Static138.anInt3439 = local15; + if (Static138.renderX < local15) { + Static138.renderX += Static233.anInt5225 + Static113.anInt4612 * (local15 - Static138.renderX) / 1000; + if (Static138.renderX > local15) { + Static138.renderX = local15; } } if (Static5.anInt40 < local23) { @@ -80,16 +80,16 @@ public final class Static125 { Static5.anInt40 = local23; } } - if (Static138.anInt3439 > local15) { - Static138.anInt3439 -= Static233.anInt5225 + (Static138.anInt3439 - local15) * Static113.anInt4612 / 1000; - if (Static138.anInt3439 < local15) { - Static138.anInt3439 = local15; + if (Static138.renderX > local15) { + Static138.renderX -= Static233.anInt5225 + (Static138.renderX - local15) * Static113.anInt4612 / 1000; + if (Static138.renderX < local15) { + Static138.renderX = local15; } } - if (Static134.anInt3302 < local9) { - Static134.anInt3302 += Static233.anInt5225 + Static113.anInt4612 * (local9 - Static134.anInt3302) / 1000; - if (local9 < Static134.anInt3302) { - Static134.anInt3302 = local9; + if (Static134.renderZ < local9) { + Static134.renderZ += Static233.anInt5225 + Static113.anInt4612 * (local9 - Static134.renderZ) / 1000; + if (local9 < Static134.renderZ) { + Static134.renderZ = local9; } } if (local23 < Static5.anInt40) { @@ -98,10 +98,10 @@ public final class Static125 { Static5.anInt40 = local23; } } - if (Static134.anInt3302 > local9) { - Static134.anInt3302 -= Static233.anInt5225 + (Static134.anInt3302 - local9) * Static113.anInt4612 / 1000; - if (local9 > Static134.anInt3302) { - Static134.anInt3302 = local9; + if (Static134.renderZ > local9) { + Static134.renderZ -= Static233.anInt5225 + (Static134.renderZ - local9) * Static113.anInt4612 / 1000; + if (local9 > Static134.renderZ) { + Static134.renderZ = local9; } } } @@ -109,8 +109,8 @@ public final class Static125 { local15 = Static251.anInt5449 * 128 + 64; local23 = Static207.method3685(Static55.level, local15, local9) - Static57.anInt1744; @Pc(236) int local236 = local23 - Static5.anInt40; - @Pc(241) int local241 = local9 - Static134.anInt3302; - @Pc(246) int local246 = local15 - Static138.anInt3439; + @Pc(241) int local241 = local9 - Static134.renderZ; + @Pc(246) int local246 = local15 - Static138.renderX; @Pc(257) int local257 = (int) Math.sqrt((double) (local246 * local246 + local241 * local241)); @Pc(268) int local268 = (int) (Math.atan2((double) local236, (double) local257) * 325.949D) & 0x7FF; if (local268 < 128) { @@ -120,19 +120,19 @@ public final class Static125 { local268 = 383; } @Pc(292) int local292 = (int) (-325.949D * Math.atan2((double) local246, (double) local241)) & 0x7FF; - if (Static240.anInt5333 < local268) { - Static240.anInt5333 += Static133.anInt5230 + Static233.anInt5217 * (local268 - Static240.anInt5333) / 1000; - if (Static240.anInt5333 > local268) { - Static240.anInt5333 = local268; + if (Static240.cameraPitch < local268) { + Static240.cameraPitch += Static133.anInt5230 + Static233.anInt5217 * (local268 - Static240.cameraPitch) / 1000; + if (Static240.cameraPitch > local268) { + Static240.cameraPitch = local268; } } - if (Static240.anInt5333 > local268) { - Static240.anInt5333 -= (Static240.anInt5333 - local268) * Static233.anInt5217 / 1000 + Static133.anInt5230; - if (Static240.anInt5333 < local268) { - Static240.anInt5333 = local268; + if (Static240.cameraPitch > local268) { + Static240.cameraPitch -= (Static240.cameraPitch - local268) * Static233.anInt5217 / 1000 + Static133.anInt5230; + if (Static240.cameraPitch < local268) { + Static240.cameraPitch = local268; } } - @Pc(350) int local350 = local292 - Static184.anInt4358; + @Pc(350) int local350 = local292 - Static184.cameraYaw; if (local350 > 1024) { local350 -= 2048; } @@ -140,14 +140,14 @@ public final class Static125 { local350 += 2048; } if (local350 > 0) { - Static184.anInt4358 += local350 * Static233.anInt5217 / 1000 + Static133.anInt5230; - Static184.anInt4358 &= 0x7FF; + Static184.cameraYaw += local350 * Static233.anInt5217 / 1000 + Static133.anInt5230; + Static184.cameraYaw &= 0x7FF; } if (local350 < 0) { - Static184.anInt4358 -= Static233.anInt5217 * -local350 / 1000 + Static133.anInt5230; - Static184.anInt4358 &= 0x7FF; + Static184.cameraYaw -= Static233.anInt5217 * -local350 / 1000 + Static133.anInt5230; + Static184.cameraYaw &= 0x7FF; } - @Pc(404) int local404 = local292 - Static184.anInt4358; + @Pc(404) int local404 = local292 - Static184.cameraYaw; if (local404 > 1024) { local404 -= 2048; } @@ -155,7 +155,7 @@ public final class Static125 { local404 += 2048; } if (local404 < 0 && local350 > 0 || local404 > 0 && local350 < 0) { - Static184.anInt4358 = local292; + Static184.cameraYaw = local292; } } } diff --git a/client/src/main/java/Static126.java b/client/src/main/java/Static126.java index 61c2643..207b5a4 100644 --- a/client/src/main/java/Static126.java +++ b/client/src/main/java/Static126.java @@ -17,8 +17,8 @@ public final class Static126 { @OriginalMember(owner = "client!jm", name = "a", descriptor = "(Z)V") public static void method2460() { - if (Static154.topLevelInterace != -1) { - Static96.method1949(Static154.topLevelInterace); + if (Static154.topLevelInterface != -1) { + Static96.method1949(Static154.topLevelInterface); } for (@Pc(15) int local15 = 0; local15 < Static24.anInt766; local15++) { if (Static186.aBooleanArray100[local15]) { @@ -29,12 +29,12 @@ public final class Static126 { } Static97.anInt2503 = -1; Static169.aClass13_18 = null; - Static182.anInt4311 = Static83.anInt372; + Static182.anInt4311 = Static83.loop; if (GlRenderer.enabled) { Static263.aBoolean299 = true; } Static214.anInt5574 = -1; - if (Static154.topLevelInterace != -1) { + if (Static154.topLevelInterface != -1) { Static24.anInt766 = 0; Static9.method182(); } diff --git a/client/src/main/java/Static127.java b/client/src/main/java/Static127.java index 8740467..968985d 100644 --- a/client/src/main/java/Static127.java +++ b/client/src/main/java/Static127.java @@ -25,26 +25,26 @@ public final class Static127 { @OriginalMember(owner = "client!k", name = "a", descriptor = "(IIBLclient!ve;Lclient!ve;)Lclient!rk;") public static Font method2462(@OriginalArg(1) int arg0, @OriginalArg(3) Js5 arg1, @OriginalArg(4) Js5 arg2) { - return Static234.method4016(arg1, 0, arg0) ? Static29.method799(arg2.method4495(arg0, 0)) : null; + return Static234.method4016(arg1, 0, arg0) ? Static29.method799(arg2.getFile(arg0, 0)) : null; } @OriginalMember(owner = "client!k", name = "a", descriptor = "(IIIIZIZ)V") public static void method2463(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) boolean arg4, @OriginalArg(5) int arg5) { - if (Static80.anInt4701 == arg2 && arg1 == Static52.anInt1695 && (Static41.anInt1316 == arg0 || Static138.method2697())) { + if (Static80.anInt4701 == arg2 && arg1 == Static52.anInt1695 && (Static41.anInt1316 == arg0 || Static138.allLevelsAreVisible())) { return; } Static80.anInt4701 = arg2; Static52.anInt1695 = arg1; Static41.anInt1316 = arg0; - if (Static138.method2697()) { + if (Static138.allLevelsAreVisible()) { Static41.anInt1316 = 0; } if (arg4) { - Static196.method3534(28); + Static196.setGameState(28); } else { - Static196.method3534(25); + Static196.setGameState(25); } - Static114.method4636(true, LocalizedText.LOADING); + Static114.drawTextOnScreen(true, LocalizedText.LOADING); @Pc(53) int local53 = Static142.originZ; @Pc(55) int local55 = Static225.originX; Static142.originZ = arg1 * 8 - 48; @@ -52,7 +52,7 @@ public final class Static127 { Static158.aClass3_Sub2_Sub4_3 = Static29.method803(Static80.anInt4701 * 8, Static52.anInt1695 * 8); @Pc(81) int local81 = Static142.originZ - local53; @Pc(86) int local86 = Static225.originX - local55; - Static235.aClass134_2 = null; + Static235.mapFunctionGroup = null; @Pc(96) int local96; @Pc(103) Npc local103; @Pc(109) int local109; @@ -138,14 +138,14 @@ public final class Static127 { } } if (arg4) { - Static138.anInt3439 -= local86 * 128; - Static134.anInt3302 -= local81 * 128; + Static138.renderX -= local86 * 128; + Static134.renderZ -= local81 * 128; Static248.anInt4232 -= local81; Static251.anInt5449 -= local86; Static265.anInt5765 -= local81; Static245.anInt5375 -= local86; } else { - Static227.anInt5096 = 1; + Static227.cameraType = 1; } Static189.anInt4451 = 0; if (Static115.anInt2939 != 0) { @@ -295,7 +295,7 @@ public final class Static127 { GameShell.replaceCanvas = true; } if (arg0.method3111(Static148.aClass100_677)) { - Static196.method3534(25); + Static196.setGameState(25); } if (arg0.method3111(Static107.aClass100_566)) { Static43.displayFps = true; diff --git a/client/src/main/java/Static132.java b/client/src/main/java/Static132.java index ccf9f59..cc22d95 100644 --- a/client/src/main/java/Static132.java +++ b/client/src/main/java/Static132.java @@ -51,8 +51,8 @@ public final class Static132 { Static13.anInt436 = Static231.anInt5204 * 15 + (Static261.aBoolean298 ? 26 : 22); Static24.anInt761 = local43 + 8; } - if (Static154.topLevelInterace != -1) { - Static54.method1304(1, Static154.topLevelInterace); + if (Static154.topLevelInterface != -1) { + Static54.method1304(1, Static154.topLevelInterface); } } @@ -97,10 +97,10 @@ public final class Static132 { @Pc(21) int local21 = local20 = local7 + 128; @Pc(26) int local26; @Pc(27) int local27 = local26 = local15 + 128; - @Pc(37) int local37 = Static83.anIntArrayArrayArray4[arg1][arg6][arg7] - Static162.anInt3947; - @Pc(49) int local49 = Static83.anIntArrayArrayArray4[arg1][arg6 + 1][arg7] - Static162.anInt3947; - @Pc(63) int local63 = Static83.anIntArrayArrayArray4[arg1][arg6 + 1][arg7 + 1] - Static162.anInt3947; - @Pc(75) int local75 = Static83.anIntArrayArrayArray4[arg1][arg6][arg7 + 1] - Static162.anInt3947; + @Pc(37) int local37 = Static83.activeTileHeightMap[arg1][arg6][arg7] - Static162.anInt3947; + @Pc(49) int local49 = Static83.activeTileHeightMap[arg1][arg6 + 1][arg7] - Static162.anInt3947; + @Pc(63) int local63 = Static83.activeTileHeightMap[arg1][arg6 + 1][arg7 + 1] - Static162.anInt3947; + @Pc(75) int local75 = Static83.activeTileHeightMap[arg1][arg6][arg7 + 1] - Static162.anInt3947; @Pc(85) int local85 = local15 * arg4 + local7 * arg5 >> 16; @Pc(95) int local95 = local15 * arg5 - local7 * arg4 >> 16; @Pc(97) int local97 = local85; diff --git a/client/src/main/java/Static134.java b/client/src/main/java/Static134.java index a2bc019..b5f9d1a 100644 --- a/client/src/main/java/Static134.java +++ b/client/src/main/java/Static134.java @@ -5,7 +5,7 @@ import org.openrs2.deob.annotation.Pc; public final class Static134 { @OriginalMember(owner = "client!kh", name = "f", descriptor = "I") - public static int anInt3302; + public static int renderZ; @OriginalMember(owner = "client!kh", name = "g", descriptor = "Lclient!hh;") public static final Class59 aClass59_2 = new Class59(); diff --git a/client/src/main/java/Static136.java b/client/src/main/java/Static136.java index 25478cb..9953261 100644 --- a/client/src/main/java/Static136.java +++ b/client/src/main/java/Static136.java @@ -99,7 +99,7 @@ public final class Static136 { } else { Static178.highDetailLighting = arg0.g1() == 1; } - Static220.aBoolean244 = arg0.g1() == 1; + Static220.highWaterDetail = arg0.g1() == 1; Static71.aBoolean107 = arg0.g1() == 1; Static102.windowMode = arg0.g1(); if (Static102.windowMode > 2) { diff --git a/client/src/main/java/Static137.java b/client/src/main/java/Static137.java index d40fb80..0f5f330 100644 --- a/client/src/main/java/Static137.java +++ b/client/src/main/java/Static137.java @@ -38,10 +38,10 @@ public final class Static137 { for (local37 = 1; local37 < 103; local37++) { local76 = 4 * 512 * (103 - local37) + 24628; for (local80 = 1; local80 < 103; local80++) { - if ((Static12.aByteArrayArrayArray2[arg0][local80][local37] & 0x18) == 0) { + if ((Static12.tileSettings[arg0][local80][local37] & 0x18) == 0) { Static152.method2835(local32, local76, arg0, local80, local37); } - if (arg0 < 3 && (Static12.aByteArrayArrayArray2[arg0 + 1][local80][local37] & 0x8) != 0) { + if (arg0 < 3 && (Static12.tileSettings[arg0 + 1][local80][local37] & 0x8) != 0) { Static152.method2835(local32, local76, arg0 + 1, local80, local37); } local76 += 4; @@ -101,7 +101,7 @@ public final class Static137 { local35 = (int) (Math.random() * 20.0D) + 238 - 10 << 16; for (local37 = 1; local37 < 103; local37++) { for (local76 = 1; local76 < 103; local76++) { - if ((Static12.aByteArrayArrayArray2[arg0][local76][local37] & 0x18) == 0 && !Static164.method3109(local76, local455, local37, local35, arg0)) { + if ((Static12.tileSettings[arg0][local76][local37] & 0x18) == 0 && !Static164.method3109(local76, local455, local37, local35, arg0)) { if (GlRenderer.enabled) { Static129.pixels = null; } else { @@ -109,7 +109,7 @@ public final class Static137 { } return false; } - if (arg0 < 3 && (Static12.aByteArrayArrayArray2[arg0 + 1][local76][local37] & 0x8) != 0 && !Static164.method3109(local76, local455, local37, local35, arg0 + 1)) { + if (arg0 < 3 && (Static12.tileSettings[arg0 + 1][local76][local37] & 0x8) != 0 && !Static164.method3109(local76, local455, local37, local35, arg0 + 1)) { if (GlRenderer.enabled) { Static129.pixels = null; } else { diff --git a/client/src/main/java/Static138.java b/client/src/main/java/Static138.java index d22d5da..c603f58 100644 --- a/client/src/main/java/Static138.java +++ b/client/src/main/java/Static138.java @@ -17,7 +17,7 @@ public final class Static138 { public static Js5 js5Archive15; @OriginalMember(owner = "client!km", name = "Pc", descriptor = "I") - public static int anInt3439; + public static int renderX; @OriginalMember(owner = "client!km", name = "Yc", descriptor = "I") public static int anInt3443; @@ -77,7 +77,7 @@ public final class Static138 { public static final JagString aClass100_654 = Static28.parse(":trade:"); @OriginalMember(owner = "client!km", name = "ad", descriptor = "I") - public static int anInt3445 = 0; + public static int fp = 0; @OriginalMember(owner = "client!km", name = "b", descriptor = "(III)I") public static int method2695(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) { @@ -103,7 +103,7 @@ public final class Static138 { } @OriginalMember(owner = "client!km", name = "f", descriptor = "(I)Z") - public static boolean method2697() { + public static boolean allLevelsAreVisible() { return GlRenderer.enabled ? true : Static162.aBoolean190; } diff --git a/client/src/main/java/Static140.java b/client/src/main/java/Static140.java index 6557eb1..39c4dcb 100644 --- a/client/src/main/java/Static140.java +++ b/client/src/main/java/Static140.java @@ -87,7 +87,7 @@ public final class Static140 { if (local10 != null) { return local10; } - @Pc(26) byte[] local26 = Static85.aClass153_36.method4495(31, arg0); + @Pc(26) byte[] local26 = Static85.aClass153_36.getFile(31, arg0); local10 = new LightType(); if (local26 != null) { local10.method2257(new Buffer(local26), arg0); @@ -97,7 +97,7 @@ public final class Static140 { } @OriginalMember(owner = "client!la", name = "a", descriptor = "(ILclient!na;Lclient!ve;)Lclient!se;") - public static Class134 method2711(@OriginalArg(1) JagString arg0, @OriginalArg(2) Js5 arg1) { + public static Class134 createMapFunctionGroup(@OriginalArg(1) JagString arg0, @OriginalArg(2) Js5 arg1) { @Pc(10) int local10 = arg1.getGroupId(arg0); if (local10 == -1) { return new Class134(0); @@ -105,7 +105,7 @@ public final class Static140 { @Pc(29) int[] local29 = arg1.method4503(local10); @Pc(35) Class134 local35 = new Class134(local29.length); for (@Pc(37) int local37 = 0; local37 < local35.anInt5074; local37++) { - @Pc(56) Buffer local56 = new Buffer(arg1.method4495(local10, local29[local37])); + @Pc(56) Buffer local56 = new Buffer(arg1.getFile(local10, local29[local37])); local35.aClass100Array153[local37] = local56.gjstr(); local35.aByteArray69[local37] = local56.g1s(); local35.aShortArray73[local37] = (short) local56.g2(); diff --git a/client/src/main/java/Static141.java b/client/src/main/java/Static141.java index 515fc8e..0102443 100644 --- a/client/src/main/java/Static141.java +++ b/client/src/main/java/Static141.java @@ -63,14 +63,14 @@ public final class Static141 { Static92.aClass3_Sub2_Sub1_6 = null; Static165.aClass3_Sub2_Sub1_8 = null; Static181.aClass3_Sub2_Sub1_9 = null; - if (Static244.anInt5370 == 5) { + if (Static244.gameState == 5) { Static181.method3344(Static209.js5Archive8); } - if (Static244.anInt5370 == 10) { + if (Static244.gameState == 10) { Static73.method1596(false); } - if (Static244.anInt5370 == 30) { - Static196.method3534(25); + if (Static244.gameState == 30) { + Static196.setGameState(25); } } @@ -82,11 +82,11 @@ public final class Static141 { Static233.anInt5225 = arg1; Static248.anInt4232 = arg4; if (arg0 && Static113.anInt4612 >= 100) { - Static138.anInt3439 = Static245.anInt5375 * 128 + 64; - Static134.anInt3302 = Static248.anInt4232 * 128 + 64; - Static5.anInt40 = Static207.method3685(Static55.level, Static138.anInt3439, Static134.anInt3302) - Static231.anInt5203; + Static138.renderX = Static245.anInt5375 * 128 + 64; + Static134.renderZ = Static248.anInt4232 * 128 + 64; + Static5.anInt40 = Static207.method3685(Static55.level, Static138.renderX, Static134.renderZ) - Static231.anInt5203; } - Static227.anInt5096 = 2; + Static227.cameraType = 2; } @OriginalMember(owner = "client!lb", name = "a", descriptor = "(Lclient!ve;Lclient!ve;ILclient!ve;)V") diff --git a/client/src/main/java/Static142.java b/client/src/main/java/Static142.java index 468102f..a4212f9 100644 --- a/client/src/main/java/Static142.java +++ b/client/src/main/java/Static142.java @@ -66,7 +66,7 @@ public final class Static142 { @Pc(308) Class102[] local308 = Static143.aClass102Array1; for (local310 = 0; local310 < local308.length; local310++) { @Pc(322) Class102 local322 = local308[local310]; - if (local322 != null && local322.anInt4058 == 1 && local322.anInt4057 == Static33.anIntArray79[local5 - Static267.anInt5774] && Static83.anInt372 % 20 < 10) { + if (local322 != null && local322.anInt4058 == 1 && local322.anInt4057 == Static33.anIntArray79[local5 - Static267.anInt5774] && Static83.loop % 20 < 10) { if (local58.anInt3730 == -1) { local359 = local17.method2691() + 15; } else { @@ -121,7 +121,7 @@ public final class Static142 { Static277.anInt5854++; } } - if (local17.anInt3378 > Static83.anInt372) { + if (local17.anInt3378 > Static83.loop) { @Pc(508) Sprite local508 = Static116.aClass3_Sub2_Sub1Array3[0]; @Pc(512) Sprite local512 = Static116.aClass3_Sub2_Sub1Array3[1]; if (local17 instanceof Npc) { @@ -167,7 +167,7 @@ public final class Static142 { } } for (local74 = 0; local74 < 4; local74++) { - if (local17.anIntArray319[local74] > Static83.anInt372) { + if (local17.anIntArray319[local74] > Static83.loop) { if (local17 instanceof Npc) { @Pc(725) Npc local725 = (Npc) local17; @Pc(728) NpcType local728 = local725.aClass96_1; diff --git a/client/src/main/java/Static145.java b/client/src/main/java/Static145.java index ead4879..8403ff0 100644 --- a/client/src/main/java/Static145.java +++ b/client/src/main/java/Static145.java @@ -21,11 +21,11 @@ public final class Static145 { @OriginalMember(owner = "client!lf", name = "a", descriptor = "(I)V") public static void method2742() { - if (Static244.anInt5370 == 10 && GlRenderer.enabled) { - Static196.method3534(28); + if (Static244.gameState == 10 && GlRenderer.enabled) { + Static196.setGameState(28); } - if (Static244.anInt5370 == 30) { - Static196.method3534(25); + if (Static244.gameState == 30) { + Static196.setGameState(25); } } @@ -102,6 +102,6 @@ public final class Static145 { @OriginalMember(owner = "client!lf", name = "c", descriptor = "(I)I") public static int method2746() { - return ((Static99.stereo ? 1 : 0) << 19) + (((Static71.aBoolean107 ? 1 : 0) << 16) + ((Static220.aBoolean244 ? 1 : 0) << 15) + ((Static178.highDetailLighting ? 1 : 0) << 13) + ((Static209.aBoolean240 ? 1 : 0) << 10) + ((Static159.aBoolean189 ? 1 : 0) << 9) + ((Static15.aBoolean33 ? 1 : 0) << 7) + ((Static53.highDetailTextures ? 1 : 0) << 6) + ((Static250.aBoolean283 ? 1 : 0) << 5) + (((Static162.aBoolean190 ? 1 : 0) << 3) + (Static113.brightness & 0x7) - (-((Static80.aBoolean231 ? 1 : 0) << 4) + -((Static11.aBoolean15 ? 1 : 0) << 8)) - (-((Static139.anInt3451 & 0x3) << 11) + -((Static125.anInt3104 == 0 ? 0 : 1) << 20) - (((Static12.anInt391 == 0 ? 0 : 1) << 21) + ((Static30.anInt978 == 0 ? 0 : 1) << 22)))) + (Static76.method1644() << 23)); + return ((Static99.stereo ? 1 : 0) << 19) + (((Static71.aBoolean107 ? 1 : 0) << 16) + ((Static220.highWaterDetail ? 1 : 0) << 15) + ((Static178.highDetailLighting ? 1 : 0) << 13) + ((Static209.aBoolean240 ? 1 : 0) << 10) + ((Static159.aBoolean189 ? 1 : 0) << 9) + ((Static15.aBoolean33 ? 1 : 0) << 7) + ((Static53.highDetailTextures ? 1 : 0) << 6) + ((Static250.aBoolean283 ? 1 : 0) << 5) + (((Static162.aBoolean190 ? 1 : 0) << 3) + (Static113.brightness & 0x7) - (-((Static80.aBoolean231 ? 1 : 0) << 4) + -((Static11.aBoolean15 ? 1 : 0) << 8)) - (-((Static139.anInt3451 & 0x3) << 11) + -((Static125.anInt3104 == 0 ? 0 : 1) << 20) - (((Static12.anInt391 == 0 ? 0 : 1) << 21) + ((Static30.anInt978 == 0 ? 0 : 1) << 22)))) + (Static76.method1644() << 23)); } } diff --git a/client/src/main/java/Static146.java b/client/src/main/java/Static146.java index 5d8bc28..c897578 100644 --- a/client/src/main/java/Static146.java +++ b/client/src/main/java/Static146.java @@ -36,8 +36,8 @@ public final class Static146 { @OriginalMember(owner = "client!lg", name = "a", descriptor = "(I)V") public static void method2750(@OriginalArg(0) int arg0) { Static235.anInt5276 = arg0; - for (@Pc(3) int local3 = 0; local3 < Static152.anInt3594; local3++) { - for (@Pc(8) int local8 = 0; local8 < Static99.anInt2550; local8++) { + for (@Pc(3) int local3 = 0; local3 < Static152.mapSizeX; local3++) { + for (@Pc(8) int local8 = 0; local8 < Static99.mapSizeZ; local8++) { if (Static130.aClass3_Sub5ArrayArrayArray1[arg0][local3][local8] == null) { Static130.aClass3_Sub5ArrayArrayArray1[arg0][local3][local8] = new Tile(arg0, local3, local8); } diff --git a/client/src/main/java/Static148.java b/client/src/main/java/Static148.java index d494f09..655e3ea 100644 --- a/client/src/main/java/Static148.java +++ b/client/src/main/java/Static148.java @@ -37,7 +37,7 @@ public final class Static148 { @OriginalMember(owner = "client!li", name = "a", descriptor = "(III)V") public static void method2766(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) { - Static7.anIntArray75[arg0] = arg1; + Static7.varps[arg0] = arg1; @Pc(21) LongNode local21 = (LongNode) Static199.aClass133_20.method3863((long) arg0); if (local21 == null) { local21 = new LongNode(MonotonicClock.currentTimeMillis() + 500L); @@ -53,7 +53,7 @@ public final class Static148 { if (local16 != null) { return local16; } - @Pc(26) byte[] local26 = Static261.js5Archive13.method4495(arg0, 0); + @Pc(26) byte[] local26 = Static261.js5Archive13.getFile(arg0, 0); local16 = new SoftwareFont(local26); local16.method2873(Static159.aClass36Array12, null); Static139.aClass99_22.method3095(local16, (long) arg0); diff --git a/client/src/main/java/Static150.java b/client/src/main/java/Static150.java index 3772779..690ef6c 100644 --- a/client/src/main/java/Static150.java +++ b/client/src/main/java/Static150.java @@ -87,9 +87,9 @@ public final class Static150 { } if (arg3 && arg2.anObjectArray17 != null && (local4 != arg2.anInt445 || arg2.anInt459 != local7)) { @Pc(305) HookRequest local305 = new HookRequest(); - local305.anObjectArray31 = arg2.anObjectArray17; + local305.arguments = arg2.anObjectArray17; local305.source = arg2; - Static185.aClass69_101.method2282(local305); + Static185.lowPriorityRequests.method2282(local305); } } diff --git a/client/src/main/java/Static152.java b/client/src/main/java/Static152.java index 6e98661..3838fa6 100644 --- a/client/src/main/java/Static152.java +++ b/client/src/main/java/Static152.java @@ -5,7 +5,7 @@ import org.openrs2.deob.annotation.Pc; public final class Static152 { @OriginalMember(owner = "client!ma", name = "i", descriptor = "I") - public static int anInt3594; + public static int mapSizeX; @OriginalMember(owner = "client!ma", name = "q", descriptor = "Lclient!fd;") public static WorldMapFont aClass41_3; diff --git a/client/src/main/java/Static154.java b/client/src/main/java/Static154.java index 45c33c7..14b3ef0 100644 --- a/client/src/main/java/Static154.java +++ b/client/src/main/java/Static154.java @@ -17,7 +17,7 @@ public final class Static154 { public static final short[][] aShortArrayArray6 = new short[][] { { 6798, 107, 10283, 16, 4797, 7744, 5799, 4634, -31839, 22433, 2983, -11343, 8, 5281, 10438, 3650, -27322, -21845, 200, 571, 908, 21830, 28946, -15701, -14010 }, { 8741, 12, -1506, -22374, 7735, 8404, 1701, -27106, 24094, 10153, -8915, 4783, 1341, 16578, -30533, 25239, 8, 5281, 10438, 3650, -27322, -21845, 200, 571, 908, 21830, 28946, -15701, -14010 }, { 25238, 8742, 12, -1506, -22374, 7735, 8404, 1701, -27106, 24094, 10153, -8915, 4783, 1341, 16578, -30533, 8, 5281, 10438, 3650, -27322, -21845, 200, 571, 908, 21830, 28946, -15701, -14010 }, { 4626, 11146, 6439, 12, 4758, 10270 }, { 4550, 4537, 5681, 5673, 5790, 6806, 8076, 4574 } }; @OriginalMember(owner = "client!md", name = "W", descriptor = "I") - public static int topLevelInterace = -1; + public static int topLevelInterface = -1; @OriginalMember(owner = "client!md", name = "a", descriptor = "(Lclient!be;I)Z") public static boolean method2926(@OriginalArg(0) Component arg0) { diff --git a/client/src/main/java/Static155.java b/client/src/main/java/Static155.java index 28cb390..3653cc4 100644 --- a/client/src/main/java/Static155.java +++ b/client/src/main/java/Static155.java @@ -64,12 +64,12 @@ public final class Static155 { } @OriginalMember(owner = "client!me", name = "a", descriptor = "(II)I") - public static int method2945(@OriginalArg(1) int arg0) { + public static int getVarbit(@OriginalArg(1) int arg0) { @Pc(13) Class85 local13 = Static125.method2449(arg0); @Pc(16) int local16 = local13.anInt3327; @Pc(19) int local19 = local13.anInt3323; @Pc(22) int local22 = local13.anInt3318; @Pc(29) int local29 = Class3_Sub9.anIntArray135[local19 - local22]; - return Static7.anIntArray75[local16] >> local22 & local29; + return Static7.varps[local16] >> local22 & local29; } } diff --git a/client/src/main/java/Static156.java b/client/src/main/java/Static156.java index ce0ac6d..701e508 100644 --- a/client/src/main/java/Static156.java +++ b/client/src/main/java/Static156.java @@ -6,7 +6,7 @@ import org.openrs2.deob.annotation.Pc; public final class Static156 { @OriginalMember(owner = "client!mf", name = "O", descriptor = "[[B") - public static byte[][] aByteArrayArray11; + public static byte[][] locationMapFilesBuffer; @OriginalMember(owner = "client!mf", name = "W", descriptor = "Lclient!ve;") public static Js5 js5Archive22; @@ -21,13 +21,13 @@ public final class Static156 { public static void method2954(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) byte[][][] arg5, @OriginalArg(6) int[] arg6, @OriginalArg(7) int[] arg7, @OriginalArg(8) int[] arg8, @OriginalArg(9) int[] arg9, @OriginalArg(10) int[] arg10, @OriginalArg(11) int arg11, @OriginalArg(12) byte arg12, @OriginalArg(13) int arg13, @OriginalArg(14) int arg14) { if (arg0 < 0) { arg0 = 0; - } else if (arg0 >= Static152.anInt3594 * 128) { - arg0 = Static152.anInt3594 * 128 - 1; + } else if (arg0 >= Static152.mapSizeX * 128) { + arg0 = Static152.mapSizeX * 128 - 1; } if (arg2 < 0) { arg2 = 0; - } else if (arg2 >= Static99.anInt2550 * 128) { - arg2 = Static99.anInt2550 * 128 - 1; + } else if (arg2 >= Static99.mapSizeZ * 128) { + arg2 = Static99.mapSizeZ * 128 - 1; } Static109.anInt2886 = MathUtils.anIntArray223[arg3]; Static121.anInt3038 = MathUtils.anIntArray225[arg3]; @@ -38,21 +38,21 @@ public final class Static156 { Static217.anInt4903 = arg2; Static167.anInt4069 = arg0 / 128; Static193.anInt4539 = arg2 / 128; - Static31.anInt987 = Static167.anInt4069 - Static277.anInt5855; + Static31.anInt987 = Static167.anInt4069 - Static277.tileVisibilityDistance; if (Static31.anInt987 < 0) { Static31.anInt987 = 0; } - Static80.anInt4698 = Static193.anInt4539 - Static277.anInt5855; + Static80.anInt4698 = Static193.anInt4539 - Static277.tileVisibilityDistance; if (Static80.anInt4698 < 0) { Static80.anInt4698 = 0; } - Static2.anInt15 = Static167.anInt4069 + Static277.anInt5855; - if (Static2.anInt15 > Static152.anInt3594) { - Static2.anInt15 = Static152.anInt3594; + Static2.anInt15 = Static167.anInt4069 + Static277.tileVisibilityDistance; + if (Static2.anInt15 > Static152.mapSizeX) { + Static2.anInt15 = Static152.mapSizeX; } - Static215.anInt4866 = Static193.anInt4539 + Static277.anInt5855; - if (Static215.anInt4866 > Static99.anInt2550) { - Static215.anInt4866 = Static99.anInt2550; + Static215.anInt4866 = Static193.anInt4539 + Static277.tileVisibilityDistance; + if (Static215.anInt4866 > Static99.mapSizeZ) { + Static215.anInt4866 = Static99.mapSizeZ; } @Pc(99) short local99; if (GlRenderer.enabled) { @@ -62,28 +62,28 @@ public final class Static156 { } @Pc(104) int local104; @Pc(113) int local113; - for (local104 = 0; local104 < Static277.anInt5855 + Static277.anInt5855 + 2; local104++) { - for (local113 = 0; local113 < Static277.anInt5855 + Static277.anInt5855 + 2; local113++) { - @Pc(130) int local130 = (local104 - Static277.anInt5855 << 7) - (Static149.anInt3555 & 0x7F); - @Pc(140) int local140 = (local113 - Static277.anInt5855 << 7) - (Static217.anInt4903 & 0x7F); - @Pc(146) int local146 = Static167.anInt4069 + local104 - Static277.anInt5855; - @Pc(152) int local152 = Static193.anInt4539 + local113 - Static277.anInt5855; - if (local146 >= 0 && local152 >= 0 && local146 < Static152.anInt3594 && local152 < Static99.anInt2550) { + for (local104 = 0; local104 < Static277.tileVisibilityDistance + Static277.tileVisibilityDistance + 2; local104++) { + for (local113 = 0; local113 < Static277.tileVisibilityDistance + Static277.tileVisibilityDistance + 2; local113++) { + @Pc(130) int local130 = (local104 - Static277.tileVisibilityDistance << 7) - (Static149.anInt3555 & 0x7F); + @Pc(140) int local140 = (local113 - Static277.tileVisibilityDistance << 7) - (Static217.anInt4903 & 0x7F); + @Pc(146) int local146 = Static167.anInt4069 + local104 - Static277.tileVisibilityDistance; + @Pc(152) int local152 = Static193.anInt4539 + local113 - Static277.tileVisibilityDistance; + if (local146 >= 0 && local152 >= 0 && local146 < Static152.mapSizeX && local152 < Static99.mapSizeZ) { @Pc(176) int local176; - if (Static80.anIntArrayArrayArray19 == null) { - local176 = Static107.anIntArrayArrayArray10[0][local146][local152] + 128 - Static162.anInt3947; + if (Static80.underWaterTileHeightMap == null) { + local176 = Static107.surfaceTileHeightMap[0][local146][local152] + 128 - Static162.anInt3947; } else { - local176 = Static80.anIntArrayArrayArray19[0][local146][local152] + 128 - Static162.anInt3947; + local176 = Static80.underWaterTileHeightMap[0][local146][local152] + 128 - Static162.anInt3947; } - @Pc(201) int local201 = Static107.anIntArrayArrayArray10[3][local146][local152] - Static162.anInt3947 - 1000; + @Pc(201) int local201 = Static107.surfaceTileHeightMap[3][local146][local152] - Static162.anInt3947 - 1000; Static89.aBooleanArrayArray3[local104][local113] = Static160.method3049(local130, local201, local176, local140, local99); } else { Static89.aBooleanArrayArray3[local104][local113] = false; } } } - for (local104 = 0; local104 < Static277.anInt5855 + Static277.anInt5855 + 1; local104++) { - for (local113 = 0; local113 < Static277.anInt5855 + Static277.anInt5855 + 1; local113++) { + for (local104 = 0; local104 < Static277.tileVisibilityDistance + Static277.tileVisibilityDistance + 1; local104++) { + for (local113 = 0; local113 < Static277.tileVisibilityDistance + Static277.tileVisibilityDistance + 1; local113++) { Static48.aBooleanArrayArray1[local104][local113] = Static89.aBooleanArrayArray3[local104][local113] || Static89.aBooleanArrayArray3[local104 + 1][local113] || Static89.aBooleanArrayArray3[local104][local113 + 1] || Static89.aBooleanArrayArray3[local104 + 1][local113 + 1]; } } @@ -93,8 +93,8 @@ public final class Static156 { Static234.anIntArray454 = arg9; Static206.anIntArray427 = arg10; Static123.method2419(); - if (Static276.aClass3_Sub5ArrayArrayArray3 != null) { - Static278.method4648(true); + if (Static276.underWaterGroundTiles != null) { + Static278.setRenderTiles(true); Static248.method3292(arg0, arg1, arg2, null, 0, (byte) 0, arg13, arg14); if (GlRenderer.enabled) { Static119.aBoolean153 = false; @@ -102,7 +102,7 @@ public final class Static156 { Static161.method3066(null); Static120.method2390(); } - Static278.method4648(false); + Static278.setRenderTiles(false); } Static248.method3292(arg0, arg1, arg2, arg5, arg11, arg12, arg13, arg14); } @@ -160,8 +160,8 @@ public final class Static156 { local1.glPushAttrib(GL2.GL_FOG_BIT); local1.glFogf(GL2.GL_FOG_START, 3072.0F); GlRenderer.disableDepthMask(); - for (@Pc(19) int local19 = 0; local19 < Static36.aClass3_Sub14ArrayArray1[0].length; local19++) { - @Pc(31) Class3_Sub14 local31 = Static36.aClass3_Sub14ArrayArray1[0][local19]; + for (@Pc(19) int local19 = 0; local19 < Static36.surfaceHdTiles[0].length; local19++) { + @Pc(31) GlTile local31 = Static36.surfaceHdTiles[0][local19]; if (local31.anInt2485 >= 0 && Rasteriser.textureProvider.method3237(local31.anInt2485) == 4) { local1.glColor4fv(Static190.method3441(local31.anInt2486), 0); @Pc(57) float local57 = 201.5F - (local31.aBoolean140 ? 1.0F : 0.5F); diff --git a/client/src/main/java/Static158.java b/client/src/main/java/Static158.java index a1756f1..e833f0e 100644 --- a/client/src/main/java/Static158.java +++ b/client/src/main/java/Static158.java @@ -21,8 +21,8 @@ public final class Static158 { public static int anInt3857 = 0; @OriginalMember(owner = "client!mh", name = "f", descriptor = "(B)V") - public static void method3008() { - if (Static179.anInt4261 == 0) { + public static void handleAccountCreation() { + if (Static179.accountCreationStep == 0) { return; } try { @@ -33,10 +33,10 @@ public final class Static158 { } if (Static57.anInt1758 >= 1) { Static223.anInt5034 = -5; - Static179.anInt4261 = 0; + Static179.accountCreationStep = 0; return; } - Static179.anInt4261 = 1; + Static179.accountCreationStep = 1; Static226.anInt5079 = 0; Static57.anInt1758++; if (Static209.port == Static271.defaultPort) { @@ -45,12 +45,12 @@ public final class Static158 { Static209.port = Static271.defaultPort; } } - if (Static179.anInt4261 == 1) { + if (Static179.accountCreationStep == 1) { Static72.aClass212_3 = GameShell.signLink.openSocket(Static60.hostname, Static209.port); - Static179.anInt4261 = 2; + Static179.accountCreationStep = 2; } @Pc(120) int local120; - if (Static179.anInt4261 == 2) { + if (Static179.accountCreationStep == 2) { if (Static72.aClass212_3.status == 2) { throw new IOException(); } @@ -75,21 +75,21 @@ public final class Static158 { } if (local120 != 21) { Static223.anInt5034 = local120; - Static179.anInt4261 = 0; + Static179.accountCreationStep = 0; Static124.socket.close(); Static124.socket = null; return; } - Static179.anInt4261 = 3; + Static179.accountCreationStep = 3; } - if (Static179.anInt4261 == 3) { + if (Static179.accountCreationStep == 3) { if (Static124.socket.available() < 1) { return; } Static229.aClass100Array156 = new JagString[Static124.socket.read()]; - Static179.anInt4261 = 4; + Static179.accountCreationStep = 4; } - if (Static179.anInt4261 == 4) { + if (Static179.accountCreationStep == 4) { if (Static124.socket.available() < Static229.aClass100Array156.length * 8) { return; } @@ -99,7 +99,7 @@ public final class Static158 { Static229.aClass100Array156[local120] = Static79.decode37(Static57.aClass3_Sub15_Sub1_3.g8()); } Static223.anInt5034 = 21; - Static179.anInt4261 = 0; + Static179.accountCreationStep = 0; Static124.socket.close(); Static124.socket = null; return; @@ -117,10 +117,10 @@ public final class Static158 { Static209.port = Static271.defaultPort; } Static226.anInt5079 = 0; - Static179.anInt4261 = 1; + Static179.accountCreationStep = 1; } else { Static223.anInt5034 = -4; - Static179.anInt4261 = 0; + Static179.accountCreationStep = 0; } } } @@ -131,37 +131,37 @@ public final class Static158 { } @OriginalMember(owner = "client!mh", name = "h", descriptor = "(B)V") - public static void method3013() { - @Pc(10) int local10 = Static191.aByteArrayArray15.length; + public static void decodeNpcFiles() { + @Pc(10) int local10 = Static191.npcSpawnsFilesBuffer.length; for (@Pc(16) int local16 = 0; local16 < local10; local16++) { - if (Static191.aByteArrayArray15[local16] != null) { + if (Static191.npcSpawnsFilesBuffer[local16] != null) { @Pc(25) int local25 = -1; for (@Pc(27) int local27 = 0; local27 < Static157.anInt3811; local27++) { - if (Static217.anIntArray434[local27] == Static238.anIntArray470[local16]) { + if (Static217.anIntArray434[local27] == Static238.regionBitPacked[local16]) { local25 = local27; break; } } if (local25 == -1) { - Static217.anIntArray434[Static157.anInt3811] = Static238.anIntArray470[local16]; + Static217.anIntArray434[Static157.anInt3811] = Static238.regionBitPacked[local16]; local25 = Static157.anInt3811++; } @Pc(67) int local67 = 0; - @Pc(74) Buffer local74 = new Buffer(Static191.aByteArrayArray15[local16]); - while (local74.offset < Static191.aByteArrayArray15[local16].length && local67 < 511) { + @Pc(74) Buffer local74 = new Buffer(Static191.npcSpawnsFilesBuffer[local16]); + while (local74.offset < Static191.npcSpawnsFilesBuffer[local16].length && local67 < 511) { @Pc(97) int local97 = local67++ << 6 | local25; @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.anIntArray470[local16] >> 8) * 64 - Static225.originX; + @Pc(125) int local125 = local113 + (Static238.regionBitPacked[local16] >> 8) * 64 - Static225.originX; @Pc(129) int local129 = local103 & 0x3F; - @Pc(142) int local142 = local129 + (Static238.anIntArray470[local16] & 0xFF) * 64 - Static142.originZ; + @Pc(142) int local142 = local129 + (Static238.regionBitPacked[local16] & 0xFF) * 64 - Static142.originZ; @Pc(148) NpcType local148 = Static214.method4363(local74.g2()); if (Static175.aClass8_Sub4_Sub2Array1[local97] == null && (local148.aByte10 & 0x1) > 0 && local107 == Static41.anInt1316 && local125 >= 0 && local148.anInt3713 + local125 < 104 && local142 >= 0 && local142 + local148.anInt3713 < 104) { Static175.aClass8_Sub4_Sub2Array1[local97] = new Npc(); @Pc(198) Npc local198 = Static175.aClass8_Sub4_Sub2Array1[local97]; Static33.anIntArray79[Static272.anInt5214++] = local97; - local198.anInt3430 = Static83.anInt372; + local198.anInt3430 = Static83.loop; local198.method2698(local148); local198.method2692(local198.aClass96_1.anInt3713); local198.anInt3400 = local198.anInt3381 = Static56.anIntArray141[local198.aClass96_1.aByte11]; diff --git a/client/src/main/java/Static160.java b/client/src/main/java/Static160.java index b5836dd..e6e888d 100644 --- a/client/src/main/java/Static160.java +++ b/client/src/main/java/Static160.java @@ -40,9 +40,9 @@ public final class Static160 { Static129.method2504(arg0, arg1, arg2.anIntArray37, arg2.anIntArray45); } } else if (GlRenderer.enabled) { - ((GlSprite) Static106.aClass3_Sub2_Sub1_7).method1427(arg0, arg1, arg2.anInt445, arg2.anInt459, Static106.aClass3_Sub2_Sub1_7.anInt1867 / 2, Static106.aClass3_Sub2_Sub1_7.anInt1859 / 2, Static57.anInt1747, 256, (GlSprite) arg2.method489(false)); + ((GlSprite) Static106.aClass3_Sub2_Sub1_7).method1427(arg0, arg1, arg2.anInt445, arg2.anInt459, Static106.aClass3_Sub2_Sub1_7.anInt1867 / 2, Static106.aClass3_Sub2_Sub1_7.anInt1859 / 2, Static57.yawTarget, 256, (GlSprite) arg2.method489(false)); } else { - ((SoftwareSprite) Static106.aClass3_Sub2_Sub1_7).method313(arg0, arg1, arg2.anInt445, arg2.anInt459, Static106.aClass3_Sub2_Sub1_7.anInt1867 / 2, Static106.aClass3_Sub2_Sub1_7.anInt1859 / 2, Static57.anInt1747, arg2.anIntArray37, arg2.anIntArray45); + ((SoftwareSprite) Static106.aClass3_Sub2_Sub1_7).method313(arg0, arg1, arg2.anInt445, arg2.anInt459, Static106.aClass3_Sub2_Sub1_7.anInt1867 / 2, Static106.aClass3_Sub2_Sub1_7.anInt1859 / 2, Static57.yawTarget, arg2.anIntArray37, arg2.anIntArray45); } Static31.aBooleanArray29[arg3] = true; } diff --git a/client/src/main/java/Static172.java b/client/src/main/java/Static172.java index c4605dd..8c361c9 100644 --- a/client/src/main/java/Static172.java +++ b/client/src/main/java/Static172.java @@ -17,7 +17,7 @@ public final class Static172 { public static Js5 aClass153_70; @OriginalMember(owner = "client!nj", name = "j", descriptor = "[I") - public static int[] anIntArray366; + public static int[] locationsMapFileIds; @OriginalMember(owner = "client!nj", name = "k", descriptor = "I") public static int anInt4165; diff --git a/client/src/main/java/Static175.java b/client/src/main/java/Static175.java index d376c6e..f1f3323 100644 --- a/client/src/main/java/Static175.java +++ b/client/src/main/java/Static175.java @@ -3,7 +3,7 @@ import org.openrs2.deob.annotation.OriginalMember; public final class Static175 { @OriginalMember(owner = "client!nm", name = "P", descriptor = "[I") - public static int[] anIntArray371; + public static int[] npcSpawnsFileIds; @OriginalMember(owner = "client!nm", name = "W", descriptor = "Lclient!na;") public static JagString url; @@ -12,7 +12,7 @@ public final class Static175 { public static final Npc[] aClass8_Sub4_Sub2Array1 = new Npc[32768]; @OriginalMember(owner = "client!nm", name = "U", descriptor = "I") - public static int anInt4220 = 0; + public static int mapFilesMissingCount = 0; @OriginalMember(owner = "client!nm", name = "Y", descriptor = "J") public static long firstGc = 0L; @@ -23,11 +23,11 @@ public final class Static175 { @OriginalMember(owner = "client!nm", name = "a", descriptor = "(Z)V") public static void method3279() { if (Static267.anInt5775 > 0) { - Static278.method4653(); + Static278.processLogout(); } else { Static233.aClass95_4 = Static124.socket; Static124.socket = null; - Static196.method3534(40); + Static196.setGameState(40); } } } diff --git a/client/src/main/java/Static179.java b/client/src/main/java/Static179.java index 39959c7..594a34d 100644 --- a/client/src/main/java/Static179.java +++ b/client/src/main/java/Static179.java @@ -16,7 +16,7 @@ public final class Static179 { public static final SoftLruHashTable aClass99_25 = new SoftLruHashTable(64); @OriginalMember(owner = "client!oe", name = "l", descriptor = "I") - public static int anInt4261 = 0; + public static int accountCreationStep = 0; @OriginalMember(owner = "client!oe", name = "n", descriptor = "I") public static int anInt4262 = 1; diff --git a/client/src/main/java/Static18.java b/client/src/main/java/Static18.java index 8b02393..069c996 100644 --- a/client/src/main/java/Static18.java +++ b/client/src/main/java/Static18.java @@ -20,14 +20,14 @@ public final class Static18 { public static boolean sentToServer = true; @OriginalMember(owner = "client!bh", name = "C", descriptor = "Lclient!na;") - public static final JagString aClass100_108 = Static28.parse("
(X100(U(Y"); + public static final JagString COMPLETE_PERCENT = Static28.parse("
(X100(U(Y"); @OriginalMember(owner = "client!bh", name = "G", descriptor = "[I") public static final int[] anIntArray57 = new int[] { 0, 1, 3, 7, 15, 31, 63, 127, 255, 511, 1023, 2047, 4095, 8191, 16383, 32767, 65535, 131071, 262143, 524287, 1048575, 2097151, 4194303, 8388607, 16777215, 33554431, 67108863, 134217727, 268435455, 536870911, 1073741823, Integer.MAX_VALUE, -1 }; @OriginalMember(owner = "client!bh", name = "a", descriptor = "(Lclient!fe;Z)V") public static void method553(@OriginalArg(0) PathingEntity arg0) { - @Pc(8) int local8 = arg0.anInt3395 - Static83.anInt372; + @Pc(8) int local8 = arg0.anInt3395 - Static83.loop; @Pc(20) int local20 = arg0.anInt3380 * 128 + arg0.method2693() * 64; @Pc(36) int local36 = arg0.anInt3428 * 128 + arg0.method2693() * 64; if (arg0.anInt3431 == 0) { @@ -85,10 +85,10 @@ public final class Static18 { local55 = local72 * local57 >> 16; local57 = local57 * local68 >> 16; } - Static240.anInt5333 = arg6; - Static184.anInt4358 = arg4; - Static134.anInt3302 = arg5 - local57; - Static138.anInt3439 = arg0 - local55; + Static240.cameraPitch = arg6; + Static184.cameraYaw = arg4; + Static134.renderZ = arg5 - local57; + Static138.renderX = arg0 - local55; Static5.anInt40 = arg2 - local59; } diff --git a/client/src/main/java/Static180.java b/client/src/main/java/Static180.java index e1d6c4b..5c63a4c 100644 --- a/client/src/main/java/Static180.java +++ b/client/src/main/java/Static180.java @@ -11,7 +11,7 @@ public final class Static180 { public static Component aClass13_22; @OriginalMember(owner = "client!og", name = "g", descriptor = "[Lclient!na;") - public static JagString[] aClass100Array125; + public static JagString[] stringLocals; @OriginalMember(owner = "client!og", name = "a", descriptor = "(Lclient!ve;Lclient!ve;B)V") public static void init(@OriginalArg(0) Js5 arg0, @OriginalArg(1) Js5 arg1) { diff --git a/client/src/main/java/Static182.java b/client/src/main/java/Static182.java index 10a6387..12fd418 100644 --- a/client/src/main/java/Static182.java +++ b/client/src/main/java/Static182.java @@ -11,7 +11,7 @@ public final class Static182 { public static Js5 aClass153_77; @OriginalMember(owner = "client!oj", name = "E", descriptor = "[[Lclient!hg;") - public static Class3_Sub14[][] aClass3_Sub14ArrayArray2; + public static GlTile[][] aClass3_Sub14ArrayArray2; @OriginalMember(owner = "client!oj", name = "p", descriptor = "I") public static final int anInt4306 = 2301979; diff --git a/client/src/main/java/Static184.java b/client/src/main/java/Static184.java index 2948841..600f8f4 100644 --- a/client/src/main/java/Static184.java +++ b/client/src/main/java/Static184.java @@ -8,10 +8,10 @@ public final class Static184 { public static Js5 js5Archive10; @OriginalMember(owner = "client!ol", name = "ib", descriptor = "I") - public static int anInt4358; + public static int cameraYaw; @OriginalMember(owner = "client!ol", name = "V", descriptor = "I") - public static int anInt4348 = 0; + public static int loginStep = 0; @OriginalMember(owner = "client!ol", name = "Y", descriptor = "Lclient!na;") public static final JagString aClass100_819 = Static28.parse(""); diff --git a/client/src/main/java/Static185.java b/client/src/main/java/Static185.java index b68e50e..48ad1a2 100644 --- a/client/src/main/java/Static185.java +++ b/client/src/main/java/Static185.java @@ -11,7 +11,7 @@ public final class Static185 { public static float aFloat23; @OriginalMember(owner = "client!p", name = "c", descriptor = "Lclient!ih;") - public static final LinkedList aClass69_101 = new LinkedList(); + public static final LinkedList lowPriorityRequests = new LinkedList(); @OriginalMember(owner = "client!p", name = "d", descriptor = "I") public static int anInt4369 = 0; @@ -21,15 +21,15 @@ public final class Static185 { @OriginalMember(owner = "client!p", name = "a", descriptor = "(I)V") public static void method3395() { - if (Static184.anInt4348 == 5) { - Static184.anInt4348 = 6; + if (Static184.loginStep == 5) { + Static184.loginStep = 6; } } @OriginalMember(owner = "client!p", name = "a", descriptor = "(IZIZLclient!mj;IIIBII)V") public static void method3397(@OriginalArg(0) int arg0, @OriginalArg(1) boolean arg1, @OriginalArg(2) int arg2, @OriginalArg(3) boolean arg3, @OriginalArg(4) CollisionMap arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7, @OriginalArg(9) int arg8, @OriginalArg(10) int arg9) { - if (arg1 && !Static138.method2697() && (Static12.aByteArrayArrayArray2[0][arg7][arg8] & 0x2) == 0) { - if ((Static12.aByteArrayArrayArray2[arg2][arg7][arg8] & 0x10) != 0) { + if (arg1 && !Static138.allLevelsAreVisible() && (Static12.tileSettings[0][arg7][arg8] & 0x2) == 0) { + if ((Static12.tileSettings[arg2][arg7][arg8] & 0x10) != 0) { return; } if (Static4.method22(arg8, arg7, arg2) != Static41.anInt1316) { @@ -70,22 +70,22 @@ public final class Static185 { local129 = (local81 >> 1) + arg8; local133 = arg8 + (local81 + 1 >> 1); } - @Pc(153) int[][] local153 = Static83.anIntArrayArrayArray4[arg0]; + @Pc(153) int[][] local153 = Static83.activeTileHeightMap[arg0]; @Pc(165) int local165 = (local84 << 6) + (arg7 << 7); @Pc(173) int local173 = (local81 << 6) + (arg8 << 7); @Pc(199) int local199 = local153[local103][local133] + local153[local112][local129] + local153[local103][local129] + local153[local112][local133] >> 2; @Pc(201) int local201 = 0; @Pc(213) int[][] local213; if (GlRenderer.enabled && arg0 != 0) { - local213 = Static83.anIntArrayArrayArray4[0]; + local213 = Static83.activeTileHeightMap[0]; local201 = local199 - (local213[local112][local133] + local213[local112][local129] + local213[local103][local129] + local213[local103][local133] >> 2); } local213 = null; @Pc(261) long local261 = (long) (arg7 | 0x40000000 | arg8 << 7 | arg6 << 14 | arg9 << 20); if (arg3) { - local213 = Static107.anIntArrayArrayArray10[0]; + local213 = Static107.surfaceTileHeightMap[0]; } else if (arg0 < 3) { - local213 = Static83.anIntArrayArrayArray4[arg0 + 1]; + local213 = Static83.activeTileHeightMap[arg0 + 1]; } if (local62.anInt4429 == 0 || arg3) { local261 |= Long.MIN_VALUE; diff --git a/client/src/main/java/Static186.java b/client/src/main/java/Static186.java index b4749a0..b94d316 100644 --- a/client/src/main/java/Static186.java +++ b/client/src/main/java/Static186.java @@ -5,7 +5,7 @@ import org.openrs2.deob.annotation.Pc; public final class Static186 { @OriginalMember(owner = "client!pa", name = "L", descriptor = "[[B") - public static byte[][] aByteArrayArray14; + public static byte[][] underWaterMapFilesBuffer; @OriginalMember(owner = "client!pa", name = "K", descriptor = "Z") public static boolean aBoolean205 = false; @@ -31,7 +31,7 @@ public final class Static186 { return; } if (Static41.anInt1309 < 10) { - if (!Static119.aClass153_44.method4489(Static269.aClass3_Sub2_Sub4_2.aClass100_138)) { + if (!Static119.aClass153_44.allFilesComplete(Static269.aClass3_Sub2_Sub4_2.aClass100_138)) { Static41.anInt1309 = Static227.js5Archive23.method4478(Static269.aClass3_Sub2_Sub4_2.aClass100_138) / 10; return; } @@ -92,7 +92,7 @@ public final class Static186 { } else if (Static41.anInt1309 == 20) { Static33.method868(new Buffer(Static119.aClass153_44.fetchFile(Static166.aClass100_779, Static269.aClass3_Sub2_Sub4_2.aClass100_138))); Static41.anInt1309 = 30; - Static7.method842(true); + Static7.ping(true); Static234.method4020(); } else if (Static41.anInt1309 == 30) { Static47.method3998(new Buffer(Static119.aClass153_44.fetchFile(Static4.aClass100_7, Static269.aClass3_Sub2_Sub4_2.aClass100_138))); @@ -105,14 +105,14 @@ public final class Static186 { } else if (Static41.anInt1309 == 50) { Static166.method3166(new Buffer(Static119.aClass153_44.fetchFile(Static42.aClass100_331, Static269.aClass3_Sub2_Sub4_2.aClass100_138))); Static41.anInt1309 = 60; - Static7.method842(true); + Static7.ping(true); Static234.method4020(); } else if (Static41.anInt1309 == 60) { if (Static119.aClass153_44.method4497(Static34.concatenate(new JagString[] { Static269.aClass3_Sub2_Sub4_2.aClass100_138, Static265.aClass100_1086 }))) { - if (!Static119.aClass153_44.method4489(Static34.concatenate(new JagString[] { Static269.aClass3_Sub2_Sub4_2.aClass100_138, Static265.aClass100_1086 }))) { + if (!Static119.aClass153_44.allFilesComplete(Static34.concatenate(new JagString[] { Static269.aClass3_Sub2_Sub4_2.aClass100_138, Static265.aClass100_1086 }))) { return; } - Static203.aClass134_1 = Static140.method2711(Static34.concatenate(new JagString[] { Static269.aClass3_Sub2_Sub4_2.aClass100_138, Static265.aClass100_1086 }), Static119.aClass153_44); + Static203.aClass134_1 = Static140.createMapFunctionGroup(Static34.concatenate(new JagString[] { Static269.aClass3_Sub2_Sub4_2.aClass100_138, Static265.aClass100_1086 }), Static119.aClass153_44); } else { Static203.aClass134_1 = new Class134(0); } @@ -121,42 +121,42 @@ public final class Static186 { } else if (Static41.anInt1309 == 70) { Static273.aClass41_7 = new WorldMapFont(11, true, GameShell.canvas); Static41.anInt1309 = 73; - Static7.method842(true); + Static7.ping(true); Static234.method4020(); } else if (Static41.anInt1309 == 73) { Static152.aClass41_3 = new WorldMapFont(12, true, GameShell.canvas); Static41.anInt1309 = 76; - Static7.method842(true); + Static7.ping(true); Static234.method4020(); } else if (Static41.anInt1309 == 76) { Static169.aClass41_5 = new WorldMapFont(14, true, GameShell.canvas); Static41.anInt1309 = 79; - Static7.method842(true); + Static7.ping(true); Static234.method4020(); } else if (Static41.anInt1309 == 79) { Static130.aClass41_1 = new WorldMapFont(17, true, GameShell.canvas); Static41.anInt1309 = 82; - Static7.method842(true); + Static7.ping(true); Static234.method4020(); } else if (Static41.anInt1309 == 82) { Static203.aClass41_8 = new WorldMapFont(19, true, GameShell.canvas); Static41.anInt1309 = 85; - Static7.method842(true); + Static7.ping(true); Static234.method4020(); } else if (Static41.anInt1309 == 85) { Static130.aClass41_2 = new WorldMapFont(22, true, GameShell.canvas); Static41.anInt1309 = 88; - Static7.method842(true); + Static7.ping(true); Static234.method4020(); } else if (Static41.anInt1309 == 88) { Static270.aClass41_9 = new WorldMapFont(26, true, GameShell.canvas); Static41.anInt1309 = 91; - Static7.method842(true); + Static7.ping(true); Static234.method4020(); } else { Static160.aClass41_4 = new WorldMapFont(30, true, GameShell.canvas); Static41.anInt1309 = 100; - Static7.method842(true); + Static7.ping(true); Static234.method4020(); System.gc(); } diff --git a/client/src/main/java/Static19.java b/client/src/main/java/Static19.java index 8e2f481..4a06d1d 100644 --- a/client/src/main/java/Static19.java +++ b/client/src/main/java/Static19.java @@ -10,7 +10,7 @@ public final class Static19 { public static int anInt636; @OriginalMember(owner = "client!bi", name = "Y", descriptor = "[[B") - public static byte[][] aByteArrayArray4; + public static byte[][] underWaterLocationsMapFilesBuffer; @OriginalMember(owner = "client!bi", name = "fb", descriptor = "I") public static int anInt647; diff --git a/client/src/main/java/Static191.java b/client/src/main/java/Static191.java index 1d84e7d..8e79dae 100644 --- a/client/src/main/java/Static191.java +++ b/client/src/main/java/Static191.java @@ -3,7 +3,7 @@ import org.openrs2.deob.annotation.OriginalMember; public final class Static191 { @OriginalMember(owner = "client!pg", name = "jb", descriptor = "[[B") - public static byte[][] aByteArrayArray15; + public static byte[][] npcSpawnsFilesBuffer; @OriginalMember(owner = "client!pg", name = "fb", descriptor = "I") public static final int anInt4506 = 50; diff --git a/client/src/main/java/Static192.java b/client/src/main/java/Static192.java index 9ce329d..a290ef2 100644 --- a/client/src/main/java/Static192.java +++ b/client/src/main/java/Static192.java @@ -9,7 +9,7 @@ public final class Static192 { @OriginalMember(owner = "client!ph", name = "a", descriptor = "(B)V") public static void loop() { while (true) { - @Pc(17) Class3_Sub8 local17 = (Class3_Sub8) Static128.aClass69_77.method2287(); + @Pc(17) Class3_Sub8 local17 = (Class3_Sub8) Static128.aClass69_77.removeHead(); if (local17 == null) { return; } @@ -43,7 +43,7 @@ public final class Static192 { @Pc(110) int local110 = (local86 >> 1) + local17.anInt1190; @Pc(117) int local117 = (local83 >> 1) + local17.anInt1204; @Pc(126) int local126 = (local83 + 1 >> 1) + local17.anInt1204; - @Pc(130) int[][] local130 = Static83.anIntArrayArrayArray4[Static55.level]; + @Pc(130) int[][] local130 = Static83.activeTileHeightMap[Static55.level]; @Pc(157) int local157 = local130[local103][local126] + local130[local110][local126] + local130[local110][local117] + local130[local103][local117] >> 2; @Pc(159) Entity local159 = null; @Pc(164) int local164 = Static133.anIntArray453[local17.anInt1198]; @@ -70,13 +70,13 @@ public final class Static192 { } if (local159 != null) { Static29.method800(Static55.level, local17.anInt1204, 0, local17.anInt1190, local17.anInt1205 + 1, -1, local164, 0, local17.anInt1187 + 1); - local40.anInt3375 = local17.anInt1205 + Static83.anInt372; + local40.anInt3375 = local17.anInt1205 + Static83.loop; local40.anInt3426 = local83 * 64 + local17.anInt1204 * 128; local40.anInt3379 = local86 * 64 + local17.anInt1190 * 128; local40.anObject5 = local159; @Pc(292) int local292 = local17.anInt1188; local40.anInt3406 = local157; - local40.anInt3390 = Static83.anInt372 + local17.anInt1187; + local40.anInt3390 = Static83.loop + local17.anInt1187; @Pc(304) int local304 = local17.anInt1191; @Pc(307) int local307 = local17.anInt1197; @Pc(310) int local310 = local17.anInt1200; diff --git a/client/src/main/java/Static193.java b/client/src/main/java/Static193.java index a5a8bdc..1514476 100644 --- a/client/src/main/java/Static193.java +++ b/client/src/main/java/Static193.java @@ -51,7 +51,7 @@ public final class Static193 { } @OriginalMember(owner = "client!pi", name = "a", descriptor = "([[[B[[B[[B[[I[[F[[I[[B[[B[[FI[[F[[I[[I[[II)[Lclient!hg;") - public static Class3_Sub14[] method3501(@OriginalArg(0) byte[][][] arg0, @OriginalArg(1) byte[][] arg1, @OriginalArg(2) byte[][] arg2, @OriginalArg(3) int[][] arg3, @OriginalArg(4) float[][] arg4, @OriginalArg(5) int[][] arg5, @OriginalArg(6) byte[][] arg6, @OriginalArg(7) byte[][] arg7, @OriginalArg(8) float[][] arg8, @OriginalArg(9) int arg9, @OriginalArg(10) float[][] arg10, @OriginalArg(11) int[][] arg11, @OriginalArg(12) int[][] arg12, @OriginalArg(13) int[][] arg13) { + public static GlTile[] method3501(@OriginalArg(0) byte[][][] arg0, @OriginalArg(1) byte[][] arg1, @OriginalArg(2) byte[][] arg2, @OriginalArg(3) int[][] arg3, @OriginalArg(4) float[][] arg4, @OriginalArg(5) int[][] arg5, @OriginalArg(6) byte[][] arg6, @OriginalArg(7) byte[][] arg7, @OriginalArg(8) float[][] arg8, @OriginalArg(9) int arg9, @OriginalArg(10) float[][] arg10, @OriginalArg(11) int[][] arg11, @OriginalArg(12) int[][] arg12, @OriginalArg(13) int[][] arg13) { @Pc(9) int[][] local9 = new int[105][105]; @Pc(16) int local16; for (@Pc(11) int local11 = 1; local11 <= 103; local11++) { @@ -101,17 +101,17 @@ public final class Static193 { @Pc(214) long local214 = (long) local196 << 32 | (long) local155; @Pc(219) int local219 = local135.length / 2; @Pc(227) long local227 = (long) local155 | (long) local161 << 32; - @Pc(233) Class3_Sub14 local233 = (Class3_Sub14) local103.method3863(local227); + @Pc(233) GlTile local233 = (GlTile) local103.method3863(local227); if (local233 == null) { - local233 = new Class3_Sub14((local161 >> 16) - 1, (float) (local161 & 0xFFFF), false, arg13 != null, local155); + local233 = new GlTile((local161 >> 16) - 1, (float) (local161 & 0xFFFF), false, arg13 != null, local155); local103.method3862(local233, local227); } local233.anInt2484++; local233.anInt2482 += local219; if (local188 != local227) { - local233 = (Class3_Sub14) local103.method3863(local188); + local233 = (GlTile) local103.method3863(local188); if (local233 == null) { - local233 = new Class3_Sub14((local169 >> 16) - 1, (float) (local169 & 0xFFFF), false, arg13 != null, local155); + local233 = new GlTile((local169 >> 16) - 1, (float) (local169 & 0xFFFF), false, arg13 != null, local155); local103.method3862(local233, local188); } local233.anInt2484++; @@ -119,18 +119,18 @@ public final class Static193 { } @Pc(340) long local340 = (long) local206 << 32 | (long) local155; if (local340 != local227 && local340 != local188) { - local233 = (Class3_Sub14) local103.method3863(local340); + local233 = (GlTile) local103.method3863(local340); if (local233 == null) { - local233 = new Class3_Sub14((local206 >> 16) - 1, (float) (local206 & 0xFFFF), false, arg13 != null, local155); + local233 = new GlTile((local206 >> 16) - 1, (float) (local206 & 0xFFFF), false, arg13 != null, local155); local103.method3862(local233, local340); } local233.anInt2482 += local219; local233.anInt2484++; } if (local214 != local227 && local188 != local214 && local214 != local340) { - local233 = (Class3_Sub14) local103.method3863(local214); + local233 = (GlTile) local103.method3863(local214); if (local233 == null) { - local233 = new Class3_Sub14((local196 >> 16) - 1, (float) (local196 & 0xFFFF), false, arg13 != null, local155); + local233 = new GlTile((local196 >> 16) - 1, (float) (local196 & 0xFFFF), false, arg13 != null, local155); local103.method3862(local233, local214); } local233.anInt2484++; @@ -139,8 +139,8 @@ public final class Static193 { } } } - @Pc(493) Class3_Sub14 local493; - for (local493 = (Class3_Sub14) local103.method3859(); local493 != null; local493 = (Class3_Sub14) local103.method3861()) { + @Pc(493) GlTile local493; + for (local493 = (GlTile) local103.method3859(); local493 != null; local493 = (GlTile) local103.method3861()) { local493.method1940(); } for (local16 = 1; local16 <= 102; local16++) { @@ -238,25 +238,25 @@ public final class Static193 { @Pc(963) int local963 = (local678 >> 16) - 1; @Pc(969) int local969 = (local655 >> 16) - 1; @Pc(975) int local975 = (local712 >> 16) - 1; - @Pc(981) Class3_Sub14 local981 = (Class3_Sub14) local103.method3863(local861); + @Pc(981) GlTile local981 = (GlTile) local103.method3863(local861); Static53.method1291(arg13, local655 <= local655, Static19.method588(local969, local883, local931), local981, local614, local112, local155, local16, local655 <= local712, arg8, local754 >= local655, arg4, local169, Static19.method588(local969, local925, local957), Static19.method588(local969, local901, local949), local655 <= local678, arg12, arg10, local628, Static19.method588(local969, local909, local939), local574); @Pc(1050) int local1050 = (local754 >> 16) - 1; if (local869 != local861) { - local981 = (Class3_Sub14) local103.method3863(local869); + local981 = (GlTile) local103.method3863(local869); Static53.method1291(arg13, local678 <= local655, Static19.method588(local963, local883, local931), local981, local614, local112, local155, local16, local712 >= local678, arg8, local678 <= local754, arg4, local169, Static19.method588(local963, local925, local957), Static19.method588(local963, local901, local949), local678 <= local678, arg12, arg10, local628, Static19.method588(local963, local909, local939), local574); } if (local877 != local861 && local877 != local869) { - local981 = (Class3_Sub14) local103.method3863(local877); + local981 = (GlTile) local103.method3863(local877); Static53.method1291(arg13, local655 >= local712, Static19.method588(local975, local883, local931), local981, local614, local112, local155, local16, local712 <= local712, arg8, local712 <= local754, arg4, local169, Static19.method588(local975, local925, local957), Static19.method588(local975, local901, local949), local678 >= local712, arg12, arg10, local628, Static19.method588(local975, local909, local939), local574); } if (local917 != local861 && local917 != local869 && local917 != local877) { - local981 = (Class3_Sub14) local103.method3863(local917); + local981 = (GlTile) local103.method3863(local917); Static53.method1291(arg13, local754 <= local655, Static19.method588(local1050, local883, local931), local981, local614, local112, local155, local16, local754 <= local712, arg8, local754 >= local754, arg4, local169, Static19.method588(local1050, local925, local957), Static19.method588(local1050, local901, local949), local678 >= local754, arg12, arg10, local628, Static19.method588(local1050, local909, local939), local574); } } } } - for (local493 = (Class3_Sub14) local103.method3859(); local493 != null; local493 = (Class3_Sub14) local103.method3861()) { + for (local493 = (GlTile) local103.method3859(); local493 != null; local493 = (GlTile) local103.method3861()) { if (local493.anInt2483 == 0) { local493.method4658(); } else { @@ -264,7 +264,7 @@ public final class Static193 { } } local16 = local103.method3864(); - @Pc(1348) Class3_Sub14[] local1348 = new Class3_Sub14[local16]; + @Pc(1348) GlTile[] local1348 = new GlTile[local16]; local103.method3865(local1348); @Pc(1358) long[] local1358 = new long[local16]; for (local155 = 0; local155 < local16; local155++) { diff --git a/client/src/main/java/Static195.java b/client/src/main/java/Static195.java index 55940de..c1ed1fe 100644 --- a/client/src/main/java/Static195.java +++ b/client/src/main/java/Static195.java @@ -4,7 +4,7 @@ import org.openrs2.deob.annotation.Pc; public final class Static195 { @OriginalMember(owner = "client!pk", name = "R", descriptor = "[[Lclient!hg;") - public static Class3_Sub14[][] aClass3_Sub14ArrayArray3; + public static GlTile[][] underWaterHdTiles; @OriginalMember(owner = "client!pk", name = "Y", descriptor = "I") public static int anInt4581; @@ -27,13 +27,13 @@ public final class Static195 { public static void method3532() { for (@Pc(16) ProjAnimNode local16 = (ProjAnimNode) Static217.aClass69_116.method2289(); local16 != null; local16 = (ProjAnimNode) Static217.aClass69_116.method2288()) { @Pc(21) ProjAnim local21 = local16.aClass8_Sub6_1; - if (Static55.level != local21.anInt4810 || local21.anInt4800 < Static83.anInt372) { + if (Static55.level != local21.anInt4810 || local21.anInt4800 < Static83.loop) { local16.method4658(); - } else if (Static83.anInt372 >= local21.anInt4822) { + } else if (Static83.loop >= local21.anInt4822) { if (local21.anInt4819 > 0) { @Pc(54) Npc local54 = Static175.aClass8_Sub4_Sub2Array1[local21.anInt4819 - 1]; if (local54 != null && local54.anInt3412 >= 0 && local54.anInt3412 < 13312 && local54.anInt3421 >= 0 && local54.anInt3421 < 13312) { - local21.method3705(local54.anInt3421, Static83.anInt372, Static207.method3685(local21.anInt4810, local54.anInt3412, local54.anInt3421) - local21.anInt4805, local54.anInt3412); + local21.method3705(local54.anInt3421, Static83.loop, Static207.method3685(local21.anInt4810, local54.anInt3412, local54.anInt3421) - local21.anInt4805, local54.anInt3412); } } if (local21.anInt4819 < 0) { @@ -45,7 +45,7 @@ public final class Static195 { local107 = Static159.aClass8_Sub4_Sub1Array1[local102]; } if (local107 != null && local107.anInt3412 >= 0 && local107.anInt3412 < 13312 && local107.anInt3421 >= 0 && local107.anInt3421 < 13312) { - local21.method3705(local107.anInt3421, Static83.anInt372, Static207.method3685(local21.anInt4810, local107.anInt3412, local107.anInt3421) - local21.anInt4805, local107.anInt3412); + local21.method3705(local107.anInt3421, Static83.loop, Static207.method3685(local21.anInt4810, local107.anInt3412, local107.anInt3421) - local21.anInt4805, local107.anInt3412); } } local21.method3704(Static178.anInt4247); diff --git a/client/src/main/java/Static196.java b/client/src/main/java/Static196.java index df46c7e..99aab4a 100644 --- a/client/src/main/java/Static196.java +++ b/client/src/main/java/Static196.java @@ -20,11 +20,11 @@ public final class Static196 { public static int anInt4587 = 0; @OriginalMember(owner = "client!pl", name = "a", descriptor = "(II)V") - public static void method3534(@OriginalArg(0) int arg0) { - if (Static244.anInt5370 == arg0) { + public static void setGameState(@OriginalArg(0) int arg0) { + if (Static244.gameState == arg0) { return; } - if (Static244.anInt5370 == 0) { + if (Static244.gameState == 0) { Static163.method3097(); } if (arg0 == 40) { @@ -38,20 +38,20 @@ public final class Static196 { if (arg0 == 25 || arg0 == 28) { Static271.anInt5804 = 0; Static230.anInt5150 = 1; - Static233.anInt5223 = 0; + Static233.loadingScreenState = 0; Static38.anInt1196 = 1; - Static175.anInt4220 = 0; + Static175.mapFilesMissingCount = 0; Static116.method2325(true); } if (arg0 == 25 || arg0 == 10) { - Static123.method2418(); + Static123.topBannerRefresh(); } if (arg0 == 5) { Static181.method3344(Static209.js5Archive8); } else { Static119.method2381(); } - @Pc(106) boolean local106 = Static244.anInt5370 == 5 || Static244.anInt5370 == 10 || Static244.anInt5370 == 28; + @Pc(106) boolean local106 = Static244.gameState == 5 || Static244.gameState == 10 || Static244.gameState == 28; if (local106 != local37) { if (local37) { Static221.anInt4363 = Static250.titleSong; @@ -69,7 +69,7 @@ public final class Static196 { if (GlRenderer.enabled && (arg0 == 25 || arg0 == 28 || arg0 == 40)) { GlRenderer.method4160(); } - Static244.anInt5370 = arg0; + Static244.gameState = arg0; } @OriginalMember(owner = "client!pl", name = "a", descriptor = "(ZI)V") diff --git a/client/src/main/java/Static197.java b/client/src/main/java/Static197.java index fd43135..5acdebe 100644 --- a/client/src/main/java/Static197.java +++ b/client/src/main/java/Static197.java @@ -8,7 +8,7 @@ import org.openrs2.deob.annotation.Pc; public final class Static197 { @OriginalMember(owner = "client!pm", name = "cb", descriptor = "[[[Lclient!bj;") - public static Tile[][][] aClass3_Sub5ArrayArrayArray2; + public static Tile[][][] surfaceGroundTiles; @OriginalMember(owner = "client!pm", name = "hb", descriptor = "I") public static int anInt4620; @@ -126,10 +126,10 @@ public final class Static197 { Static260.frameBuffer = null; Static260.frameBuffer = Static131.create(GameShell.canvasHeight, GameShell.canvasWidth, GameShell.canvas); Static129.method2492(); - if (Static244.anInt5370 == 5) { + if (Static244.gameState == 5) { Static182.method3359(true, Static280.aClass3_Sub2_Sub9_43); } else { - Static114.method4636(false, LocalizedText.LOADING); + Static114.drawTextOnScreen(false, LocalizedText.LOADING); } try { @Pc(269) Graphics local269 = GameShell.canvas.getGraphics(); @@ -190,7 +190,7 @@ public final class Static197 { Static95.method1939(); Static114.method4637(); } - Static87.aBoolean130 = !Static138.method2697(); + Static87.aBoolean130 = !Static138.allLevelsAreVisible(); if (arg2) { Static141.method2721(); } @@ -199,10 +199,10 @@ public final class Static197 { } else { Static124.aBoolean156 = false; } - if (Static154.topLevelInterace != -1) { + if (Static154.topLevelInterface != -1) { Static210.method3712(true); } - if (Static124.socket != null && (Static244.anInt5370 == 30 || Static244.anInt5370 == 25)) { + if (Static124.socket != null && (Static244.gameState == 30 || Static244.gameState == 25)) { Static59.method1373(); } for (@Pc(466) int local466 = 0; local466 < 100; local466++) { diff --git a/client/src/main/java/Static198.java b/client/src/main/java/Static198.java index 9e0905f..608ee9d 100644 --- a/client/src/main/java/Static198.java +++ b/client/src/main/java/Static198.java @@ -56,13 +56,13 @@ public final class Static198 { return; } @Pc(38) int local38 = Static207.method3685(Static55.level, arg5, arg2) - arg3; - @Pc(42) int local42 = arg2 - Static134.anInt3302; + @Pc(42) int local42 = arg2 - Static134.renderZ; @Pc(46) int local46 = local38 - Static5.anInt40; - @Pc(50) int local50 = arg5 - Static138.anInt3439; - @Pc(54) int local54 = MathUtils.anIntArray223[Static240.anInt5333]; - @Pc(58) int local58 = MathUtils.anIntArray225[Static240.anInt5333]; - @Pc(62) int local62 = MathUtils.anIntArray223[Static184.anInt4358]; - @Pc(66) int local66 = MathUtils.anIntArray225[Static184.anInt4358]; + @Pc(50) int local50 = arg5 - Static138.renderX; + @Pc(54) int local54 = MathUtils.anIntArray223[Static240.cameraPitch]; + @Pc(58) int local58 = MathUtils.anIntArray225[Static240.cameraPitch]; + @Pc(62) int local62 = MathUtils.anIntArray223[Static184.cameraYaw]; + @Pc(66) int local66 = MathUtils.anIntArray225[Static184.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/Static199.java b/client/src/main/java/Static199.java index d2fddcc..4db628b 100644 --- a/client/src/main/java/Static199.java +++ b/client/src/main/java/Static199.java @@ -28,7 +28,7 @@ public final class Static199 { if (local10 != null) { return local10; } - @Pc(27) byte[] local27 = Static182.aClass153_77.method4495(1, arg0); + @Pc(27) byte[] local27 = Static182.aClass153_77.getFile(1, arg0); local10 = new FluType(); if (local27 != null) { local10.method3217(arg0, new Buffer(local27)); diff --git a/client/src/main/java/Static2.java b/client/src/main/java/Static2.java index fc7775f..d4dd639 100644 --- a/client/src/main/java/Static2.java +++ b/client/src/main/java/Static2.java @@ -52,7 +52,7 @@ public final class Static2 { @Pc(72) HookRequest local72; if (arg1 == 0 && local23.anObjectArray12 != null) { local72 = new HookRequest(); - local72.anObjectArray31 = local23.anObjectArray12; + local72.arguments = local23.anObjectArray12; local72.source = local23; Static82.method1767(local72); } @@ -64,7 +64,7 @@ public final class Static2 { } } local72 = new HookRequest(); - local72.anObjectArray31 = local23.anObjectArray8; + local72.arguments = local23.anObjectArray8; local72.source = local23; Static82.method1767(local72); } @@ -280,7 +280,7 @@ public final class Static2 { } } else if (local16 == 327) { arg0.modelXAngle = 150; - arg0.modelYAngle = (int) (Math.sin((double) Static83.anInt372 / 40.0D) * 256.0D) & 0x7FF; + arg0.modelYAngle = (int) (Math.sin((double) Static83.loop / 40.0D) * 256.0D) & 0x7FF; arg0.modelType = 5; arg0.modelId = -1; } else if (local16 == 328) { @@ -288,7 +288,7 @@ public final class Static2 { arg0.modelId = 0; } else { arg0.modelXAngle = 150; - arg0.modelYAngle = (int) (Math.sin((double) Static83.anInt372 / 40.0D) * 256.0D) & 0x7FF; + arg0.modelYAngle = (int) (Math.sin((double) Static83.loop / 40.0D) * 256.0D) & 0x7FF; arg0.modelType = 5; arg0.modelId = ((int) Static173.self.aClass100_364.encode37() << 11) + 2047; arg0.anInt496 = Static173.self.anInt3388; diff --git a/client/src/main/java/Static202.java b/client/src/main/java/Static202.java index 8f02abb..35c75c9 100644 --- a/client/src/main/java/Static202.java +++ b/client/src/main/java/Static202.java @@ -96,7 +96,7 @@ public final class Static202 { } @OriginalMember(owner = "client!qg", name = "a", descriptor = "(IZI)V") - public static void method3655(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) { + public static void setVarbitClient(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) { @Pc(7) Class85 local7 = Static125.method2449(arg0); @Pc(10) int local10 = local7.anInt3323; @Pc(16) int local16 = local7.anInt3318; @@ -106,7 +106,7 @@ public final class Static202 { arg1 = 0; } local25 <<= local16; - Static148.method2766(local19, local25 & arg1 << local16 | Static7.anIntArray75[local19] & ~local25); + Static148.method2766(local19, local25 & arg1 << local16 | Static7.varps[local19] & ~local25); } @OriginalMember(owner = "client!qg", name = "a", descriptor = "([Lclient!na;[SI)V") @@ -134,7 +134,7 @@ public final class Static202 { if (local10 != null) { return local10; } - @Pc(20) byte[] local20 = Static153.aClass153_57.method4495(33, arg0); + @Pc(20) byte[] local20 = Static153.aClass153_57.getFile(33, arg0); local10 = new Class63(); if (local20 != null) { local10.method2249(new Buffer(local20), arg0); diff --git a/client/src/main/java/Static203.java b/client/src/main/java/Static203.java index 8968998..a8d71c6 100644 --- a/client/src/main/java/Static203.java +++ b/client/src/main/java/Static203.java @@ -63,7 +63,7 @@ public final class Static203 { } else { GameShell.canvas.setLocation(GameShell.leftMargin, GameShell.topMargin); } - if (Static154.topLevelInterace != -1) { + if (Static154.topLevelInterface != -1) { Static210.method3712(true); } Static139.method2704(); diff --git a/client/src/main/java/Static207.java b/client/src/main/java/Static207.java index 18c7475..cc6ad0b 100644 --- a/client/src/main/java/Static207.java +++ b/client/src/main/java/Static207.java @@ -19,7 +19,7 @@ public final class Static207 { public static final JagString aClass100_904 = Static28.parse("::wm2"); @OriginalMember(owner = "client!ql", name = "a", descriptor = "(IFII[[I[[II[[FIBIZLclient!hg;[[FII[[FI)I") - public static int method3683(@OriginalArg(0) int arg0, @OriginalArg(1) float arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int[][] arg4, @OriginalArg(5) int[][] arg5, @OriginalArg(6) int arg6, @OriginalArg(7) float[][] arg7, @OriginalArg(8) int arg8, @OriginalArg(10) int arg9, @OriginalArg(11) boolean arg10, @OriginalArg(12) Class3_Sub14 arg11, @OriginalArg(13) float[][] arg12, @OriginalArg(14) int arg13, @OriginalArg(15) int arg14, @OriginalArg(16) float[][] arg15, @OriginalArg(17) int arg16) { + public static int method3683(@OriginalArg(0) int arg0, @OriginalArg(1) float arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int[][] arg4, @OriginalArg(5) int[][] arg5, @OriginalArg(6) int arg6, @OriginalArg(7) float[][] arg7, @OriginalArg(8) int arg8, @OriginalArg(10) int arg9, @OriginalArg(11) boolean arg10, @OriginalArg(12) GlTile arg11, @OriginalArg(13) float[][] arg12, @OriginalArg(14) int arg13, @OriginalArg(15) int arg14, @OriginalArg(16) float[][] arg15, @OriginalArg(17) int arg16) { @Pc(20) int local20; if (arg9 == 1) { local20 = arg14; @@ -188,7 +188,7 @@ public final class Static207 { @OriginalMember(owner = "client!ql", name = "a", descriptor = "(IIII)I") public static int method3685(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2) { - if (Static83.anIntArrayArrayArray4 == null) { + if (Static83.activeTileHeightMap == null) { return 0; } @Pc(12) int local12 = arg1 >> 7; @@ -199,11 +199,11 @@ public final class Static207 { @Pc(36) int local36 = arg1 & 0x7F; @Pc(40) int local40 = arg2 & 0x7F; @Pc(42) int local42 = arg0; - if (arg0 < 3 && (Static12.aByteArrayArrayArray2[1][local12][local16] & 0x2) == 2) { + if (arg0 < 3 && (Static12.tileSettings[1][local12][local16] & 0x2) == 2) { local42 = arg0 + 1; } - @Pc(91) int local91 = local36 * Static83.anIntArrayArrayArray4[local42][local12 + 1][local16 + 1] + Static83.anIntArrayArrayArray4[local42][local12][local16 + 1] * (128 - local36) >> 7; - @Pc(118) int local118 = local36 * Static83.anIntArrayArrayArray4[local42][local12 + 1][local16] + (128 - local36) * Static83.anIntArrayArrayArray4[local42][local12][local16] >> 7; + @Pc(91) int local91 = local36 * Static83.activeTileHeightMap[local42][local12 + 1][local16 + 1] + Static83.activeTileHeightMap[local42][local12][local16 + 1] * (128 - local36) >> 7; + @Pc(118) int local118 = local36 * Static83.activeTileHeightMap[local42][local12 + 1][local16] + (128 - local36) * Static83.activeTileHeightMap[local42][local12][local16] >> 7; return local40 * local91 + (128 - local40) * local118 >> 7; } } diff --git a/client/src/main/java/Static210.java b/client/src/main/java/Static210.java index 0d0bd98..2d5c87d 100644 --- a/client/src/main/java/Static210.java +++ b/client/src/main/java/Static210.java @@ -21,7 +21,7 @@ public final class Static210 { @OriginalMember(owner = "client!rb", name = "a", descriptor = "(ZB)V") public static void method3712(@OriginalArg(0) boolean arg0) { - Static234.method4017(GameShell.canvasHeight, arg0, Static154.topLevelInterace, GameShell.canvasWidth); + Static234.method4017(GameShell.canvasHeight, arg0, Static154.topLevelInterface, GameShell.canvasWidth); } @OriginalMember(owner = "client!rb", name = "a", descriptor = "(Lclient!wa;Z)Lclient!bn;") diff --git a/client/src/main/java/Static214.java b/client/src/main/java/Static214.java index d2181aa..1f63685 100644 --- a/client/src/main/java/Static214.java +++ b/client/src/main/java/Static214.java @@ -60,7 +60,7 @@ public final class Static214 { if (local10 != null) { return local10; } - @Pc(26) byte[] local26 = Static58.aClass153_28.method4495(Static60.method1447(arg0), Static179.method3322(arg0)); + @Pc(26) byte[] local26 = Static58.aClass153_28.getFile(Static60.method1447(arg0), Static179.method3322(arg0)); local10 = new NpcType(); local10.anInt3741 = arg0; if (local26 != null) { diff --git a/client/src/main/java/Static215.java b/client/src/main/java/Static215.java index d55c03b..5bd159b 100644 --- a/client/src/main/java/Static215.java +++ b/client/src/main/java/Static215.java @@ -3,7 +3,7 @@ import org.openrs2.deob.annotation.OriginalMember; public final class Static215 { @OriginalMember(owner = "client!rh", name = "a", descriptor = "[I") - public static int[] anIntArray432; + public static int[] intLocals; @OriginalMember(owner = "client!rh", name = "d", descriptor = "I") public static int anInt4866; diff --git a/client/src/main/java/Static216.java b/client/src/main/java/Static216.java index a0670fc..9ef63ce 100644 --- a/client/src/main/java/Static216.java +++ b/client/src/main/java/Static216.java @@ -16,8 +16,8 @@ public final class Static216 { public static final int[] anIntArray187 = new int[14]; @OriginalMember(owner = "client!ri", name = "a", descriptor = "(B)V") - public static void method1639() { - if (Static184.anInt4348 == 0 || Static184.anInt4348 == 5) { + public static void handleLogin() { + if (Static184.loginStep == 0 || Static184.loginStep == 5) { return; } try { @@ -27,8 +27,8 @@ public final class Static216 { Static124.socket = null; } if (Static276.anInt5816 >= 1) { - Static266.anInt5336 = -5; - Static184.anInt4348 = 0; + Static266.returnCode = -5; + Static184.loginStep = 0; return; } Static92.anInt2430 = 0; @@ -37,14 +37,14 @@ public final class Static216 { } else { Static209.port = Static271.defaultPort; } - Static184.anInt4348 = 1; + Static184.loginStep = 1; Static276.anInt5816++; } - if (Static184.anInt4348 == 1) { + if (Static184.loginStep == 1) { Static72.aClass212_3 = GameShell.signLink.openSocket(Static60.hostname, Static209.port); - Static184.anInt4348 = 2; + Static184.loginStep = 2; } - if (Static184.anInt4348 == 2) { + if (Static184.loginStep == 2) { if (Static72.aClass212_3.status == 2) { throw new IOException(); } @@ -73,15 +73,15 @@ public final class Static216 { Static147.soundChannel.method3571(); } if (local150 != 0) { - Static266.anInt5336 = local150; - Static184.anInt4348 = 0; + Static266.returnCode = local150; + Static184.loginStep = 0; Static124.socket.close(); Static124.socket = null; return; } - Static184.anInt4348 = 3; + Static184.loginStep = 3; } - if (Static184.anInt4348 == 3) { + if (Static184.loginStep == 3) { if (Static124.socket.available() < 8) { return; } @@ -108,7 +108,7 @@ public final class Static216 { } Static6.outboundBuffer.encryptRsa(GlobalConfig.RSA_EXPONENT, GlobalConfig.RSA_MODULUS); Static17.aClass3_Sub15_Sub1_2.offset = 0; - if (Static244.anInt5370 == 40) { + if (Static244.gameState == 40) { Static17.aClass3_Sub15_Sub1_2.p1(18); } else { Static17.aClass3_Sub15_Sub1_2.p1(16); @@ -171,72 +171,72 @@ public final class Static216 { local210[local583] += 50; } Static57.aClass3_Sub15_Sub1_3.method2240(local210); - Static184.anInt4348 = 4; + Static184.loginStep = 4; } - if (Static184.anInt4348 == 4) { + if (Static184.loginStep == 4) { if (Static124.socket.available() < 1) { return; } @Pc(623) int local623 = Static124.socket.read(); if (local623 == 21) { - Static184.anInt4348 = 7; + Static184.loginStep = 7; } else if (local623 == 29) { - Static184.anInt4348 = 10; + Static184.loginStep = 10; } else if (local623 == 1) { - Static184.anInt4348 = 5; - Static266.anInt5336 = local623; + Static184.loginStep = 5; + Static266.returnCode = local623; return; } else if (local623 == 2) { - Static184.anInt4348 = 8; + Static184.loginStep = 8; } else if (local623 == 15) { - Static184.anInt4348 = 0; - Static266.anInt5336 = local623; + Static184.loginStep = 0; + Static266.returnCode = local623; return; } else if (local623 == 23 && Static276.anInt5816 < 1) { - Static184.anInt4348 = 1; + Static184.loginStep = 1; Static276.anInt5816++; Static92.anInt2430 = 0; Static124.socket.close(); Static124.socket = null; return; } else { - Static266.anInt5336 = local623; - Static184.anInt4348 = 0; + Static266.returnCode = local623; + Static184.loginStep = 0; Static124.socket.close(); Static124.socket = null; return; } } - if (Static184.anInt4348 == 6) { + if (Static184.loginStep == 6) { Static6.outboundBuffer.offset = 0; Static6.outboundBuffer.p1isaac(17); Static124.socket.write(Static6.outboundBuffer.data, Static6.outboundBuffer.offset); - Static184.anInt4348 = 4; + Static184.loginStep = 4; return; } - if (Static184.anInt4348 == 7) { + if (Static184.loginStep == 7) { if (Static124.socket.available() >= 1) { Static231.anInt5202 = (Static124.socket.read() + 3) * 60; - Static184.anInt4348 = 0; - Static266.anInt5336 = 21; + Static184.loginStep = 0; + Static266.returnCode = 21; Static124.socket.close(); Static124.socket = null; return; } return; } - if (Static184.anInt4348 == 10) { + if (Static184.loginStep == 10) { if (Static124.socket.available() >= 1) { Static204.anInt4765 = Static124.socket.read(); - Static184.anInt4348 = 0; - Static266.anInt5336 = 29; + Static184.loginStep = 0; + Static266.returnCode = 29; Static124.socket.close(); Static124.socket = null; return; } return; } - if (Static184.anInt4348 == 8) { + if (Static184.loginStep == 8) { if (Static124.socket.available() < 14) { return; } @@ -269,16 +269,16 @@ public final class Static216 { } Static164.anInt3985 = Static57.aClass3_Sub15_Sub1_3.method2243(); Static223.anInt5028 = Static57.aClass3_Sub15_Sub1_3.g2(); - Static184.anInt4348 = 9; + Static184.loginStep = 9; } - if (Static184.anInt4348 == 9) { + if (Static184.loginStep == 9) { if (Static124.socket.available() < Static223.anInt5028) { return; } Static57.aClass3_Sub15_Sub1_3.offset = 0; Static124.socket.read(0, Static223.anInt5028, Static57.aClass3_Sub15_Sub1_3.data); - Static266.anInt5336 = 2; - Static184.anInt4348 = 0; + Static266.returnCode = 2; + Static184.loginStep = 0; Static243.method4221(); Static80.anInt4701 = -1; Static75.method1629(false); @@ -291,10 +291,10 @@ public final class Static216 { Static124.socket = null; } if (Static276.anInt5816 >= 1) { - Static184.anInt4348 = 0; - Static266.anInt5336 = -4; + Static184.loginStep = 0; + Static266.returnCode = -4; } else { - Static184.anInt4348 = 1; + Static184.loginStep = 1; Static92.anInt2430 = 0; Static276.anInt5816++; if (Static271.defaultPort == Static209.port) { diff --git a/client/src/main/java/Static217.java b/client/src/main/java/Static217.java index 06354d0..8a239e1 100644 --- a/client/src/main/java/Static217.java +++ b/client/src/main/java/Static217.java @@ -164,7 +164,7 @@ public final class Static217 { @Pc(154) CollisionMap local154 = null; if (!arg7) { @Pc(159) int local159 = arg1; - if ((Static12.aByteArrayArrayArray2[1][local120][local137] & 0x2) == 2) { + if ((Static12.tileSettings[1][local120][local137] & 0x2) == 2) { local159 = arg1 - 1; } if (local159 >= 0) { diff --git a/client/src/main/java/Static220.java b/client/src/main/java/Static220.java index 06382ef..938a1b4 100644 --- a/client/src/main/java/Static220.java +++ b/client/src/main/java/Static220.java @@ -11,13 +11,13 @@ public final class Static220 { public static final SoftLruHashTable aClass99_28 = new SoftLruHashTable(64); @OriginalMember(owner = "client!rm", name = "g", descriptor = "Z") - public static boolean aBoolean244 = true; + public static boolean highWaterDetail = true; @OriginalMember(owner = "client!rm", name = "i", descriptor = "Lclient!na;") public static final JagString aClass100_930 = Static28.parse("(Z"); @OriginalMember(owner = "client!rm", name = "a", descriptor = "(IBI)V") - public static void method3797(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) { + public static void spawnGroundObject(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) { @Pc(9) LinkedList local9 = Static159.aClass69ArrayArrayArray1[Static55.level][arg1][arg0]; if (local9 == null) { Static187.method3420(Static55.level, arg1, arg0); @@ -112,8 +112,8 @@ public final class Static220 { @OriginalMember(owner = "client!rm", name = "a", descriptor = "(III)V") public static void method3801() { for (@Pc(1) int local1 = 0; local1 < Static126.anInt3114; local1++) { - for (@Pc(6) int local6 = 0; local6 < Static152.anInt3594; local6++) { - for (@Pc(11) int local11 = 0; local11 < Static99.anInt2550; local11++) { + for (@Pc(6) int local6 = 0; local6 < Static152.mapSizeX; local6++) { + for (@Pc(11) int local11 = 0; local11 < Static99.mapSizeZ; local11++) { @Pc(22) Tile local22 = Static130.aClass3_Sub5ArrayArrayArray1[local1][local6][local11]; if (local22 != null) { @Pc(27) Wall local27 = local22.aClass77_1; diff --git a/client/src/main/java/Static225.java b/client/src/main/java/Static225.java index 8fbd645..2641753 100644 --- a/client/src/main/java/Static225.java +++ b/client/src/main/java/Static225.java @@ -35,7 +35,7 @@ public final class Static225 { } Static105.anIntArray256[Static267.anInt5774++] = local20; @Pc(65) Player local65 = Static159.aClass8_Sub4_Sub1Array1[local20]; - local65.anInt3430 = Static83.anInt372; + local65.anInt3430 = Static83.loop; @Pc(73) int local73 = Static57.aClass3_Sub15_Sub1_3.method2238(1); if (local73 == 1) { Static44.anIntArray106[Static116.anInt2951++] = local20; @@ -83,11 +83,11 @@ public final class Static225 { Static5.anInt39 = arg2; Static186.username = arg0; if (Static186.username.method3108(Static186.EMPTY_FILE) || Static186.password.method3108(Static186.EMPTY_FILE)) { - Static266.anInt5336 = 3; + Static266.returnCode = 3; } else if (Static125.worldId == -1) { Static20.anInt673 = 0; Static196.anInt4587 = 0; - Static266.anInt5336 = -3; + Static266.returnCode = -3; Static219.anInt4937 = 1; @Pc(43) Buffer local43 = new Buffer(128); local43.p1(10); diff --git a/client/src/main/java/Static227.java b/client/src/main/java/Static227.java index 5ac7d5d..1174d44 100644 --- a/client/src/main/java/Static227.java +++ b/client/src/main/java/Static227.java @@ -12,7 +12,7 @@ public final class Static227 { public static Js5 js5Archive23; @OriginalMember(owner = "client!sg", name = "o", descriptor = "I") - public static int anInt5096; + public static int cameraType; @OriginalMember(owner = "client!sg", name = "b", descriptor = "[I") public static final int[] anIntArray446 = new int[25]; diff --git a/client/src/main/java/Static23.java b/client/src/main/java/Static23.java index d4aa58e..8be5ed9 100644 --- a/client/src/main/java/Static23.java +++ b/client/src/main/java/Static23.java @@ -30,21 +30,21 @@ public final class Static23 { for (local3 = arg1; local3 < arg3 + arg1; local3++) { for (local10 = arg2; local10 < arg2 + arg4; local10++) { if (local10 >= 0 && local10 < 104 && local3 >= 0 && local3 < 104) { - Static83.anIntArrayArrayArray4[arg0][local10][local3] = arg0 <= 0 ? 0 : Static83.anIntArrayArrayArray4[arg0 - 1][local10][local3]; + Static83.activeTileHeightMap[arg0][local10][local3] = arg0 <= 0 ? 0 : Static83.activeTileHeightMap[arg0 - 1][local10][local3]; } } } if (arg2 > 0 && arg2 < 104) { for (local3 = arg1 + 1; local3 < arg1 + arg3; local3++) { if (local3 >= 0 && local3 < 104) { - Static83.anIntArrayArrayArray4[arg0][arg2][local3] = Static83.anIntArrayArrayArray4[arg0][arg2 - 1][local3]; + Static83.activeTileHeightMap[arg0][arg2][local3] = Static83.activeTileHeightMap[arg0][arg2 - 1][local3]; } } } if (arg1 > 0 && arg1 < 104) { for (local3 = arg2 + 1; local3 < arg2 + arg4; local3++) { if (local3 >= 0 && local3 < 104) { - Static83.anIntArrayArrayArray4[arg0][local3][arg1] = Static83.anIntArrayArrayArray4[arg0][local3][arg1 - 1]; + Static83.activeTileHeightMap[arg0][local3][arg1] = Static83.activeTileHeightMap[arg0][local3][arg1 - 1]; } } } @@ -52,19 +52,19 @@ public final class Static23 { return; } if (arg0 == 0) { - if (arg2 > 0 && Static83.anIntArrayArrayArray4[arg0][arg2 - 1][arg1] != 0) { - Static83.anIntArrayArrayArray4[arg0][arg2][arg1] = Static83.anIntArrayArrayArray4[arg0][arg2 - 1][arg1]; - } else if (arg1 > 0 && Static83.anIntArrayArrayArray4[arg0][arg2][arg1 - 1] != 0) { - Static83.anIntArrayArrayArray4[arg0][arg2][arg1] = Static83.anIntArrayArrayArray4[arg0][arg2][arg1 - 1]; - } else if (arg2 > 0 && arg1 > 0 && Static83.anIntArrayArrayArray4[arg0][arg2 - 1][arg1 - 1] != 0) { - Static83.anIntArrayArrayArray4[arg0][arg2][arg1] = Static83.anIntArrayArrayArray4[arg0][arg2 - 1][arg1 - 1]; + if (arg2 > 0 && Static83.activeTileHeightMap[arg0][arg2 - 1][arg1] != 0) { + Static83.activeTileHeightMap[arg0][arg2][arg1] = Static83.activeTileHeightMap[arg0][arg2 - 1][arg1]; + } else if (arg1 > 0 && Static83.activeTileHeightMap[arg0][arg2][arg1 - 1] != 0) { + Static83.activeTileHeightMap[arg0][arg2][arg1] = Static83.activeTileHeightMap[arg0][arg2][arg1 - 1]; + } else if (arg2 > 0 && arg1 > 0 && Static83.activeTileHeightMap[arg0][arg2 - 1][arg1 - 1] != 0) { + Static83.activeTileHeightMap[arg0][arg2][arg1] = Static83.activeTileHeightMap[arg0][arg2 - 1][arg1 - 1]; } - } else if (arg2 > 0 && Static83.anIntArrayArrayArray4[arg0 - 1][arg2 - 1][arg1] != Static83.anIntArrayArrayArray4[arg0][arg2 - 1][arg1]) { - Static83.anIntArrayArrayArray4[arg0][arg2][arg1] = Static83.anIntArrayArrayArray4[arg0][arg2 - 1][arg1]; - } else if (arg1 > 0 && Static83.anIntArrayArrayArray4[arg0][arg2][arg1 - 1] != Static83.anIntArrayArrayArray4[arg0 - 1][arg2][arg1 - 1]) { - Static83.anIntArrayArrayArray4[arg0][arg2][arg1] = Static83.anIntArrayArrayArray4[arg0][arg2][arg1 - 1]; - } else if (arg2 > 0 && arg1 > 0 && Static83.anIntArrayArrayArray4[arg0][arg2 - 1][arg1 - 1] != Static83.anIntArrayArrayArray4[arg0 - 1][arg2 - 1][arg1 - 1]) { - Static83.anIntArrayArrayArray4[arg0][arg2][arg1] = Static83.anIntArrayArrayArray4[arg0][arg2 - 1][arg1 - 1]; + } else if (arg2 > 0 && Static83.activeTileHeightMap[arg0 - 1][arg2 - 1][arg1] != Static83.activeTileHeightMap[arg0][arg2 - 1][arg1]) { + Static83.activeTileHeightMap[arg0][arg2][arg1] = Static83.activeTileHeightMap[arg0][arg2 - 1][arg1]; + } else if (arg1 > 0 && Static83.activeTileHeightMap[arg0][arg2][arg1 - 1] != Static83.activeTileHeightMap[arg0 - 1][arg2][arg1 - 1]) { + Static83.activeTileHeightMap[arg0][arg2][arg1] = Static83.activeTileHeightMap[arg0][arg2][arg1 - 1]; + } else if (arg2 > 0 && arg1 > 0 && Static83.activeTileHeightMap[arg0][arg2 - 1][arg1 - 1] != Static83.activeTileHeightMap[arg0 - 1][arg2 - 1][arg1 - 1]) { + Static83.activeTileHeightMap[arg0][arg2][arg1] = Static83.activeTileHeightMap[arg0][arg2 - 1][arg1 - 1]; } } diff --git a/client/src/main/java/Static230.java b/client/src/main/java/Static230.java index 3caa34c..024652c 100644 --- a/client/src/main/java/Static230.java +++ b/client/src/main/java/Static230.java @@ -21,7 +21,7 @@ public final class Static230 { public static int anInt5152 = 0; @OriginalMember(owner = "client!sj", name = "u", descriptor = "Z") - public static boolean aBoolean250 = false; + public static boolean dynamicMapRegion = false; @OriginalMember(owner = "client!sj", name = "w", descriptor = "Lclient!na;") public static final JagString aClass100_978 = Static28.parse("<)4col>"); @@ -132,9 +132,9 @@ public final class Static230 { } @Pc(27) byte[] local27; if (arg0 < 32768) { - local27 = Static238.aClass153_96.method4495(1, arg0); + local27 = Static238.aClass153_96.getFile(1, arg0); } else { - local27 = Static262.aClass153_108.method4495(1, arg0 & 0x7FFF); + local27 = Static262.aClass153_108.getFile(1, arg0 & 0x7FFF); } local10 = new Class3_Sub2_Sub6(); if (local27 != null) { diff --git a/client/src/main/java/Static233.java b/client/src/main/java/Static233.java index 20f15df..d7b1d56 100644 --- a/client/src/main/java/Static233.java +++ b/client/src/main/java/Static233.java @@ -38,7 +38,7 @@ public final class Static233 { public static boolean aBoolean254 = false; @OriginalMember(owner = "client!t", name = "y", descriptor = "I") - public static int anInt5223 = 0; + public static int loadingScreenState = 0; @OriginalMember(owner = "client!t", name = "z", descriptor = "I") public static int anInt5224 = 0; @@ -65,7 +65,7 @@ public final class Static233 { @Pc(17) Class102 local17 = local5[local3]; if (local17 != null && local17.anInt4058 == 2) { Static198.method1026(arg0 >> 1, arg4, (local17.anInt4046 - Static142.originZ << 7) + local17.anInt4047, local17.anInt4050 * 2, arg2 >> 1, local17.anInt4045 + (local17.anInt4053 - Static225.originX << 7), arg3); - if (Static65.anInt1951 > -1 && Static83.anInt372 % 20 < 10) { + if (Static65.anInt1951 > -1 && Static83.loop % 20 < 10) { Static276.aClass3_Sub2_Sub1Array11[local17.anInt4048].method1423(arg1 + Static65.anInt1951 - 12, arg5 + -28 - -Static16.anInt548); } } @@ -85,11 +85,11 @@ public final class Static233 { @Pc(19) byte local19; @Pc(21) byte[][] local21; if (GlRenderer.enabled && arg0) { - local21 = Static19.aByteArrayArray4; + local21 = Static19.underWaterLocationsMapFilesBuffer; local19 = 1; } else { local19 = 4; - local21 = Static156.aByteArrayArray11; + local21 = Static156.locationMapFilesBuffer; } for (@Pc(29) int local29 = 0; local29 < local19; local29++) { Static107.method2261(); @@ -103,8 +103,8 @@ public final class Static233 { @Pc(83) int local83 = local56 >> 14 & 0x3FF; @Pc(89) int local89 = local56 >> 3 & 0x7FF; @Pc(99) int local99 = local89 / 8 + (local83 / 8 << 8); - for (@Pc(101) int local101 = 0; local101 < Static238.anIntArray470.length; local101++) { - if (Static238.anIntArray470[local101] == local99 && local21[local101] != null) { + for (@Pc(101) int local101 = 0; local101 < Static238.regionBitPacked.length; local101++) { + if (Static238.regionBitPacked[local101] == local99 && local21[local101] != null) { Static217.method3771(Static148.collisionMaps, local29, local21[local101], local67, local77, local36 * 8, local43 * 8, arg0, (local83 & 0x7) * 8, (local89 & 0x7) * 8); break; } diff --git a/client/src/main/java/Static234.java b/client/src/main/java/Static234.java index d8e0d7b..7106d5d 100644 --- a/client/src/main/java/Static234.java +++ b/client/src/main/java/Static234.java @@ -30,14 +30,14 @@ public final class Static234 { if ((local18 & 0x40) != 0) { local43 = Static57.aClass3_Sub15_Sub1_3.g1(); local47 = Static57.aClass3_Sub15_Sub1_3.p1neg(); - local14.method2686(local47, Static83.anInt372, local43); - local14.anInt3378 = Static83.anInt372 + 300; + local14.method2686(local47, Static83.loop, local43); + local14.anInt3378 = Static83.loop + 300; local14.anInt3372 = Static57.aClass3_Sub15_Sub1_3.g1ssub(); } if ((local18 & 0x2) != 0) { local43 = Static57.aClass3_Sub15_Sub1_3.p1neg(); local47 = Static57.aClass3_Sub15_Sub1_3.g1ssub(); - local14.method2686(local47, Static83.anInt372, local43); + local14.method2686(local47, Static83.loop, local43); } if ((local18 & 0x10) != 0) { local43 = Static57.aClass3_Sub15_Sub1_3.g2(); @@ -65,15 +65,15 @@ public final class Static234 { } if (local147) { local14.anInt3432 = local43; - local14.anInt3359 = (local47 & 0xFFFF) + Static83.anInt372; + local14.anInt3359 = (local47 & 0xFFFF) + Static83.loop; local14.anInt3361 = 0; local14.anInt3399 = 0; local14.anInt3394 = local47 >> 16; local14.anInt3418 = 1; - if (local14.anInt3359 > Static83.anInt372) { + if (local14.anInt3359 > Static83.loop) { local14.anInt3399 = -1; } - if (local14.anInt3432 != -1 && local14.anInt3359 == Static83.anInt372) { + if (local14.anInt3432 != -1 && local14.anInt3359 == Static83.loop) { @Pc(227) int local227 = Static34.method877(local14.anInt3432).anInt1754; if (local227 != -1) { @Pc(236) SeqType local236 = Static36.method941(local227); @@ -124,7 +124,7 @@ public final class Static234 { @OriginalMember(owner = "client!ta", name = "a", descriptor = "(Lclient!ve;III)Z") public static boolean method4016(@OriginalArg(0) Js5 arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) { - @Pc(9) byte[] local9 = arg0.method4495(arg2, arg1); + @Pc(9) byte[] local9 = arg0.getFile(arg2, arg1); if (local9 == null) { return false; } else { @@ -149,7 +149,7 @@ public final class Static234 { @Pc(25) int local25 = Static119.aClass153_44.getGroupId(Static54.aClass100_374); @Pc(30) int[] local30 = Static119.aClass153_44.method4503(local25); for (@Pc(32) int local32 = 0; local32 < local30.length; local32++) { - Static228.aClass69_120.method2282(Static210.method3713(new Buffer(Static119.aClass153_44.method4495(local25, local30[local32])))); + Static228.aClass69_120.method2282(Static210.method3713(new Buffer(Static119.aClass153_44.getFile(local25, local30[local32])))); } } diff --git a/client/src/main/java/Static235.java b/client/src/main/java/Static235.java index 861a9cc..dd7606c 100644 --- a/client/src/main/java/Static235.java +++ b/client/src/main/java/Static235.java @@ -5,7 +5,7 @@ import org.openrs2.deob.annotation.Pc; public final class Static235 { @OriginalMember(owner = "client!tb", name = "X", descriptor = "Lclient!se;") - public static Class134 aClass134_2; + public static Class134 mapFunctionGroup; @OriginalMember(owner = "client!tb", name = "P", descriptor = "Lclient!na;") public static final JagString aClass100_1002 = Static28.parse("(U5"); @@ -26,9 +26,9 @@ public final class Static235 { } @Pc(24) byte[] local24; if (arg0 < 32768) { - local24 = Static87.aClass153_38.method4495(0, arg0); + local24 = Static87.aClass153_38.getFile(0, arg0); } else { - local24 = Static29.aClass153_19.method4495(0, arg0 & 0x7FFF); + local24 = Static29.aClass153_19.getFile(0, arg0 & 0x7FFF); } local10 = new Class3_Sub2_Sub2(); if (local24 != null) { diff --git a/client/src/main/java/Static236.java b/client/src/main/java/Static236.java index fa2a1c4..3c7eaf9 100644 --- a/client/src/main/java/Static236.java +++ b/client/src/main/java/Static236.java @@ -8,7 +8,7 @@ public final class Static236 { public static int method4047() { if (Static127.aBoolean160) { return 0; - } else if (Static138.method2697()) { + } else if (Static138.allLevelsAreVisible()) { return Static80.aBoolean231 ? 2 : 1; } else { return 1; diff --git a/client/src/main/java/Static238.java b/client/src/main/java/Static238.java index 82e81ca..2fd7125 100644 --- a/client/src/main/java/Static238.java +++ b/client/src/main/java/Static238.java @@ -8,7 +8,7 @@ public final class Static238 { public static Js5 aClass153_96; @OriginalMember(owner = "client!te", name = "H", descriptor = "[I") - public static int[] anIntArray470; + public static int[] regionBitPacked; @OriginalMember(owner = "client!te", name = "B", descriptor = "[I") public static final int[] anIntArray469 = new int[] { 0, -1, 0, 1 }; diff --git a/client/src/main/java/Static240.java b/client/src/main/java/Static240.java index ff6addf..c5357b5 100644 --- a/client/src/main/java/Static240.java +++ b/client/src/main/java/Static240.java @@ -7,7 +7,7 @@ public final class Static240 { public static FontMetrics aFontMetrics1; @OriginalMember(owner = "client!tg", name = "b", descriptor = "I") - public static int anInt5333; + public static int cameraPitch; @OriginalMember(owner = "client!tg", name = "c", descriptor = "I") public static int screenLowerX; diff --git a/client/src/main/java/Static242.java b/client/src/main/java/Static242.java index 96c61b0..b8ef262 100644 --- a/client/src/main/java/Static242.java +++ b/client/src/main/java/Static242.java @@ -6,10 +6,10 @@ import org.openrs2.deob.annotation.Pc; public final class Static242 { @OriginalMember(owner = "client!tj", name = "a", descriptor = "Lclient!ek;") - public static SoftwareIndexedSprite aClass36_Sub1_4; + public static SoftwareIndexedSprite shadowMapImage; @OriginalMember(owner = "client!tj", name = "b", descriptor = "[[Lclient!wm;") - public static Class165[][] aClass165ArrayArray1; + public static Class165[][] shadows; @OriginalMember(owner = "client!tj", name = "c", descriptor = "I") private static int anInt5345; @@ -97,7 +97,7 @@ public final class Static242 { @Pc(31) int local31 = arg1 + arg3 - 1 - 1 >> 7; for (@Pc(33) int local33 = local5; local33 <= local15; local33++) { for (@Pc(38) int local38 = local21; local38 <= local31; local38++) { - aClass165ArrayArray1[local33][local38].aBoolean313 = true; + shadows[local33][local38].outputToSprite = true; } } } @@ -113,9 +113,9 @@ public final class Static242 { @Pc(43) int local43 = local19 - (local29 * Static161.anInt3920 >> 8) >> 3; @Pc(53) int local53 = local33 - (local29 * Static161.anInt3921 >> 8) >> 3; if (arg0 != 0 && arg0 != 1 && (arg2 || arg3)) { - method4210(aClass36_Sub1Array2[arg0], aClass36_Sub1_4, local43 + 1, local53 + 1, arg1, arg2); + method4210(aClass36_Sub1Array2[arg0], shadowMapImage, local43 + 1, local53 + 1, arg1, arg2); } else { - method4194(aClass36_Sub1Array2[1], aClass36_Sub1_4, local43 + 1, local53 + 1); + method4194(aClass36_Sub1Array2[1], shadowMapImage, local43 + 1, local53 + 1); } } @@ -134,10 +134,10 @@ public final class Static242 { if (local29 - arg0 >= -arg2 && local29 - arg0 <= arg2) { for (@Pc(51) int local51 = local22 * 8; local51 < local22 * 8 + 8; local51++) { if (local51 - arg1 >= -arg2 && local51 - arg1 <= arg2 && arg4[local29 + arg2 - arg0][local51 + arg2 - arg1]) { - @Pc(89) Class165 local89 = aClass165ArrayArray1[local17][local22]; - if (local89.aBoolean313) { - local89.method4677(aClass36_Sub1_4, local17, local22); - local89.aBoolean313 = false; + @Pc(89) Class165 local89 = shadows[local17][local22]; + if (local89.outputToSprite) { + local89.method4677(shadowMapImage, local17, local22); + local89.outputToSprite = false; } local1.glPushMatrix(); local1.glTranslatef((float) (local17 * 1024), 0.0F, (float) (local22 * 1024)); @@ -226,11 +226,11 @@ public final class Static242 { public static void method4201() { anInt5346 = 13; anInt5345 = 13; - aClass36_Sub1_4 = new SoftwareIndexedSprite(anInt5346 * 128 + 2, anInt5345 * 128 + 2, 0); - aClass165ArrayArray1 = new Class165[anInt5346][anInt5345]; + shadowMapImage = new SoftwareIndexedSprite(anInt5346 * 128 + 2, anInt5345 * 128 + 2, 0); + shadows = new Class165[anInt5346][anInt5345]; for (@Pc(32) int local32 = 0; local32 < anInt5346; local32++) { for (@Pc(37) int local37 = 0; local37 < anInt5345; local37++) { - aClass165ArrayArray1[local32][local37] = new Class165(); + shadows[local32][local37] = new Class165(); } } } @@ -280,9 +280,9 @@ public final class Static242 { @OriginalMember(owner = "client!tj", name = "a", descriptor = "()V") public static void method4203() { - aClass36_Sub1_4 = null; + shadowMapImage = null; aClass36_Sub1Array2 = null; - aClass165ArrayArray1 = null; + shadows = null; } @OriginalMember(owner = "client!tj", name = "b", descriptor = "([B[BIIIIII)V") @@ -338,7 +338,7 @@ public final class Static242 { if (arg0 != null) { @Pc(12) int local12 = arg1 - (arg2 * Static161.anInt3920 >> 8) >> 3; @Pc(22) int local22 = arg3 - (arg2 * Static161.anInt3921 >> 8) >> 3; - method4202(arg0, aClass36_Sub1_4, local12 + 1, local22 + 1); + method4202(arg0, shadowMapImage, local12 + 1, local22 + 1); } } @@ -371,7 +371,7 @@ public final class Static242 { } else { @Pc(13) int local13 = arg1 - (arg2 * Static161.anInt3920 >> 8) >> 3; @Pc(23) int local23 = arg3 - (arg2 * Static161.anInt3921 >> 8) >> 3; - return method4200(arg0, aClass36_Sub1_4, local13 + 1, local23 + 1); + return method4200(arg0, shadowMapImage, local13 + 1, local23 + 1); } } @@ -415,7 +415,7 @@ public final class Static242 { if (arg0 != null) { @Pc(12) int local12 = arg1 - (arg2 * Static161.anInt3920 >> 8) >> 3; @Pc(22) int local22 = arg3 - (arg2 * Static161.anInt3921 >> 8) >> 3; - method4194(arg0, aClass36_Sub1_4, local12 + 1, local22 + 1); + method4194(arg0, shadowMapImage, local12 + 1, local22 + 1); } } } diff --git a/client/src/main/java/Static243.java b/client/src/main/java/Static243.java index 98af418..7b423b5 100644 --- a/client/src/main/java/Static243.java +++ b/client/src/main/java/Static243.java @@ -20,11 +20,11 @@ public final class Static243 { public static int[] anIntArray476 = new int[2]; @OriginalMember(owner = "client!tk", name = "a", descriptor = "(Lclient!sc;ZLclient!wl;)Lclient!hg;") - public static Class3_Sub14 method4212(@OriginalArg(0) HashTable arg0, @OriginalArg(2) FloType arg1) { + public static GlTile method4212(@OriginalArg(0) HashTable arg0, @OriginalArg(2) FloType arg1) { @Pc(23) long local23 = (long) ((arg1.anInt5892 + 1 << 16) + arg1.anInt5885) + ((long) arg1.anInt5897 << 56) + ((long) arg1.anInt5889 << 32); - @Pc(38) Class3_Sub14 local38 = (Class3_Sub14) arg0.method3863(local23); + @Pc(38) GlTile local38 = (GlTile) arg0.method3863(local23); if (local38 == null) { - local38 = new Class3_Sub14(arg1.anInt5892, (float) arg1.anInt5885, true, false, arg1.anInt5889); + local38 = new GlTile(arg1.anInt5892, (float) arg1.anInt5885, true, false, arg1.anInt5889); arg0.method3862(local38, local23); } return local38; @@ -60,7 +60,7 @@ public final class Static243 { Static260.anInt5014 = 0; Static132.anInt3291 = (int) (Math.random() * 100.0D) - 50; Static84.anInt2255 = 0; - Static57.anInt1747 = (int) (Math.random() * 20.0D) - 10 & 0x7FF; + Static57.yawTarget = (int) (Math.random() * 20.0D) - 10 & 0x7FF; Static107.anInt2875 = -1; Static267.anInt5774 = 0; Static270.anInt5795 = 0; @@ -110,13 +110,13 @@ public final class Static243 { for (local3506 = 0; local3506 < Static155.varcs.length; local3506++) { Static155.varcs[local3506] = -1; } - if (Static154.topLevelInterace != -1) { - Static109.method2275(Static154.topLevelInterace); + if (Static154.topLevelInterface != -1) { + Static109.method2275(Static154.topLevelInterface); } for (@Pc(3755) Class3_Sub31 local3755 = (Class3_Sub31) Static119.aClass133_9.method3859(); local3755 != null; local3755 = (Class3_Sub31) Static119.aClass133_9.method3861()) { Static132.method2605(true, local3755); } - Static154.topLevelInterace = -1; + Static154.topLevelInterface = -1; Static119.aClass133_9 = new HashTable(8); Static52.method1287(); Static39.aClass13_10 = null; diff --git a/client/src/main/java/Static244.java b/client/src/main/java/Static244.java index cde38db..8f73831 100644 --- a/client/src/main/java/Static244.java +++ b/client/src/main/java/Static244.java @@ -8,7 +8,7 @@ public final class Static244 { public static final SoftLruHashTable aClass99_32 = new SoftLruHashTable(50); @OriginalMember(owner = "client!tl", name = "d", descriptor = "I") - public static int anInt5370 = 0; + public static int gameState = 0; @OriginalMember(owner = "client!tl", name = "f", descriptor = "Lclient!na;") diff --git a/client/src/main/java/Static245.java b/client/src/main/java/Static245.java index c657e33..bae1ed2 100644 --- a/client/src/main/java/Static245.java +++ b/client/src/main/java/Static245.java @@ -37,7 +37,7 @@ public final class Static245 { } for (@Pc(46) int local46 = 0; local46 < local25; local46++) { if (Static241.components[arg0][local46] == null) { - @Pc(62) byte[] local62 = Static202.aClass153_84.method4495(arg0, local46); + @Pc(62) byte[] local62 = Static202.aClass153_84.getFile(arg0, local46); if (local62 != null) { @Pc(74) Component local74 = Static241.components[arg0][local46] = new Component(); local74.anInt507 = local46 + (arg0 << 16); @@ -210,8 +210,8 @@ public final class Static245 { local417 = local517.anInt2240 >> 7; local255 = local517.anInt2245 >> 7; if (local417 >= 0 && local255 >= 0 && local417 < 104 && local255 < 104) { - local517.aBoolean125 = (Static12.aByteArrayArrayArray2[1][local417][local255] & 0x2) != 0; - local517.anInt2235 = Static83.anIntArrayArrayArray4[local517.anInt2241][local417][local255] - local517.anInt2235; + local517.aBoolean125 = (Static12.tileSettings[1][local417][local255] & 0x2) != 0; + local517.anInt2235 = Static83.activeTileHeightMap[local517.anInt2241][local417][local255] - local517.anInt2235; Static120.method2389(local517); } } diff --git a/client/src/main/java/Static246.java b/client/src/main/java/Static246.java index 8f2a9d8..cab1750 100644 --- a/client/src/main/java/Static246.java +++ b/client/src/main/java/Static246.java @@ -25,7 +25,7 @@ public final class Static246 { @Pc(15) SpotAnim local15 = local9.aClass8_Sub2_1; if (local15.anInt606 != Static55.level || local15.aBoolean41) { local9.method4658(); - } else if (local15.anInt590 <= Static83.anInt372) { + } else if (local15.anInt590 <= Static83.loop) { local15.method558(Static178.anInt4247); if (local15.aBoolean41) { local9.method4658(); @@ -135,7 +135,7 @@ public final class Static246 { if (local16 != null) { return local16; } - @Pc(27) byte[] local27 = Static9.aClass153_2.method4495(5, arg0); + @Pc(27) byte[] local27 = Static9.aClass153_2.getFile(5, arg0); local16 = new Class3_Sub2_Sub14(); if (local27 != null) { local16.method2927(new Buffer(local27)); diff --git a/client/src/main/java/Static247.java b/client/src/main/java/Static247.java index 08301aa..c0ba3a1 100644 --- a/client/src/main/java/Static247.java +++ b/client/src/main/java/Static247.java @@ -59,7 +59,7 @@ public final class Static247 { @Pc(1179) Tile var32; while (true) { do { - local8 = (Tile) Static7.aClass69_32.method2287(); + local8 = (Tile) Static7.aClass69_32.removeHead(); if (local8 == null) { return; } @@ -71,7 +71,7 @@ public final class Static247 { local31 = Static130.aClass3_Sub5ArrayArrayArray1[local24]; @Pc(33) float local33 = 0.0F; if (GlRenderer.enabled) { - if (Static80.anIntArrayArrayArray19 == Static83.anIntArrayArrayArray4) { + if (Static80.underWaterTileHeightMap == Static83.activeTileHeightMap) { var9 = Static62.anIntArrayArray11[local18][local21]; var10 = var9 & 0xFFFFFF; if (var10 != Static152.anInt3604) { @@ -84,7 +84,7 @@ public final class Static247 { Static22.anInt730 = local65; Static147.method2761(local65); } - local115 = Static107.anIntArrayArrayArray10[0][local18][local21] + Static107.anIntArrayArrayArray10[0][local18 + 1][local21] + Static107.anIntArrayArrayArray10[0][local18][local21 + 1] + Static107.anIntArrayArrayArray10[0][local18 + 1][local21 + 1] >> 2; + local115 = Static107.surfaceTileHeightMap[0][local18][local21] + Static107.surfaceTileHeightMap[0][local18 + 1][local21] + Static107.surfaceTileHeightMap[0][local18][local21 + 1] + Static107.surfaceTileHeightMap[0][local18 + 1][local21 + 1] >> 2; Static27.setMaterial(-local115, 3); local33 = 201.5F; GlRenderer.method4159(local33); @@ -377,21 +377,21 @@ public final class Static247 { if (local1332 == 0) { local65 -= 64; local115 += 64; - if (local115 < local65 && local18 > 0 && local21 < Static99.anInt2550 - 1) { + if (local115 < local65 && local18 > 0 && local21 < Static99.mapSizeZ - 1) { Static120.method2393(Static149.anInt3555, Static162.anInt3947, Static217.anInt4903, local24, local18 - 1, local21 + 1); break label882; } } else if (local1332 == 1) { local65 += 64; local115 += 64; - if (local115 < -local65 && local18 < Static152.anInt3594 - 1 && local21 < Static99.anInt2550 - 1) { + if (local115 < -local65 && local18 < Static152.mapSizeX - 1 && local21 < Static99.mapSizeZ - 1) { Static120.method2393(Static149.anInt3555, Static162.anInt3947, Static217.anInt4903, local24, local18 + 1, local21 + 1); break label882; } } else if (local1332 == 2) { local65 += 64; local115 -= 64; - if (local115 > local65 && local18 < Static152.anInt3594 - 1 && local21 > 0) { + if (local115 > local65 && local18 < Static152.mapSizeX - 1 && local21 > 0) { Static120.method2393(Static149.anInt3555, Static162.anInt3947, Static217.anInt4903, local24, local18 + 1, local21 - 1); break label882; } @@ -664,7 +664,7 @@ public final class Static247 { if (local8 != null && local8.anObjectArray11 != null) { @Pc(19) HookRequest local19 = new HookRequest(); local19.source = local8; - local19.anObjectArray31 = local8.anObjectArray11; + local19.arguments = local8.anObjectArray11; Static82.method1767(local19); } Static15.anInt506 = arg1; @@ -688,7 +688,7 @@ public final class Static247 { if (local10 != null) { return local10; } - @Pc(20) byte[] local20 = Static81.aClass153_34.method4495(16, arg0); + @Pc(20) byte[] local20 = Static81.aClass153_34.getFile(16, arg0); local10 = new Class35(); if (local20 != null) { local10.method1323(new Buffer(local20)); diff --git a/client/src/main/java/Static248.java b/client/src/main/java/Static248.java index 5640c2a..f904d1e 100644 --- a/client/src/main/java/Static248.java +++ b/client/src/main/java/Static248.java @@ -51,7 +51,7 @@ public final class Static248 { for (local37 = Static80.anInt4698; local37 < Static215.anInt4866; local37++) { @Pc(46) Tile local46 = local30[local32][local37]; if (local46 != null) { - if (Static48.aBooleanArrayArray1[local32 + Static277.anInt5855 - Static167.anInt4069][local37 + Static277.anInt5855 - Static193.anInt4539] && (arg3 == null || local23 < arg4 || arg3[local23][local32][local37] != arg5)) { + if (Static48.aBooleanArrayArray1[local32 + Static277.tileVisibilityDistance - Static167.anInt4069][local37 + Static277.tileVisibilityDistance - Static193.anInt4539] && (arg3 == null || local23 < arg4 || arg3[local23][local32][local37] != arg5)) { local46.aBoolean45 = true; local46.aBoolean46 = true; if (local46.anInt662 > 0) { @@ -95,7 +95,7 @@ public final class Static248 { } } } - @Pc(240) boolean local240 = Static83.anIntArrayArrayArray4 == Static80.anIntArrayArrayArray19; + @Pc(240) boolean local240 = Static83.activeTileHeightMap == Static80.underWaterTileHeightMap; if (GlRenderer.enabled) { @Pc(244) GL2 local244 = GlRenderer.gl; local244.glPushMatrix(); @@ -108,7 +108,7 @@ public final class Static248 { Static152.anInt3604 = -1; Static22.anInt730 = -1; for (local32 = 0; local32 < Static182.aClass3_Sub14ArrayArray2[0].length; local32++) { - @Pc(285) Class3_Sub14 local285 = Static182.aClass3_Sub14ArrayArray2[0][local32]; + @Pc(285) GlTile local285 = Static182.aClass3_Sub14ArrayArray2[0][local32]; @Pc(294) float local294 = 251.5F - (local285.aBoolean140 ? 1.0F : 0.5F); if (local285.anInt2486 != Static152.anInt3604) { Static152.anInt3604 = local285.anInt2486; @@ -126,16 +126,16 @@ public final class Static248 { break; } for (local37 = 0; local37 < Static182.aClass3_Sub14ArrayArray2[local32].length; local37++) { - @Pc(336) Class3_Sub14 local336 = Static182.aClass3_Sub14ArrayArray2[local32][local37]; + @Pc(336) GlTile local336 = Static182.aClass3_Sub14ArrayArray2[local32][local37]; @Pc(350) float local350 = 201.5F - (float) local32 * 50.0F - (local336.aBoolean140 ? 1.0F : 0.5F); - if (local336.anInt2485 != -1 && Rasteriser.textureProvider.method3237(local336.anInt2485) == 4 && Static220.aBoolean244) { + if (local336.anInt2485 != -1 && Rasteriser.textureProvider.method3237(local336.anInt2485) == 4 && Static220.highWaterDetail) { Static21.method619(local336.anInt2486); } local336.method1944(Static130.aClass3_Sub5ArrayArrayArray1, local350, false); } if (local32 == 0 && Static139.anInt3451 > 0) { GlRenderer.method4159(101.5F); - Static242.method4198(Static167.anInt4069, Static193.anInt4539, Static277.anInt5855, arg1, Static48.aBooleanArrayArray1, Static83.anIntArrayArrayArray4[0]); + Static242.method4198(Static167.anInt4069, Static193.anInt4539, Static277.tileVisibilityDistance, arg1, Static48.aBooleanArrayArray1, Static83.activeTileHeightMap[0]); } local32++; } @@ -151,11 +151,11 @@ public final class Static248 { @Pc(428) int local428; for (local399 = Static235.anInt5276; local399 < Static126.anInt3114; local399++) { local406 = Static130.aClass3_Sub5ArrayArrayArray1[local399]; - for (local37 = -Static277.anInt5855; local37 <= 0; local37++) { + for (local37 = -Static277.tileVisibilityDistance; local37 <= 0; local37++) { local415 = Static167.anInt4069 + local37; local183 = Static167.anInt4069 - local37; if (local415 >= Static31.anInt987 || local183 < Static2.anInt15) { - for (local428 = -Static277.anInt5855; local428 <= 0; local428++) { + for (local428 = -Static277.tileVisibilityDistance; local428 <= 0; local428++) { local434 = Static193.anInt4539 + local428; local438 = Static193.anInt4539 - local428; if (local415 >= Static31.anInt987) { @@ -198,11 +198,11 @@ public final class Static248 { } for (local399 = Static235.anInt5276; local399 < Static126.anInt3114; local399++) { local406 = Static130.aClass3_Sub5ArrayArrayArray1[local399]; - for (local37 = -Static277.anInt5855; local37 <= 0; local37++) { + for (local37 = -Static277.tileVisibilityDistance; local37 <= 0; local37++) { local415 = Static167.anInt4069 + local37; local183 = Static167.anInt4069 - local37; if (local415 >= Static31.anInt987 || local183 < Static2.anInt15) { - for (local428 = -Static277.anInt5855; local428 <= 0; local428++) { + for (local428 = -Static277.tileVisibilityDistance; local428 <= 0; local428++) { local434 = Static193.anInt4539 + local428; local438 = Static193.anInt4539 - local428; if (local415 >= Static31.anInt987) { diff --git a/client/src/main/java/Static250.java b/client/src/main/java/Static250.java index a6d487c..23d9695 100644 --- a/client/src/main/java/Static250.java +++ b/client/src/main/java/Static250.java @@ -51,13 +51,13 @@ public final class Static250 { for (@Pc(93) int local93 = 0; local93 < Static182.keyQueueSize; local93++) { @Pc(104) int local104 = Static227.keyCodes[local93]; if (local104 == 98) { - Static72.anInt2031 = Static72.anInt2031 + 47 & 0xFFFFFFF0; + Static72.pitchTarget = Static72.pitchTarget + 47 & 0xFFFFFFF0; } else if (local104 == 99) { - Static72.anInt2031 = Static72.anInt2031 - 17 & 0xFFFFFFF0; + Static72.pitchTarget = Static72.pitchTarget - 17 & 0xFFFFFFF0; } else if (local104 == 96) { - Static57.anInt1747 = Static57.anInt1747 - 65 & 0xFFFFFF80; + Static57.yawTarget = Static57.yawTarget - 65 & 0xFFFFFF80; } else if (local104 == 97) { - Static57.anInt1747 = Static57.anInt1747 + 191 & 0xFFFFFF80; + Static57.yawTarget = Static57.yawTarget + 191 & 0xFFFFFF80; } } } else { @@ -75,9 +75,9 @@ public final class Static250 { } else { Static38.anInt1203 /= 2; } - Static72.anInt2031 += Static56.anInt1743 / 2; - Static57.anInt1747 += Static38.anInt1203 / 2; + Static72.pitchTarget += Static56.anInt1743 / 2; + Static57.yawTarget += Static38.anInt1203 / 2; } - Static87.method1812(); + Static87.clampCameraAngle(); } } diff --git a/client/src/main/java/Static252.java b/client/src/main/java/Static252.java index 3a3dc22..9f77ae8 100644 --- a/client/src/main/java/Static252.java +++ b/client/src/main/java/Static252.java @@ -41,28 +41,28 @@ public final class Static252 { Static243.anIntArray476[local33] = 1000000; Static50.anIntArray134[local33] = 0; } - if (Static227.anInt5096 != 1) { - local33 = Static207.method3685(Static55.level, Static138.anInt3439, Static134.anInt3302); - if (local33 - Static5.anInt40 < 800 && (Static12.aByteArrayArrayArray2[Static55.level][Static138.anInt3439 >> 7][Static134.anInt3302 >> 7] & 0x4) != 0) { - Static254.method4348(false, Static138.anInt3439 >> 7, Static134.anInt3302 >> 7, Static130.aClass3_Sub5ArrayArrayArray1, 1); + if (Static227.cameraType != 1) { + local33 = Static207.method3685(Static55.level, Static138.renderX, Static134.renderZ); + if (local33 - Static5.anInt40 < 800 && (Static12.tileSettings[Static55.level][Static138.renderX >> 7][Static134.renderZ >> 7] & 0x4) != 0) { + Static254.method4348(false, Static138.renderX >> 7, Static134.renderZ >> 7, Static130.aClass3_Sub5ArrayArrayArray1, 1); } return; } - if ((Static12.aByteArrayArrayArray2[Static55.level][Static173.self.anInt3412 >> 7][Static173.self.anInt3421 >> 7] & 0x4) != 0) { + if ((Static12.tileSettings[Static55.level][Static173.self.anInt3412 >> 7][Static173.self.anInt3421 >> 7] & 0x4) != 0) { Static254.method4348(false, Static173.self.anInt3412 >> 7, Static173.self.anInt3421 >> 7, Static130.aClass3_Sub5ArrayArrayArray1, 0); } - if (Static240.anInt5333 >= 310) { + if (Static240.cameraPitch >= 310) { return; } @Pc(135) int local135 = Static173.self.anInt3421 >> 7; - local40 = Static134.anInt3302 >> 7; + local40 = Static134.renderZ >> 7; @Pc(146) int local146; if (local40 < local135) { local146 = local135 - local40; } else { local146 = local40 - local135; } - local33 = Static138.anInt3439 >> 7; + local33 = Static138.renderX >> 7; @Pc(162) int local162 = Static173.self.anInt3412 >> 7; @Pc(174) int local174; if (local162 > local33) { @@ -81,7 +81,7 @@ public final class Static252 { } else if (local40 > local135) { local40--; } - if ((Static12.aByteArrayArrayArray2[Static55.level][local33][local40] & 0x4) != 0) { + if ((Static12.tileSettings[Static55.level][local33][local40] & 0x4) != 0) { Static254.method4348(false, local33, local40, Static130.aClass3_Sub5ArrayArrayArray1, 1); break; } @@ -93,7 +93,7 @@ public final class Static252 { local33--; } local186 -= 65536; - if ((Static12.aByteArrayArrayArray2[Static55.level][local33][local40] & 0x4) != 0) { + if ((Static12.tileSettings[Static55.level][local33][local40] & 0x4) != 0) { Static254.method4348(false, local33, local40, Static130.aClass3_Sub5ArrayArrayArray1, 1); break; } @@ -109,7 +109,7 @@ public final class Static252 { } else if (local33 > local162) { local33--; } - if ((Static12.aByteArrayArrayArray2[Static55.level][local33][local40] & 0x4) != 0) { + if ((Static12.tileSettings[Static55.level][local33][local40] & 0x4) != 0) { Static254.method4348(false, local33, local40, Static130.aClass3_Sub5ArrayArrayArray1, 1); break; } @@ -121,7 +121,7 @@ public final class Static252 { local40--; } local186 -= 65536; - if ((Static12.aByteArrayArrayArray2[Static55.level][local33][local40] & 0x4) != 0) { + if ((Static12.tileSettings[Static55.level][local33][local40] & 0x4) != 0) { Static254.method4348(false, local33, local40, Static130.aClass3_Sub5ArrayArrayArray1, 1); break; } diff --git a/client/src/main/java/Static253.java b/client/src/main/java/Static253.java index f28043e..bbf876d 100644 --- a/client/src/main/java/Static253.java +++ b/client/src/main/java/Static253.java @@ -45,9 +45,9 @@ public final class Static253 { } @Pc(59) int local59; @Pc(57) int local57; - if (Static227.anInt5096 == 1) { - local57 = Static230.anInt5161 + Static57.anInt1747 & 0x7FF; - local59 = Static72.anInt2031; + if (Static227.cameraType == 1) { + local57 = Static230.anInt5161 + Static57.yawTarget & 0x7FF; + local59 = Static72.pitchTarget; if (local59 < Static234.anInt5245 / 256) { local59 = Static234.anInt5245 / 256; } @@ -57,44 +57,44 @@ public final class Static253 { Static18.method555(Static81.anInt2223, arg0, Static207.method3685(Static55.level, Static173.self.anInt3412, Static173.self.anInt3421) - 50, 600 - -(local59 * 3), local57, Static111.anInt2900, local59); } local57 = Static5.anInt40; - local59 = Static138.anInt3439; - @Pc(121) int local121 = Static134.anInt3302; - @Pc(123) int local123 = Static240.anInt5333; - @Pc(125) int local125 = Static184.anInt4358; + local59 = Static138.renderX; + @Pc(121) int local121 = Static134.renderZ; + @Pc(123) int local123 = Static240.cameraPitch; + @Pc(125) int local125 = Static184.cameraYaw; @Pc(127) int local127; @Pc(171) int local171; for (local127 = 0; local127 < 5; local127++) { if (Static176.aBooleanArray95[local127]) { local171 = (int) ((double) -Static222.anIntArray437[local127] + (double) (Static222.anIntArray437[local127] * 2 + 1) * Math.random() + Math.sin((double) Static31.anIntArray76[local127] * ((double) Static202.anIntArray424[local127] / 100.0D)) * (double) Static276.anIntArray564[local127]); if (local127 == 3) { - Static184.anInt4358 = local171 + Static184.anInt4358 & 0x7FF; + Static184.cameraYaw = local171 + Static184.cameraYaw & 0x7FF; } if (local127 == 4) { - Static240.anInt5333 += local171; - if (Static240.anInt5333 < 128) { - Static240.anInt5333 = 128; + Static240.cameraPitch += local171; + if (Static240.cameraPitch < 128) { + Static240.cameraPitch = 128; } - if (Static240.anInt5333 > 383) { - Static240.anInt5333 = 383; + if (Static240.cameraPitch > 383) { + Static240.cameraPitch = 383; } } if (local127 == 2) { - Static134.anInt3302 += local171; + Static134.renderZ += local171; } if (local127 == 1) { Static5.anInt40 += local171; } if (local127 == 0) { - Static138.anInt3439 += local171; + Static138.renderX += local171; } } } Static252.method4302(); if (GlRenderer.enabled) { Static46.method1187(arg2, arg4, arg2 + arg3, arg4 - -arg0); - @Pc(248) float local248 = (float) Static240.anInt5333 * 0.17578125F; - @Pc(253) float local253 = (float) Static184.anInt4358 * 0.17578125F; - if (Static227.anInt5096 == 3) { + @Pc(248) float local248 = (float) Static240.cameraPitch * 0.17578125F; + @Pc(253) float local253 = (float) Static184.cameraYaw * 0.17578125F; + if (Static227.cameraType == 3) { local248 = Static146.aFloat15 * 360.0F / 6.2831855F; local253 = Static84.aFloat10 * 360.0F / 6.2831855F; } @@ -122,16 +122,16 @@ public final class Static253 { GlRenderer.method4173(); GlRenderer.setDepthTestEnabled(true); GlRenderer.setFogEnabled(true); - if (Static244.anInt5370 == 10) { - local171 = Static103.method2235(Static178.anInt4247, Static134.anInt3302 >> 10, Static113.brightness, Static138.anInt3439 >> 10); + if (Static244.gameState == 10) { + local171 = Static103.method2235(Static178.anInt4247, Static134.renderZ >> 10, Static113.brightness, Static138.renderX >> 10); } else { local171 = Static103.method2235(Static178.anInt4247, Static173.self.movementQueueZ[0] >> 3, Static113.brightness, Static173.self.movementQueueX[0] >> 3); } - Static120.method2394(Static83.anInt372, !Static11.aBoolean15); + Static120.method2394(Static83.loop, !Static11.aBoolean15); GlRenderer.clearColorAndDepthBuffers(local171); - Static143.method2731(Static240.anInt5333, Static134.anInt3302, Static5.anInt40, Static138.anInt3439, Static184.anInt4358); - GlRenderer.anInt5323 = Static83.anInt372; - Static156.method2954(Static138.anInt3439, Static5.anInt40, Static134.anInt3302, Static240.anInt5333, Static184.anInt4358, Static266.aByteArrayArrayArray15, Static79.anIntArray205, Static149.anIntArray338, Static267.anIntArray518, Static50.anIntArray134, Static243.anIntArray476, Static55.level + 1, local387, Static173.self.anInt3412 >> 7, Static173.self.anInt3421 >> 7); + Static143.method2731(Static240.cameraPitch, Static134.renderZ, Static5.anInt40, Static138.renderX, Static184.cameraYaw); + GlRenderer.anInt5323 = Static83.loop; + Static156.method2954(Static138.renderX, Static5.anInt40, Static134.renderZ, Static240.cameraPitch, Static184.cameraYaw, Static266.aByteArrayArrayArray15, Static79.anIntArray205, Static149.anIntArray338, Static267.anIntArray518, Static50.anIntArray134, Static243.anIntArray476, Static55.level + 1, local387, Static173.self.anInt3412 >> 7, Static173.self.anInt3421 >> 7); Static263.aBoolean299 = true; Static120.method2390(); Static143.method2731(0, 0, 0, 0, 0); @@ -141,7 +141,7 @@ public final class Static253 { Static233.method4000(arg3, arg2, arg0, Static223.anInt5029, Static223.anInt5029, arg4); } else { Static129.method2495(arg2, arg4, arg3, arg0, 0); - Static156.method2954(Static138.anInt3439, Static5.anInt40, Static134.anInt3302, Static240.anInt5333, Static184.anInt4358, Static266.aByteArrayArrayArray15, Static79.anIntArray205, Static149.anIntArray338, Static267.anIntArray518, Static50.anIntArray134, Static243.anIntArray476, Static55.level + 1, local387, Static173.self.anInt3412 >> 7, Static173.self.anInt3421 >> 7); + Static156.method2954(Static138.renderX, Static5.anInt40, Static134.renderZ, Static240.cameraPitch, Static184.cameraYaw, Static266.aByteArrayArrayArray15, Static79.anIntArray205, Static149.anIntArray338, Static267.anIntArray518, Static50.anIntArray134, Static243.anIntArray476, Static55.level + 1, local387, Static173.self.anInt3412 >> 7, Static173.self.anInt3421 >> 7); Static107.method2261(); Static223.method3858(); Static142.method2726(arg4, arg3, arg2, 256, arg0, 256); @@ -149,11 +149,11 @@ public final class Static253 { } ((Js5GlTextureProvider) Rasteriser.textureProvider).method3239(Static178.anInt4247); Static115.method2310(arg3, arg4, arg0, arg2); - Static240.anInt5333 = local123; - Static134.anInt3302 = local121; + Static240.cameraPitch = local123; + Static134.renderZ = local121; Static5.anInt40 = local57; - Static138.anInt3439 = local59; - Static184.anInt4358 = local125; + Static138.renderX = local59; + Static184.cameraYaw = local125; if (Static19.aBoolean43 && Static107.js5NetQueue.method2328() == 0) { Static19.aBoolean43 = false; } @@ -163,7 +163,7 @@ public final class Static253 { } else { Static129.method2495(arg2, arg4, arg3, arg0, 0); } - Static114.method4636(false, LocalizedText.LOADING); + Static114.drawTextOnScreen(false, LocalizedText.LOADING); } if (!arg1 && !Static19.aBoolean43 && !Static60.aBoolean108 && arg2 <= Static155.anInt3751 && arg3 + arg2 > Static155.anInt3751 && arg4 <= Static60.anInt1892 && arg0 + arg4 > Static60.anInt1892) { Static176.method3304(arg4, arg3, arg0, arg2, Static60.anInt1892, Static155.anInt3751); @@ -181,7 +181,7 @@ public final class Static253 { if (local10 != null) { return local10; } - @Pc(24) byte[] local24 = Static84.aClass153_35.method4495(Static97.method1959(arg0), Static103.method2236(arg0)); + @Pc(24) byte[] local24 = Static84.aClass153_35.getFile(Static97.method1959(arg0), Static103.method2236(arg0)); local10 = new EnumType(); if (local24 != null) { local10.method3094(new Buffer(local24)); diff --git a/client/src/main/java/Static254.java b/client/src/main/java/Static254.java index 7609134..991df06 100644 --- a/client/src/main/java/Static254.java +++ b/client/src/main/java/Static254.java @@ -20,7 +20,7 @@ public final class Static254 { public static final JagString aClass100_1061 = Static28.parse("null"); @OriginalMember(owner = "client!uj", name = "t", descriptor = "[I") - public static final int[] anIntArray487 = new int[1000]; + public static final int[] intStack = new int[1000]; @OriginalMember(owner = "client!uj", name = "A", descriptor = "[I") public static final int[] anIntArray489 = new int[] { 2, 0, 0, 2, 0, 0, 0, 4, 4 }; @@ -44,7 +44,7 @@ public final class Static254 { @Pc(14) byte local14 = arg0 ? 1 : (byte) (Static136.anInt3325 & 0xFF); if (local14 == Static266.aByteArrayArrayArray15[Static55.level][arg1][arg2]) { return false; - } else if ((Static12.aByteArrayArrayArray2[Static55.level][arg1][arg2] & 0x4) == 0) { + } else if ((Static12.tileSettings[Static55.level][arg1][arg2] & 0x4) == 0) { return false; } else { @Pc(47) int local47 = 0; @@ -62,13 +62,13 @@ public final class Static254 { local47 = local47 + 1 & 0xFFF; @Pc(130) boolean local130 = false; @Pc(132) boolean local132 = false; - if ((Static12.aByteArrayArrayArray2[Static55.level][local108][local122] & 0x4) == 0) { + if ((Static12.tileSettings[Static55.level][local108][local122] & 0x4) == 0) { local130 = true; } @Pc(150) int local150; @Pc(191) int local191; label238: for (local150 = Static55.level + 1; local150 <= 3; local150++) { - if ((Static12.aByteArrayArrayArray2[local150][local108][local122] & 0x8) == 0) { + if ((Static12.tileSettings[local150][local108][local122] & 0x8) == 0) { @Pc(227) int local227; @Pc(358) int local358; if (local130 && arg3[local150][local108][local122] != null) { @@ -122,8 +122,8 @@ public final class Static254 { } } if (local132) { - if (Static83.anIntArrayArrayArray4[Static55.level + 1][local108][local122] > Static79.anIntArray205[arg4]) { - Static79.anIntArray205[arg4] = Static83.anIntArrayArrayArray4[Static55.level + 1][local108][local122]; + if (Static83.activeTileHeightMap[Static55.level + 1][local108][local122] > Static79.anIntArray205[arg4]) { + Static79.anIntArray205[arg4] = Static83.activeTileHeightMap[Static55.level + 1][local108][local122]; } local150 = local108 << 7; if (local150 < Static149.anIntArray338[arg4]) { @@ -147,7 +147,7 @@ public final class Static254 { } local122++; if (local122 < 104) { - if (local108 - 1 >= 0 && local14 != Static266.aByteArrayArrayArray15[Static55.level][local108 - 1][local122] && (Static12.aByteArrayArrayArray2[Static55.level][local108][local122] & 0x4) == 0 && (Static12.aByteArrayArrayArray2[Static55.level][local108 - 1][local122 - 1] & 0x4) == 0) { + if (local108 - 1 >= 0 && local14 != Static266.aByteArrayArrayArray15[Static55.level][local108 - 1][local122] && (Static12.tileSettings[Static55.level][local108][local122] & 0x4) == 0 && (Static12.tileSettings[Static55.level][local108 - 1][local122 - 1] & 0x4) == 0) { Static259.anIntArray514[local69] = 0x52000000 | 0x120000 | local108 - 1; Static84.anIntArray209[local69] = local122 | 0x130000; Static266.aByteArrayArrayArray15[Static55.level][local108 - 1][local122] = local14; @@ -159,7 +159,7 @@ public final class Static254 { local69 = local69 + 1 & 0xFFF; Static266.aByteArrayArrayArray15[Static55.level][local108][local122] = local14; } - if (local108 + 1 < 104 && Static266.aByteArrayArrayArray15[Static55.level][local108 + 1][local122] != local14 && (Static12.aByteArrayArrayArray2[Static55.level][local108][local122] & 0x4) == 0 && (Static12.aByteArrayArrayArray2[Static55.level][local108 + 1][local122 - 1] & 0x4) == 0) { + if (local108 + 1 < 104 && Static266.aByteArrayArrayArray15[Static55.level][local108 + 1][local122] != local14 && (Static12.tileSettings[Static55.level][local108][local122] & 0x4) == 0 && (Static12.tileSettings[Static55.level][local108 + 1][local122 - 1] & 0x4) == 0) { Static259.anIntArray514[local69] = 0x92000000 | 0x520000 | local108 + 1; Static84.anIntArray209[local69] = local122 | 0x530000; Static266.aByteArrayArrayArray15[Static55.level][local108 + 1][local122] = local14; @@ -175,7 +175,7 @@ public final class Static254 { } local122--; if (local122 >= 0) { - if (local108 - 1 >= 0 && Static266.aByteArrayArrayArray15[Static55.level][local108 - 1][local122] != local14 && (Static12.aByteArrayArrayArray2[Static55.level][local108][local122] & 0x4) == 0 && (Static12.aByteArrayArrayArray2[Static55.level][local108 - 1][local122 + 1] & 0x4) == 0) { + if (local108 - 1 >= 0 && Static266.aByteArrayArrayArray15[Static55.level][local108 - 1][local122] != local14 && (Static12.tileSettings[Static55.level][local108][local122] & 0x4) == 0 && (Static12.tileSettings[Static55.level][local108 - 1][local122 + 1] & 0x4) == 0) { Static259.anIntArray514[local69] = local108 - 1 | 0xD20000 | 0x12000000; Static84.anIntArray209[local69] = local122 | 0xD30000; Static266.aByteArrayArrayArray15[Static55.level][local108 - 1][local122] = local14; @@ -187,7 +187,7 @@ public final class Static254 { local69 = local69 + 1 & 0xFFF; Static266.aByteArrayArrayArray15[Static55.level][local108][local122] = local14; } - if (local108 + 1 < 104 && Static266.aByteArrayArrayArray15[Static55.level][local108 + 1][local122] != local14 && (Static12.aByteArrayArrayArray2[Static55.level][local108][local122] & 0x4) == 0 && (Static12.aByteArrayArrayArray2[Static55.level][local108 + 1][local122 + 1] & 0x4) == 0) { + if (local108 + 1 < 104 && Static266.aByteArrayArrayArray15[Static55.level][local108 + 1][local122] != local14 && (Static12.tileSettings[Static55.level][local108][local122] & 0x4) == 0 && (Static12.tileSettings[Static55.level][local108 + 1][local122 + 1] & 0x4) == 0) { Static259.anIntArray514[local69] = local108 + 1 | 0xD2000000 | 0x920000; Static84.anIntArray209[local69] = local122 | 0x930000; Static266.aByteArrayArrayArray15[Static55.level][local108 + 1][local122] = local14; diff --git a/client/src/main/java/Static256.java b/client/src/main/java/Static256.java index 29b19eb..cf5dd08 100644 --- a/client/src/main/java/Static256.java +++ b/client/src/main/java/Static256.java @@ -98,7 +98,7 @@ public final class Static256 { if (local6 != null) { return local6; } - @Pc(30) byte[] local30 = Static35.aClass153_22.method4495(4, arg0); + @Pc(30) byte[] local30 = Static35.aClass153_22.getFile(4, arg0); local6 = new FloType(); if (local30 != null) { local6.method4669(new Buffer(local30), arg0); diff --git a/client/src/main/java/Static26.java b/client/src/main/java/Static26.java index 07e8220..6d2018f 100644 --- a/client/src/main/java/Static26.java +++ b/client/src/main/java/Static26.java @@ -26,47 +26,47 @@ public final class Static26 { public static final int[] anIntArray68 = new int[50]; @OriginalMember(owner = "client!ca", name = "h", descriptor = "(I)V") - public static void method740() { - @Pc(10) int local10 = (Static138.anInt3439 >> 10) + (Static225.originX >> 3); - @Pc(23) int local23 = (Static134.anInt3302 >> 10) + (Static142.originZ >> 3); - Static156.aByteArrayArray11 = new byte[18][]; - Static35.anIntArray82 = new int[18]; - Static191.aByteArrayArray15 = new byte[18][]; - Static36.anIntArray84 = new int[18]; - Static72.anIntArrayArray14 = new int[18][4]; - Static186.aByteArrayArray14 = new byte[18][]; - Static238.anIntArray470 = new int[18]; - Static273.aByteArrayArray13 = new byte[18][]; - Static175.anIntArray371 = new int[18]; - Static99.anIntArray239 = new int[18]; - Static172.anIntArray366 = new int[18]; - Static19.aByteArrayArray4 = new byte[18][]; + public static void setupLoadingScreenRegion() { + @Pc(10) int local10 = (Static138.renderX >> 10) + (Static225.originX >> 3); + @Pc(23) int local23 = (Static134.renderZ >> 10) + (Static142.originZ >> 3); + Static156.locationMapFilesBuffer = new byte[18][]; + Static35.underWaterLocationsMapFileIds = new int[18]; + Static191.npcSpawnsFilesBuffer = new byte[18][]; + Static36.mapFileIds = new int[18]; + Static72.regionsXteaKeys = new int[18][4]; + Static186.underWaterMapFilesBuffer = new byte[18][]; + Static238.regionBitPacked = new int[18]; + Static273.mapFilesBuffer = new byte[18][]; + Static175.npcSpawnsFileIds = new int[18]; + Static99.underWaterMapFileIds = new int[18]; + Static172.locationsMapFileIds = new int[18]; + Static19.underWaterLocationsMapFilesBuffer = new byte[18][]; @Pc(74) int local74 = 0; @Pc(80) int local80; for (local80 = (local10 - 6) / 8; local80 <= (local10 + 6) / 8; local80++) { for (@Pc(97) int local97 = (local23 - 6) / 8; local97 <= (local23 + 6) / 8; local97++) { @Pc(115) int local115 = (local80 << 8) + local97; - Static238.anIntArray470[local74] = local115; - Static36.anIntArray84[local74] = js5Archive5.getGroupId(Static34.concatenate(new JagString[] { Static103.aClass100_558, Static123.parseInt(local80), Static86.aClass100_488, Static123.parseInt(local97) })); - Static172.anIntArray366[local74] = js5Archive5.getGroupId(Static34.concatenate(new JagString[] { Static270.aClass100_1090, Static123.parseInt(local80), Static86.aClass100_488, Static123.parseInt(local97) })); - Static175.anIntArray371[local74] = js5Archive5.getGroupId(Static34.concatenate(new JagString[] { Static179.aClass100_807, Static123.parseInt(local80), Static86.aClass100_488, Static123.parseInt(local97) })); - Static99.anIntArray239[local74] = js5Archive5.getGroupId(Static34.concatenate(new JagString[] { Static165.aClass100_772, Static123.parseInt(local80), Static86.aClass100_488, Static123.parseInt(local97) })); - Static35.anIntArray82[local74] = js5Archive5.getGroupId(Static34.concatenate(new JagString[] { Static278.aClass100_1103, Static123.parseInt(local80), Static86.aClass100_488, Static123.parseInt(local97) })); - if (Static175.anIntArray371[local74] == -1) { - Static36.anIntArray84[local74] = -1; - Static172.anIntArray366[local74] = -1; - Static99.anIntArray239[local74] = -1; - Static35.anIntArray82[local74] = -1; + Static238.regionBitPacked[local74] = local115; + Static36.mapFileIds[local74] = js5Archive5.getGroupId(Static34.concatenate(new JagString[] { Static103.aClass100_558, Static123.parseInt(local80), Static86.aClass100_488, Static123.parseInt(local97) })); + Static172.locationsMapFileIds[local74] = js5Archive5.getGroupId(Static34.concatenate(new JagString[] { Static270.aClass100_1090, Static123.parseInt(local80), Static86.aClass100_488, Static123.parseInt(local97) })); + Static175.npcSpawnsFileIds[local74] = js5Archive5.getGroupId(Static34.concatenate(new JagString[] { Static179.aClass100_807, Static123.parseInt(local80), Static86.aClass100_488, Static123.parseInt(local97) })); + Static99.underWaterMapFileIds[local74] = js5Archive5.getGroupId(Static34.concatenate(new JagString[] { Static165.aClass100_772, Static123.parseInt(local80), Static86.aClass100_488, Static123.parseInt(local97) })); + Static35.underWaterLocationsMapFileIds[local74] = js5Archive5.getGroupId(Static34.concatenate(new JagString[] { Static278.aClass100_1103, Static123.parseInt(local80), Static86.aClass100_488, Static123.parseInt(local97) })); + if (Static175.npcSpawnsFileIds[local74] == -1) { + Static36.mapFileIds[local74] = -1; + Static172.locationsMapFileIds[local74] = -1; + Static99.underWaterMapFileIds[local74] = -1; + Static35.underWaterLocationsMapFileIds[local74] = -1; } local74++; } } - for (local80 = local74; local80 < Static175.anIntArray371.length; local80++) { - Static175.anIntArray371[local80] = -1; - Static36.anIntArray84[local80] = -1; - Static172.anIntArray366[local80] = -1; - Static99.anIntArray239[local80] = -1; - Static35.anIntArray82[local80] = -1; + for (local80 = local74; local80 < Static175.npcSpawnsFileIds.length; local80++) { + Static175.npcSpawnsFileIds[local80] = -1; + Static36.mapFileIds[local80] = -1; + Static172.locationsMapFileIds[local80] = -1; + Static99.underWaterMapFileIds[local80] = -1; + Static35.underWaterLocationsMapFileIds[local80] = -1; } Static127.method2463(0, local23, local10, 8, true, 8); } @@ -79,18 +79,18 @@ public final class Static26 { @OriginalMember(owner = "client!ca", name = "a", descriptor = "(ZI)V") public static void method743(@OriginalArg(0) boolean arg0) { - @Pc(13) int local13 = Static273.aByteArrayArray13.length; + @Pc(13) int local13 = Static273.mapFilesBuffer.length; @Pc(19) byte[][] local19; if (GlRenderer.enabled && arg0) { - local19 = Static19.aByteArrayArray4; + local19 = Static19.underWaterLocationsMapFilesBuffer; } else { - local19 = Static156.aByteArrayArray11; + local19 = Static156.locationMapFilesBuffer; } for (@Pc(25) int local25 = 0; local25 < local13; local25++) { @Pc(32) byte[] local32 = local19[local25]; if (local32 != null) { - @Pc(45) int local45 = (Static238.anIntArray470[local25] >> 8) * 64 - Static225.originX; - @Pc(56) int local56 = (Static238.anIntArray470[local25] & 0xFF) * 64 - Static142.originZ; + @Pc(45) int local45 = (Static238.regionBitPacked[local25] >> 8) * 64 - Static225.originX; + @Pc(56) int local56 = (Static238.regionBitPacked[local25] & 0xFF) * 64 - Static142.originZ; Static107.method2261(); Static124.method2437(local45, arg0, local32, local56, Static148.collisionMaps); } diff --git a/client/src/main/java/Static260.java b/client/src/main/java/Static260.java index 52f0942..bed4c33 100644 --- a/client/src/main/java/Static260.java +++ b/client/src/main/java/Static260.java @@ -31,19 +31,19 @@ public final class Static260 { @Pc(36) int local36 = Static265.anInt5765 * 128 + 64; @Pc(44) int local44 = Static207.method3685(Static55.level, local30, local36) - Static57.anInt1744; @Pc(49) int local49 = local44 - Static5.anInt40; - @Pc(54) int local54 = local30 - Static138.anInt3439; - @Pc(59) int local59 = local36 - Static134.anInt3302; + @Pc(54) int local54 = local30 - Static138.renderX; + @Pc(59) int local59 = local36 - Static134.renderZ; @Pc(70) int local70 = (int) Math.sqrt((double) (local59 * local59 + local54 * local54)); - Static240.anInt5333 = (int) (Math.atan2((double) local49, (double) local70) * 325.949D) & 0x7FF; - Static184.anInt4358 = (int) (Math.atan2((double) local54, (double) local59) * -325.949D) & 0x7FF; - if (Static240.anInt5333 < 128) { - Static240.anInt5333 = 128; + Static240.cameraPitch = (int) (Math.atan2((double) local49, (double) local70) * 325.949D) & 0x7FF; + Static184.cameraYaw = (int) (Math.atan2((double) local54, (double) local59) * -325.949D) & 0x7FF; + if (Static240.cameraPitch < 128) { + Static240.cameraPitch = 128; } - if (Static240.anInt5333 > 383) { - Static240.anInt5333 = 383; + if (Static240.cameraPitch > 383) { + Static240.cameraPitch = 383; } } - Static227.anInt5096 = 2; + Static227.cameraType = 2; } @OriginalMember(owner = "client!vd", name = "b", descriptor = "(IIII)Z") @@ -53,7 +53,7 @@ public final class Static260 { } @Pc(10) int local10 = arg1 << 7; @Pc(14) int local14 = arg2 << 7; - @Pc(24) int local24 = Static83.anIntArrayArrayArray4[arg0][arg1][arg2] - 1; + @Pc(24) int local24 = Static83.activeTileHeightMap[arg0][arg1][arg2] - 1; @Pc(28) int local28 = local24 - 120; @Pc(32) int local32 = local24 - 230; @Pc(36) int local36 = local24 - 238; @@ -175,7 +175,7 @@ public final class Static260 { } @OriginalMember(owner = "client!vd", name = "a", descriptor = "(BZ)V") - public static void method3852(@OriginalArg(1) boolean arg0) { + public static void clearAmbientSounds(@OriginalArg(1) boolean arg0) { @Pc(14) AreaSound local14; for (local14 = (AreaSound) Static3.aClass69_135.method2289(); local14 != null; local14 = (AreaSound) Static3.aClass69_135.method2288()) { if (local14.aClass3_Sub3_Sub1_1 != null) { diff --git a/client/src/main/java/Static263.java b/client/src/main/java/Static263.java index 9dbff70..c9ccf10 100644 --- a/client/src/main/java/Static263.java +++ b/client/src/main/java/Static263.java @@ -44,7 +44,7 @@ public final class Static263 { } if (local8.anObjectArray29 != null) { @Pc(19) HookRequest local19 = new HookRequest(); - local19.anObjectArray31 = local8.anObjectArray29; + local19.arguments = local8.anObjectArray29; local19.source = local8; local19.aClass100_598 = arg0; local19.anInt3101 = arg2; @@ -111,9 +111,9 @@ public final class Static263 { @OriginalMember(owner = "client!vg", name = "a", descriptor = "(IILclient!fe;)V") public static void method4514(@OriginalArg(0) int arg0, @OriginalArg(2) PathingEntity arg1) { - if (Static83.anInt372 < arg1.anInt3395) { + if (Static83.loop < arg1.anInt3395) { Static18.method553(arg1); - } else if (arg1.anInt3386 >= Static83.anInt372) { + } else if (arg1.anInt3386 >= Static83.loop) { Static280.method4665(arg1); } else { Static104.method2247(arg1); diff --git a/client/src/main/java/Static264.java b/client/src/main/java/Static264.java index 2cb83d0..cd8d021 100644 --- a/client/src/main/java/Static264.java +++ b/client/src/main/java/Static264.java @@ -33,25 +33,25 @@ public final class Static264 { @OriginalMember(owner = "client!vh", name = "a", descriptor = "(Lclient!th;III)V") public static void method3574(@OriginalArg(0) Entity arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) { @Pc(12) Tile local12; - if (arg2 < Static152.anInt3594) { + if (arg2 < Static152.mapSizeX) { local12 = Static130.aClass3_Sub5ArrayArrayArray1[arg1][arg2 + 1][arg3]; if (local12 != null && local12.aClass15_1 != null && local12.aClass15_1.aClass8_1.method4543()) { arg0.method4544(local12.aClass15_1.aClass8_1, 128, 0, 0, true); } } - if (arg3 < Static152.anInt3594) { + if (arg3 < Static152.mapSizeX) { local12 = Static130.aClass3_Sub5ArrayArrayArray1[arg1][arg2][arg3 + 1]; if (local12 != null && local12.aClass15_1 != null && local12.aClass15_1.aClass8_1.method4543()) { arg0.method4544(local12.aClass15_1.aClass8_1, 0, 0, 128, true); } } - if (arg2 < Static152.anInt3594 && arg3 < Static99.anInt2550) { + if (arg2 < Static152.mapSizeX && arg3 < Static99.mapSizeZ) { local12 = Static130.aClass3_Sub5ArrayArrayArray1[arg1][arg2 + 1][arg3 + 1]; if (local12 != null && local12.aClass15_1 != null && local12.aClass15_1.aClass8_1.method4543()) { arg0.method4544(local12.aClass15_1.aClass8_1, 128, 0, 128, true); } } - if (arg2 < Static152.anInt3594 && arg3 > 0) { + if (arg2 < Static152.mapSizeX && arg3 > 0) { local12 = Static130.aClass3_Sub5ArrayArrayArray1[arg1][arg2 + 1][arg3 - 1]; if (local12 != null && local12.aClass15_1 != null && local12.aClass15_1.aClass8_1.method4543()) { arg0.method4544(local12.aClass15_1.aClass8_1, 128, 0, -128, true); diff --git a/client/src/main/java/Static266.java b/client/src/main/java/Static266.java index aff7deb..b07b03a 100644 --- a/client/src/main/java/Static266.java +++ b/client/src/main/java/Static266.java @@ -14,7 +14,7 @@ public final class Static266 { public static final int[] anIntArray471 = new int[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 73, 74, 76, 78, 83, 84, 85, 86, 91, 92, 93, 94, 95, 97, 103, 104, 105, 106, 107, 108, 113, 114, 115, 116, 118, 119, 120, 121, 122, 123, 124, 125, 133, 134, 136, 138, 143, 144, 145, 146, 151, 152, 153, 154, 155, 157, 163, 164, 165, 166, 168, 169, 174, 175, 176, 177, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 97, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 157, 215, 216, 117, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 66, 66, 66, 66, 66, 66, 65, 75, 79, 79, 79, 79, 87, 87, 87, 87, 77, 96, 98, 98, 98, 98, 98, 250, 251, 109, 109, 109, 109, 117, 252, 167, 126, 126, 126, 126, 126, 126, 125, 135, 139, 139, 139, 139, 147, 147, 147, 147, 137, 156, 158, 158, 158, 158, 158, 253, 254, 170, 170, 170, 170, 178, 255, 178 }; @OriginalMember(owner = "client!vk", name = "b", descriptor = "I") - public static int anInt5336 = -2; + public static int returnCode = -2; @OriginalMember(owner = "client!vk", name = "d", descriptor = "Lclient!na;") public static final JagString aClass100_1010 = Static28.parse("null"); diff --git a/client/src/main/java/Static267.java b/client/src/main/java/Static267.java index fac11ab..0199812 100644 --- a/client/src/main/java/Static267.java +++ b/client/src/main/java/Static267.java @@ -102,7 +102,7 @@ public final class Static267 { Static1.anInt6++; } Static226.anInt5084 += arg0; - local60 = (arg0 + (Static83.anInt372 & 0x1)) / 2; + local60 = (arg0 + (Static83.loop & 0x1)) / 2; if (local60 <= 0) { return; } diff --git a/client/src/main/java/Static269.java b/client/src/main/java/Static269.java index eb8022d..56c1500 100644 --- a/client/src/main/java/Static269.java +++ b/client/src/main/java/Static269.java @@ -194,8 +194,8 @@ public final class Static269 { local194 = local529.anInt2245 >> 7; local190 = local529.anInt2240 >> 7; if (local190 >= 0 && local194 >= 0 && local190 < 104 && local194 < 104) { - local529.aBoolean125 = (Static12.aByteArrayArrayArray2[1][local190][local194] & 0x2) != 0; - local529.anInt2235 = Static83.anIntArrayArrayArray4[local529.anInt2241][local190][local194] - local529.anInt2235; + local529.aBoolean125 = (Static12.tileSettings[1][local190][local194] & 0x2) != 0; + local529.anInt2235 = Static83.activeTileHeightMap[local529.anInt2241][local190][local194] - local529.anInt2235; Static120.method2389(local529); } } diff --git a/client/src/main/java/Static27.java b/client/src/main/java/Static27.java index 0fed0c5..6a3cfc9 100644 --- a/client/src/main/java/Static27.java +++ b/client/src/main/java/Static27.java @@ -27,7 +27,7 @@ public final class Static27 { @OriginalMember(owner = "client!cb", name = "b", descriptor = "(III)V") public static void setMaterial(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) { - if (arg1 == 4 && !Static220.aBoolean244) { + if (arg1 == 4 && !Static220.highWaterDetail) { arg1 = 2; arg0 = 2; } diff --git a/client/src/main/java/Static271.java b/client/src/main/java/Static271.java index fbed959..0374831 100644 --- a/client/src/main/java/Static271.java +++ b/client/src/main/java/Static271.java @@ -53,7 +53,7 @@ public final class Static271 { if (local15 != null) { return local15; } - @Pc(30) byte[] local30 = Static146.aClass153_54.method4495(Static253.method4328(arg0), Static33.method872(arg0)); + @Pc(30) byte[] local30 = Static146.aClass153_54.getFile(Static253.method4328(arg0), Static33.method872(arg0)); local15 = new LocType(); local15.anInt4426 = arg0; if (local30 != null) { diff --git a/client/src/main/java/Static273.java b/client/src/main/java/Static273.java index 212df99..796f149 100644 --- a/client/src/main/java/Static273.java +++ b/client/src/main/java/Static273.java @@ -8,7 +8,7 @@ public final class Static273 { public static WorldMapFont aClass41_7; @OriginalMember(owner = "client!we", name = "H", descriptor = "[[B") - public static byte[][] aByteArrayArray13; + public static byte[][] mapFilesBuffer; @OriginalMember(owner = "client!we", name = "w", descriptor = "I") public static int anInt4130 = 0; @@ -74,13 +74,13 @@ public final class Static273 { } } if (local46 == 5) { - local41 = Static7.anIntArray75[local33[local39++]]; + local41 = Static7.varps[local33[local39++]]; } if (local46 == 6) { local41 = ObjType.anIntArray213[Static141.anIntArray326[local33[local39++]] - 1]; } if (local46 == 7) { - local41 = Static7.anIntArray75[local33[local39++]] * 100 / 46875; + local41 = Static7.varps[local33[local39++]] * 100 / 46875; } if (local46 == 8) { local41 = Static173.self.anInt1652; @@ -113,13 +113,13 @@ public final class Static273 { local41 = Static251.anInt5456; } if (local46 == 13) { - local124 = Static7.anIntArray75[local33[local39++]]; + local124 = Static7.varps[local33[local39++]]; @Pc(353) int local353 = local33[local39++]; local41 = (0x1 << local353 & local124) == 0 ? 0 : 1; } if (local46 == 14) { local124 = local33[local39++]; - local41 = Static155.method2945(local124); + local41 = Static155.getVarbit(local124); } if (local46 == 18) { local41 = (Static173.self.anInt3412 >> 7) + Static225.originX; diff --git a/client/src/main/java/Static276.java b/client/src/main/java/Static276.java index f55a830..b0c0315 100644 --- a/client/src/main/java/Static276.java +++ b/client/src/main/java/Static276.java @@ -5,7 +5,7 @@ import org.openrs2.deob.annotation.Pc; public final class Static276 { @OriginalMember(owner = "client!wh", name = "c", descriptor = "[[[Lclient!bj;") - public static Tile[][][] aClass3_Sub5ArrayArrayArray3; + public static Tile[][][] underWaterGroundTiles; @OriginalMember(owner = "client!wh", name = "l", descriptor = "[Lclient!qf;") public static Sprite[] aClass3_Sub2_Sub1Array11; @@ -36,7 +36,7 @@ public final class Static276 { if (Static9.method187(arg0, arg1, arg2)) { @Pc(10) int local10 = arg1 << 7; @Pc(14) int local14 = arg2 << 7; - return Static256.method4394(local10 + 1, Static83.anIntArrayArrayArray4[arg0][arg1][arg2] + arg3, local14 + 1) && Static256.method4394(local10 + 128 - 1, Static83.anIntArrayArrayArray4[arg0][arg1 + 1][arg2] + arg3, local14 + 1) && Static256.method4394(local10 + 128 - 1, Static83.anIntArrayArrayArray4[arg0][arg1 + 1][arg2 + 1] + arg3, local14 + 128 - 1) && Static256.method4394(local10 + 1, Static83.anIntArrayArrayArray4[arg0][arg1][arg2 + 1] + arg3, local14 + 128 - 1); + return Static256.method4394(local10 + 1, Static83.activeTileHeightMap[arg0][arg1][arg2] + arg3, local14 + 1) && Static256.method4394(local10 + 128 - 1, Static83.activeTileHeightMap[arg0][arg1 + 1][arg2] + arg3, local14 + 1) && Static256.method4394(local10 + 128 - 1, Static83.activeTileHeightMap[arg0][arg1 + 1][arg2 + 1] + arg3, local14 + 128 - 1) && Static256.method4394(local10 + 1, Static83.activeTileHeightMap[arg0][arg1][arg2 + 1] + arg3, local14 + 128 - 1); } else { return false; } diff --git a/client/src/main/java/Static277.java b/client/src/main/java/Static277.java index 38bf26a..97a39af 100644 --- a/client/src/main/java/Static277.java +++ b/client/src/main/java/Static277.java @@ -11,7 +11,7 @@ public final class Static277 { public static int anInt5853; @OriginalMember(owner = "client!wi", name = "db", descriptor = "I") - public static int anInt5855; + public static int tileVisibilityDistance; @OriginalMember(owner = "client!wi", name = "W", descriptor = "I") public static int anInt5850 = 0; diff --git a/client/src/main/java/Static278.java b/client/src/main/java/Static278.java index 710dd5c..36818e2 100644 --- a/client/src/main/java/Static278.java +++ b/client/src/main/java/Static278.java @@ -29,7 +29,7 @@ public final class Static278 { } @Pc(37) Npc local37 = Static175.aClass8_Sub4_Sub2Array1[local14]; Static33.anIntArray79[Static272.anInt5214++] = local14; - local37.anInt3430 = Static83.anInt372; + local37.anInt3430 = Static83.loop; if (local37.aClass96_1 != null && local37.aClass96_1.method2935()) { Static91.method1877(local37); } @@ -87,15 +87,15 @@ public final class Static278 { } @OriginalMember(owner = "client!wj", name = "a", descriptor = "(Z)V") - public static void method4648(@OriginalArg(0) boolean arg0) { + public static void setRenderTiles(@OriginalArg(0) boolean arg0) { if (arg0) { - Static130.aClass3_Sub5ArrayArrayArray1 = Static276.aClass3_Sub5ArrayArrayArray3; - Static83.anIntArrayArrayArray4 = Static80.anIntArrayArrayArray19; - Static182.aClass3_Sub14ArrayArray2 = Static195.aClass3_Sub14ArrayArray3; + Static130.aClass3_Sub5ArrayArrayArray1 = Static276.underWaterGroundTiles; + Static83.activeTileHeightMap = Static80.underWaterTileHeightMap; + Static182.aClass3_Sub14ArrayArray2 = Static195.underWaterHdTiles; } else { - Static130.aClass3_Sub5ArrayArrayArray1 = Static197.aClass3_Sub5ArrayArrayArray2; - Static83.anIntArrayArrayArray4 = Static107.anIntArrayArrayArray10; - Static182.aClass3_Sub14ArrayArray2 = Static36.aClass3_Sub14ArrayArray1; + Static130.aClass3_Sub5ArrayArrayArray1 = Static197.surfaceGroundTiles; + Static83.activeTileHeightMap = Static107.surfaceTileHeightMap; + Static182.aClass3_Sub14ArrayArray2 = Static36.surfaceHdTiles; } Static126.anInt3114 = Static130.aClass3_Sub5ArrayArrayArray1.length; } @@ -133,32 +133,32 @@ public final class Static278 { return; } if (!arg2) { - Static12.aByteArrayArrayArray2[arg7][arg5][arg4] = 0; + Static12.tileSettings[arg7][arg5][arg4] = 0; } while (true) { local32 = arg3.g1(); if (local32 == 0) { if (arg2) { - Static83.anIntArrayArrayArray4[0][arg5][arg4] = Static107.anIntArrayArrayArray10[0][arg5][arg4]; + Static83.activeTileHeightMap[0][arg5][arg4] = Static107.surfaceTileHeightMap[0][arg5][arg4]; } else if (arg7 == 0) { - Static83.anIntArrayArrayArray4[0][arg5][arg4] = -Static65.method1498(arg4 + arg1 + 556238, arg0 + arg5 + 932731) * 8; + Static83.activeTileHeightMap[0][arg5][arg4] = -Static65.method1498(arg4 + arg1 + 556238, arg0 + arg5 + 932731) * 8; } else { - Static83.anIntArrayArrayArray4[arg7][arg5][arg4] = Static83.anIntArrayArrayArray4[arg7 - 1][arg5][arg4] - 240; + Static83.activeTileHeightMap[arg7][arg5][arg4] = Static83.activeTileHeightMap[arg7 - 1][arg5][arg4] - 240; } break; } if (local32 == 1) { @Pc(111) int local111 = arg3.g1(); if (arg2) { - Static83.anIntArrayArrayArray4[0][arg5][arg4] = Static107.anIntArrayArrayArray10[0][arg5][arg4] + local111 * 8; + Static83.activeTileHeightMap[0][arg5][arg4] = Static107.surfaceTileHeightMap[0][arg5][arg4] + local111 * 8; } else { if (local111 == 1) { local111 = 0; } if (arg7 == 0) { - Static83.anIntArrayArrayArray4[0][arg5][arg4] = -local111 * 8; + Static83.activeTileHeightMap[0][arg5][arg4] = -local111 * 8; } else { - Static83.anIntArrayArrayArray4[arg7][arg5][arg4] = Static83.anIntArrayArrayArray4[arg7 - 1][arg5][arg4] - local111 * 8; + Static83.activeTileHeightMap[arg7][arg5][arg4] = Static83.activeTileHeightMap[arg7 - 1][arg5][arg4] - local111 * 8; } } break; @@ -170,7 +170,7 @@ public final class Static278 { } else if (local32 > 81) { Static253.aByteArrayArrayArray16[arg7][arg5][arg4] = (byte) (local32 - 81); } else if (!arg2) { - Static12.aByteArrayArrayArray2[arg7][arg5][arg4] = (byte) (local32 - 49); + Static12.tileSettings[arg7][arg5][arg4] = (byte) (local32 - 49); } } } @@ -194,7 +194,7 @@ public final class Static278 { } @OriginalMember(owner = "client!wj", name = "b", descriptor = "(B)V") - public static void method4653() { + public static void processLogout() { if (Static124.socket != null) { Static124.socket.close(); Static124.socket = null; @@ -203,15 +203,15 @@ public final class Static278 { Static65.method1500(); @Pc(19) int local19; for (local19 = 0; local19 < 4; local19++) { - Static148.collisionMaps[local19].method3050(); + Static148.collisionMaps[local19].resetFlags(); } Static116.method2325(false); System.gc(); Static29.method801(); Static144.aBoolean173 = false; Static221.anInt4363 = -1; - Static260.method3852(true); - Static230.aBoolean250 = false; + Static260.clearAmbientSounds(true); + Static230.dynamicMapRegion = false; Static142.originZ = 0; Static80.anInt4701 = 0; Static52.anInt1695 = 0; @@ -235,7 +235,7 @@ public final class Static278 { } } } - Static35.method902(); + Static35.resetCameraEffects(); Static189.anInt4443 = 0; Static8.method121(); Static73.method1596(true); diff --git a/client/src/main/java/Static28.java b/client/src/main/java/Static28.java index 331923c..4a92075 100644 --- a/client/src/main/java/Static28.java +++ b/client/src/main/java/Static28.java @@ -88,39 +88,39 @@ public final class Static28 { } @OriginalMember(owner = "client!cd", name = "a", descriptor = "(IIIIZ)V") - public static void method792(@OriginalArg(3) int arg0, @OriginalArg(4) boolean arg1) { - Static152.anInt3594 = 104; - Static99.anInt2550 = 104; - Static277.anInt5855 = arg0; - Static197.aClass3_Sub5ArrayArrayArray2 = new Tile[4][Static152.anInt3594][Static99.anInt2550]; - Static107.anIntArrayArrayArray10 = new int[4][Static152.anInt3594 + 1][Static99.anInt2550 + 1]; + public static void method792(@OriginalArg(3) int tileVisibility, @OriginalArg(4) boolean hasUnderWaterMap) { + Static152.mapSizeX = 104; + Static99.mapSizeZ = 104; + Static277.tileVisibilityDistance = tileVisibility; + Static197.surfaceGroundTiles = new Tile[4][Static152.mapSizeX][Static99.mapSizeZ]; + Static107.surfaceTileHeightMap = new int[4][Static152.mapSizeX + 1][Static99.mapSizeZ + 1]; if (GlRenderer.enabled) { - Static36.aClass3_Sub14ArrayArray1 = new Class3_Sub14[4][]; + Static36.surfaceHdTiles = new GlTile[4][]; } - if (arg1) { - Static276.aClass3_Sub5ArrayArrayArray3 = new Tile[1][Static152.anInt3594][Static99.anInt2550]; - Static62.anIntArrayArray11 = new int[Static152.anInt3594][Static99.anInt2550]; - Static80.anIntArrayArrayArray19 = new int[1][Static152.anInt3594 + 1][Static99.anInt2550 + 1]; + if (hasUnderWaterMap) { + Static276.underWaterGroundTiles = new Tile[1][Static152.mapSizeX][Static99.mapSizeZ]; + Static62.anIntArrayArray11 = new int[Static152.mapSizeX][Static99.mapSizeZ]; + Static80.underWaterTileHeightMap = new int[1][Static152.mapSizeX + 1][Static99.mapSizeZ + 1]; if (GlRenderer.enabled) { - Static195.aClass3_Sub14ArrayArray3 = new Class3_Sub14[1][]; + Static195.underWaterHdTiles = new GlTile[1][]; } } else { - Static276.aClass3_Sub5ArrayArrayArray3 = null; + Static276.underWaterGroundTiles = null; Static62.anIntArrayArray11 = null; - Static80.anIntArrayArrayArray19 = null; - Static195.aClass3_Sub14ArrayArray3 = null; + Static80.underWaterTileHeightMap = null; + Static195.underWaterHdTiles = null; } - Static278.method4648(false); + Static278.setRenderTiles(false); Static91.aClass120Array1 = new Class120[500]; anInt917 = 0; Static247.aClass120Array2 = new Class120[500]; Static215.anInt4870 = 0; - Static140.anIntArrayArrayArray12 = new int[4][Static152.anInt3594 + 1][Static99.anInt2550 + 1]; + Static140.anIntArrayArrayArray12 = new int[4][Static152.mapSizeX + 1][Static99.mapSizeZ + 1]; Static243.aClass31Array3 = new Scenery[5000]; Static22.anInt726 = 0; Static25.aClass31Array2 = new Scenery[100]; - Static48.aBooleanArrayArray1 = new boolean[Static277.anInt5855 + Static277.anInt5855 + 1][Static277.anInt5855 + Static277.anInt5855 + 1]; - Static89.aBooleanArrayArray3 = new boolean[Static277.anInt5855 + Static277.anInt5855 + 2][Static277.anInt5855 + Static277.anInt5855 + 2]; - Static232.aByteArrayArrayArray13 = new byte[4][Static152.anInt3594][Static99.anInt2550]; + Static48.aBooleanArrayArray1 = new boolean[Static277.tileVisibilityDistance + Static277.tileVisibilityDistance + 1][Static277.tileVisibilityDistance + Static277.tileVisibilityDistance + 1]; + Static89.aBooleanArrayArray3 = new boolean[Static277.tileVisibilityDistance + Static277.tileVisibilityDistance + 2][Static277.tileVisibilityDistance + Static277.tileVisibilityDistance + 2]; + Static232.aByteArrayArrayArray13 = new byte[4][Static152.mapSizeX][Static99.mapSizeZ]; } } diff --git a/client/src/main/java/Static280.java b/client/src/main/java/Static280.java index 64a9576..3a76aec 100644 --- a/client/src/main/java/Static280.java +++ b/client/src/main/java/Static280.java @@ -24,9 +24,9 @@ public final class Static280 { @OriginalMember(owner = "client!wl", name = "a", descriptor = "(Lclient!fe;B)V") public static void method4665(@OriginalArg(0) PathingEntity arg0) { - if (Static83.anInt372 == arg0.anInt3386 || arg0.anInt3369 == -1 || arg0.anInt3420 != 0 || arg0.anInt3360 + 1 > Static36.method941(arg0.anInt3369).anIntArray474[arg0.anInt3425]) { + if (Static83.loop == arg0.anInt3386 || arg0.anInt3369 == -1 || arg0.anInt3420 != 0 || arg0.anInt3360 + 1 > Static36.method941(arg0.anInt3369).anIntArray474[arg0.anInt3425]) { @Pc(35) int local35 = arg0.anInt3386 - arg0.anInt3395; - @Pc(41) int local41 = Static83.anInt372 - arg0.anInt3395; + @Pc(41) int local41 = Static83.loop - arg0.anInt3395; @Pc(52) int local52 = arg0.anInt3380 * 128 + arg0.method2693() * 64; @Pc(64) int local64 = arg0.anInt3428 * 128 + arg0.method2693() * 64; @Pc(75) int local75 = arg0.anInt3416 * 128 + arg0.method2693() * 64; diff --git a/client/src/main/java/Static291.java b/client/src/main/java/Static291.java index b51a1fd..08926b9 100644 --- a/client/src/main/java/Static291.java +++ b/client/src/main/java/Static291.java @@ -6,7 +6,7 @@ public final class Static291 { @OriginalMember(owner = "client!rf", name = "a", descriptor = "(Lclient!ve;II)Lclient!rf;") public static Song method3742(@OriginalArg(0) Js5 arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) { - @Pc(5) byte[] local5 = arg0.method4495(arg1, arg2); + @Pc(5) byte[] local5 = arg0.getFile(arg1, arg2); return local5 == null ? null : new Song(new Buffer(local5)); } } diff --git a/client/src/main/java/Static292.java b/client/src/main/java/Static292.java index ab2c6d9..a1a54d0 100644 --- a/client/src/main/java/Static292.java +++ b/client/src/main/java/Static292.java @@ -6,7 +6,7 @@ public final class Static292 { @OriginalMember(owner = "client!sl", name = "a", descriptor = "(Lclient!ve;II)Lclient!sl;") public static SynthSound method3988(@OriginalArg(0) Js5 arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) { - @Pc(5) byte[] local5 = arg0.method4495(arg1, arg2); + @Pc(5) byte[] local5 = arg0.getFile(arg1, arg2); return local5 == null ? null : new SynthSound(new Buffer(local5)); } } diff --git a/client/src/main/java/Static3.java b/client/src/main/java/Static3.java index 9553c50..e777738 100644 --- a/client/src/main/java/Static3.java +++ b/client/src/main/java/Static3.java @@ -11,7 +11,7 @@ public final class Static3 { public static final boolean[] aBooleanArray135 = new boolean[200]; @OriginalMember(owner = "client!ab", name = "j", descriptor = "[Lclient!na;") - public static final JagString[] aClass100Array176 = new JagString[1000]; + public static final JagString[] stringStack = new JagString[1000]; @OriginalMember(owner = "client!ab", name = "n", descriptor = "Lclient!ih;") public static final LinkedList aClass69_135 = new LinkedList(); diff --git a/client/src/main/java/Static31.java b/client/src/main/java/Static31.java index 7c57bbe..634624b 100644 --- a/client/src/main/java/Static31.java +++ b/client/src/main/java/Static31.java @@ -27,7 +27,7 @@ public final class Static31 { @OriginalMember(owner = "client!ch", name = "c", descriptor = "(I)V") public static void method846() { - if (!Static138.method2697() && Static41.anInt1316 != Static55.level) { + if (!Static138.allLevelsAreVisible() && Static41.anInt1316 != Static55.level) { Static127.method2463(Static55.level, Static52.anInt1695, Static80.anInt4701, Static173.self.movementQueueZ[0], false, Static173.self.movementQueueX[0]); } else if (Static55.level != Static107.anInt2875 && Static137.method2665(Static55.level)) { Static107.anInt2875 = Static55.level; @@ -54,7 +54,7 @@ public final class Static31 { Static124.socket = null; } if (Static196.anInt4587 >= 1) { - Static266.anInt5336 = -5; + Static266.returnCode = -5; Static219.anInt4937 = 0; return; } @@ -96,7 +96,7 @@ public final class Static31 { Static147.soundChannel.method3571(); } if (local126 != 101) { - Static266.anInt5336 = local126; + Static266.returnCode = local126; Static219.anInt4937 = 0; Static124.socket.close(); Static124.socket = null; @@ -112,7 +112,7 @@ public final class Static31 { Static176.method3303(local126); if (Static125.worldId == -1) { Static219.anInt4937 = 0; - Static266.anInt5336 = 6; + Static266.returnCode = 6; Static124.socket.close(); Static124.socket = null; return; @@ -138,7 +138,7 @@ public final class Static31 { Static20.anInt673 = 0; Static196.anInt4587++; } else { - Static266.anInt5336 = -4; + Static266.returnCode = -4; Static219.anInt4937 = 0; } } diff --git a/client/src/main/java/Static34.java b/client/src/main/java/Static34.java index 1375bc0..fca1f5b 100644 --- a/client/src/main/java/Static34.java +++ b/client/src/main/java/Static34.java @@ -91,7 +91,7 @@ public final class Static34 { if (local10 != null) { return local10; } - @Pc(26) byte[] local26 = Static132.aClass153_48.method4495(Static206.method3681(arg0), Static133.method4010(arg0)); + @Pc(26) byte[] local26 = Static132.aClass153_48.getFile(Static206.method3681(arg0), Static133.method4010(arg0)); local10 = new SpotAnimType(); local10.anInt1751 = arg0; if (local26 != null) { @@ -129,7 +129,7 @@ public final class Static34 { } } @Pc(156) int local156; - if (arg0.anInt3432 != -1 && Static83.anInt372 >= arg0.anInt3359) { + if (arg0.anInt3432 != -1 && Static83.loop >= arg0.anInt3359) { local156 = method877(arg0.anInt3432).anInt1754; if (local156 == -1) { arg0.anInt3432 = -1; @@ -160,7 +160,7 @@ public final class Static34 { } if (arg0.anInt3369 != -1 && arg0.anInt3420 <= 1) { local18 = Static36.method941(arg0.anInt3369); - if (local18.anInt5363 == 1 && arg0.anInt3405 > 0 && Static83.anInt372 >= arg0.anInt3395 && Static83.anInt372 > arg0.anInt3386) { + if (local18.anInt5363 == 1 && arg0.anInt3405 > 0 && Static83.loop >= arg0.anInt3395 && Static83.loop > arg0.anInt3386) { arg0.anInt3420 = 1; return; } diff --git a/client/src/main/java/Static35.java b/client/src/main/java/Static35.java index ed3a6d7..1d11126 100644 --- a/client/src/main/java/Static35.java +++ b/client/src/main/java/Static35.java @@ -10,7 +10,7 @@ public final class Static35 { public static Js5 aClass153_22; @OriginalMember(owner = "client!cl", name = "V", descriptor = "[I") - public static int[] anIntArray82; + public static int[] underWaterLocationsMapFileIds; @OriginalMember(owner = "client!cl", name = "X", descriptor = "I") public static int anInt1091; @@ -104,7 +104,7 @@ public final class Static35 { } @OriginalMember(owner = "client!cl", name = "e", descriptor = "(I)V") - public static void method902() { + public static void resetCameraEffects() { for (@Pc(3) int local3 = 0; local3 < 5; local3++) { Static176.aBooleanArray95[local3] = false; } @@ -112,6 +112,6 @@ public final class Static35 { Static233.anInt5217 = 0; Static155.anInt3718 = -1; Static52.anInt1694 = -1; - Static227.anInt5096 = 1; + Static227.cameraType = 1; } } diff --git a/client/src/main/java/Static36.java b/client/src/main/java/Static36.java index 1ae94ea..139d4b8 100644 --- a/client/src/main/java/Static36.java +++ b/client/src/main/java/Static36.java @@ -8,10 +8,10 @@ public final class Static36 { public static int anInt1165; @OriginalMember(owner = "client!client", name = "kb", descriptor = "[[Lclient!hg;") - public static Class3_Sub14[][] aClass3_Sub14ArrayArray1; + public static GlTile[][] surfaceHdTiles; @OriginalMember(owner = "client!client", name = "lb", descriptor = "[I") - public static int[] anIntArray84; + public static int[] mapFileIds; @OriginalMember(owner = "client!client", name = "U", descriptor = "Lclient!sc;") public static final HashTable aClass133_3 = new HashTable(16); @@ -43,7 +43,7 @@ public final class Static36 { if (local17 != null) { return local17; } - @Pc(32) byte[] local32 = Static243.aClass153_98.method4495(Static221.method3389(arg0), Static118.method2356(arg0)); + @Pc(32) byte[] local32 = Static243.aClass153_98.getFile(Static221.method3389(arg0), Static118.method2356(arg0)); local17 = new SeqType(); local17.anInt5361 = arg0; if (local32 != null) { @@ -93,7 +93,7 @@ public final class Static36 { continue; } if (local9.aBoolean29 && Static215.anInt4873 >= local61 && Static223.anInt5032 >= local63 && Static215.anInt4873 < local65 && Static223.anInt5032 < local67) { - for (@Pc(164) HookRequest local164 = (HookRequest) Static185.aClass69_101.method2289(); local164 != null; local164 = (HookRequest) Static185.aClass69_101.method2288()) { + for (@Pc(164) HookRequest local164 = (HookRequest) Static185.lowPriorityRequests.method2289(); local164 != null; local164 = (HookRequest) Static185.lowPriorityRequests.method2288()) { if (local164.aBoolean158) { local164.method4658(); local164.source.aBoolean19 = false; @@ -126,7 +126,7 @@ public final class Static36 { if (local9.aByteArray8 != null) { for (local243 = 0; local243 < local9.aByteArray8.length; local243++) { if (Static187.pressedKeys[local9.aByteArray8[local243]]) { - if (local9.anIntArray49 == null || Static83.anInt372 >= local9.anIntArray49[local243]) { + if (local9.anIntArray49 == null || Static83.loop >= local9.anIntArray49[local243]) { @Pc(279) byte local279 = local9.aByteArray7[local243]; if (local279 == 0 || ((local279 & 0x2) == 0 || Static187.pressedKeys[86]) && ((local279 & 0x1) == 0 || Static187.pressedKeys[82]) && ((local279 & 0x4) == 0 || Static187.pressedKeys[81])) { Static263.method4512(Static186.EMPTY_FILE, -1, local243 + 1, local9.anInt507); @@ -137,7 +137,7 @@ public final class Static36 { if (local322 == 0) { local9.anIntArray49[local243] = Integer.MAX_VALUE; } else { - local9.anIntArray49[local243] = Static83.anInt372 + local322; + local9.anIntArray49[local243] = Static83.loop + local322; } } } @@ -164,8 +164,8 @@ public final class Static36 { local399.aBoolean158 = true; local399.source = local9; local399.anInt3097 = Static58.wheelRotation; - local399.anObjectArray31 = local9.anObjectArray10; - Static185.aClass69_101.method2282(local399); + local399.arguments = local9.anObjectArray10; + Static185.lowPriorityRequests.method2282(local399); } if (Static105.aClass13_14 != null || Static118.aClass13_15 != null || Static60.aBoolean108 || local9.anInt453 != 1400 && Static137.anInt3337 > 0) { local221 = false; @@ -241,8 +241,8 @@ public final class Static36 { local399.source = local9; local399.anInt3102 = Static7.clickX - local50; local399.anInt3097 = Static60.clickY - local55; - local399.anObjectArray31 = local9.anObjectArray5; - Static185.aClass69_101.method2282(local399); + local399.arguments = local9.anObjectArray5; + Static185.lowPriorityRequests.method2282(local399); } } if (local9.aBoolean24 && local212 && local9.anObjectArray6 != null) { @@ -251,8 +251,8 @@ public final class Static36 { local399.source = local9; local399.anInt3102 = Static215.anInt4873 - local50; local399.anInt3097 = Static223.anInt5032 - local55; - local399.anObjectArray31 = local9.anObjectArray6; - Static185.aClass69_101.method2282(local399); + local399.arguments = local9.anObjectArray6; + Static185.lowPriorityRequests.method2282(local399); } if (local9.aBoolean24 && !local212) { local9.aBoolean24 = false; @@ -262,8 +262,8 @@ public final class Static36 { local399.source = local9; local399.anInt3102 = Static215.anInt4873 - local50; local399.anInt3097 = Static223.anInt5032 - local55; - local399.anObjectArray31 = local9.anObjectArray18; - Static115.aClass69_70.method2282(local399); + local399.arguments = local9.anObjectArray18; + Static115.mediumPriorityRequests.method2282(local399); } } if (local212 && local9.anObjectArray9 != null) { @@ -272,8 +272,8 @@ public final class Static36 { local399.source = local9; local399.anInt3102 = Static215.anInt4873 - local50; local399.anInt3097 = Static223.anInt5032 - local55; - local399.anObjectArray31 = local9.anObjectArray9; - Static185.aClass69_101.method2282(local399); + local399.arguments = local9.anObjectArray9; + Static185.lowPriorityRequests.method2282(local399); } if (!local9.aBoolean19 && local207) { local9.aBoolean19 = true; @@ -283,8 +283,8 @@ public final class Static36 { local399.source = local9; local399.anInt3102 = Static215.anInt4873 - local50; local399.anInt3097 = Static223.anInt5032 - local55; - local399.anObjectArray31 = local9.anObjectArray19; - Static185.aClass69_101.method2282(local399); + local399.arguments = local9.anObjectArray19; + Static185.lowPriorityRequests.method2282(local399); } } if (local9.aBoolean19 && local207 && local9.anObjectArray23 != null) { @@ -293,8 +293,8 @@ public final class Static36 { local399.source = local9; local399.anInt3102 = Static215.anInt4873 - local50; local399.anInt3097 = Static223.anInt5032 - local55; - local399.anObjectArray31 = local9.anObjectArray23; - Static185.aClass69_101.method2282(local399); + local399.arguments = local9.anObjectArray23; + Static185.lowPriorityRequests.method2282(local399); } if (local9.aBoolean19 && !local207) { local9.aBoolean19 = false; @@ -304,23 +304,23 @@ public final class Static36 { local399.source = local9; local399.anInt3102 = Static215.anInt4873 - local50; local399.anInt3097 = Static223.anInt5032 - local55; - local399.anObjectArray31 = local9.anObjectArray24; - Static115.aClass69_70.method2282(local399); + local399.arguments = local9.anObjectArray24; + Static115.mediumPriorityRequests.method2282(local399); } } if (local9.anObjectArray22 != null) { local399 = new HookRequest(); local399.source = local9; - local399.anObjectArray31 = local9.anObjectArray22; - Static4.aClass69_2.method2282(local399); + local399.arguments = local9.anObjectArray22; + Static4.highPriorityRequests.method2282(local399); } @Pc(966) HookRequest local966; if (local9.anObjectArray4 != null && Static4.updatedVarcsWriterIndex > local9.anInt511) { if (local9.anIntArray38 == null || Static4.updatedVarcsWriterIndex - local9.anInt511 > 32) { local399 = new HookRequest(); local399.source = local9; - local399.anObjectArray31 = local9.anObjectArray4; - Static185.aClass69_101.method2282(local399); + local399.arguments = local9.anObjectArray4; + Static185.lowPriorityRequests.method2282(local399); } else { label563: for (local243 = local9.anInt511; local243 < Static4.updatedVarcsWriterIndex; local243++) { local508 = Static138.updatedVarcs[local243 & 0x1F]; @@ -328,8 +328,8 @@ public final class Static36 { if (local9.anIntArray38[local322] == local508) { local966 = new HookRequest(); local966.source = local9; - local966.anObjectArray31 = local9.anObjectArray4; - Static185.aClass69_101.method2282(local966); + local966.arguments = local9.anObjectArray4; + Static185.lowPriorityRequests.method2282(local966); break label563; } } @@ -341,8 +341,8 @@ public final class Static36 { if (local9.anIntArray35 == null || Static72.updatedVarcstrsWriterIndex - local9.anInt487 > 32) { local399 = new HookRequest(); local399.source = local9; - local399.anObjectArray31 = local9.anObjectArray15; - Static185.aClass69_101.method2282(local399); + local399.arguments = local9.anObjectArray15; + Static185.lowPriorityRequests.method2282(local399); } else { label539: for (local243 = local9.anInt487; local243 < Static72.updatedVarcstrsWriterIndex; local243++) { local508 = Static233.updatedVarcstrs[local243 & 0x1F]; @@ -350,8 +350,8 @@ public final class Static36 { if (local9.anIntArray35[local322] == local508) { local966 = new HookRequest(); local966.source = local9; - local966.anObjectArray31 = local9.anObjectArray15; - Static185.aClass69_101.method2282(local966); + local966.arguments = local9.anObjectArray15; + Static185.lowPriorityRequests.method2282(local966); break label539; } } @@ -363,8 +363,8 @@ public final class Static36 { if (local9.anIntArray44 == null || Static70.updatedVarpsWriterIndex - local9.anInt471 > 32) { local399 = new HookRequest(); local399.source = local9; - local399.anObjectArray31 = local9.anObjectArray25; - Static185.aClass69_101.method2282(local399); + local399.arguments = local9.anObjectArray25; + Static185.lowPriorityRequests.method2282(local399); } else { label515: for (local243 = local9.anInt471; local243 < Static70.updatedVarpsWriterIndex; local243++) { local508 = Static83.updatedVarps[local243 & 0x1F]; @@ -372,8 +372,8 @@ public final class Static36 { if (local9.anIntArray44[local322] == local508) { local966 = new HookRequest(); local966.source = local9; - local966.anObjectArray31 = local9.anObjectArray25; - Static185.aClass69_101.method2282(local966); + local966.arguments = local9.anObjectArray25; + Static185.lowPriorityRequests.method2282(local966); break label515; } } @@ -385,8 +385,8 @@ public final class Static36 { if (local9.anIntArray34 == null || Static111.anInt2901 - local9.anInt493 > 32) { local399 = new HookRequest(); local399.source = local9; - local399.anObjectArray31 = local9.anObjectArray7; - Static185.aClass69_101.method2282(local399); + local399.arguments = local9.anObjectArray7; + Static185.lowPriorityRequests.method2282(local399); } else { label491: for (local243 = local9.anInt493; local243 < Static111.anInt2901; local243++) { local508 = Static27.anIntArray70[local243 & 0x1F]; @@ -394,8 +394,8 @@ public final class Static36 { if (local9.anIntArray34[local322] == local508) { local966 = new HookRequest(); local966.source = local9; - local966.anObjectArray31 = local9.anObjectArray7; - Static185.aClass69_101.method2282(local966); + local966.arguments = local9.anObjectArray7; + Static185.lowPriorityRequests.method2282(local966); break label491; } } @@ -407,8 +407,8 @@ public final class Static36 { if (local9.anIntArray42 == null || Static89.anInt2385 - local9.anInt525 > 32) { local399 = new HookRequest(); local399.source = local9; - local399.anObjectArray31 = local9.anObjectArray2; - Static185.aClass69_101.method2282(local399); + local399.arguments = local9.anObjectArray2; + Static185.lowPriorityRequests.method2282(local399); } else { label467: for (local243 = local9.anInt525; local243 < Static89.anInt2385; local243++) { local508 = Static249.anIntArray478[local243 & 0x1F]; @@ -416,8 +416,8 @@ public final class Static36 { if (local9.anIntArray42[local322] == local508) { local966 = new HookRequest(); local966.source = local9; - local966.anObjectArray31 = local9.anObjectArray2; - Static185.aClass69_101.method2282(local966); + local966.arguments = local9.anObjectArray2; + Static185.lowPriorityRequests.method2282(local966); break label467; } } @@ -428,32 +428,32 @@ public final class Static36 { if (Static49.anInt1464 > local9.anInt482 && local9.anObjectArray20 != null) { local399 = new HookRequest(); local399.source = local9; - local399.anObjectArray31 = local9.anObjectArray20; - Static185.aClass69_101.method2282(local399); + local399.arguments = local9.anObjectArray20; + Static185.lowPriorityRequests.method2282(local399); } if (Static185.anInt4369 > local9.anInt482 && local9.anObjectArray1 != null) { local399 = new HookRequest(); local399.source = local9; - local399.anObjectArray31 = local9.anObjectArray1; - Static185.aClass69_101.method2282(local399); + local399.arguments = local9.anObjectArray1; + Static185.lowPriorityRequests.method2282(local399); } if (Static278.anInt5867 > local9.anInt482 && local9.anObjectArray28 != null) { local399 = new HookRequest(); local399.source = local9; - local399.anObjectArray31 = local9.anObjectArray28; - Static185.aClass69_101.method2282(local399); + local399.arguments = local9.anObjectArray28; + Static185.lowPriorityRequests.method2282(local399); } if (Static207.anInt4778 > local9.anInt482 && local9.anObjectArray21 != null) { local399 = new HookRequest(); local399.source = local9; - local399.anObjectArray31 = local9.anObjectArray21; - Static185.aClass69_101.method2282(local399); + local399.arguments = local9.anObjectArray21; + Static185.lowPriorityRequests.method2282(local399); } if (Static209.miscTransmitAt > local9.anInt482 && local9.anObjectArray30 != null) { local399 = new HookRequest(); local399.source = local9; - local399.anObjectArray31 = local9.anObjectArray30; - Static185.aClass69_101.method2282(local399); + local399.arguments = local9.anObjectArray30; + Static185.lowPriorityRequests.method2282(local399); } local9.anInt482 = Static119.transmitTimer; if (local9.anObjectArray14 != null) { @@ -462,15 +462,15 @@ public final class Static36 { local1430.source = local9; local1430.anInt3100 = Static227.keyCodes[local243]; local1430.anInt3099 = Static205.keyChars[local243]; - local1430.anObjectArray31 = local9.anObjectArray14; - Static185.aClass69_101.method2282(local1430); + local1430.arguments = local9.anObjectArray14; + Static185.lowPriorityRequests.method2282(local1430); } } if (Static13.aBoolean16 && local9.anObjectArray13 != null) { local399 = new HookRequest(); local399.source = local9; - local399.anObjectArray31 = local9.anObjectArray13; - Static185.aClass69_101.method2282(local399); + local399.arguments = local9.anObjectArray13; + Static185.lowPriorityRequests.method2282(local399); } } } diff --git a/client/src/main/java/Static38.java b/client/src/main/java/Static38.java index d3e16f8..10e24c2 100644 --- a/client/src/main/java/Static38.java +++ b/client/src/main/java/Static38.java @@ -142,7 +142,7 @@ public final class Static38 { if ((local28.aLong55 & 0x3FFFFFFFFFFFFFFFL) < local4) { if ((local28.aLong55 & 0x4000000000000000L) != 0L) { @Pc(58) int local58 = (int) local28.aLong192; - Static7.anIntArray75[local58] = Static106.anIntArray257[local58]; + Static7.varps[local58] = Static106.anIntArray257[local58]; local28.method4658(); return local58; } @@ -279,7 +279,7 @@ public final class Static38 { } } } - if (local39.anObject5 == null || Static83.anInt372 < local39.anInt3390 || local39.anInt3375 <= Static83.anInt372) { + if (local39.anObject5 == null || Static83.loop < local39.anInt3390 || local39.anInt3375 <= Static83.loop) { local39.anInt3424 = Static207.method3685(Static55.level, local39.anInt3412, local39.anInt3421); Static43.method1141(Static55.level, local39.anInt3412, local39.anInt3421, local39.anInt3424, (local82 - 1) * 64 + 60, local39, local39.anInt3381, local272, local39.aBoolean171); } else { diff --git a/client/src/main/java/Static4.java b/client/src/main/java/Static4.java index 7aaa85d..8e75dac 100644 --- a/client/src/main/java/Static4.java +++ b/client/src/main/java/Static4.java @@ -12,7 +12,7 @@ public final class Static4 { public static int js5ConnectState = 0; @OriginalMember(owner = "client!ac", name = "i", descriptor = "Lclient!ih;") - public static final LinkedList aClass69_2 = new LinkedList(); + public static final LinkedList highPriorityRequests = new LinkedList(); @OriginalMember(owner = "client!ac", name = "k", descriptor = "S") public static short aShort1 = 32767; @@ -34,8 +34,8 @@ public final class Static4 { @OriginalMember(owner = "client!ac", name = "a", descriptor = "(IIII)I") public static int method22(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2) { - if ((Static12.aByteArrayArrayArray2[arg2][arg1][arg0] & 0x8) == 0) { - return arg2 <= 0 || (Static12.aByteArrayArrayArray2[1][arg1][arg0] & 0x2) == 0 ? arg2 : arg2 - 1; + if ((Static12.tileSettings[arg2][arg1][arg0] & 0x8) == 0) { + return arg2 <= 0 || (Static12.tileSettings[1][arg1][arg0] & 0x2) == 0 ? arg2 : arg2 - 1; } else { return 0; } @@ -131,7 +131,7 @@ public final class Static4 { local163[0] = Integer.valueOf(Static57.aClass3_Sub15_Sub1_3.g4()); if (Static248.method3288(local133)) { @Pc(226) HookRequest local226 = new HookRequest(); - local226.anObjectArray31 = local163; + local226.arguments = local163; Static82.method1767(local226); } Static164.anInt3985 = -1; @@ -463,10 +463,10 @@ public final class Static4 { if (local786 == 2) { Static5.method34(); } - Static154.topLevelInterace = local133; + Static154.topLevelInterface = local133; Static81.method1753(local133); Static210.method3712(false); - Static74.method1626(Static154.topLevelInterace); + Static74.method1626(Static154.topLevelInterface); for (local171 = 0; local171 < 100; local171++) { Static186.aBooleanArray100[local171] = true; } @@ -575,14 +575,14 @@ public final class Static4 { if (local1245) { local1894.anInt3361 = 0; local1894.anInt3432 = local171; - local1894.anInt3359 = Static83.anInt372 + local133; + local1894.anInt3359 = Static83.loop + local133; local1894.anInt3399 = 0; - if (local1894.anInt3359 > Static83.anInt372) { + if (local1894.anInt3359 > Static83.loop) { local1894.anInt3399 = -1; } local1894.anInt3394 = local786; local1894.anInt3418 = 1; - if (local1894.anInt3432 != -1 && Static83.anInt372 == local1894.anInt3359) { + if (local1894.anInt3432 != -1 && Static83.loop == local1894.anInt3359) { local1986 = Static34.method877(local1894.anInt3432).anInt1754; if (local1986 != -1) { local1994 = Static36.method941(local1986); @@ -610,7 +610,7 @@ public final class Static4 { local1245 = false; } if (local1245) { - local2033.anInt3359 = local133 + Static83.anInt372; + local2033.anInt3359 = local133 + Static83.loop; local2033.anInt3394 = local786; local2033.anInt3432 = local171; if (local2033.anInt3432 == 65535) { @@ -619,10 +619,10 @@ public final class Static4 { local2033.anInt3418 = 1; local2033.anInt3361 = 0; local2033.anInt3399 = 0; - if (local2033.anInt3359 > Static83.anInt372) { + if (local2033.anInt3359 > Static83.loop) { local2033.anInt3399 = -1; } - if (local2033.anInt3432 != -1 && local2033.anInt3359 == Static83.anInt372) { + if (local2033.anInt3432 != -1 && local2033.anInt3359 == Static83.loop) { local1986 = Static34.method877(local2033.anInt3432).anInt1754; if (local1986 != -1) { local1994 = Static36.method941(local1986); @@ -641,7 +641,7 @@ public final class Static4 { if (local277 >= 0 && local1160 >= 0 && local277 < 104 && local1160 < 104) { local1160 = local1160 * 128 + 64; local277 = local277 * 128 + 64; - @Pc(2241) SpotAnim local2241 = new SpotAnim(local171, local1146, local277, local1160, Static207.method3685(local1146, local277, local1160) - local786, local133, Static83.anInt372); + @Pc(2241) SpotAnim local2241 = new SpotAnim(local171, local1146, local277, local1160, Static207.method3685(local1146, local277, local1160) - local786, local133, Static83.loop); Static99.aClass69_64.method2282(new SpotAnimNode(local2241)); } } @@ -697,13 +697,13 @@ public final class Static4 { local786 = Static57.aClass3_Sub15_Sub1_3.g2(); local864 = Static57.aClass3_Sub15_Sub1_3.g2(); if (Static248.method3288(local786)) { - Static57.anInt1747 = local133; - Static72.anInt2031 = local864; - if (Static227.anInt5096 == 2) { - Static240.anInt5333 = Static72.anInt2031; - Static184.anInt4358 = Static57.anInt1747; + Static57.yawTarget = local133; + Static72.pitchTarget = local864; + if (Static227.cameraType == 2) { + Static240.cameraPitch = Static72.pitchTarget; + Static184.cameraYaw = Static57.yawTarget; } - Static87.method1812(); + Static87.clampCameraAngle(); } Static164.anInt3985 = -1; return true; @@ -725,7 +725,7 @@ public final class Static4 { for (local786 = Static180.anInt4264; local786 < Static180.anInt4264 + 8; local786++) { if (Static159.aClass69ArrayArrayArray1[Static55.level][local133][local786] != null) { Static159.aClass69ArrayArrayArray1[Static55.level][local133][local786] = null; - Static220.method3797(local786, local133); + Static220.spawnGroundObject(local786, local133); } } } @@ -858,9 +858,9 @@ public final class Static4 { Static164.anInt3985 = -1; return true; } else if (Static164.anInt3985 == 128) { - for (local133 = 0; local133 < Static7.anIntArray75.length; local133++) { - if (Static106.anIntArray257[local133] != Static7.anIntArray75[local133]) { - Static7.anIntArray75[local133] = Static106.anIntArray257[local133]; + for (local133 = 0; local133 < Static7.varps.length; local133++) { + if (Static106.anIntArray257[local133] != Static7.varps[local133]) { + Static7.varps[local133] = Static106.anIntArray257[local133]; Static85.method1775(local133); Static83.updatedVarps[Static70.updatedVarpsWriterIndex++ & 0x1F] = local133; } @@ -946,8 +946,8 @@ public final class Static4 { Static43.method1143(local3490); Static17.method531(local3490, true); } - if (Static154.topLevelInterace != -1) { - Static54.method1304(1, Static154.topLevelInterace); + if (Static154.topLevelInterface != -1) { + Static54.method1304(1, Static154.topLevelInterface); } } Static164.anInt3985 = -1; @@ -1002,8 +1002,8 @@ public final class Static4 { Static164.anInt3985 = -1; return true; } else if (Static164.anInt3985 == 209) { - if (Static154.topLevelInterace != -1) { - Static54.method1304(0, Static154.topLevelInterace); + if (Static154.topLevelInterface != -1) { + Static54.method1304(0, Static154.topLevelInterface); } Static164.anInt3985 = -1; return true; @@ -1350,12 +1350,12 @@ public final class Static4 { } else if (Static164.anInt3985 == 24) { local133 = Static57.aClass3_Sub15_Sub1_3.g2(); if (Static248.method3288(local133)) { - Static35.method902(); + Static35.resetCameraEffects(); } Static164.anInt3985 = -1; return true; } else if (Static164.anInt3985 == 86) { - Static278.method4653(); + Static278.processLogout(); Static164.anInt3985 = -1; return false; } else if (Static164.anInt3985 == 116) { @@ -1585,7 +1585,7 @@ public final class Static4 { return true; } else { Static89.report("T1 - " + Static164.anInt3985 + "," + Static5.anInt45 + "," + Static49.anInt1462 + " - " + Static223.anInt5028, null); - Static278.method4653(); + Static278.processLogout(); return true; } } @@ -1629,7 +1629,7 @@ public final class Static4 { if (Static105.aClass13_14.anObjectArray26 != null && Static138.aBoolean172) { local176 = new HookRequest(); local176.source = Static105.aClass13_14; - local176.anObjectArray31 = Static105.aClass13_14.anObjectArray26; + local176.arguments = Static105.aClass13_14.anObjectArray26; local176.anInt3102 = local122; local176.anInt3097 = local130; Static82.method1767(local176); @@ -1641,7 +1641,7 @@ public final class Static4 { local176.anInt3097 = local130; local176.aClass13_16 = Static56.aClass13_12; local176.anInt3102 = local122; - local176.anObjectArray31 = Static105.aClass13_14.anObjectArray16; + local176.arguments = Static105.aClass13_14.anObjectArray16; local176.source = Static105.aClass13_14; Static82.method1767(local176); } diff --git a/client/src/main/java/Static40.java b/client/src/main/java/Static40.java index 9070a05..1248508 100644 --- a/client/src/main/java/Static40.java +++ b/client/src/main/java/Static40.java @@ -11,12 +11,12 @@ public final class Static40 { public static final JagString aClass100_253 = Static28.parse("(U0a )2 via: "); @OriginalMember(owner = "client!da", name = "d", descriptor = "(I)V") - public static void method1008() { + public static void updateLoginScreenCamera() { if (Static155.anInt3718 == -1 || Static52.anInt1694 == -1) { return; } @Pc(27) int local27 = (Static233.anInt5224 * (Static114.anInt5843 - Static228.anInt5101) >> 16) + Static228.anInt5101; - @Pc(30) float[] local30 = new float[3]; + @Pc(30) float[] renderCoordinates = new float[3]; Static233.anInt5224 += local27; if (Static233.anInt5224 >= 65535) { Static233.anInt5224 = 65535; @@ -47,11 +47,11 @@ public final class Static40 { local146 = local131 - local141; local155 = local111 + local141 - local131 * 2; local173 = Static107.anIntArrayArrayArray9[Static155.anInt3718][local70 + 2][local72] + local131 - local119 - local111; - local30[local72] = (float) local119 + (((float) local173 * local66 + (float) local155) * local66 + (float) local146) * local66; + renderCoordinates[local72] = (float) local119 + (((float) local173 * local66 + (float) local155) * local66 + (float) local146) * local66; } - Static5.anInt40 = (int) local30[1] * -1; - Static138.anInt3439 = (int) local30[0] - Static225.originX * 128; - Static134.anInt3302 = (int) local30[2] - Static142.originZ * 128; + Static5.anInt40 = (int) renderCoordinates[1] * -1; + Static138.renderX = (int) renderCoordinates[0] - Static225.originX * 128; + Static134.renderZ = (int) renderCoordinates[2] - Static142.originZ * 128; @Pc(226) float[] local226 = new float[3]; local141 = Static75.anInt2119 * 2; for (local131 = 0; local131 < 3; local131++) { @@ -64,14 +64,14 @@ public final class Static40 { @Pc(331) int local331 = Static107.anIntArrayArrayArray9[Static52.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] - local30[0]; - @Pc(371) float local371 = local226[2] - local30[2]; - @Pc(382) float local382 = (local226[1] - local30[1]) * -1.0F; + @Pc(363) float local363 = local226[0] - renderCoordinates[0]; + @Pc(371) float local371 = local226[2] - renderCoordinates[2]; + @Pc(382) float local382 = (local226[1] - renderCoordinates[1]) * -1.0F; @Pc(392) double local392 = Math.sqrt((double) (local371 * local371 + local363 * local363)); Static146.aFloat15 = (float) Math.atan2((double) local382, local392); Static84.aFloat10 = -((float) Math.atan2((double) local363, (double) local371)); - Static240.anInt5333 = (int) ((double) Static146.aFloat15 * 325.949D) & 0x7FF; - Static184.anInt4358 = (int) ((double) Static84.aFloat10 * 325.949D) & 0x7FF; + Static240.cameraPitch = (int) ((double) Static146.aFloat15 * 325.949D) & 0x7FF; + Static184.cameraYaw = (int) ((double) Static84.aFloat10 * 325.949D) & 0x7FF; } @OriginalMember(owner = "client!da", name = "a", descriptor = "(ILclient!ve;Z)Lclient!ok;") @@ -85,7 +85,7 @@ public final class Static40 { if (local10 != null) { return local10; } - @Pc(20) byte[] local20 = Static98.aClass153_42.method4495(34, arg0); + @Pc(20) byte[] local20 = Static98.aClass153_42.getFile(34, arg0); local10 = new Class2(); if (local20 != null) { local10.method6(new Buffer(local20), arg0); @@ -142,7 +142,7 @@ public final class Static40 { Static6.outboundBuffer.p1(local8.offset); Static6.outboundBuffer.pBytes(local8.data, local8.offset); Static223.anInt5034 = -3; - Static179.anInt4261 = 1; + Static179.accountCreationStep = 1; Static226.anInt5079 = 0; Static57.anInt1758 = 0; } diff --git a/client/src/main/java/Static41.java b/client/src/main/java/Static41.java index 4363d3a..c27ac71 100644 --- a/client/src/main/java/Static41.java +++ b/client/src/main/java/Static41.java @@ -178,19 +178,19 @@ public final class Static41 { @Pc(84) int local84 = Static57.aClass3_Sub15_Sub1_3.method2238(1); if (local84 == 0) { Static105.anIntArray256[Static267.anInt5774++] = local75; - local79.anInt3430 = Static83.anInt372; + local79.anInt3430 = Static83.loop; } else { @Pc(107) int local107 = Static57.aClass3_Sub15_Sub1_3.method2238(2); if (local107 == 0) { Static105.anIntArray256[Static267.anInt5774++] = local75; - local79.anInt3430 = Static83.anInt372; + local79.anInt3430 = Static83.loop; Static44.anIntArray106[Static116.anInt2951++] = local75; } else { @Pc(153) int local153; @Pc(163) int local163; if (local107 == 1) { Static105.anIntArray256[Static267.anInt5774++] = local75; - local79.anInt3430 = Static83.anInt372; + local79.anInt3430 = Static83.loop; local153 = Static57.aClass3_Sub15_Sub1_3.method2238(3); local79.method2684(1, local153); local163 = Static57.aClass3_Sub15_Sub1_3.method2238(1); @@ -199,7 +199,7 @@ public final class Static41 { } } else if (local107 == 2) { Static105.anIntArray256[Static267.anInt5774++] = local75; - local79.anInt3430 = Static83.anInt372; + local79.anInt3430 = Static83.loop; if (Static57.aClass3_Sub15_Sub1_3.method2238(1) == 1) { local153 = Static57.aClass3_Sub15_Sub1_3.method2238(3); local79.method2684(2, local153); diff --git a/client/src/main/java/Static44.java b/client/src/main/java/Static44.java index 2418c3e..467b1cd 100644 --- a/client/src/main/java/Static44.java +++ b/client/src/main/java/Static44.java @@ -46,8 +46,8 @@ public final class Static44 { } } Static102.method2073(); - Static227.anInt5096 = 1; - Static196.method3534(30); + Static227.cameraType = 1; + Static196.setGameState(30); for (local35 = 0; local35 < 100; local35++) { Static186.aBooleanArray100[local35] = true; } @@ -104,8 +104,8 @@ public final class Static44 { Static17.method531(local28, false); } Static74.method1626(arg0); - if (Static154.topLevelInterace != -1) { - Static54.method1304(1, Static154.topLevelInterace); + if (Static154.topLevelInterface != -1) { + Static54.method1304(1, Static154.topLevelInterface); } return local9; } diff --git a/client/src/main/java/Static45.java b/client/src/main/java/Static45.java index 0b8174f..208191c 100644 --- a/client/src/main/java/Static45.java +++ b/client/src/main/java/Static45.java @@ -17,20 +17,20 @@ public final class Static45 { public static final SoftLruHashTable aClass99_6 = new SoftLruHashTable(32); @OriginalMember(owner = "client!di", name = "a", descriptor = "([Lclient!mj;ZI)V") - public static void method1169(@OriginalArg(0) CollisionMap[] arg0, @OriginalArg(1) boolean arg1) { - @Pc(10) int local10; - @Pc(15) int local15; - if (!arg1) { - for (local10 = 0; local10 < 4; local10++) { - for (local15 = 0; local15 < 104; local15++) { - for (@Pc(22) int local22 = 0; local22 < 104; local22++) { - if ((Static12.aByteArrayArrayArray2[local10][local15][local22] & 0x1) == 1) { - @Pc(43) int local43 = local10; - if ((Static12.aByteArrayArrayArray2[1][local15][local22] & 0x2) == 2) { - local43 = local10 - 1; + public static void method1169(@OriginalArg(0) CollisionMap[] collisionMaps, @OriginalArg(1) boolean underwater) { + @Pc(10) int level; + @Pc(15) int x; + if (!underwater) { + for (level = 0; level < 4; level++) { + for (x = 0; x < 104; x++) { + for (@Pc(22) int z = 0; z < 104; z++) { + if ((Static12.tileSettings[level][x][z] & 0x1) == 1) { + @Pc(43) int transformedLevel = level; + if ((Static12.tileSettings[1][x][z] & 0x2) == 2) { + transformedLevel = level - 1; } - if (local43 >= 0) { - arg0[local43].method3051(local22, local15); + if (transformedLevel >= 0) { + collisionMaps[transformedLevel].addRangeableFlag(z, x); } } } @@ -52,15 +52,15 @@ public final class Static45 { } } @Pc(128) byte local128; - if (arg1) { + if (underwater) { local128 = 1; } else { local128 = 4; } - local10 = Static86.anInt2293 >> 2 << 10; + level = Static86.anInt2293 >> 2 << 10; @Pc(142) int[][] local142 = new int[104][104]; @Pc(146) int[][] local146 = new int[104][104]; - local15 = Static183.anInt4272 >> 1; + x = Static183.anInt4272 >> 1; @Pc(152) int local152; @Pc(168) int local168; @Pc(173) int local173; @@ -84,8 +84,8 @@ public final class Static45 { local173 = local168 * 768 >> 8; for (local178 = 1; local178 < 103; local178++) { for (local194 = 1; local194 < 103; local194++) { - local209 = Static83.anIntArrayArrayArray4[local152][local194][local178 + 1] - Static83.anIntArrayArrayArray4[local152][local194][local178 - 1]; - local202 = Static83.anIntArrayArrayArray4[local152][local194 + 1][local178] - Static83.anIntArrayArrayArray4[local152][local194 - 1][local178]; + local209 = Static83.activeTileHeightMap[local152][local194][local178 + 1] - Static83.activeTileHeightMap[local152][local194][local178 - 1]; + local202 = Static83.activeTileHeightMap[local152][local194 + 1][local178] - Static83.activeTileHeightMap[local152][local194 - 1][local178]; local349 = (int) Math.sqrt((double) (local202 * local202 + local209 * local209 + 65536)); local267 = (local209 << 8) / local349; local254 = -65536 / local349; @@ -110,8 +110,8 @@ public final class Static45 { local200 = local194 * 1024 >> 8; for (local202 = 1; local202 < 103; local202++) { for (local209 = 1; local209 < 103; local209++) { - local234 = Static83.anIntArrayArrayArray4[local152][local209 + 1][local202] - Static83.anIntArrayArrayArray4[local152][local209 - 1][local202]; - local254 = Static83.anIntArrayArrayArray4[local152][local209][local202 + 1] - Static83.anIntArrayArrayArray4[local152][local209][local202 - 1]; + local234 = Static83.activeTileHeightMap[local152][local209 + 1][local202] - Static83.activeTileHeightMap[local152][local209 - 1][local202]; + local254 = Static83.activeTileHeightMap[local152][local209][local202 + 1] - Static83.activeTileHeightMap[local152][local209][local202 - 1]; local267 = (int) Math.sqrt((double) (local234 * local234 + local254 * local254 + 65536)); local273 = (local234 << 8) / local267; local322 = (local159[local209][local202 + 1] >> 3) + (local159[local209][local202 - 1] >> 2) + (local159[local209 - 1][local202] >> 2) + (local159[local209 + 1][local202] >> 3) + (local159[local209][local202] >> 1); @@ -188,17 +188,17 @@ public final class Static45 { } for (local168 = 1; local168 < 103; local168++) { label771: for (local173 = 1; local173 < 103; local173++) { - if (arg1 || Static138.method2697() || (Static12.aByteArrayArrayArray2[0][local168][local173] & 0x2) != 0 || (Static12.aByteArrayArrayArray2[local152][local168][local173] & 0x10) == 0 && Static4.method22(local173, local168, local152) == Static41.anInt1316) { + if (underwater || Static138.allLevelsAreVisible() || (Static12.tileSettings[0][local168][local173] & 0x2) != 0 || (Static12.tileSettings[local152][local168][local173] & 0x10) == 0 && Static4.method22(local173, local168, local152) == Static41.anInt1316) { if (Static146.anInt3508 > local152) { Static146.anInt3508 = local152; } local178 = Static253.aByteArrayArrayArray16[local152][local168][local173] & 0xFF; local194 = Static240.aByteArrayArrayArray14[local152][local168][local173] & 0xFF; if (local178 > 0 || local194 > 0) { - local202 = Static83.anIntArrayArrayArray4[local152][local168 + 1][local173]; - local200 = Static83.anIntArrayArrayArray4[local152][local168][local173]; - local349 = Static83.anIntArrayArrayArray4[local152][local168][local173 + 1]; - local209 = Static83.anIntArrayArrayArray4[local152][local168 + 1][local173 + 1]; + local202 = Static83.activeTileHeightMap[local152][local168 + 1][local173]; + local200 = Static83.activeTileHeightMap[local152][local168][local173]; + local349 = Static83.activeTileHeightMap[local152][local168][local173 + 1]; + local209 = Static83.activeTileHeightMap[local152][local168 + 1][local173 + 1]; if (local152 > 0) { @Pc(1067) boolean local1067 = true; if (local178 == 0 && Static163.aByteArrayArrayArray11[local152][local168][local173] != 0) { @@ -216,13 +216,13 @@ public final class Static45 { local254 = 0; } else { local234 = local142[local168][local173]; - local267 = (local234 & 0x7F) + local15; + local267 = (local234 & 0x7F) + x; if (local267 < 0) { local267 = 0; } else if (local267 > 127) { local267 = 127; } - local273 = (local234 & 0x380) + (local234 + local10 & 0xFC00) + local267; + local273 = (local234 & 0x380) + (local234 + level & 0xFC00) + local267; local254 = Rasteriser.palette[Static87.method1814(96, local273)]; } local267 = local146[local168][local173]; @@ -232,9 +232,9 @@ public final class Static45 { if (local194 == 0) { Static176.method3305(local152, local168, local173, 0, 0, -1, local200, local202, local209, local349, Static87.method1814(local267, local234), Static87.method1814(local273, local234), Static87.method1814(local326, local234), Static87.method1814(local332, local234), 0, 0, 0, 0, local254, 0); if (GlRenderer.enabled && local152 > 0 && local234 != -1 && Static199.method3593(local178 - 1).aBoolean198) { - Static242.method4197(0, 0, true, false, local168, local173, local200 - Static83.anIntArrayArrayArray4[0][local168][local173], -Static83.anIntArrayArrayArray4[0][local168 + 1][local173] + local202, local209 - Static83.anIntArrayArrayArray4[0][local168 + 1][local173 + 1], local349 - Static83.anIntArrayArrayArray4[0][local168][local173 + 1]); + Static242.method4197(0, 0, true, false, local168, local173, local200 - Static83.activeTileHeightMap[0][local168][local173], -Static83.activeTileHeightMap[0][local168 + 1][local173] + local202, local209 - Static83.activeTileHeightMap[0][local168 + 1][local173 + 1], local349 - Static83.activeTileHeightMap[0][local168][local173 + 1]); } - if (GlRenderer.enabled && !arg1 && Static62.anIntArrayArray11 != null && local152 == 0) { + if (GlRenderer.enabled && !underwater && Static62.anIntArrayArray11 != null && local152 == 0) { for (local322 = local168 - 1; local322 <= local168 + 1; local322++) { for (@Pc(1794) int local1794 = local173 - 1; local1794 <= local173 + 1; local1794++) { if ((local322 != local168 || local173 != local1794) && local322 >= 0 && local322 < 104 && local1794 >= 0 && local1794 < 104) { @@ -257,7 +257,7 @@ public final class Static45 { @Pc(1301) int local1301; @Pc(1353) int local1353; @Pc(1288) int local1288; - if (GlRenderer.enabled && !arg1 && Static62.anIntArrayArray11 != null && local152 == 0) { + if (GlRenderer.enabled && !underwater && Static62.anIntArrayArray11 != null && local152 == 0) { if (local1248.anInt5892 != -1 && Rasteriser.textureProvider.method3237(local1248.anInt5892) == 4) { Static62.anIntArrayArray11[local168][local173] = (local1248.anInt5898 << 24) + local1248.anInt5889; } else { @@ -291,29 +291,29 @@ public final class Static45 { local1353 = 0; } else { local1301 = local1248.anInt5899; - local1429 = local15 + (local1301 & 0x7F); + local1429 = x + (local1301 & 0x7F); if (local1429 < 0) { local1429 = 0; } else if (local1429 > 127) { local1429 = 127; } - local1458 = (local1301 & 0x380) + ((local1301 + local10 & 0xFC00) + local1429); + local1458 = (local1301 & 0x380) + ((local1301 + level & 0xFC00) + local1429); local1353 = Rasteriser.palette[Static230.method3949(local1458, 96)]; } if (local1248.anInt5894 >= 0) { local1429 = local1248.anInt5894; - local1458 = local15 + (local1429 & 0x7F); + local1458 = x + (local1429 & 0x7F); if (local1458 < 0) { local1458 = 0; } else if (local1458 > 127) { local1458 = 127; } - @Pc(1529) int local1529 = (local1429 & 0x380) + ((local1429 + local10 & 0xFC00) + local1458); + @Pc(1529) int local1529 = (local1429 & 0x380) + ((local1429 + level & 0xFC00) + local1458); local1353 = Rasteriser.palette[Static230.method3949(local1529, 96)]; } Static176.method3305(local152, local168, local173, local322, local1242, local1288, local200, local202, local209, local349, Static87.method1814(local267, local234), Static87.method1814(local273, local234), Static87.method1814(local326, local234), Static87.method1814(local332, local234), Static230.method3949(local1301, local267), Static230.method3949(local1301, local273), Static230.method3949(local1301, local326), Static230.method3949(local1301, local332), local254, local1353); if (GlRenderer.enabled && local152 > 0) { - Static242.method4197(local322, local1242, local1301 == -2 || !local1248.aBoolean311, local234 == -1 || !Static199.method3593(local178 - 1).aBoolean198, local168, local173, local200 - Static83.anIntArrayArrayArray4[0][local168][local173], local202 - Static83.anIntArrayArrayArray4[0][local168 + 1][local173], local209 - Static83.anIntArrayArrayArray4[0][local168 + 1][local173 + 1], -Static83.anIntArrayArrayArray4[0][local168][local173 + 1] + local349); + Static242.method4197(local322, local1242, local1301 == -2 || !local1248.aBoolean311, local234 == -1 || !Static199.method3593(local178 - 1).aBoolean198, local168, local173, local200 - Static83.activeTileHeightMap[0][local168][local173], local202 - Static83.activeTileHeightMap[0][local168 + 1][local173], local209 - Static83.activeTileHeightMap[0][local168 + 1][local173 + 1], -Static83.activeTileHeightMap[0][local168][local173 + 1] + local349); } } } @@ -322,21 +322,21 @@ public final class Static45 { } if (GlRenderer.enabled) { @Pc(1888) float[][] local1888 = new float[105][105]; - @Pc(1892) int[][] local1892 = Static83.anIntArrayArrayArray4[local152]; + @Pc(1892) int[][] local1892 = Static83.activeTileHeightMap[local152]; @Pc(1896) float[][] local1896 = new float[105][105]; @Pc(1900) float[][] local1900 = new float[105][105]; local200 = 1; while (true) { if (local200 > 103) { - @Pc(2025) Class3_Sub14[] local2025; - if (arg1) { - local2025 = Static193.method3501(Static12.aByteArrayArrayArray2, Static163.aByteArrayArrayArray11[local152], Static253.aByteArrayArrayArray16[local152], local146, local1896, Static62.anIntArrayArray11, Static240.aByteArrayArrayArray14[local152], Static4.aByteArrayArrayArray1[local152], local1888, local152, local1900, local142, Static83.anIntArrayArrayArray4[local152], Static107.anIntArrayArrayArray10[0]); + @Pc(2025) GlTile[] local2025; + if (underwater) { + local2025 = Static193.method3501(Static12.tileSettings, Static163.aByteArrayArrayArray11[local152], Static253.aByteArrayArrayArray16[local152], local146, local1896, Static62.anIntArrayArray11, Static240.aByteArrayArrayArray14[local152], Static4.aByteArrayArrayArray1[local152], local1888, local152, local1900, local142, Static83.activeTileHeightMap[local152], Static107.surfaceTileHeightMap[0]); Static110.method2280(local152, local2025); break; } - local2025 = Static193.method3501(Static12.aByteArrayArrayArray2, Static163.aByteArrayArrayArray11[local152], Static253.aByteArrayArrayArray16[local152], local146, local1896, null, Static240.aByteArrayArrayArray14[local152], Static4.aByteArrayArrayArray1[local152], local1888, local152, local1900, local142, Static83.anIntArrayArrayArray4[local152], null); - @Pc(2049) Class3_Sub14[] local2049 = Static1.method2(local1896, local1888, Static83.anIntArrayArrayArray4[local152], local152, local1900, Static4.aByteArrayArrayArray1[local152], local146, Static163.aByteArrayArrayArray11[local152], Static253.aByteArrayArrayArray16[local152], Static240.aByteArrayArrayArray14[local152], Static12.aByteArrayArrayArray2); - @Pc(2057) Class3_Sub14[] local2057 = new Class3_Sub14[local2025.length + local2049.length]; + local2025 = Static193.method3501(Static12.tileSettings, Static163.aByteArrayArrayArray11[local152], Static253.aByteArrayArrayArray16[local152], local146, local1896, null, Static240.aByteArrayArrayArray14[local152], Static4.aByteArrayArrayArray1[local152], local1888, local152, local1900, local142, Static83.activeTileHeightMap[local152], null); + @Pc(2049) GlTile[] local2049 = Static1.method2(local1896, local1888, Static83.activeTileHeightMap[local152], local152, local1900, Static4.aByteArrayArrayArray1[local152], local146, Static163.aByteArrayArrayArray11[local152], Static253.aByteArrayArrayArray16[local152], Static240.aByteArrayArrayArray14[local152], Static12.tileSettings); + @Pc(2057) GlTile[] local2057 = new GlTile[local2025.length + local2049.length]; for (local349 = 0; local349 < local2025.length; local349++) { local2057[local349] = local2025[local349]; } @@ -344,7 +344,7 @@ public final class Static45 { local2057[local2025.length + local349] = local2049[local349]; } Static110.method2280(local152, local2057); - Static221.method3393(local1900, Static253.aByteArrayArrayArray16[local152], Static4.aByteArrayArrayArray1[local152], Static120.aClass51Array1, local152, Static120.anInt3034, local1896, Static163.aByteArrayArrayArray11[local152], Static240.aByteArrayArrayArray14[local152], Static83.anIntArrayArrayArray4[local152], local1888); + Static221.method3393(local1900, Static253.aByteArrayArrayArray16[local152], Static4.aByteArrayArrayArray1[local152], Static120.aClass51Array1, local152, Static120.anInt3034, local1896, Static163.aByteArrayArrayArray11[local152], Static240.aByteArrayArrayArray14[local152], Static83.activeTileHeightMap[local152], local1888); break; } for (local202 = 1; local202 <= 103; local202++) { @@ -365,13 +365,13 @@ public final class Static45 { Static118.aByteArrayArrayArray9[local152] = null; } Static220.method3801(); - if (arg1) { + if (underwater) { return; } @Pc(2204) int local2204; for (local152 = 0; local152 < 104; local152++) { for (local2204 = 0; local2204 < 104; local2204++) { - if ((Static12.aByteArrayArrayArray2[1][local152][local2204] & 0x2) == 2) { + if ((Static12.tileSettings[1][local152][local2204] & 0x2) == 2) { Static224.method3884(local152, local2204); } } @@ -404,8 +404,8 @@ public final class Static45 { } local202 = (local200 + 1 - local194) * (-local173 + (local178 - -1)); if (local202 >= 8) { - local349 = Static83.anIntArrayArrayArray4[local200][local168][local173] - 240; - local234 = Static83.anIntArrayArrayArray4[local194][local168][local173]; + local349 = Static83.activeTileHeightMap[local200][local168][local173] - 240; + local234 = Static83.activeTileHeightMap[local194][local168][local173]; Static278.method4647(1, local168 * 128, local168 * 128, local173 * 128, local178 * 128 + 128, local349, local234); for (local254 = local194; local254 <= local200; local254++) { for (local267 = local173; local267 <= local178; local267++) { @@ -439,8 +439,8 @@ public final class Static45 { } local202 = (local178 + 1 - local173) * (-local194 + local200 - -1); if (local202 >= 8) { - local349 = Static83.anIntArrayArrayArray4[local200][local173][local2204] - 240; - local234 = Static83.anIntArrayArrayArray4[local194][local173][local2204]; + local349 = Static83.activeTileHeightMap[local200][local173][local2204] - 240; + local234 = Static83.activeTileHeightMap[local194][local173][local2204]; Static278.method4647(2, local173 * 128, local178 * 128 + 128, local2204 * 128, local2204 * 128, local349, local234); for (local254 = local194; local254 <= local200; local254++) { for (local267 = local173; local267 <= local178; local267++) { @@ -473,7 +473,7 @@ public final class Static45 { local178++; } if ((local178 + 1 - local173) * (local200 - (local194 - 1)) >= 4) { - local202 = Static83.anIntArrayArrayArray4[local152][local173][local194]; + local202 = Static83.activeTileHeightMap[local152][local173][local194]; Static278.method4647(4, local173 * 128, local178 * 128 + 128, local194 * 128, local200 * 128 + 128, local202, local202); for (local209 = local173; local209 <= local178; local209++) { for (local349 = local194; local349 <= local200; local349++) { diff --git a/client/src/main/java/Static48.java b/client/src/main/java/Static48.java index bc5a3b5..67ae8be 100644 --- a/client/src/main/java/Static48.java +++ b/client/src/main/java/Static48.java @@ -37,7 +37,7 @@ public final class Static48 { local4.p1(Static209.aBoolean240 ? 1 : 0); local4.p1(Static139.anInt3451); local4.p1(Static178.highDetailLighting ? 1 : 0); - local4.p1(Static220.aBoolean244 ? 1 : 0); + local4.p1(Static220.highWaterDetail ? 1 : 0); local4.p1(Static71.aBoolean107 ? 1 : 0); local4.p1(Static102.windowMode); local4.p1(Static99.stereo ? 1 : 0); diff --git a/client/src/main/java/Static49.java b/client/src/main/java/Static49.java index 1933a0f..759a083 100644 --- a/client/src/main/java/Static49.java +++ b/client/src/main/java/Static49.java @@ -95,19 +95,19 @@ public final class Static49 { @Pc(70) int local70 = Static57.aClass3_Sub15_Sub1_3.method2238(1); if (local70 == 0) { Static33.anIntArray79[Static272.anInt5214++] = local61; - local65.anInt3430 = Static83.anInt372; + local65.anInt3430 = Static83.loop; } else { @Pc(92) int local92 = Static57.aClass3_Sub15_Sub1_3.method2238(2); if (local92 == 0) { Static33.anIntArray79[Static272.anInt5214++] = local61; - local65.anInt3430 = Static83.anInt372; + local65.anInt3430 = Static83.loop; Static44.anIntArray106[Static116.anInt2951++] = local61; } else { @Pc(139) int local139; @Pc(149) int local149; if (local92 == 1) { Static33.anIntArray79[Static272.anInt5214++] = local61; - local65.anInt3430 = Static83.anInt372; + local65.anInt3430 = Static83.loop; local139 = Static57.aClass3_Sub15_Sub1_3.method2238(3); local65.method2684(1, local139); local149 = Static57.aClass3_Sub15_Sub1_3.method2238(1); @@ -116,7 +116,7 @@ public final class Static49 { } } else if (local92 == 2) { Static33.anIntArray79[Static272.anInt5214++] = local61; - local65.anInt3430 = Static83.anInt372; + local65.anInt3430 = Static83.loop; if (Static57.aClass3_Sub15_Sub1_3.method2238(1) == 1) { local139 = Static57.aClass3_Sub15_Sub1_3.method2238(3); local65.method2684(2, local139); @@ -175,7 +175,7 @@ public final class Static49 { } @Pc(24) JagString local24 = Static13.method471(); if (arg0 == null) { - @Pc(40) int local40 = Static280.aClass3_Sub2_Sub9_43.method2859(local24, arg2 + 4, arg1 - -15, Static39.aRandom1, Static60.anInt1895); + @Pc(40) int local40 = Static280.aClass3_Sub2_Sub9_43.method2859(local24, arg2 + 4, arg1 - -15, Static39.aRandom1, Static60.gregorianDateSeed); Static133.method4012(arg2 + 4, Static280.aClass3_Sub2_Sub9_43.method2858(local24) + local40, arg1, 15); return; } @@ -183,7 +183,7 @@ public final class Static49 { if (local59 == null) { local59 = Static280.aClass3_Sub2_Sub9_43; } - local59.method2878(local24, arg2, arg1, arg0.anInt445, arg0.anInt459, arg0.anInt474, arg0.anInt513, arg0.anInt460, arg0.anInt478, Static39.aRandom1, Static60.anInt1895, Static50.anIntArray132); + local59.method2878(local24, arg2, arg1, arg0.anInt445, arg0.anInt459, arg0.anInt474, arg0.anInt513, arg0.anInt460, arg0.anInt478, Static39.aRandom1, Static60.gregorianDateSeed, Static50.anIntArray132); Static133.method4012(Static50.anIntArray132[0], Static50.anIntArray132[2], Static50.anIntArray132[1], Static50.anIntArray132[3]); } @@ -191,9 +191,9 @@ public final class Static49 { public static void method1208() { Static224.aBoolean247 = false; Static231.anInt5202 = 0; - Static266.anInt5336 = -3; + Static266.returnCode = -3; Static92.anInt2430 = 0; - Static184.anInt4348 = 1; + Static184.loginStep = 1; Static276.anInt5816 = 0; Static204.anInt4765 = -1; } diff --git a/client/src/main/java/Static5.java b/client/src/main/java/Static5.java index 6ea504c..d8cd22b 100644 --- a/client/src/main/java/Static5.java +++ b/client/src/main/java/Static5.java @@ -51,7 +51,7 @@ public final class Static5 { public static void method34() { Static116.method2325(false); System.gc(); - Static196.method3534(25); + Static196.setGameState(25); } @OriginalMember(owner = "client!af", name = "a", descriptor = "(IIIIIILclient!th;IJ)Z") diff --git a/client/src/main/java/Static53.java b/client/src/main/java/Static53.java index a981e0f..739cde3 100644 --- a/client/src/main/java/Static53.java +++ b/client/src/main/java/Static53.java @@ -30,7 +30,7 @@ public final class Static53 { } @OriginalMember(owner = "client!ec", name = "a", descriptor = "([[IZILclient!hg;[IIIIZ[[FZI[[FIIIZ[[I[[FBI[Z)V") - public static void method1291(@OriginalArg(0) int[][] arg0, @OriginalArg(1) boolean arg1, @OriginalArg(2) int arg2, @OriginalArg(3) Class3_Sub14 arg3, @OriginalArg(4) int[] arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7, @OriginalArg(8) boolean arg8, @OriginalArg(9) float[][] arg9, @OriginalArg(10) boolean arg10, @OriginalArg(12) float[][] arg11, @OriginalArg(13) int arg12, @OriginalArg(14) int arg13, @OriginalArg(15) int arg14, @OriginalArg(16) boolean arg15, @OriginalArg(17) int[][] arg16, @OriginalArg(18) float[][] arg17, @OriginalArg(19) byte arg18, @OriginalArg(20) int arg19, @OriginalArg(21) boolean[] arg20) { + public static void method1291(@OriginalArg(0) int[][] arg0, @OriginalArg(1) boolean arg1, @OriginalArg(2) int arg2, @OriginalArg(3) GlTile arg3, @OriginalArg(4) int[] arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7, @OriginalArg(8) boolean arg8, @OriginalArg(9) float[][] arg9, @OriginalArg(10) boolean arg10, @OriginalArg(12) float[][] arg11, @OriginalArg(13) int arg12, @OriginalArg(14) int arg13, @OriginalArg(15) int arg14, @OriginalArg(16) boolean arg15, @OriginalArg(17) int[][] arg16, @OriginalArg(18) float[][] arg17, @OriginalArg(19) byte arg18, @OriginalArg(20) int arg19, @OriginalArg(21) boolean[] arg20) { @Pc(11) int local11 = (arg2 << 8) + (arg1 ? 255 : 0); @Pc(25) int local25 = (arg8 ? 255 : 0) + (arg14 << 8); @Pc(31) int[] local31 = new int[arg4.length / 2]; @@ -79,7 +79,7 @@ public final class Static53 { @OriginalMember(owner = "client!ec", name = "a", descriptor = "(IZ)V") public static void method1293(@OriginalArg(1) boolean arg0) { Static162.aBoolean190 = arg0; - Static87.aBoolean130 = !Static138.method2697(); + Static87.aBoolean130 = !Static138.allLevelsAreVisible(); } @OriginalMember(owner = "client!ec", name = "a", descriptor = "(B)V") @@ -90,7 +90,7 @@ public final class Static53 { @Pc(19) Component local19 = Static201.method1418(Static98.anInt2512, Static15.anInt506); if (local19 != null && local19.anObjectArray27 != null) { @Pc(29) HookRequest local29 = new HookRequest(); - local29.anObjectArray31 = local19.anObjectArray27; + local29.arguments = local19.anObjectArray27; local29.source = local19; Static82.method1767(local29); } diff --git a/client/src/main/java/Static54.java b/client/src/main/java/Static54.java index 1f17f04..9db3b25 100644 --- a/client/src/main/java/Static54.java +++ b/client/src/main/java/Static54.java @@ -26,7 +26,7 @@ public final class Static54 { Static129.method2496(arg2, arg1, arg2 + arg3.anInt445, arg1 + arg3.anInt459); } if (Static270.anInt5795 != 2 && Static270.anInt5795 != 5 && Static89.aClass3_Sub2_Sub1_5 != null) { - @Pc(48) int local48 = Static59.anInt1814 + Static57.anInt1747 & 0x7FF; + @Pc(48) int local48 = Static59.anInt1814 + Static57.yawTarget & 0x7FF; @Pc(57) int local57 = Static173.self.anInt3412 / 32 + 48; @Pc(67) int local67 = 464 - Static173.self.anInt3421 / 32; if (GlRenderer.enabled) { @@ -42,37 +42,37 @@ public final class Static54 { @Pc(200) int local200; @Pc(239) int local239; @Pc(271) int local271; - if (Static235.aClass134_2 != null) { - for (@Pc(117) int local117 = 0; local117 < Static235.aClass134_2.anInt5074; local117++) { - if (Static235.aClass134_2.method3892(local117)) { - local146 = (Static235.aClass134_2.aShortArray73[local117] - Static225.originX) * 4 + 2 - Static173.self.anInt3412 / 32; + if (Static235.mapFunctionGroup != null) { + for (@Pc(117) int local117 = 0; local117 < Static235.mapFunctionGroup.anInt5074; local117++) { + if (Static235.mapFunctionGroup.method3892(local117)) { + local146 = (Static235.mapFunctionGroup.aShortArray73[local117] - Static225.originX) * 4 + 2 - Static173.self.anInt3412 / 32; local150 = MathUtils.anIntArray223[local48]; local154 = MathUtils.anIntArray225[local48]; @Pc(156) Font local156 = Static114.aClass3_Sub2_Sub9_42; @Pc(164) int local164 = local150 * 256 / (Static273.anInt4130 + 256); - local181 = (Static235.aClass134_2.aShortArray72[local117] - Static142.originZ) * 4 + 2 - Static173.self.anInt3421 / 32; + local181 = (Static235.mapFunctionGroup.aShortArray72[local117] - Static142.originZ) * 4 + 2 - Static173.self.anInt3421 / 32; @Pc(189) int local189 = local154 * 256 / (Static273.anInt4130 + 256); local200 = local181 * local189 - local146 * local164 >> 16; - if (Static235.aClass134_2.method3894(local117) == 1) { + if (Static235.mapFunctionGroup.method3894(local117) == 1) { local156 = Static215.aClass3_Sub2_Sub9_32; } - if (Static235.aClass134_2.method3894(local117) == 2) { + if (Static235.mapFunctionGroup.method3894(local117) == 2) { local156 = Static280.aClass3_Sub2_Sub9_43; } local231 = local164 * local181 + local189 * local146 >> 16; - local239 = local156.method2856(Static235.aClass134_2.aClass100Array153[local117], 100); + local239 = local156.method2856(Static235.mapFunctionGroup.aClass100Array153[local117], 100); @Pc(245) int local245 = local231 - local239 / 2; if (local245 >= -arg3.anInt445 && local245 <= arg3.anInt445 && local200 >= -arg3.anInt459 && local200 <= arg3.anInt459) { local271 = 16777215; - if (Static235.aClass134_2.anIntArray444[local117] != -1) { - local271 = Static235.aClass134_2.anIntArray444[local117]; + if (Static235.mapFunctionGroup.anIntArray444[local117] != -1) { + local271 = Static235.mapFunctionGroup.anIntArray444[local117]; } if (GlRenderer.enabled) { Static46.method1188((GlSprite) arg3.method489(false)); } else { Static129.method2486(arg3.anIntArray37, arg3.anIntArray45); } - local156.method2869(Static235.aClass134_2.aClass100Array153[local117], arg2 + local245 + arg3.anInt445 / 2, arg1 + arg3.anInt459 / 2 + -local200, local239, 50, local271, 0, 1, 0, 0); + local156.method2869(Static235.mapFunctionGroup.aClass100Array153[local117], arg2 + local245 + arg3.anInt445 / 2, arg1 + arg3.anInt459 / 2 + -local200, local239, 50, local271, 0, 1, 0, 0); if (GlRenderer.enabled) { Static46.method1173(); } else { @@ -160,7 +160,7 @@ public final class Static54 { @Pc(756) Class102[] local756 = Static143.aClass102Array1; for (local181 = 0; local181 < local756.length; local181++) { @Pc(770) Class102 local770 = local756[local181]; - if (local770 != null && local770.anInt4058 != 0 && Static83.anInt372 % 20 < 10) { + if (local770 != null && local770.anInt4058 != 0 && Static83.loop % 20 < 10) { if (local770.anInt4058 == 1 && local770.anInt4057 >= 0 && local770.anInt4057 < Static175.aClass8_Sub4_Sub2Array1.length) { @Pc(804) Npc local804 = Static175.aClass8_Sub4_Sub2Array1[local770.anInt4057]; if (local804 != null) { diff --git a/client/src/main/java/Static57.java b/client/src/main/java/Static57.java index 2ecbf0b..9afa066 100644 --- a/client/src/main/java/Static57.java +++ b/client/src/main/java/Static57.java @@ -10,7 +10,7 @@ public final class Static57 { public static int anInt1757; @OriginalMember(owner = "client!eg", name = "d", descriptor = "I") - public static int anInt1747 = 0; + public static int yawTarget = 0; @OriginalMember(owner = "client!eg", name = "e", descriptor = "Lclient!i;") public static final Packet aClass3_Sub15_Sub1_3 = new Packet(65536); diff --git a/client/src/main/java/Static58.java b/client/src/main/java/Static58.java index 47eef0d..abdf3e0 100644 --- a/client/src/main/java/Static58.java +++ b/client/src/main/java/Static58.java @@ -36,7 +36,7 @@ public final class Static58 { } @OriginalMember(owner = "client!eh", name = "a", descriptor = "(I[[I[[FI[[FIBIIBZBI[[FILclient!hg;)V") - public static void method1324(@OriginalArg(0) int arg0, @OriginalArg(1) int[][] arg1, @OriginalArg(2) float[][] arg2, @OriginalArg(3) int arg3, @OriginalArg(4) float[][] arg4, @OriginalArg(5) int arg5, @OriginalArg(6) byte arg6, @OriginalArg(7) int arg7, @OriginalArg(8) int arg8, @OriginalArg(10) boolean arg9, @OriginalArg(11) byte arg10, @OriginalArg(12) int arg11, @OriginalArg(13) float[][] arg12, @OriginalArg(14) int arg13, @OriginalArg(15) Class3_Sub14 arg14) { + public static void method1324(@OriginalArg(0) int arg0, @OriginalArg(1) int[][] arg1, @OriginalArg(2) float[][] arg2, @OriginalArg(3) int arg3, @OriginalArg(4) float[][] arg4, @OriginalArg(5) int arg5, @OriginalArg(6) byte arg6, @OriginalArg(7) int arg7, @OriginalArg(8) int arg8, @OriginalArg(10) boolean arg9, @OriginalArg(11) byte arg10, @OriginalArg(12) int arg11, @OriginalArg(13) float[][] arg12, @OriginalArg(14) int arg13, @OriginalArg(15) GlTile arg14) { @Pc(11) int local11 = (arg0 << 8) + 255; @Pc(17) int local17 = (arg5 << 8) + 255; @Pc(23) int local23 = (arg8 << 8) + 255; diff --git a/client/src/main/java/Static6.java b/client/src/main/java/Static6.java index 1d84939..73dd0c7 100644 --- a/client/src/main/java/Static6.java +++ b/client/src/main/java/Static6.java @@ -30,7 +30,7 @@ public final class Static6 { public static void method84() { Static65.method1500(); for (@Pc(9) int local9 = 0; local9 < 4; local9++) { - Static148.collisionMaps[local9].method3050(); + Static148.collisionMaps[local9].resetFlags(); } System.gc(); } diff --git a/client/src/main/java/Static60.java b/client/src/main/java/Static60.java index 3b897e6..6f2ee33 100644 --- a/client/src/main/java/Static60.java +++ b/client/src/main/java/Static60.java @@ -17,7 +17,7 @@ public final class Static60 { public static AudioThread aClass19_1; @OriginalMember(owner = "client!em", name = "D", descriptor = "I") - public static int anInt1895; + public static int gregorianDateSeed; @OriginalMember(owner = "client!em", name = "u", descriptor = "Lclient!na;") public static final JagString aClass100_420 = Static28.parse(")1o"); @@ -37,7 +37,7 @@ public final class Static60 { return; } @Pc(21) int local21 = arg3 * arg3 + arg2 * arg2; - @Pc(27) int local27 = Static59.anInt1814 + Static57.anInt1747 & 0x7FF; + @Pc(27) int local27 = Static59.anInt1814 + Static57.yawTarget & 0x7FF; @Pc(39) int local39 = Math.max(arg0.anInt445 / 2, arg0.anInt459 / 2) + 10; if (local39 * local39 < local21) { return; diff --git a/client/src/main/java/Static63.java b/client/src/main/java/Static63.java index 95275d0..0939828 100644 --- a/client/src/main/java/Static63.java +++ b/client/src/main/java/Static63.java @@ -75,27 +75,27 @@ public final class Static63 { } @OriginalMember(owner = "client!fa", name = "c", descriptor = "()V") - public static synchronized void method1490() { + public static synchronized void process() { @Pc(1) GL2 local1 = GlRenderer.gl; @Pc(3) int local3 = 0; while (true) { - @Pc(8) IntNode local8 = (IntNode) aClass69_48.method2287(); + @Pc(8) IntNode local8 = (IntNode) aClass69_48.removeHead(); if (local8 == null) { if (local3 > 0) { local1.glDeleteBuffers(local3, anIntArray151, 0); local3 = 0; } while (true) { - local8 = (IntNode) aClass69_49.method2287(); + local8 = (IntNode) aClass69_49.removeHead(); if (local8 == null) { while (true) { - local8 = (IntNode) aClass69_50.method2287(); + local8 = (IntNode) aClass69_50.removeHead(); if (local8 == null) { if (local3 > 0) { local1.glDeleteTextures(local3, anIntArray151, 0); } while (true) { - local8 = (IntNode) aClass69_51.method2287(); + local8 = (IntNode) aClass69_51.removeHead(); if (local8 == null) { if (anInt1945 + onCard2d + onCardTexture > 100663296 && MonotonicClock.currentTimeMillis() > aLong71 + 60000L) { System.gc(); diff --git a/client/src/main/java/Static64.java b/client/src/main/java/Static64.java index 218ed89..c167cb1 100644 --- a/client/src/main/java/Static64.java +++ b/client/src/main/java/Static64.java @@ -36,7 +36,7 @@ public final class Static64 { @Pc(23) int local23; for (local23 = 0; local23 < Static240.anInt5335; local23++) { @Pc(30) int local30 = Static52.anIntArray136[local23]; - if (Static83.anInt372 != Static159.aClass8_Sub4_Sub1Array1[local30].anInt3430) { + if (Static83.loop != Static159.aClass8_Sub4_Sub1Array1[local30].anInt3430) { if (Static159.aClass8_Sub4_Sub1Array1[local30].anInt1664 > 0) { Static271.method4597(Static159.aClass8_Sub4_Sub1Array1[local30]); } diff --git a/client/src/main/java/Static65.java b/client/src/main/java/Static65.java index daaa70a..ebd3aa1 100644 --- a/client/src/main/java/Static65.java +++ b/client/src/main/java/Static65.java @@ -32,26 +32,26 @@ public final class Static65 { @Pc(3) int local3; @Pc(9) int local9; @Pc(14) int local14; - if (Static197.aClass3_Sub5ArrayArrayArray2 != null) { - for (local3 = 0; local3 < Static197.aClass3_Sub5ArrayArrayArray2.length; local3++) { - for (local9 = 0; local9 < Static152.anInt3594; local9++) { - for (local14 = 0; local14 < Static99.anInt2550; local14++) { - Static197.aClass3_Sub5ArrayArrayArray2[local3][local9][local14] = null; + if (Static197.surfaceGroundTiles != null) { + for (local3 = 0; local3 < Static197.surfaceGroundTiles.length; local3++) { + for (local9 = 0; local9 < Static152.mapSizeX; local9++) { + for (local14 = 0; local14 < Static99.mapSizeZ; local14++) { + Static197.surfaceGroundTiles[local3][local9][local14] = null; } } } } - Static36.aClass3_Sub14ArrayArray1 = null; - if (Static276.aClass3_Sub5ArrayArrayArray3 != null) { - for (local3 = 0; local3 < Static276.aClass3_Sub5ArrayArrayArray3.length; local3++) { - for (local9 = 0; local9 < Static152.anInt3594; local9++) { - for (local14 = 0; local14 < Static99.anInt2550; local14++) { - Static276.aClass3_Sub5ArrayArrayArray3[local3][local9][local14] = null; + Static36.surfaceHdTiles = null; + if (Static276.underWaterGroundTiles != null) { + for (local3 = 0; local3 < Static276.underWaterGroundTiles.length; local3++) { + for (local9 = 0; local9 < Static152.mapSizeX; local9++) { + for (local14 = 0; local14 < Static99.mapSizeZ; local14++) { + Static276.underWaterGroundTiles[local3][local9][local14] = null; } } } } - Static195.aClass3_Sub14ArrayArray3 = null; + Static195.underWaterHdTiles = null; Static28.anInt917 = 0; if (Static91.aClass120Array1 != null) { for (local3 = 0; local3 < Static28.anInt917; local3++) { @@ -72,7 +72,7 @@ public final class Static65 { } @OriginalMember(owner = "client!fc", name = "b", descriptor = "(I)V") - public static void method1501() { + public static void handleKeyboard() { @Pc(12) Keyboard local12 = Static10.aClass149_1; synchronized (Static10.aClass149_1) { Static102.anInt2678 = Static228.anInt5105; diff --git a/client/src/main/java/Static67.java b/client/src/main/java/Static67.java index b7583f7..667bb91 100644 --- a/client/src/main/java/Static67.java +++ b/client/src/main/java/Static67.java @@ -21,5 +21,5 @@ public final class Static67 { public static final int[] anIntArray320 = new int[100]; @OriginalMember(owner = "client!fe", name = "nc", descriptor = "[Lclient!hj;") - public static final GoSubFrame[] aClass61Array3 = new GoSubFrame[50]; + public static final GoSubFrame[] callStack = new GoSubFrame[50]; } diff --git a/client/src/main/java/Static69.java b/client/src/main/java/Static69.java index 8d31fe9..c6976a0 100644 --- a/client/src/main/java/Static69.java +++ b/client/src/main/java/Static69.java @@ -85,12 +85,12 @@ public final class Static69 { for (@Pc(17) int local17 = arg1; local17 <= arg1 + 1; local17++) { if (local17 != Static126.anInt3114) { for (@Pc(28) int local28 = local3; local28 <= local7; local28++) { - if (local28 >= 0 && local28 < Static152.anInt3594) { + if (local28 >= 0 && local28 < Static152.mapSizeX) { for (@Pc(39) int local39 = local11; local39 <= local15; local39++) { - if (local39 >= 0 && local39 < Static99.anInt2550 && (!local1 || local28 >= local7 || local39 >= local15 || local39 < arg3 && local28 != arg2)) { + if (local39 >= 0 && local39 < Static99.mapSizeZ && (!local1 || local28 >= local7 || local39 >= local15 || local39 < arg3 && local28 != arg2)) { @Pc(71) Tile local71 = Static130.aClass3_Sub5ArrayArrayArray1[local17][local28][local39]; if (local71 != null) { - @Pc(158) int local158 = (Static83.anIntArrayArrayArray4[local17][local28][local39] + Static83.anIntArrayArrayArray4[local17][local28 + 1][local39] + Static83.anIntArrayArrayArray4[local17][local28][local39 + 1] + Static83.anIntArrayArrayArray4[local17][local28 + 1][local39 + 1]) / 4 - (Static83.anIntArrayArrayArray4[arg1][arg2][arg3] + Static83.anIntArrayArrayArray4[arg1][arg2 + 1][arg3] + Static83.anIntArrayArrayArray4[arg1][arg2][arg3 + 1] + Static83.anIntArrayArrayArray4[arg1][arg2 + 1][arg3 + 1]) / 4; + @Pc(158) int local158 = (Static83.activeTileHeightMap[local17][local28][local39] + Static83.activeTileHeightMap[local17][local28 + 1][local39] + Static83.activeTileHeightMap[local17][local28][local39 + 1] + Static83.activeTileHeightMap[local17][local28 + 1][local39 + 1]) / 4 - (Static83.activeTileHeightMap[arg1][arg2][arg3] + Static83.activeTileHeightMap[arg1][arg2 + 1][arg3] + Static83.activeTileHeightMap[arg1][arg2][arg3 + 1] + Static83.activeTileHeightMap[arg1][arg2 + 1][arg3 + 1]) / 4; @Pc(161) Wall local161 = local71.aClass77_1; if (local161 != null) { if (local161.aClass8_5.method4543()) { diff --git a/client/src/main/java/Static7.java b/client/src/main/java/Static7.java index e1ddbd9..739dd65 100644 --- a/client/src/main/java/Static7.java +++ b/client/src/main/java/Static7.java @@ -15,7 +15,7 @@ public final class Static7 { public static final SoftLruHashTable aClass99_5 = new SoftLruHashTable(2); @OriginalMember(owner = "client!ah", name = "j", descriptor = "[I") - public static final int[] anIntArray75 = new int[2500]; + public static final int[] varps = new int[2500]; @OriginalMember(owner = "client!ah", name = "n", descriptor = "I") public static int anInt983 = 0; @@ -27,9 +27,9 @@ public final class Static7 { public static int clickX = 0; @OriginalMember(owner = "client!ah", name = "a", descriptor = "(BZ)V") - public static void method842(@OriginalArg(1) boolean arg0) { + public static void ping(@OriginalArg(1) boolean arg0) { Static107.method2261(); - if (Static244.anInt5370 != 30 && Static244.anInt5370 != 25) { + if (Static244.gameState != 30 && Static244.gameState != 25) { return; } Static131.anInt3251++; diff --git a/client/src/main/java/Static71.java b/client/src/main/java/Static71.java index 857f8e0..5b5ed3f 100644 --- a/client/src/main/java/Static71.java +++ b/client/src/main/java/Static71.java @@ -25,7 +25,7 @@ public final class Static71 { if (local6 != null) { return local6; } - @Pc(25) byte[] local25 = Static167.aClass153_61.method4495(Static18.method554(arg0), Static247.method4247(arg0)); + @Pc(25) byte[] local25 = Static167.aClass153_61.getFile(Static18.method554(arg0), Static247.method4247(arg0)); local6 = new ObjType(); local6.anInt2354 = arg0; if (local25 != null) { diff --git a/client/src/main/java/Static72.java b/client/src/main/java/Static72.java index c3fa527..688677e 100644 --- a/client/src/main/java/Static72.java +++ b/client/src/main/java/Static72.java @@ -11,10 +11,10 @@ public final class Static72 { public static PrivilegedRequest aClass212_3; @OriginalMember(owner = "client!fl", name = "D", descriptor = "[[I") - public static int[][] anIntArrayArray14; + public static int[][] regionsXteaKeys; @OriginalMember(owner = "client!fl", name = "s", descriptor = "I") - public static int anInt2031 = 128; + public static int pitchTarget = 128; @OriginalMember(owner = "client!fl", name = "B", descriptor = "I") public static int updatedVarcstrsWriterIndex = 0; diff --git a/client/src/main/java/Static73.java b/client/src/main/java/Static73.java index d4c13a9..56a4ce2 100644 --- a/client/src/main/java/Static73.java +++ b/client/src/main/java/Static73.java @@ -28,19 +28,19 @@ public final class Static73 { @OriginalMember(owner = "client!fm", name = "a", descriptor = "(ZI)V") public static void method1596(@OriginalArg(0) boolean arg0) { if (arg0) { - if (Static154.topLevelInterace != -1) { - Static109.method2275(Static154.topLevelInterace); + if (Static154.topLevelInterface != -1) { + Static109.method2275(Static154.topLevelInterface); } for (@Pc(18) Class3_Sub31 local18 = (Class3_Sub31) Static119.aClass133_9.method3859(); local18 != null; local18 = (Class3_Sub31) Static119.aClass133_9.method3861()) { Static132.method2605(true, local18); } - Static154.topLevelInterace = -1; + Static154.topLevelInterface = -1; Static119.aClass133_9 = new HashTable(8); Static52.method1287(); - Static154.topLevelInterace = Static156.loginScreenId; + Static154.topLevelInterface = Static156.loginScreenId; Static210.method3712(false); Static87.method1807(); - Static74.method1626(Static154.topLevelInterace); + Static74.method1626(Static154.topLevelInterface); } Static35.anInt1092 = -1; Static81.method1750(Static270.anInt5794); @@ -49,22 +49,22 @@ public final class Static73 { Static173.self.anInt3412 = 3000; if (!GlRenderer.enabled) { Static145.method2743(Static209.js5Archive8); - Static196.method3534(10); + Static196.setGameState(10); return; } - if (Static227.anInt5096 == 2) { - Static138.anInt3439 = Static245.anInt5375 << 7; - Static134.anInt3302 = Static248.anInt4232 << 7; + if (Static227.cameraType == 2) { + Static138.renderX = Static245.anInt5375 << 7; + Static134.renderZ = Static248.anInt4232 << 7; } else { - Static40.method1008(); + Static40.updateLoginScreenCamera(); } Static86.method1799(); - Static26.method740(); - Static196.method3534(28); + Static26.setupLoadingScreenRegion(); + Static196.setGameState(28); } @OriginalMember(owner = "client!fm", name = "a", descriptor = "(ZII)V") - public static void method1597(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) { + public static void setLightPosition(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) { Static85.anInt2263 = Static192.aClass92ArrayArray1[arg1][arg0].anInt3530; Static159.anInt3893 = Static192.aClass92ArrayArray1[arg1][arg0].anInt3528; Static148.anInt3534 = Static192.aClass92ArrayArray1[arg1][arg0].anInt3527; @@ -90,7 +90,7 @@ public final class Static73 { } local16 = (arg1 << 7) + 1; local20 = (arg3 << 7) + 2; - @Pc(156) int local156 = Static83.anIntArrayArrayArray4[arg0][arg1][arg3] + arg5; + @Pc(156) int local156 = Static83.activeTileHeightMap[arg0][arg1][arg3] + arg5; if (!Static256.method4394(local16, local156, local20)) { return false; } @@ -109,7 +109,7 @@ public final class Static73 { } else if (Static9.method187(arg0, arg1, arg3)) { local16 = arg1 << 7; local20 = arg3 << 7; - return Static256.method4394(local16 + 1, Static83.anIntArrayArrayArray4[arg0][arg1][arg3] + arg5, local20 + 1) && Static256.method4394(local16 + 128 - 1, Static83.anIntArrayArrayArray4[arg0][arg1 + 1][arg3] + arg5, local20 + 1) && Static256.method4394(local16 + 128 - 1, Static83.anIntArrayArrayArray4[arg0][arg1 + 1][arg3 + 1] + arg5, local20 + 128 - 1) && Static256.method4394(local16 + 1, Static83.anIntArrayArrayArray4[arg0][arg1][arg3 + 1] + arg5, local20 + 128 - 1); + return Static256.method4394(local16 + 1, Static83.activeTileHeightMap[arg0][arg1][arg3] + arg5, local20 + 1) && Static256.method4394(local16 + 128 - 1, Static83.activeTileHeightMap[arg0][arg1 + 1][arg3] + arg5, local20 + 1) && Static256.method4394(local16 + 128 - 1, Static83.activeTileHeightMap[arg0][arg1 + 1][arg3 + 1] + arg5, local20 + 128 - 1) && Static256.method4394(local16 + 1, Static83.activeTileHeightMap[arg0][arg1][arg3 + 1] + arg5, local20 + 128 - 1); } else { return false; } diff --git a/client/src/main/java/Static74.java b/client/src/main/java/Static74.java index c9c346a..12332ae 100644 --- a/client/src/main/java/Static74.java +++ b/client/src/main/java/Static74.java @@ -82,7 +82,7 @@ public final class Static74 { @Pc(41) Component local41 = local31[local33]; if (local41.anObjectArray3 != null) { @Pc(50) HookRequest local50 = new HookRequest(); - local50.anObjectArray31 = local41.anObjectArray3; + local50.arguments = local41.anObjectArray3; local50.source = local41; Static88.method1818(2000000, local50); } diff --git a/client/src/main/java/Static75.java b/client/src/main/java/Static75.java index 6cefcb1..2c1ade3 100644 --- a/client/src/main/java/Static75.java +++ b/client/src/main/java/Static75.java @@ -9,7 +9,7 @@ public final class Static75 { @OriginalMember(owner = "client!g", name = "a", descriptor = "(IZ)V") public static void method1629(@OriginalArg(1) boolean arg0) { - Static230.aBoolean250 = arg0; + Static230.dynamicMapRegion = arg0; @Pc(13) int local13; @Pc(20) int local20; @Pc(26) int local26; @@ -19,30 +19,30 @@ public final class Static75 { @Pc(138) int local138; @Pc(151) int local151; @Pc(169) int local169; - if (!Static230.aBoolean250) { + if (!Static230.dynamicMapRegion) { local13 = Static57.aClass3_Sub15_Sub1_3.g2sub(); local20 = (Static223.anInt5028 - Static57.aClass3_Sub15_Sub1_3.offset) / 16; - Static72.anIntArrayArray14 = new int[local20][4]; + Static72.regionsXteaKeys = new int[local20][4]; for (local26 = 0; local26 < local20; local26++) { for (local31 = 0; local31 < 4; local31++) { - Static72.anIntArrayArray14[local26][local31] = Static57.aClass3_Sub15_Sub1_3.p4rme(); + Static72.regionsXteaKeys[local26][local31] = Static57.aClass3_Sub15_Sub1_3.p4rme(); } } local26 = Static57.aClass3_Sub15_Sub1_3.g1ssub(); local31 = Static57.aClass3_Sub15_Sub1_3.g2(); local60 = Static57.aClass3_Sub15_Sub1_3.g2sub(); local64 = Static57.aClass3_Sub15_Sub1_3.g2sub(); - Static238.anIntArray470 = new int[local20]; - Static273.aByteArrayArray13 = new byte[local20][]; - Static191.aByteArrayArray15 = null; - Static99.anIntArray239 = new int[local20]; - Static156.aByteArrayArray11 = new byte[local20][]; - Static19.aByteArrayArray4 = new byte[local20][]; - Static175.anIntArray371 = null; - Static36.anIntArray84 = new int[local20]; - Static186.aByteArrayArray14 = new byte[local20][]; - Static172.anIntArray366 = new int[local20]; - Static35.anIntArray82 = new int[local20]; + Static238.regionBitPacked = new int[local20]; + Static273.mapFilesBuffer = new byte[local20][]; + Static191.npcSpawnsFilesBuffer = null; + Static99.underWaterMapFileIds = new int[local20]; + Static156.locationMapFilesBuffer = new byte[local20][]; + Static19.underWaterLocationsMapFilesBuffer = new byte[local20][]; + Static175.npcSpawnsFileIds = null; + Static36.mapFileIds = new int[local20]; + Static186.underWaterMapFilesBuffer = new byte[local20][]; + Static172.locationsMapFileIds = new int[local20]; + Static35.underWaterLocationsMapFileIds = new int[local20]; local20 = 0; @Pc(100) boolean local100 = false; if ((local31 / 8 == 48 || local31 / 8 == 49) && local60 / 8 == 48) { @@ -55,17 +55,17 @@ public final class Static75 { for (local151 = (local60 - 6) / 8; local151 <= (local60 + 6) / 8; local151++) { local169 = (local138 << 8) + local151; if (local100 && (local151 == 49 || local151 == 149 || local151 == 147 || local138 == 50 || local138 == 49 && local151 == 47)) { - Static238.anIntArray470[local20] = local169; - Static36.anIntArray84[local20] = -1; - Static172.anIntArray366[local20] = -1; - Static99.anIntArray239[local20] = -1; - Static35.anIntArray82[local20] = -1; + Static238.regionBitPacked[local20] = local169; + Static36.mapFileIds[local20] = -1; + Static172.locationsMapFileIds[local20] = -1; + Static99.underWaterMapFileIds[local20] = -1; + Static35.underWaterLocationsMapFileIds[local20] = -1; } else { - Static238.anIntArray470[local20] = local169; - Static36.anIntArray84[local20] = Static26.js5Archive5.getGroupId(Static34.concatenate(new JagString[] { Static103.aClass100_558, Static123.parseInt(local138), Static86.aClass100_488, Static123.parseInt(local151) })); - Static172.anIntArray366[local20] = Static26.js5Archive5.getGroupId(Static34.concatenate(new JagString[] { Static270.aClass100_1090, Static123.parseInt(local138), Static86.aClass100_488, Static123.parseInt(local151) })); - Static99.anIntArray239[local20] = Static26.js5Archive5.getGroupId(Static34.concatenate(new JagString[] { Static165.aClass100_772, Static123.parseInt(local138), Static86.aClass100_488, Static123.parseInt(local151) })); - Static35.anIntArray82[local20] = Static26.js5Archive5.getGroupId(Static34.concatenate(new JagString[] { Static278.aClass100_1103, Static123.parseInt(local138), Static86.aClass100_488, Static123.parseInt(local151) })); + Static238.regionBitPacked[local20] = local169; + Static36.mapFileIds[local20] = Static26.js5Archive5.getGroupId(Static34.concatenate(new JagString[] { Static103.aClass100_558, Static123.parseInt(local138), Static86.aClass100_488, Static123.parseInt(local151) })); + Static172.locationsMapFileIds[local20] = Static26.js5Archive5.getGroupId(Static34.concatenate(new JagString[] { Static270.aClass100_1090, Static123.parseInt(local138), Static86.aClass100_488, Static123.parseInt(local151) })); + Static99.underWaterMapFileIds[local20] = Static26.js5Archive5.getGroupId(Static34.concatenate(new JagString[] { Static165.aClass100_772, Static123.parseInt(local138), Static86.aClass100_488, Static123.parseInt(local151) })); + Static35.underWaterLocationsMapFileIds[local20] = Static26.js5Archive5.getGroupId(Static34.concatenate(new JagString[] { Static278.aClass100_1103, Static123.parseInt(local138), Static86.aClass100_488, Static123.parseInt(local151) })); } local20++; } @@ -93,24 +93,24 @@ public final class Static75 { } Static57.aClass3_Sub15_Sub1_3.method2244(); local60 = (Static223.anInt5028 - Static57.aClass3_Sub15_Sub1_3.offset) / 16; - Static72.anIntArrayArray14 = new int[local60][4]; + Static72.regionsXteaKeys = new int[local60][4]; for (local64 = 0; local64 < local60; local64++) { for (local391 = 0; local391 < 4; local391++) { - Static72.anIntArrayArray14[local64][local391] = Static57.aClass3_Sub15_Sub1_3.p4rme(); + Static72.regionsXteaKeys[local64][local391] = Static57.aClass3_Sub15_Sub1_3.p4rme(); } } local64 = Static57.aClass3_Sub15_Sub1_3.g2(); - Static35.anIntArray82 = new int[local60]; - Static172.anIntArray366 = new int[local60]; - Static36.anIntArray84 = new int[local60]; - Static19.aByteArrayArray4 = new byte[local60][]; - Static175.anIntArray371 = null; - Static99.anIntArray239 = new int[local60]; - Static156.aByteArrayArray11 = new byte[local60][]; - Static273.aByteArrayArray13 = new byte[local60][]; - Static238.anIntArray470 = new int[local60]; - Static191.aByteArrayArray15 = null; - Static186.aByteArrayArray14 = new byte[local60][]; + Static35.underWaterLocationsMapFileIds = new int[local60]; + Static172.locationsMapFileIds = new int[local60]; + Static36.mapFileIds = new int[local60]; + Static19.underWaterLocationsMapFilesBuffer = new byte[local60][]; + Static175.npcSpawnsFileIds = null; + Static99.underWaterMapFileIds = new int[local60]; + Static156.locationMapFilesBuffer = new byte[local60][]; + Static273.mapFilesBuffer = new byte[local60][]; + Static238.regionBitPacked = new int[local60]; + Static191.npcSpawnsFilesBuffer = null; + Static186.underWaterMapFilesBuffer = new byte[local60][]; local60 = 0; for (local391 = 0; local391 < 4; local391++) { for (local138 = 0; local138 < 13; local138++) { @@ -122,19 +122,19 @@ public final class Static75 { @Pc(571) int local571 = local561 / 8 + (local555 / 8 << 8); @Pc(573) int local573; for (local573 = 0; local573 < local60; local573++) { - if (local571 == Static238.anIntArray470[local573]) { + if (local571 == Static238.regionBitPacked[local573]) { local571 = -1; break; } } if (local571 != -1) { - Static238.anIntArray470[local60] = local571; + Static238.regionBitPacked[local60] = local571; @Pc(609) int local609 = local571 & 0xFF; local573 = local571 >> 8 & 0xFF; - Static36.anIntArray84[local60] = Static26.js5Archive5.getGroupId(Static34.concatenate(new JagString[] { Static103.aClass100_558, Static123.parseInt(local573), Static86.aClass100_488, Static123.parseInt(local609) })); - Static172.anIntArray366[local60] = Static26.js5Archive5.getGroupId(Static34.concatenate(new JagString[] { Static270.aClass100_1090, Static123.parseInt(local573), Static86.aClass100_488, Static123.parseInt(local609) })); - Static99.anIntArray239[local60] = Static26.js5Archive5.getGroupId(Static34.concatenate(new JagString[] { Static165.aClass100_772, Static123.parseInt(local573), Static86.aClass100_488, Static123.parseInt(local609) })); - Static35.anIntArray82[local60] = Static26.js5Archive5.getGroupId(Static34.concatenate(new JagString[] { Static278.aClass100_1103, Static123.parseInt(local573), Static86.aClass100_488, Static123.parseInt(local609) })); + Static36.mapFileIds[local60] = Static26.js5Archive5.getGroupId(Static34.concatenate(new JagString[] { Static103.aClass100_558, Static123.parseInt(local573), Static86.aClass100_488, Static123.parseInt(local609) })); + Static172.locationsMapFileIds[local60] = Static26.js5Archive5.getGroupId(Static34.concatenate(new JagString[] { Static270.aClass100_1090, Static123.parseInt(local573), Static86.aClass100_488, Static123.parseInt(local609) })); + Static99.underWaterMapFileIds[local60] = Static26.js5Archive5.getGroupId(Static34.concatenate(new JagString[] { Static165.aClass100_772, Static123.parseInt(local573), Static86.aClass100_488, Static123.parseInt(local609) })); + Static35.underWaterLocationsMapFileIds[local60] = Static26.js5Archive5.getGroupId(Static34.concatenate(new JagString[] { Static278.aClass100_1103, Static123.parseInt(local573), Static86.aClass100_488, Static123.parseInt(local609) })); local60++; } } @@ -155,7 +155,7 @@ public final class Static75 { } @OriginalMember(owner = "client!g", name = "b", descriptor = "(I)V") - public static void method1632() { + public static void setDefaultChunksAtmosphere() { @Pc(9) Environment local9 = new Environment(); for (@Pc(18) int local18 = 0; local18 < 13; local18++) { for (@Pc(25) int local25 = 0; local25 < 13; local25++) { @@ -210,7 +210,7 @@ public final class Static75 { Static159.aClass69ArrayArrayArray1[Static55.level][local19][local27] = new LinkedList(); } Static159.aClass69ArrayArrayArray1[Static55.level][local19][local27].method2282(new ObjStackNode(local122)); - Static220.method3797(local27, local19); + Static220.spawnGroundObject(local27, local19); } } else { @Pc(218) int local218; @@ -242,8 +242,8 @@ public final class Static75 { local27 = local27 * 64; local19 = local19 * 64; local23 = local23 * 64; - local317 = new ProjAnim(local45, Static55.level, local23, local19, Static207.method3685(Static55.level, local23, local19) - local218, Static83.anInt372 + local228, local232 + Static83.anInt372, local236, local247, local39, local224); - local317.method3705(local31, Static83.anInt372 + local228, -local224 + Static207.method3685(Static55.level, local27, local31), local27); + local317 = new ProjAnim(local45, Static55.level, local23, local19, Static207.method3685(Static55.level, local23, local19) - local218, Static83.loop + local228, local232 + Static83.loop, local236, local247, local39, local224); + local317.method3705(local31, Static83.loop + local228, -local224 + Static207.method3685(Static55.level, local27, local31), local27); Static217.aClass69_116.method2282(new ProjAnimNode(local317)); } } else if (Static164.anInt3985 == 17) { @@ -256,7 +256,7 @@ public final class Static75 { if (local23 >= 0 && local19 >= 0 && local23 < 104 && local19 < 104) { local23 = local23 * 128 + 64; local19 = local19 * 128 + 64; - @Pc(427) SpotAnim local427 = new SpotAnim(local27, Static55.level, local23, local19, Static207.method3685(Static55.level, local23, local19) - local31, local39, Static83.anInt372); + @Pc(427) SpotAnim local427 = new SpotAnim(local27, Static55.level, local23, local19, Static207.method3685(Static55.level, local23, local19) - local31, local39, Static83.loop); Static99.aClass69_64.method2282(new SpotAnimNode(local427)); } } else if (Static164.anInt3985 == 179) { @@ -322,7 +322,7 @@ public final class Static75 { break; } } - Static220.method3797(local19, local23); + Static220.spawnGroundObject(local19, local23); } } } else if (Static164.anInt3985 == 135) { @@ -340,7 +340,7 @@ public final class Static75 { Static159.aClass69ArrayArrayArray1[Static55.level][local19][local27] = new LinkedList(); } Static159.aClass69ArrayArrayArray1[Static55.level][local19][local27].method2282(new ObjStackNode(local812)); - Static220.method3797(local27, local19); + Static220.spawnGroundObject(local27, local19); } } else if (Static164.anInt3985 == 16) { local15 = Static57.aClass3_Sub15_Sub1_3.g1(); @@ -364,8 +364,8 @@ public final class Static75 { local19 = local19 * 128 + 64; local23 = local23 * 128 + 64; local27 = local27 * 128 + 64; - local317 = new ProjAnim(local45, Static55.level, local23, local19, Static207.method3685(Static55.level, local23, local19) - local218, local228 + Static83.anInt372, local232 + Static83.anInt372, local236, local247, local39, local224); - local317.method3705(local31, Static83.anInt372 + local228, Static207.method3685(Static55.level, local27, local31) - local224, local27); + local317 = new ProjAnim(local45, Static55.level, local23, local19, Static207.method3685(Static55.level, local23, local19) - local218, local228 + Static83.loop, local232 + Static83.loop, local236, local247, local39, local224); + local317.method3705(local31, Static83.loop + local228, Static207.method3685(Static55.level, local27, local31) - local224, local27); Static217.aClass69_116.method2282(new ProjAnimNode(local317)); } } else if (Static164.anInt3985 == 104) { @@ -426,8 +426,8 @@ public final class Static75 { } } } - @Pc(1331) ProjAnim local1331 = new ProjAnim(local218, Static55.level, local23, local19, Static207.method3685(Static55.level, local23, local19) - local224, local232 + Static83.anInt372, local236 + Static83.anInt372, local247, local633, local45, local228); - local1331.method3705(local31, local232 + Static83.anInt372, -local228 + Static207.method3685(Static55.level, local27, local31), local27); + @Pc(1331) ProjAnim local1331 = new ProjAnim(local218, Static55.level, local23, local19, Static207.method3685(Static55.level, local23, local19) - local224, local232 + Static83.loop, local236 + Static83.loop, local247, local633, local45, local228); + local1331.method3705(local31, local232 + Static83.loop, -local228 + Static207.method3685(Static55.level, local27, local31), local27); Static217.aClass69_116.method2282(new ProjAnimNode(local1331)); } } else if (Static164.anInt3985 == 97) { @@ -470,7 +470,7 @@ public final class Static75 { if (local1565.method2289() == null) { Static159.aClass69ArrayArrayArray1[Static55.level][local23][local19] = null; } - Static220.method3797(local19, local23); + Static220.spawnGroundObject(local19, local23); } } } diff --git a/client/src/main/java/Static77.java b/client/src/main/java/Static77.java index 6300070..e15e186 100644 --- a/client/src/main/java/Static77.java +++ b/client/src/main/java/Static77.java @@ -35,7 +35,7 @@ public final class Static77 { @OriginalMember(owner = "client!gb", name = "a", descriptor = "(Lclient!ve;II)Lclient!gb;") public static RawModel method1686(@OriginalArg(0) Js5 arg0, @OriginalArg(1) int arg1) { - @Pc(5) byte[] local5 = arg0.method4495(arg1, 0); + @Pc(5) byte[] local5 = arg0.getFile(arg1, 0); return local5 == null ? null : new RawModel(local5); } } diff --git a/client/src/main/java/Static78.java b/client/src/main/java/Static78.java index ca9e87b..4a4c97c 100644 --- a/client/src/main/java/Static78.java +++ b/client/src/main/java/Static78.java @@ -42,7 +42,7 @@ public final class Static78 { } else { Static6.outboundBuffer.p8(name); } - Static179.anInt4261 = 1; + Static179.accountCreationStep = 1; Static226.anInt5079 = 0; Static57.anInt1758 = 0; Static223.anInt5034 = -3; @@ -64,128 +64,135 @@ public final class Static78 { } @OriginalMember(owner = "client!gd", name = "c", descriptor = "(I)V") - public static void method1696() { - Static7.method842(false); - Static175.anInt4220 = 0; - @Pc(12) boolean local12 = true; - @Pc(14) int local14; - for (local14 = 0; local14 < Static273.aByteArrayArray13.length; local14++) { - if (Static36.anIntArray84[local14] != -1 && Static273.aByteArrayArray13[local14] == null) { - Static273.aByteArrayArray13[local14] = Static26.js5Archive5.method4495(Static36.anIntArray84[local14], 0); - if (Static273.aByteArrayArray13[local14] == null) { - Static175.anInt4220++; - local12 = false; + public static void rebuildMap() { + Static7.ping(false); + Static175.mapFilesMissingCount = 0; + @Pc(12) boolean fileExists = true; + @Pc(14) int id; + for (id = 0; id < Static273.mapFilesBuffer.length; id++) { + if (Static36.mapFileIds[id] != -1 && Static273.mapFilesBuffer[id] == null) { + Static273.mapFilesBuffer[id] = Static26.js5Archive5.getFile(Static36.mapFileIds[id], 0); + if (Static273.mapFilesBuffer[id] == null) { + Static175.mapFilesMissingCount++; + fileExists = false; } } - if (Static172.anIntArray366[local14] != -1 && Static156.aByteArrayArray11[local14] == null) { - Static156.aByteArrayArray11[local14] = Static26.js5Archive5.method4488(Static172.anIntArray366[local14], Static72.anIntArrayArray14[local14], 0); - if (Static156.aByteArrayArray11[local14] == null) { - local12 = false; - Static175.anInt4220++; + if (Static172.locationsMapFileIds[id] != -1 && Static156.locationMapFilesBuffer[id] == null) { + Static156.locationMapFilesBuffer[id] = Static26.js5Archive5.getFileXTEA(Static172.locationsMapFileIds[id], Static72.regionsXteaKeys[id], 0); + if (Static156.locationMapFilesBuffer[id] == null) { + fileExists = false; + Static175.mapFilesMissingCount++; } } + if (GlRenderer.enabled) { - if (Static99.anIntArray239[local14] != -1 && Static186.aByteArrayArray14[local14] == null) { - Static186.aByteArrayArray14[local14] = Static26.js5Archive5.method4495(Static99.anIntArray239[local14], 0); - if (Static186.aByteArrayArray14[local14] == null) { - local12 = false; - Static175.anInt4220++; + if (Static99.underWaterMapFileIds[id] != -1 && Static186.underWaterMapFilesBuffer[id] == null) { + Static186.underWaterMapFilesBuffer[id] = Static26.js5Archive5.getFile(Static99.underWaterMapFileIds[id], 0); + if (Static186.underWaterMapFilesBuffer[id] == null) { + fileExists = false; + Static175.mapFilesMissingCount++; } } - if (Static35.anIntArray82[local14] != -1 && Static19.aByteArrayArray4[local14] == null) { - Static19.aByteArrayArray4[local14] = Static26.js5Archive5.method4495(Static35.anIntArray82[local14], 0); - if (Static19.aByteArrayArray4[local14] == null) { - Static175.anInt4220++; - local12 = false; + if (Static35.underWaterLocationsMapFileIds[id] != -1 && Static19.underWaterLocationsMapFilesBuffer[id] == null) { + Static19.underWaterLocationsMapFilesBuffer[id] = Static26.js5Archive5.getFile(Static35.underWaterLocationsMapFileIds[id], 0); + if (Static19.underWaterLocationsMapFilesBuffer[id] == null) { + Static175.mapFilesMissingCount++; + fileExists = false; } } } - if (Static175.anIntArray371 != null && Static191.aByteArrayArray15[local14] == null && Static175.anIntArray371[local14] != -1) { - Static191.aByteArrayArray15[local14] = Static26.js5Archive5.method4488(Static175.anIntArray371[local14], Static72.anIntArrayArray14[local14], 0); - if (Static191.aByteArrayArray15[local14] == null) { - Static175.anInt4220++; - local12 = false; + + if (Static175.npcSpawnsFileIds != null && Static191.npcSpawnsFilesBuffer[id] == null && Static175.npcSpawnsFileIds[id] != -1) { + Static191.npcSpawnsFilesBuffer[id] = Static26.js5Archive5.getFileXTEA(Static175.npcSpawnsFileIds[id], Static72.regionsXteaKeys[id], 0); + if (Static191.npcSpawnsFilesBuffer[id] == null) { + Static175.mapFilesMissingCount++; + fileExists = false; } } } - if (Static235.aClass134_2 == null) { + + if (Static235.mapFunctionGroup == null) { if (Static158.aClass3_Sub2_Sub4_3 == null || !Static227.js5Archive23.method4497(Static34.concatenate(new JagString[] { Static158.aClass3_Sub2_Sub4_3.aClass100_138, Static50.aClass100_363 }))) { - Static235.aClass134_2 = new Class134(0); - } else if (Static227.js5Archive23.method4489(Static34.concatenate(new JagString[] { Static158.aClass3_Sub2_Sub4_3.aClass100_138, Static50.aClass100_363 }))) { - Static235.aClass134_2 = Static140.method2711(Static34.concatenate(new JagString[] { Static158.aClass3_Sub2_Sub4_3.aClass100_138, Static50.aClass100_363 }), Static227.js5Archive23); + Static235.mapFunctionGroup = new Class134(0); + } else if (Static227.js5Archive23.allFilesComplete(Static34.concatenate(new JagString[] { Static158.aClass3_Sub2_Sub4_3.aClass100_138, Static50.aClass100_363 }))) { + Static235.mapFunctionGroup = Static140.createMapFunctionGroup(Static34.concatenate(new JagString[] { Static158.aClass3_Sub2_Sub4_3.aClass100_138, Static50.aClass100_363 }), Static227.js5Archive23); } else { - local12 = false; - Static175.anInt4220++; + fileExists = false; + Static175.mapFilesMissingCount++; } } - if (!local12) { - Static233.anInt5223 = 1; + + if (!fileExists) { + Static233.loadingScreenState = 1; return; } + Static271.anInt5804 = 0; - local12 = true; - @Pc(320) int local320; - @Pc(309) int local309; - for (local14 = 0; local14 < Static273.aByteArrayArray13.length; local14++) { - @Pc(294) byte[] local294 = Static156.aByteArrayArray11[local14]; + fileExists = true; + @Pc(320) int chunkX; + @Pc(309) int chunkZ; + for (id = 0; id < Static273.mapFilesBuffer.length; id++) { + @Pc(294) byte[] local294 = Static156.locationMapFilesBuffer[id]; if (local294 != null) { - local309 = (Static238.anIntArray470[local14] & 0xFF) * 64 - Static142.originZ; - local320 = (Static238.anIntArray470[local14] >> 8) * 64 - Static225.originX; - if (Static230.aBoolean250) { - local309 = 10; - local320 = 10; + chunkZ = (Static238.regionBitPacked[id] & 0xFF) * 64 - Static142.originZ; + chunkX = (Static238.regionBitPacked[id] >> 8) * 64 - Static225.originX; + if (Static230.dynamicMapRegion) { + chunkZ = 10; + chunkX = 10; } - local12 &= Static49.method1201(local320, local309, local294); + fileExists &= Static49.method1201(chunkX, chunkZ, local294); } if (GlRenderer.enabled) { - local294 = Static19.aByteArrayArray4[local14]; + local294 = Static19.underWaterLocationsMapFilesBuffer[id]; if (local294 != null) { - local320 = (Static238.anIntArray470[local14] >> 8) * 64 - Static225.originX; - local309 = (Static238.anIntArray470[local14] & 0xFF) * 64 - Static142.originZ; - if (Static230.aBoolean250) { - local309 = 10; - local320 = 10; + chunkX = (Static238.regionBitPacked[id] >> 8) * 64 - Static225.originX; + chunkZ = (Static238.regionBitPacked[id] & 0xFF) * 64 - Static142.originZ; + if (Static230.dynamicMapRegion) { + chunkZ = 10; + chunkX = 10; } - local12 &= Static49.method1201(local320, local309, local294); + fileExists &= Static49.method1201(chunkX, chunkZ, local294); } } } - if (!local12) { - Static233.anInt5223 = 2; + if (!fileExists) { + Static233.loadingScreenState = 2; return; } - if (Static233.anInt5223 != 0) { - Static114.method4636(true, Static34.concatenate(new JagString[] { LocalizedText.LOADING, Static18.aClass100_108 })); + + if (Static233.loadingScreenState != 0) { + Static114.drawTextOnScreen(true, Static34.concatenate(new JagString[] { LocalizedText.LOADING, Static18.COMPLETE_PERCENT})); } + Static107.method2261(); Static217.method3768(); - @Pc(420) boolean local420 = false; - @Pc(427) int local427; - if (GlRenderer.enabled && Static220.aBoolean244) { - for (local427 = 0; local427 < Static273.aByteArrayArray13.length; local427++) { - if (Static19.aByteArrayArray4[local427] != null || Static186.aByteArrayArray14[local427] != null) { - local420 = true; + @Pc(420) boolean hasUnderWaterMap = false; + @Pc(427) int i; + if (GlRenderer.enabled && Static220.highWaterDetail) { + for (i = 0; i < Static273.mapFilesBuffer.length; i++) { + if (Static19.underWaterLocationsMapFilesBuffer[i] != null || Static186.underWaterMapFilesBuffer[i] != null) { + hasUnderWaterMap = true; break; } } } - Static28.method792(GlRenderer.enabled ? 28 : 25, local420); - for (local427 = 0; local427 < 4; local427++) { - Static148.collisionMaps[local427].method3050(); + Static28.method792(GlRenderer.enabled ? 28 : 25, hasUnderWaterMap); + for (i = 0; i < 4; i++) { + Static148.collisionMaps[i].resetFlags(); } - for (local427 = 0; local427 < 4; local427++) { - for (local320 = 0; local320 < 104; local320++) { - for (local309 = 0; local309 < 104; local309++) { - Static12.aByteArrayArrayArray2[local427][local320][local309] = 0; + for (i = 0; i < 4; i++) { + for (chunkX = 0; chunkX < 104; chunkX++) { + for (chunkZ = 0; chunkZ < 104; chunkZ++) { + Static12.tileSettings[i][chunkX][chunkZ] = 0; } } } - Static260.method3852(false); + Static260.clearAmbientSounds(false); if (GlRenderer.enabled) { - Static242.aClass36_Sub1_4.method1392(); - for (local427 = 0; local427 < 13; local427++) { - for (local320 = 0; local320 < 13; local320++) { - Static242.aClass165ArrayArray1[local427][local320].aBoolean313 = true; + Static242.shadowMapImage.method1392(); + for (i = 0; i < 13; i++) { + for (chunkX = 0; chunkX < 13; chunkX++) { + Static242.shadows[i][chunkX].outputToSprite = true; } } } @@ -193,84 +200,84 @@ public final class Static78 { Static120.method2404(); } if (GlRenderer.enabled) { - Static75.method1632(); + Static75.setDefaultChunksAtmosphere(); } Static107.method2261(); System.gc(); - Static7.method842(true); + Static7.ping(true); Static196.method3535(false); - if (!Static230.aBoolean250) { + if (!Static230.dynamicMapRegion) { Static87.method1805(false); - Static7.method842(true); + Static7.ping(true); if (GlRenderer.enabled) { - local427 = Static173.self.movementQueueX[0] >> 3; - local320 = Static173.self.movementQueueZ[0] >> 3; - Static73.method1597(local320, local427); + i = Static173.self.movementQueueX[0] >> 3; + chunkX = Static173.self.movementQueueZ[0] >> 3; + Static73.setLightPosition(chunkX, i); } Static26.method743(false); - if (Static191.aByteArrayArray15 != null) { - Static158.method3013(); + if (Static191.npcSpawnsFilesBuffer != null) { + Static158.decodeNpcFiles(); } } - if (Static230.aBoolean250) { + if (Static230.dynamicMapRegion) { Static89.method1835(false); - Static7.method842(true); + Static7.ping(true); if (GlRenderer.enabled) { - local427 = Static173.self.movementQueueX[0] >> 3; - local320 = Static173.self.movementQueueZ[0] >> 3; - Static73.method1597(local320, local427); + i = Static173.self.movementQueueX[0] >> 3; + chunkX = Static173.self.movementQueueZ[0] >> 3; + Static73.setLightPosition(chunkX, i); } Static233.method4002(false); } Static217.method3768(); - Static7.method842(true); + Static7.ping(true); Static45.method1169(Static148.collisionMaps, false); if (GlRenderer.enabled) { Static120.method2395(); } - Static7.method842(true); - local427 = Static146.anInt3508; - if (local427 > Static55.level) { - local427 = Static55.level; + Static7.ping(true); + i = Static146.anInt3508; + if (i > Static55.level) { + i = Static55.level; } - if (local427 < Static55.level - 1) { + if (i < Static55.level - 1) { } - if (Static138.method2697()) { + if (Static138.allLevelsAreVisible()) { Static146.method2750(0); } else { Static146.method2750(Static146.anInt3508); } Static105.method2255(); - if (GlRenderer.enabled && local420) { - Static278.method4648(true); + if (GlRenderer.enabled && hasUnderWaterMap) { + Static278.setRenderTiles(true); Static196.method3535(true); - if (!Static230.aBoolean250) { + if (!Static230.dynamicMapRegion) { Static87.method1805(true); - Static7.method842(true); + Static7.ping(true); Static26.method743(true); } - if (Static230.aBoolean250) { + if (Static230.dynamicMapRegion) { Static89.method1835(true); - Static7.method842(true); + Static7.ping(true); Static233.method4002(true); } Static217.method3768(); - Static7.method842(true); + Static7.ping(true); Static45.method1169(Static148.collisionMaps, true); - Static7.method842(true); + Static7.ping(true); Static105.method2255(); - Static278.method4648(false); + Static278.setRenderTiles(false); } if (GlRenderer.enabled) { - for (local320 = 0; local320 < 13; local320++) { - for (local309 = 0; local309 < 13; local309++) { - Static242.aClass165ArrayArray1[local320][local309].method4676(Static83.anIntArrayArrayArray4[0], local320 * 8, local309 * 8); + for (chunkX = 0; chunkX < 13; chunkX++) { + for (chunkZ = 0; chunkZ < 13; chunkZ++) { + Static242.shadows[chunkX][chunkZ].method4676(Static83.activeTileHeightMap[0], chunkX * 8, chunkZ * 8); } } } - for (local320 = 0; local320 < 104; local320++) { - for (local309 = 0; local309 < 104; local309++) { - Static220.method3797(local309, local320); + for (chunkX = 0; chunkX < 104; chunkX++) { + for (chunkZ = 0; chunkZ < 104; chunkZ++) { + Static220.spawnGroundObject(chunkZ, chunkX); } } Static269.method2218(); @@ -278,28 +285,28 @@ public final class Static78 { Static219.method3796(); Static217.method3768(); Static231.aBoolean252 = false; - if (GameShell.frame != null && Static124.socket != null && Static244.anInt5370 == 25) { + if (GameShell.frame != null && Static124.socket != null && Static244.gameState == 25) { Static6.outboundBuffer.p1isaac(20); Static6.outboundBuffer.p4(1057001181); } - if (!Static230.aBoolean250) { + if (!Static230.dynamicMapRegion) { @Pc(815) int local815 = (Static52.anInt1695 + 6) / 8; @Pc(821) int local821 = (Static52.anInt1695 - 6) / 8; - local320 = (Static80.anInt4701 - 6) / 8; - local309 = (Static80.anInt4701 + 6) / 8; - for (@Pc(837) int local837 = local320 - 1; local837 <= local309 + 1; local837++) { + chunkX = (Static80.anInt4701 - 6) / 8; + chunkZ = (Static80.anInt4701 + 6) / 8; + for (@Pc(837) int local837 = chunkX - 1; local837 <= chunkZ + 1; local837++) { for (@Pc(850) int local850 = local821 - 1; local850 <= local815 + 1; local850++) { - if (local837 < local320 || local837 > local309 || local850 < local821 || local850 > local815) { + if (local837 < chunkX || local837 > chunkZ || local850 < local821 || local850 > local815) { Static26.js5Archive5.method4486(Static34.concatenate(new JagString[] { Static103.aClass100_558, Static123.parseInt(local837), Static86.aClass100_488, Static123.parseInt(local850) })); Static26.js5Archive5.method4486(Static34.concatenate(new JagString[] { Static270.aClass100_1090, Static123.parseInt(local837), Static86.aClass100_488, Static123.parseInt(local850) })); } } } } - if (Static244.anInt5370 == 28) { - Static196.method3534(10); + if (Static244.gameState == 28) { + Static196.setGameState(10); } else { - Static196.method3534(30); + Static196.setGameState(30); if (Static124.socket != null) { Static6.outboundBuffer.p1isaac(110); } diff --git a/client/src/main/java/Static79.java b/client/src/main/java/Static79.java index 8c4f738..41e6768 100644 --- a/client/src/main/java/Static79.java +++ b/client/src/main/java/Static79.java @@ -45,9 +45,9 @@ public final class Static79 { return; } @Pc(39) int local39; - if (!Static138.method2697() && (Static12.aByteArrayArrayArray2[0][arg1][arg4] & 0x2) == 0) { + if (!Static138.allLevelsAreVisible() && (Static12.tileSettings[0][arg1][arg4] & 0x2) == 0) { local39 = arg2; - if ((Static12.aByteArrayArrayArray2[arg2][arg1][arg4] & 0x8) != 0) { + if ((Static12.tileSettings[arg2][arg1][arg4] & 0x8) != 0) { local39 = 0; } if (local39 != Static41.anInt1316) { @@ -55,7 +55,7 @@ public final class Static79 { } } local39 = arg2; - if (arg2 < 3 && (Static12.aByteArrayArrayArray2[1][arg1][arg4] & 0x2) == 2) { + if (arg2 < 3 && (Static12.tileSettings[1][arg1][arg4] & 0x2) == 2) { local39 = arg2 + 1; } Static43.method1144(arg4, arg1, arg2, arg6, local39, Static148.collisionMaps[arg2]); diff --git a/client/src/main/java/Static8.java b/client/src/main/java/Static8.java index 5db105d..1dcfab8 100644 --- a/client/src/main/java/Static8.java +++ b/client/src/main/java/Static8.java @@ -120,7 +120,7 @@ public final class Static8 { @Pc(19) Class35 local19 = Static247.method4248(local3); if (local19 != null && local19.anInt1765 == 0) { Static106.anIntArray257[local3] = 0; - Static7.anIntArray75[local3] = 0; + Static7.varps[local3] = 0; } } Static199.aClass133_20 = new HashTable(16); diff --git a/client/src/main/java/Static80.java b/client/src/main/java/Static80.java index 2291b49..db9acf7 100644 --- a/client/src/main/java/Static80.java +++ b/client/src/main/java/Static80.java @@ -12,7 +12,7 @@ public final class Static80 { public static int anInt4698; @OriginalMember(owner = "client!gf", name = "O", descriptor = "[[[I") - public static int[][][] anIntArrayArrayArray19; + public static int[][][] underWaterTileHeightMap; @OriginalMember(owner = "client!gf", name = "R", descriptor = "I") public static int anInt4701; @@ -40,7 +40,7 @@ public final class Static80 { Static53.method1293(true); aBoolean231 = true; Static99.stereo = true; - Static220.aBoolean244 = true; + Static220.highWaterDetail = true; Static102.windowMode = 0; Static22.anInt729 = 0; Static250.aBoolean283 = true; diff --git a/client/src/main/java/Static81.java b/client/src/main/java/Static81.java index 427ec55..a88c2dc 100644 --- a/client/src/main/java/Static81.java +++ b/client/src/main/java/Static81.java @@ -62,7 +62,7 @@ public final class Static81 { if (local10 != null) { return local10; } - @Pc(21) byte[] local21 = Static216.aClass153_31.method4495(3, arg0); + @Pc(21) byte[] local21 = Static216.aClass153_31.getFile(3, arg0); local10 = new IdkType(); if (local21 != null) { local10.method1209(new Buffer(local21)); @@ -109,7 +109,7 @@ public final class Static81 { } for (@Pc(34) int i = 0; i < 100 && Static10.readPacket(); i++) { } - if (Static244.anInt5370 != 30) { + if (Static244.gameState != 30) { return; } Static233.loop(Static6.outboundBuffer); // ReflectionCheck @@ -243,8 +243,8 @@ public final class Static81 { Static16.anInt551 = 20; Static197.aBoolean228 = false; Static6.outboundBuffer.p1isaac(21); - Static6.outboundBuffer.p2add(Static72.anInt2031); - Static6.outboundBuffer.p2le(Static57.anInt1747); + Static6.outboundBuffer.p2add(Static72.pitchTarget); + Static6.outboundBuffer.p2le(Static57.yawTarget); } if (GameShell.focus && !Static67.prevFocus) { Static67.prevFocus = true; @@ -262,7 +262,7 @@ public final class Static81 { Static18.sentToServer = true; } Static31.method846(); - if (Static244.anInt5370 != 30) { + if (Static244.gameState != 30) { return; } Static251.loop(); // ChangeLocRequest @@ -488,26 +488,25 @@ public final class Static81 { } // WorldMap.component Static24.component = null; - if (Static154.topLevelInterace != -1) { - Static57.method1320(0, 0, 0, GameShell.canvasWidth, Static154.topLevelInterace, 0, GameShell.canvasHeight); + if (Static154.topLevelInterface != -1) { + Static57.method1320(0, 0, 0, GameShell.canvasWidth, Static154.topLevelInterface, 0, GameShell.canvasHeight); } Static119.transmitTimer++; while (true) { - // todo: this is actually split up into low/medium/high - @Pc(1569) Component highPriorityComponent; - @Pc(1560) Component highPrioritySource; - @Pc(1555) HookRequest highPriorityRequest; + @Pc(1569) Component priorityComponent; + @Pc(1560) Component prioritySource; + @Pc(1555) HookRequest priorityRequest; do { - highPriorityRequest = (HookRequest) Static4.aClass69_2.method2287(); - if (highPriorityRequest == null) { + priorityRequest = (HookRequest) Static4.highPriorityRequests.removeHead(); + if (priorityRequest == null) { while (true) { do { - highPriorityRequest = (HookRequest) Static115.aClass69_70.method2287(); - if (highPriorityRequest == null) { + priorityRequest = (HookRequest) Static115.mediumPriorityRequests.removeHead(); + if (priorityRequest == null) { while (true) { do { - highPriorityRequest = (HookRequest) Static185.aClass69_101.method2287(); - if (highPriorityRequest == null) { + priorityRequest = (HookRequest) Static185.lowPriorityRequests.removeHead(); + if (priorityRequest == null) { if (Static24.component == null) { Static137.anInt3337 = 0; } @@ -591,12 +590,12 @@ public final class Static81 { Static43.method1143(Static43.aClass13_11); } } - if (Static227.anInt5096 == 1) { + if (Static227.cameraType == 1) { Static250.method4273(); - } else if (Static227.anInt5096 == 2) { - Static125.method2450(); + } else if (Static227.cameraType == 2) { + Static125.updateLockedCamera(); } else { - Static40.method1008(); + Static40.updateLoginScreenCamera(); } for (y = 0; y < 5; y++) { @Pc(2001) int local2001 = Static31.anIntArray76[y]++; @@ -690,32 +689,31 @@ public final class Static81 { } return; } - // low priority actually - highPrioritySource = highPriorityRequest.source; - if (highPrioritySource.componentId < 0) { + prioritySource = priorityRequest.source; + if (prioritySource.componentId < 0) { break; } - highPriorityComponent = Static5.getComponent(highPrioritySource.layer); - } while (highPriorityComponent == null || highPriorityComponent.createdComponents == null || highPrioritySource.componentId >= highPriorityComponent.createdComponents.length || highPrioritySource != highPriorityComponent.createdComponents[highPrioritySource.componentId]); - Static82.method1767(highPriorityRequest); + priorityComponent = Static5.getComponent(prioritySource.layer); + } while (priorityComponent == null || priorityComponent.createdComponents == null || prioritySource.componentId >= priorityComponent.createdComponents.length || prioritySource != priorityComponent.createdComponents[prioritySource.componentId]); + Static82.method1767(priorityRequest); } } - highPrioritySource = highPriorityRequest.source; - if (highPrioritySource.componentId < 0) { + prioritySource = priorityRequest.source; + if (prioritySource.componentId < 0) { break; } - highPriorityComponent = Static5.getComponent(highPrioritySource.layer); - } while (highPriorityComponent == null || highPriorityComponent.createdComponents == null || highPriorityComponent.createdComponents.length <= highPrioritySource.componentId || highPriorityComponent.createdComponents[highPrioritySource.componentId] != highPrioritySource); - Static82.method1767(highPriorityRequest); + priorityComponent = Static5.getComponent(prioritySource.layer); + } while (priorityComponent == null || priorityComponent.createdComponents == null || priorityComponent.createdComponents.length <= prioritySource.componentId || priorityComponent.createdComponents[prioritySource.componentId] != prioritySource); + Static82.method1767(priorityRequest); } } - highPrioritySource = highPriorityRequest.source; - if (highPrioritySource.componentId < 0) { + prioritySource = priorityRequest.source; + if (prioritySource.componentId < 0) { break; } - highPriorityComponent = Static5.getComponent(highPrioritySource.layer); - } while (highPriorityComponent == null || highPriorityComponent.createdComponents == null || highPrioritySource.componentId >= highPriorityComponent.createdComponents.length || highPriorityComponent.createdComponents[highPrioritySource.componentId] != highPrioritySource); - Static82.method1767(highPriorityRequest); + priorityComponent = Static5.getComponent(prioritySource.layer); + } while (priorityComponent == null || priorityComponent.createdComponents == null || prioritySource.componentId >= priorityComponent.createdComponents.length || priorityComponent.createdComponents[prioritySource.componentId] != prioritySource); + Static82.method1767(priorityRequest); } } } diff --git a/client/src/main/java/Static83.java b/client/src/main/java/Static83.java index a7defd1..37f057f 100644 --- a/client/src/main/java/Static83.java +++ b/client/src/main/java/Static83.java @@ -8,7 +8,7 @@ public final class Static83 { public static int[][][] anIntArrayArrayArray3; @OriginalMember(owner = "client!gj", name = "m", descriptor = "[[[I") - public static int[][][] anIntArrayArrayArray4; + public static int[][][] activeTileHeightMap; @OriginalMember(owner = "client!gj", name = "r", descriptor = "F") public static float aFloat3; @@ -17,7 +17,7 @@ public final class Static83 { public static int modeWhere = 0; @OriginalMember(owner = "client!gj", name = "d", descriptor = "I") - public static int anInt372 = 0; + public static int loop = 0; @OriginalMember(owner = "client!gj", name = "p", descriptor = "Lclient!n;") public static final SoftLruHashTable aClass99_3 = new SoftLruHashTable(64); diff --git a/client/src/main/java/Static84.java b/client/src/main/java/Static84.java index a7aaf31..d86b840 100644 --- a/client/src/main/java/Static84.java +++ b/client/src/main/java/Static84.java @@ -86,8 +86,8 @@ public final class Static84 { if ((arg0 & 0x1) != 0) { local13 = Static57.aClass3_Sub15_Sub1_3.gSmart1or2(); local17 = Static57.aClass3_Sub15_Sub1_3.g1add(); - arg2.method2686(local17, Static83.anInt372, local13); - arg2.anInt3378 = Static83.anInt372 + 300; + arg2.method2686(local17, Static83.loop, local13); + arg2.anInt3378 = Static83.loop + 300; arg2.anInt3372 = Static57.aClass3_Sub15_Sub1_3.g1ssub(); } if ((arg0 & 0x8) != 0) { @@ -117,8 +117,8 @@ public final class Static84 { arg2.anInt3428 = Static57.aClass3_Sub15_Sub1_3.g1(); arg2.anInt3416 = Static57.aClass3_Sub15_Sub1_3.g1add(); arg2.anInt3392 = Static57.aClass3_Sub15_Sub1_3.g1(); - arg2.anInt3395 = Static57.aClass3_Sub15_Sub1_3.g2le() + Static83.anInt372; - arg2.anInt3386 = Static57.aClass3_Sub15_Sub1_3.g2le() + Static83.anInt372; + arg2.anInt3395 = Static57.aClass3_Sub15_Sub1_3.g2le() + Static83.loop; + arg2.anInt3386 = Static57.aClass3_Sub15_Sub1_3.g2le() + Static83.loop; arg2.anInt3431 = Static57.aClass3_Sub15_Sub1_3.p1neg(); arg2.anInt3409 = 1; arg2.anInt3405 = 0; @@ -138,7 +138,7 @@ public final class Static84 { if ((arg0 & 0x200) != 0) { local13 = Static57.aClass3_Sub15_Sub1_3.gSmart1or2(); local17 = Static57.aClass3_Sub15_Sub1_3.g1ssub(); - arg2.method2686(local17, Static83.anInt372, local13); + arg2.method2686(local17, Static83.loop, local13); } if ((arg0 & 0x800) != 0) { local13 = Static57.aClass3_Sub15_Sub1_3.p1neg(); @@ -167,16 +167,16 @@ public final class Static84 { local573 = false; } if (local573) { - arg2.anInt3359 = (local17 & 0xFFFF) + Static83.anInt372; + arg2.anInt3359 = (local17 & 0xFFFF) + Static83.loop; arg2.anInt3361 = 0; arg2.anInt3399 = 0; arg2.anInt3432 = local13; - if (arg2.anInt3359 > Static83.anInt372) { + if (arg2.anInt3359 > Static83.loop) { arg2.anInt3399 = -1; } arg2.anInt3394 = local17 >> 16; arg2.anInt3418 = 1; - if (arg2.anInt3432 != -1 && Static83.anInt372 == arg2.anInt3359) { + if (arg2.anInt3432 != -1 && Static83.loop == arg2.anInt3359) { local24 = Static34.method877(arg2.anInt3432).anInt1754; if (local24 != -1) { @Pc(663) SeqType local663 = Static36.method941(local24); diff --git a/client/src/main/java/Static85.java b/client/src/main/java/Static85.java index ddedfcc..e3f7d0d 100644 --- a/client/src/main/java/Static85.java +++ b/client/src/main/java/Static85.java @@ -29,7 +29,7 @@ public final class Static85 { if (local17 == 0) { return; } - @Pc(25) int local25 = Static7.anIntArray75[arg0]; + @Pc(25) int local25 = Static7.varps[arg0]; if (local17 == 6) { Static79.anInt2157 = local25; } diff --git a/client/src/main/java/Static86.java b/client/src/main/java/Static86.java index 551623a..7434a2e 100644 --- a/client/src/main/java/Static86.java +++ b/client/src/main/java/Static86.java @@ -39,7 +39,7 @@ public final class Static86 { @Pc(19) int local19; for (local19 = 0; local19 < Static240.anInt5335; local19++) { @Pc(30) int local30 = Static52.anIntArray136[local19]; - if (Static175.aClass8_Sub4_Sub2Array1[local30].anInt3430 != Static83.anInt372) { + if (Static175.aClass8_Sub4_Sub2Array1[local30].anInt3430 != Static83.loop) { if (Static175.aClass8_Sub4_Sub2Array1[local30].aClass96_1.method2935()) { Static91.method1877(Static175.aClass8_Sub4_Sub2Array1[local30]); } diff --git a/client/src/main/java/Static87.java b/client/src/main/java/Static87.java index 3a39424..03eea92 100644 --- a/client/src/main/java/Static87.java +++ b/client/src/main/java/Static87.java @@ -68,10 +68,10 @@ public final class Static87 { @Pc(9) byte[][] local9; if (GlRenderer.enabled && arg0) { local7 = 1; - local9 = Static186.aByteArrayArray14; + local9 = Static186.underWaterMapFilesBuffer; } else { local7 = 4; - local9 = Static273.aByteArrayArray13; + local9 = Static273.mapFilesBuffer; } @Pc(18) int local18 = local9.length; @Pc(20) int local20; @@ -79,8 +79,8 @@ public final class Static87 { @Pc(49) int local49; @Pc(53) byte[] local53; for (local20 = 0; local20 < local18; local20++) { - local38 = (Static238.anIntArray470[local20] >> 8) * 64 - Static225.originX; - local49 = (Static238.anIntArray470[local20] & 0xFF) * 64 - Static142.originZ; + local38 = (Static238.regionBitPacked[local20] >> 8) * 64 - Static225.originX; + local49 = (Static238.regionBitPacked[local20] & 0xFF) * 64 - Static142.originZ; local53 = local9[local20]; if (local53 != null) { Static107.method2261(); @@ -88,8 +88,8 @@ public final class Static87 { } } for (local20 = 0; local20 < local18; local20++) { - local38 = (Static238.anIntArray470[local20] >> 8) * 64 - Static225.originX; - local49 = (Static238.anIntArray470[local20] & 0xFF) * 64 - Static142.originZ; + local38 = (Static238.regionBitPacked[local20] >> 8) * 64 - Static225.originX; + local49 = (Static238.regionBitPacked[local20] & 0xFF) * 64 - Static142.originZ; local53 = local9[local20]; if (local53 == null && Static52.anInt1695 < 800) { Static107.method2261(); @@ -128,7 +128,7 @@ public final class Static87 { } else { local57 = arg8; } - local30.anInt465 = Static83.anInt372; + local30.anInt465 = Static83.loop; local30.anInt517 = local57; if (!local30.aBoolean32 || !Static36.method947(local30)) { if (local30.anInt453 > 0) { @@ -236,7 +236,7 @@ public final class Static87 { continue; } local276 -= local30.anInt459 / 2; - local503 = Static57.anInt1747 + Static59.anInt1814 & 0x7FF; + local503 = Static57.yawTarget + Static59.anInt1814 & 0x7FF; local270 -= local30.anInt445 / 2; local514 = MathUtils.anIntArray223[local503]; local518 = MathUtils.anIntArray225[local503]; @@ -893,14 +893,14 @@ public final class Static87 { } @OriginalMember(owner = "client!gn", name = "b", descriptor = "(B)V") - public static void method1812() { - if (Static72.anInt2031 < 128) { - Static72.anInt2031 = 128; + public static void clampCameraAngle() { + if (Static72.pitchTarget < 128) { + Static72.pitchTarget = 128; } - if (Static72.anInt2031 > 383) { - Static72.anInt2031 = 383; + if (Static72.pitchTarget > 383) { + Static72.pitchTarget = 383; } - Static57.anInt1747 &= 0x7FF; + Static57.yawTarget &= 0x7FF; @Pc(33) int local33 = Static81.anInt2223 >> 7; @Pc(37) int local37 = Static111.anInt2900 >> 7; @Pc(43) int local43 = Static207.method3685(Static55.level, Static81.anInt2223, Static111.anInt2900); @@ -910,10 +910,10 @@ public final class Static87 { for (local64 = local33 - 4; local64 <= local33 + 4; local64++) { for (@Pc(73) int local73 = local37 - 4; local73 <= local37 + 4; local73++) { @Pc(80) int local80 = Static55.level; - if (local80 < 3 && (Static12.aByteArrayArrayArray2[1][local64][local73] & 0x2) == 2) { + if (local80 < 3 && (Static12.tileSettings[1][local64][local73] & 0x2) == 2) { local80++; } - @Pc(117) int local117 = (Static232.aByteArrayArrayArray13[local80][local64][local73] & 0xFF) * 8 + local43 - Static83.anIntArrayArrayArray4[local80][local64][local73]; + @Pc(117) int local117 = (Static232.aByteArrayArrayArray13[local80][local64][local73] & 0xFF) * 8 + local43 - Static83.activeTileHeightMap[local80][local64][local73]; if (local117 > local45) { local45 = local117; } diff --git a/client/src/main/java/Static88.java b/client/src/main/java/Static88.java index cfb227b..85a08ea 100644 --- a/client/src/main/java/Static88.java +++ b/client/src/main/java/Static88.java @@ -13,253 +13,253 @@ public final class Static88 { } @OriginalMember(owner = "client!h", name = "a", descriptor = "(BILclient!jl;)V") - public static void method1818(@OriginalArg(1) int arg0, @OriginalArg(2) HookRequest arg1) { - @Pc(4) Object[] local4 = arg1.anObjectArray31; - @Pc(10) int local10 = (Integer) local4[0]; - @Pc(14) ClientScript local14 = Static91.method1875(local10); - if (local14 == null) { + public static void method1818(@OriginalArg(1) int maxCycles, @OriginalArg(2) HookRequest request) { + @Pc(4) Object[] local4 = request.arguments; + @Pc(10) int sid = (Integer) local4[0]; + @Pc(14) ClientScript script = Static91.getCs2ById(sid); + if (script == null) { return; } - Static138.anInt3445 = 0; - @Pc(26) int local26 = 0; - @Pc(28) int local28 = 0; - @Pc(30) int local30 = -1; - @Pc(33) int[] local33 = local14.anIntArray416; - @Pc(36) int[] local36 = local14.anIntArray415; + Static138.fp = 0; + @Pc(26) int ssp = 0; + @Pc(28) int isp = 0; + @Pc(30) int pc = -1; + @Pc(33) int[] intOperands = script.intOperands; + @Pc(36) int[] opcodes = script.opcodes; @Pc(44) byte local44 = -1; - @Pc(58) int local58; + @Pc(58) int cycles; try { - Static215.anIntArray432 = new int[local14.anInt4667]; + Static215.intLocals = new int[script.anInt4667]; @Pc(50) int local50 = 0; - Static180.aClass100Array125 = new JagString[local14.anInt4671]; + Static180.stringLocals = new JagString[script.anInt4671]; @Pc(56) int local56 = 0; - @Pc(77) int local77; + @Pc(77) int id; @Pc(194) JagString local194; - for (local58 = 1; local58 < local4.length; local58++) { - if (local4[local58] instanceof Integer) { - local77 = (Integer) local4[local58]; - if (local77 == -2147483647) { - local77 = arg1.anInt3102; + for (cycles = 1; cycles < local4.length; cycles++) { + if (local4[cycles] instanceof Integer) { + id = (Integer) local4[cycles]; + if (id == -2147483647) { + id = request.anInt3102; } - if (local77 == -2147483646) { - local77 = arg1.anInt3097; + if (id == -2147483646) { + id = request.anInt3097; } - if (local77 == -2147483645) { - local77 = arg1.source == null ? -1 : arg1.source.anInt507; + if (id == -2147483645) { + id = request.source == null ? -1 : request.source.anInt507; } - if (local77 == -2147483644) { - local77 = arg1.anInt3101; + if (id == -2147483644) { + id = request.anInt3101; } - if (local77 == -2147483643) { - local77 = arg1.source == null ? -1 : arg1.source.componentId; + if (id == -2147483643) { + id = request.source == null ? -1 : request.source.componentId; } - if (local77 == -2147483642) { - local77 = arg1.aClass13_16 == null ? -1 : arg1.aClass13_16.anInt507; + if (id == -2147483642) { + id = request.aClass13_16 == null ? -1 : request.aClass13_16.anInt507; } - if (local77 == -2147483641) { - local77 = arg1.aClass13_16 == null ? -1 : arg1.aClass13_16.componentId; + if (id == -2147483641) { + id = request.aClass13_16 == null ? -1 : request.aClass13_16.componentId; } - if (local77 == -2147483640) { - local77 = arg1.anInt3100; + if (id == -2147483640) { + id = request.anInt3100; } - if (local77 == -2147483639) { - local77 = arg1.anInt3099; + if (id == -2147483639) { + id = request.anInt3099; } - Static215.anIntArray432[local50++] = local77; - } else if (local4[local58] instanceof JagString) { - local194 = (JagString) local4[local58]; + Static215.intLocals[local50++] = id; + } else if (local4[cycles] instanceof JagString) { + local194 = (JagString) local4[cycles]; if (local194.method3108(Static15.aClass100_83)) { - local194 = arg1.aClass100_598; + local194 = request.aClass100_598; } - Static180.aClass100Array125[local56++] = local194; + Static180.stringLocals[local56++] = local194; } } - local58 = 0; - label4266: while (true) { - local58++; - if (arg0 < local58) { + cycles = 0; + nextOp: while (true) { + cycles++; + if (maxCycles < cycles) { throw new RuntimeException("slow"); } - local30++; - @Pc(226) int local226 = local36[local30]; + pc++; + @Pc(226) int opcode = opcodes[pc]; @Pc(803) int local803; @Pc(652) int local652; @Pc(809) int local809; @Pc(609) JagString local609; - if (local226 < 100) { - if (local226 == 0) { - Static254.anIntArray487[local28++] = local33[local30]; + if (opcode < 100) { + if (opcode == 0) { + Static254.intStack[isp++] = intOperands[pc]; continue; } - if (local226 == 1) { - local77 = local33[local30]; - Static254.anIntArray487[local28++] = Static7.anIntArray75[local77]; + if (opcode == 1) { + id = intOperands[pc]; + Static254.intStack[isp++] = Static7.varps[id]; continue; } - if (local226 == 2) { - local77 = local33[local30]; - local28--; - Static148.method2766(local77, Static254.anIntArray487[local28]); + if (opcode == 2) { + id = intOperands[pc]; + isp--; + Static148.method2766(id, Static254.intStack[isp]); continue; } - if (local226 == 3) { - Static3.aClass100Array176[local26++] = local14.aClass100Array140[local30]; + if (opcode == 3) { + Static3.stringStack[ssp++] = script.stringOperands[pc]; continue; } - if (local226 == 6) { - local30 += local33[local30]; + if (opcode == 6) { + pc += intOperands[pc]; continue; } - if (local226 == 7) { - local28 -= 2; - if (Static254.anIntArray487[local28] != Static254.anIntArray487[local28 + 1]) { - local30 += local33[local30]; + if (opcode == 7) { + isp -= 2; + if (Static254.intStack[isp] != Static254.intStack[isp + 1]) { + pc += intOperands[pc]; } continue; } - if (local226 == 8) { - local28 -= 2; - if (Static254.anIntArray487[local28 + 1] == Static254.anIntArray487[local28]) { - local30 += local33[local30]; + if (opcode == 8) { + isp -= 2; + if (Static254.intStack[isp + 1] == Static254.intStack[isp]) { + pc += intOperands[pc]; } continue; } - if (local226 == 9) { - local28 -= 2; - if (Static254.anIntArray487[local28] < Static254.anIntArray487[local28 + 1]) { - local30 += local33[local30]; + if (opcode == 9) { + isp -= 2; + if (Static254.intStack[isp] < Static254.intStack[isp + 1]) { + pc += intOperands[pc]; } continue; } - if (local226 == 10) { - local28 -= 2; - if (Static254.anIntArray487[local28 + 1] < Static254.anIntArray487[local28]) { - local30 += local33[local30]; + if (opcode == 10) { + isp -= 2; + if (Static254.intStack[isp + 1] < Static254.intStack[isp]) { + pc += intOperands[pc]; } continue; } - if (local226 == 21) { - if (Static138.anInt3445 == 0) { + if (opcode == 21) { + if (Static138.fp == 0) { return; } - @Pc(423) GoSubFrame local423 = Static67.aClass61Array3[--Static138.anInt3445]; - local14 = local423.aClass3_Sub2_Sub17_1; - Static215.anIntArray432 = local423.anIntArray237; - local36 = local14.anIntArray415; - local30 = local423.anInt2515; - Static180.aClass100Array125 = local423.aClass100Array79; - local33 = local14.anIntArray416; + @Pc(423) GoSubFrame frame = Static67.callStack[--Static138.fp]; + script = frame.script; + Static215.intLocals = frame.intLocals; + opcodes = script.opcodes; + pc = frame.pc; + Static180.stringLocals = frame.stringLocals; + intOperands = script.intOperands; continue; } - if (local226 == 25) { - local77 = local33[local30]; - Static254.anIntArray487[local28++] = Static155.method2945(local77); + if (opcode == 25) { + id = intOperands[pc]; + Static254.intStack[isp++] = Static155.getVarbit(id); continue; } - if (local226 == 27) { - local77 = local33[local30]; - local28--; - Static202.method3655(local77, Static254.anIntArray487[local28]); + if (opcode == 27) { + id = intOperands[pc]; + isp--; + Static202.setVarbitClient(id, Static254.intStack[isp]); continue; } - if (local226 == 31) { - local28 -= 2; - if (Static254.anIntArray487[local28 + 1] >= Static254.anIntArray487[local28]) { - local30 += local33[local30]; + if (opcode == 31) { + isp -= 2; + if (Static254.intStack[isp + 1] >= Static254.intStack[isp]) { + pc += intOperands[pc]; } continue; } - if (local226 == 32) { - local28 -= 2; - if (Static254.anIntArray487[local28] >= Static254.anIntArray487[local28 + 1]) { - local30 += local33[local30]; + if (opcode == 32) { + isp -= 2; + if (Static254.intStack[isp] >= Static254.intStack[isp + 1]) { + pc += intOperands[pc]; } continue; } - if (local226 == 33) { - Static254.anIntArray487[local28++] = Static215.anIntArray432[local33[local30]]; + if (opcode == 33) { + Static254.intStack[isp++] = Static215.intLocals[intOperands[pc]]; continue; } - @Pc(555) int local555; - if (local226 == 34) { - local555 = local33[local30]; - local28--; - Static215.anIntArray432[local555] = Static254.anIntArray487[local28]; + @Pc(555) int local; + if (opcode == 34) { + local = intOperands[pc]; + isp--; + Static215.intLocals[local] = Static254.intStack[isp]; continue; } - if (local226 == 35) { - Static3.aClass100Array176[local26++] = Static180.aClass100Array125[local33[local30]]; + if (opcode == 35) { + Static3.stringStack[ssp++] = Static180.stringLocals[intOperands[pc]]; continue; } - if (local226 == 36) { - local555 = local33[local30]; - local26--; - Static180.aClass100Array125[local555] = Static3.aClass100Array176[local26]; + if (opcode == 36) { + local = intOperands[pc]; + ssp--; + Static180.stringLocals[local] = Static3.stringStack[ssp]; continue; } - if (local226 == 37) { - local77 = local33[local30]; - local26 -= local77; - local609 = Static118.method2355(local26, local77, Static3.aClass100Array176); - Static3.aClass100Array176[local26++] = local609; + if (opcode == 37) { + id = intOperands[pc]; + ssp -= id; + local609 = Static118.method2355(ssp, id, Static3.stringStack); + Static3.stringStack[ssp++] = local609; continue; } - if (local226 == 38) { - local28--; + if (opcode == 38) { + isp--; continue; } - if (local226 == 39) { - local26--; + if (opcode == 39) { + ssp--; continue; } - if (local226 == 40) { - local77 = local33[local30]; - @Pc(642) ClientScript local642 = Static91.method1875(local77); + if (opcode == 40) { + id = intOperands[pc]; + @Pc(642) ClientScript local642 = Static91.getCs2ById(id); @Pc(646) int[] local646 = new int[local642.anInt4667]; @Pc(650) JagString[] local650 = new JagString[local642.anInt4671]; for (local652 = 0; local652 < local642.anInt4665; local652++) { - local646[local652] = Static254.anIntArray487[local652 + local28 - local642.anInt4665]; + local646[local652] = Static254.intStack[local652 + isp - local642.anInt4665]; } for (local652 = 0; local652 < local642.anInt4669; local652++) { - local650[local652] = Static3.aClass100Array176[local652 + local26 - local642.anInt4669]; + local650[local652] = Static3.stringStack[local652 + ssp - local642.anInt4669]; } - local28 -= local642.anInt4665; - local26 -= local642.anInt4669; + isp -= local642.anInt4665; + ssp -= local642.anInt4669; @Pc(705) GoSubFrame local705 = new GoSubFrame(); - local705.aClass100Array79 = Static180.aClass100Array125; - local705.anIntArray237 = Static215.anIntArray432; - local705.anInt2515 = local30; - local705.aClass3_Sub2_Sub17_1 = local14; - if (Static138.anInt3445 >= Static67.aClass61Array3.length) { + local705.stringLocals = Static180.stringLocals; + local705.intLocals = Static215.intLocals; + local705.pc = pc; + local705.script = script; + if (Static138.fp >= Static67.callStack.length) { throw new RuntimeException(); } - local14 = local642; - local30 = -1; - Static67.aClass61Array3[Static138.anInt3445++] = local705; - Static215.anIntArray432 = local646; - local33 = local642.anIntArray416; - local36 = local642.anIntArray415; - Static180.aClass100Array125 = local650; + script = local642; + pc = -1; + Static67.callStack[Static138.fp++] = local705; + Static215.intLocals = local646; + intOperands = local642.intOperands; + opcodes = local642.opcodes; + Static180.stringLocals = local650; continue; } - if (local226 == 42) { - Static254.anIntArray487[local28++] = Static155.varcs[local33[local30]]; + if (opcode == 42) { + Static254.intStack[isp++] = Static155.varcs[intOperands[pc]]; continue; } - if (local226 == 43) { - local77 = local33[local30]; - local28--; - Static155.varcs[local77] = Static254.anIntArray487[local28]; - Static4.method24(local77); + if (opcode == 43) { + id = intOperands[pc]; + isp--; + Static155.varcs[id] = Static254.intStack[isp]; + Static4.method24(id); continue; } - if (local226 == 44) { - local77 = local33[local30] >> 16; - local28--; - local803 = Static254.anIntArray487[local28]; - local809 = local33[local30] & 0xFFFF; + if (opcode == 44) { + id = intOperands[pc] >> 16; + isp--; + local803 = Static254.intStack[isp]; + local809 = intOperands[pc] & 0xFFFF; if (local803 >= 0 && local803 <= 5000) { - Static55.anIntArray140[local77] = local803; + Static55.anIntArray140[id] = local803; @Pc(828) byte local828 = -1; if (local809 == 105) { local828 = 0; @@ -267,61 +267,61 @@ public final class Static88 { local652 = 0; while (true) { if (local803 <= local652) { - continue label4266; + continue nextOp; } - Static179.anIntArrayArray33[local77][local652] = local828; + Static179.anIntArrayArray33[id][local652] = local828; local652++; } } throw new RuntimeException(); } - if (local226 == 45) { - local77 = local33[local30]; - local28--; - local809 = Static254.anIntArray487[local28]; - if (local809 >= 0 && local809 < Static55.anIntArray140[local77]) { - Static254.anIntArray487[local28++] = Static179.anIntArrayArray33[local77][local809]; + if (opcode == 45) { + id = intOperands[pc]; + isp--; + local809 = Static254.intStack[isp]; + if (local809 >= 0 && local809 < Static55.anIntArray140[id]) { + Static254.intStack[isp++] = Static179.anIntArrayArray33[id][local809]; continue; } throw new RuntimeException(); } - if (local226 == 46) { - local77 = local33[local30]; - local28 -= 2; - local809 = Static254.anIntArray487[local28]; - if (local809 >= 0 && local809 < Static55.anIntArray140[local77]) { - Static179.anIntArrayArray33[local77][local809] = Static254.anIntArray487[local28 + 1]; + if (opcode == 46) { + id = intOperands[pc]; + isp -= 2; + local809 = Static254.intStack[isp]; + if (local809 >= 0 && local809 < Static55.anIntArray140[id]) { + Static179.anIntArrayArray33[id][local809] = Static254.intStack[isp + 1]; continue; } throw new RuntimeException(); } - if (local226 == 47) { - local194 = Static226.varcstrs[local33[local30]]; + if (opcode == 47) { + local194 = Static226.varcstrs[intOperands[pc]]; if (local194 == null) { local194 = Static254.aClass100_1061; } - Static3.aClass100Array176[local26++] = local194; + Static3.stringStack[ssp++] = local194; continue; } - if (local226 == 48) { - local77 = local33[local30]; - local26--; - Static226.varcstrs[local77] = Static3.aClass100Array176[local26]; - Static89.method1840(local77); + if (opcode == 48) { + id = intOperands[pc]; + ssp--; + Static226.varcstrs[id] = Static3.stringStack[ssp]; + Static89.method1840(id); continue; } - if (local226 == 51) { - @Pc(992) HashTable local992 = local14.aClass133Array1[local33[local30]]; - local28--; - @Pc(1002) IntNode local1002 = (IntNode) local992.method3863((long) Static254.anIntArray487[local28]); + if (opcode == 51) { + @Pc(992) HashTable local992 = script.aClass133Array1[intOperands[pc]]; + isp--; + @Pc(1002) IntNode local1002 = (IntNode) local992.method3863((long) Static254.intStack[isp]); if (local1002 != null) { - local30 += local1002.anInt3141; + pc += local1002.anInt3141; } continue; } } @Pc(1020) boolean local1020; - if (local33[local30] == 1) { + if (intOperands[pc] == 1) { local1020 = true; } else { local1020 = false; @@ -331,12 +331,12 @@ public final class Static88 { @Pc(1063) Component local1063; @Pc(1087) int local1087; @Pc(1256) Component local1256; - if (local226 < 300) { - if (local226 == 100) { - local28 -= 3; - local809 = Static254.anIntArray487[local28]; - local803 = Static254.anIntArray487[local28 + 1]; - local1052 = Static254.anIntArray487[local28 + 2]; + if (opcode < 300) { + if (opcode == 100) { + isp -= 3; + local809 = Static254.intStack[isp]; + local803 = Static254.intStack[isp + 1]; + local1052 = Static254.intStack[isp + 2]; if (local803 != 0) { local1063 = Static5.getComponent(local809); if (local1063.createdComponents == null) { @@ -369,7 +369,7 @@ public final class Static88 { throw new RuntimeException(); } @Pc(1204) Component local1204; - if (local226 == 101) { + if (opcode == 101) { local1182 = local1020 ? Static274.aClass13_24 : Static227.aClass13_25; if (local1182.componentId == -1) { if (!local1020) { @@ -382,20 +382,20 @@ public final class Static88 { Static43.method1143(local1204); continue; } - if (local226 == 102) { - local28--; - local1182 = Static5.getComponent(Static254.anIntArray487[local28]); + if (opcode == 102) { + isp--; + local1182 = Static5.getComponent(Static254.intStack[isp]); local1182.createdComponents = null; Static43.method1143(local1182); continue; } - if (local226 == 200) { - local28 -= 2; - local809 = Static254.anIntArray487[local28]; - local803 = Static254.anIntArray487[local28 + 1]; + if (opcode == 200) { + isp -= 2; + local809 = Static254.intStack[isp]; + local803 = Static254.intStack[isp + 1]; local1256 = Static201.method1418(local809, local803); if (local1256 != null && local803 != -1) { - Static254.anIntArray487[local28++] = 1; + Static254.intStack[isp++] = 1; if (local1020) { Static274.aClass13_24 = local1256; } else { @@ -403,17 +403,17 @@ public final class Static88 { } continue; } - Static254.anIntArray487[local28++] = 0; + Static254.intStack[isp++] = 0; continue; } - if (local226 == 201) { - local28--; - local809 = Static254.anIntArray487[local28]; + if (opcode == 201) { + isp--; + local809 = Static254.intStack[isp]; local1204 = Static5.getComponent(local809); if (local1204 == null) { - Static254.anIntArray487[local28++] = 0; + Static254.intStack[isp++] = 0; } else { - Static254.anIntArray487[local28++] = 1; + Static254.intStack[isp++] = 1; if (local1020) { Static274.aClass13_24 = local1204; } else { @@ -424,64 +424,64 @@ public final class Static88 { } } else { @Pc(12388) boolean local12388; - if (local226 < 500) { - if (local226 == 403) { - local28 -= 2; - local803 = Static254.anIntArray487[local28 + 1]; - local809 = Static254.anIntArray487[local28]; + if (opcode < 500) { + if (opcode == 403) { + isp -= 2; + local803 = Static254.intStack[isp + 1]; + local809 = Static254.intStack[isp]; for (local1052 = 0; local1052 < Static204.anIntArray425.length; local1052++) { if (local809 == Static204.anIntArray425[local1052]) { Static173.self.aClass59_1.method1953(local1052, local803); - continue label4266; + continue nextOp; } } local1052 = 0; while (true) { if (local1052 >= Static153.anIntArray351.length) { - continue label4266; + continue nextOp; } if (local809 == Static153.anIntArray351[local1052]) { Static173.self.aClass59_1.method1953(local1052, local803); - continue label4266; + continue nextOp; } local1052++; } } - if (local226 == 404) { - local28 -= 2; - local809 = Static254.anIntArray487[local28]; - local803 = Static254.anIntArray487[local28 + 1]; + if (opcode == 404) { + isp -= 2; + local809 = Static254.intStack[isp]; + local803 = Static254.intStack[isp + 1]; Static173.self.aClass59_1.method1951(local809, local803); continue; } - if (local226 == 410) { - local28--; - local12388 = Static254.anIntArray487[local28] != 0; + if (opcode == 410) { + isp--; + local12388 = Static254.intStack[isp] != 0; Static173.self.aClass59_1.method1948(local12388); continue; } } else { @Pc(1552) boolean local1552; - if ((local226 < 1000 || local226 >= 1100) && (local226 < 2000 || local226 >= 2100)) { + if ((opcode < 1000 || opcode >= 1100) && (opcode < 2000 || opcode >= 2100)) { @Pc(2522) JagString local2522; - if (local226 >= 1100 && local226 < 1200 || !(local226 < 2100 || local226 >= 2200)) { - if (local226 < 2000) { + if (opcode >= 1100 && opcode < 1200 || !(opcode < 2100 || opcode >= 2200)) { + if (opcode < 2000) { local1182 = local1020 ? Static274.aClass13_24 : Static227.aClass13_25; } else { - local226 -= 1000; - local28--; - local1182 = Static5.getComponent(Static254.anIntArray487[local28]); + opcode -= 1000; + isp--; + local1182 = Static5.getComponent(Static254.intStack[isp]); } - if (local226 == 1100) { - local28 -= 2; - local1182.anInt489 = Static254.anIntArray487[local28]; + if (opcode == 1100) { + isp -= 2; + local1182.anInt489 = Static254.intStack[isp]; if (local1182.anInt489 > local1182.anInt486 - local1182.anInt445) { local1182.anInt489 = local1182.anInt486 - local1182.anInt445; } if (local1182.anInt489 < 0) { local1182.anInt489 = 0; } - local1182.scrollY = Static254.anIntArray487[local28 + 1]; + local1182.scrollY = Static254.intStack[isp + 1]; if (local1182.scrollY > local1182.anInt491 - local1182.anInt459) { local1182.scrollY = local1182.anInt491 - local1182.anInt459; } @@ -494,69 +494,69 @@ public final class Static88 { } continue; } - if (local226 == 1101) { - local28--; - local1182.anInt474 = Static254.anIntArray487[local28]; + if (opcode == 1101) { + isp--; + local1182.anInt474 = Static254.intStack[isp]; Static43.method1143(local1182); if (local1182.componentId == -1) { Static245.method4224(local1182.anInt507); } continue; } - if (local226 == 1102) { - local28--; - local1182.aBoolean30 = Static254.anIntArray487[local28] == 1; + if (opcode == 1102) { + isp--; + local1182.aBoolean30 = Static254.intStack[isp] == 1; Static43.method1143(local1182); continue; } - if (local226 == 1103) { - local28--; - local1182.anInt476 = Static254.anIntArray487[local28]; + if (opcode == 1103) { + isp--; + local1182.anInt476 = Static254.intStack[isp]; Static43.method1143(local1182); continue; } - if (local226 == 1104) { - local28--; - local1182.anInt490 = Static254.anIntArray487[local28]; + if (opcode == 1104) { + isp--; + local1182.anInt490 = Static254.intStack[isp]; Static43.method1143(local1182); continue; } - if (local226 == 1105) { - local28--; - local1182.anInt477 = Static254.anIntArray487[local28]; + if (opcode == 1105) { + isp--; + local1182.anInt477 = Static254.intStack[isp]; Static43.method1143(local1182); continue; } - if (local226 == 1106) { - local28--; - local1182.anInt521 = Static254.anIntArray487[local28]; + if (opcode == 1106) { + isp--; + local1182.anInt521 = Static254.intStack[isp]; Static43.method1143(local1182); continue; } - if (local226 == 1107) { - local28--; - local1182.aBoolean23 = Static254.anIntArray487[local28] == 1; + if (opcode == 1107) { + isp--; + local1182.aBoolean23 = Static254.intStack[isp] == 1; Static43.method1143(local1182); continue; } - if (local226 == 1108) { + if (opcode == 1108) { local1182.modelType = 1; - local28--; - local1182.modelId = Static254.anIntArray487[local28]; + isp--; + local1182.modelId = Static254.intStack[isp]; Static43.method1143(local1182); if (local1182.componentId == -1) { Static271.method4600(local1182.anInt507); } continue; } - if (local226 == 1109) { - local28 -= 6; - local1182.modelXOffset = Static254.anIntArray487[local28]; - local1182.modelZOffset = Static254.anIntArray487[local28 + 1]; - local1182.modelXAngle = Static254.anIntArray487[local28 + 2]; - local1182.modelYAngle = Static254.anIntArray487[local28 + 3]; - local1182.modelYOffset = Static254.anIntArray487[local28 + 4]; - local1182.modelZoom = Static254.anIntArray487[local28 + 5]; + if (opcode == 1109) { + isp -= 6; + local1182.modelXOffset = Static254.intStack[isp]; + local1182.modelZOffset = Static254.intStack[isp + 1]; + local1182.modelXAngle = Static254.intStack[isp + 2]; + local1182.modelYAngle = Static254.intStack[isp + 3]; + local1182.modelYOffset = Static254.intStack[isp + 4]; + local1182.modelZoom = Static254.intStack[isp + 5]; Static43.method1143(local1182); if (local1182.componentId == -1) { Static153.method2910(local1182.anInt507); @@ -564,9 +564,9 @@ public final class Static88 { } continue; } - if (local226 == 1110) { - local28--; - local803 = Static254.anIntArray487[local28]; + if (opcode == 1110) { + isp--; + local803 = Static254.intStack[isp]; if (local1182.anInt522 != local803) { local1182.anInt522 = local803; local1182.anInt510 = 0; @@ -579,15 +579,15 @@ public final class Static88 { } continue; } - if (local226 == 1111) { - local28--; - local1182.aBoolean22 = Static254.anIntArray487[local28] == 1; + if (opcode == 1111) { + isp--; + local1182.aBoolean22 = Static254.intStack[isp] == 1; Static43.method1143(local1182); continue; } - if (local226 == 1112) { - local26--; - local2522 = Static3.aClass100Array176[local26]; + if (opcode == 1112) { + ssp--; + local2522 = Static3.stringStack[ssp]; if (!local2522.method3108(local1182.aClass100_84)) { local1182.aClass100_84 = local2522; Static43.method1143(local1182); @@ -597,95 +597,95 @@ public final class Static88 { } continue; } - if (local226 == 1113) { - local28--; - local1182.anInt502 = Static254.anIntArray487[local28]; + if (opcode == 1113) { + isp--; + local1182.anInt502 = Static254.intStack[isp]; Static43.method1143(local1182); continue; } - if (local226 == 1114) { - local28 -= 3; - local1182.anInt460 = Static254.anIntArray487[local28]; - local1182.anInt478 = Static254.anIntArray487[local28 + 1]; - local1182.anInt467 = Static254.anIntArray487[local28 + 2]; + if (opcode == 1114) { + isp -= 3; + local1182.anInt460 = Static254.intStack[isp]; + local1182.anInt478 = Static254.intStack[isp + 1]; + local1182.anInt467 = Static254.intStack[isp + 2]; Static43.method1143(local1182); continue; } - if (local226 == 1115) { - local28--; - local1182.aBoolean28 = Static254.anIntArray487[local28] == 1; + if (opcode == 1115) { + isp--; + local1182.aBoolean28 = Static254.intStack[isp] == 1; Static43.method1143(local1182); continue; } - if (local226 == 1116) { - local28--; - local1182.anInt514 = Static254.anIntArray487[local28]; + if (opcode == 1116) { + isp--; + local1182.anInt514 = Static254.intStack[isp]; Static43.method1143(local1182); continue; } - if (local226 == 1117) { - local28--; - local1182.anInt513 = Static254.anIntArray487[local28]; + if (opcode == 1117) { + isp--; + local1182.anInt513 = Static254.intStack[isp]; Static43.method1143(local1182); continue; } - if (local226 == 1118) { - local28--; - local1182.aBoolean21 = Static254.anIntArray487[local28] == 1; + if (opcode == 1118) { + isp--; + local1182.aBoolean21 = Static254.intStack[isp] == 1; Static43.method1143(local1182); continue; } - if (local226 == 1119) { - local28--; - local1182.aBoolean26 = Static254.anIntArray487[local28] == 1; + if (opcode == 1119) { + isp--; + local1182.aBoolean26 = Static254.intStack[isp] == 1; Static43.method1143(local1182); continue; } - if (local226 == 1120) { - local28 -= 2; - local1182.anInt486 = Static254.anIntArray487[local28]; - local1182.anInt491 = Static254.anIntArray487[local28 + 1]; + if (opcode == 1120) { + isp -= 2; + local1182.anInt486 = Static254.intStack[isp]; + local1182.anInt491 = Static254.intStack[isp + 1]; Static43.method1143(local1182); if (local1182.anInt452 == 0) { Static17.method531(local1182, false); } continue; } - if (local226 == 1121) { - local28 -= 2; - local1182.aShort11 = (short) Static254.anIntArray487[local28]; - local1182.aShort10 = (short) Static254.anIntArray487[local28 + 1]; + if (opcode == 1121) { + isp -= 2; + local1182.aShort11 = (short) Static254.intStack[isp]; + local1182.aShort10 = (short) Static254.intStack[isp + 1]; Static43.method1143(local1182); continue; } - if (local226 == 1122) { - local28--; - local1182.aBoolean18 = Static254.anIntArray487[local28] == 1; + if (opcode == 1122) { + isp--; + local1182.aBoolean18 = Static254.intStack[isp] == 1; Static43.method1143(local1182); continue; } - if (local226 == 1123) { - local28--; - local1182.modelZoom = Static254.anIntArray487[local28]; + if (opcode == 1123) { + isp--; + local1182.modelZoom = Static254.intStack[isp]; Static43.method1143(local1182); if (local1182.componentId == -1) { Static153.method2910(local1182.anInt507); } continue; } - } else if (local226 >= 1200 && local226 < 1300 || !(local226 < 2200 || local226 >= 2300)) { - if (local226 < 2000) { + } else if (opcode >= 1200 && opcode < 1300 || !(opcode < 2200 || opcode >= 2300)) { + if (opcode < 2000) { local1182 = local1020 ? Static274.aClass13_24 : Static227.aClass13_25; } else { - local28--; - local1182 = Static5.getComponent(Static254.anIntArray487[local28]); - local226 -= 1000; + isp--; + local1182 = Static5.getComponent(Static254.intStack[isp]); + opcode -= 1000; } Static43.method1143(local1182); - if (local226 == 1200 || local226 == 1205) { - local28 -= 2; - local1052 = Static254.anIntArray487[local28 + 1]; - local803 = Static254.anIntArray487[local28]; + if (opcode == 1200 || opcode == 1205) { + isp -= 2; + local1052 = Static254.intStack[isp + 1]; + local803 = Static254.intStack[isp]; if (local1182.componentId == -1) { Static251.method4279(local1182.anInt507); Static153.method2910(local1182.anInt507); @@ -710,7 +710,7 @@ public final class Static88 { } else if (local1182.baseWidth > 0) { local1182.modelZoom = local1182.modelZoom * 32 / local1182.baseWidth; } - if (local226 == 1205) { + if (opcode == 1205) { local1182.aBoolean31 = false; } else { local1182.aBoolean31 = true; @@ -718,16 +718,16 @@ public final class Static88 { } continue; } - if (local226 == 1201) { + if (opcode == 1201) { local1182.modelType = 2; - local28--; - local1182.modelId = Static254.anIntArray487[local28]; + isp--; + local1182.modelId = Static254.intStack[isp]; if (local1182.componentId == -1) { Static271.method4600(local1182.anInt507); } continue; } - if (local226 == 1202) { + if (opcode == 1202) { local1182.modelType = 3; local1182.modelId = Static173.self.aClass59_1.method1952(); if (local1182.componentId == -1) { @@ -735,91 +735,91 @@ public final class Static88 { } continue; } - if (local226 == 1203) { + if (opcode == 1203) { local1182.modelType = 6; - local28--; - local1182.modelId = Static254.anIntArray487[local28]; + isp--; + local1182.modelId = Static254.intStack[isp]; if (local1182.componentId == -1) { Static271.method4600(local1182.anInt507); } continue; } - if (local226 == 1204) { + if (opcode == 1204) { local1182.modelType = 5; - local28--; - local1182.modelId = Static254.anIntArray487[local28]; + isp--; + local1182.modelId = Static254.intStack[isp]; if (local1182.componentId == -1) { Static271.method4600(local1182.anInt507); } continue; } - } else if (local226 >= 1300 && local226 < 1400 || local226 >= 2300 && local226 < 2400) { - if (local226 >= 2000) { - local28--; - local1182 = Static5.getComponent(Static254.anIntArray487[local28]); - local226 -= 1000; + } else if (opcode >= 1300 && opcode < 1400 || opcode >= 2300 && opcode < 2400) { + if (opcode >= 2000) { + isp--; + local1182 = Static5.getComponent(Static254.intStack[isp]); + opcode -= 1000; } else { local1182 = local1020 ? Static274.aClass13_24 : Static227.aClass13_25; } - if (local226 == 1300) { - local28--; - local803 = Static254.anIntArray487[local28] - 1; + if (opcode == 1300) { + isp--; + local803 = Static254.intStack[isp] - 1; if (local803 >= 0 && local803 <= 9) { - local26--; - local1182.method480(Static3.aClass100Array176[local26], local803); + ssp--; + local1182.method480(Static3.stringStack[ssp], local803); continue; } - local26--; + ssp--; continue; } - if (local226 == 1301) { - local28 -= 2; - local1052 = Static254.anIntArray487[local28 + 1]; - local803 = Static254.anIntArray487[local28]; + if (opcode == 1301) { + isp -= 2; + local1052 = Static254.intStack[isp + 1]; + local803 = Static254.intStack[isp]; local1182.aClass13_5 = Static201.method1418(local803, local1052); continue; } - if (local226 == 1302) { - local28--; - local1182.aBoolean27 = Static254.anIntArray487[local28] == 1; + if (opcode == 1302) { + isp--; + local1182.aBoolean27 = Static254.intStack[isp] == 1; continue; } - if (local226 == 1303) { - local28--; - local1182.anInt472 = Static254.anIntArray487[local28]; + if (opcode == 1303) { + isp--; + local1182.anInt472 = Static254.intStack[isp]; continue; } - if (local226 == 1304) { - local28--; - local1182.anInt447 = Static254.anIntArray487[local28]; + if (opcode == 1304) { + isp--; + local1182.anInt447 = Static254.intStack[isp]; continue; } - if (local226 == 1305) { - local26--; - local1182.aClass100_88 = Static3.aClass100Array176[local26]; + if (opcode == 1305) { + ssp--; + local1182.aClass100_88 = Static3.stringStack[ssp]; continue; } - if (local226 == 1306) { - local26--; - local1182.aClass100_86 = Static3.aClass100Array176[local26]; + if (opcode == 1306) { + ssp--; + local1182.aClass100_86 = Static3.stringStack[ssp]; continue; } - if (local226 == 1307) { + if (opcode == 1307) { local1182.aClass100Array18 = null; continue; } - if (local226 == 1308) { - local28--; - local1182.anInt484 = Static254.anIntArray487[local28]; - local28--; - local1182.anInt499 = Static254.anIntArray487[local28]; + if (opcode == 1308) { + isp--; + local1182.anInt484 = Static254.intStack[isp]; + isp--; + local1182.anInt499 = Static254.intStack[isp]; continue; } - if (local226 == 1309) { - local28--; - local803 = Static254.anIntArray487[local28]; - local28--; - local1052 = Static254.anIntArray487[local28]; + if (opcode == 1309) { + isp--; + local803 = Static254.intStack[isp]; + isp--; + local1052 = Static254.intStack[isp]; if (local1052 >= 1 && local1052 <= 10) { local1182.method477(local1052 - 1, local803); } @@ -827,25 +827,25 @@ public final class Static88 { } } else { @Pc(4859) int local4859; - if (local226 >= 1400 && local226 < 1500 || local226 >= 2400 && local226 < 2500) { - if (local226 < 2000) { + if (opcode >= 1400 && opcode < 1500 || opcode >= 2400 && opcode < 2500) { + if (opcode < 2000) { local1182 = local1020 ? Static274.aClass13_24 : Static227.aClass13_25; } else { - local226 -= 1000; - local28--; - local1182 = Static5.getComponent(Static254.anIntArray487[local28]); + opcode -= 1000; + isp--; + local1182 = Static5.getComponent(Static254.intStack[isp]); } @Pc(12937) int[] local12937 = null; - local26--; - local2522 = Static3.aClass100Array176[local26]; + ssp--; + local2522 = Static3.stringStack[ssp]; if (local2522.length() > 0 && local2522.method3149(local2522.length() - 1) == 89) { - local28--; - local652 = Static254.anIntArray487[local28]; + isp--; + local652 = Static254.intStack[isp]; if (local652 > 0) { local12937 = new int[local652]; while (local652-- > 0) { - local28--; - local12937[local652] = Static254.anIntArray487[local28]; + isp--; + local12937[local652] = Static254.intStack[isp]; } } local2522 = local2522.substring(local2522.length() - 1, 0); @@ -853,325 +853,325 @@ public final class Static88 { @Pc(13000) Object[] local13000 = new Object[local2522.length() + 1]; for (local4859 = local13000.length - 1; local4859 >= 1; local4859--) { if (local2522.method3149(local4859 - 1) == 115) { - local26--; - local13000[local4859] = Static3.aClass100Array176[local26]; + ssp--; + local13000[local4859] = Static3.stringStack[ssp]; } else { - local28--; - local13000[local4859] = Integer.valueOf(Static254.anIntArray487[local28]); + isp--; + local13000[local4859] = Integer.valueOf(Static254.intStack[isp]); } } - local28--; - local4859 = Static254.anIntArray487[local28]; + isp--; + local4859 = Static254.intStack[isp]; if (local4859 == -1) { local13000 = null; } else { local13000[0] = Integer.valueOf(local4859); } local1182.aBoolean25 = true; - if (local226 == 1400) { + if (opcode == 1400) { local1182.anObjectArray5 = local13000; - } else if (local226 == 1401) { + } else if (opcode == 1401) { local1182.anObjectArray9 = local13000; - } else if (local226 == 1402) { + } else if (opcode == 1402) { local1182.anObjectArray18 = local13000; - } else if (local226 == 1403) { + } else if (opcode == 1403) { local1182.anObjectArray19 = local13000; - } else if (local226 == 1404) { + } else if (opcode == 1404) { local1182.anObjectArray24 = local13000; - } else if (local226 == 1405) { + } else if (opcode == 1405) { local1182.anObjectArray26 = local13000; - } else if (local226 == 1406) { + } else if (opcode == 1406) { local1182.anObjectArray27 = local13000; - } else if (local226 == 1407) { + } else if (opcode == 1407) { local1182.anIntArray44 = local12937; local1182.anObjectArray25 = local13000; - } else if (local226 == 1408) { + } else if (opcode == 1408) { local1182.anObjectArray22 = local13000; - } else if (local226 == 1409) { + } else if (opcode == 1409) { local1182.anObjectArray29 = local13000; - } else if (local226 == 1410) { + } else if (opcode == 1410) { local1182.anObjectArray16 = local13000; - } else if (local226 == 1411) { + } else if (opcode == 1411) { local1182.anObjectArray6 = local13000; - } else if (local226 == 1412) { + } else if (opcode == 1412) { local1182.anObjectArray23 = local13000; - } else if (local226 == 1414) { + } else if (opcode == 1414) { local1182.anIntArray34 = local12937; local1182.anObjectArray7 = local13000; - } else if (local226 == 1415) { + } else if (opcode == 1415) { local1182.anIntArray42 = local12937; local1182.anObjectArray2 = local13000; - } else if (local226 == 1416) { + } else if (opcode == 1416) { local1182.anObjectArray11 = local13000; - } else if (local226 == 1417) { + } else if (opcode == 1417) { local1182.anObjectArray10 = local13000; - } else if (local226 == 1418) { + } else if (opcode == 1418) { local1182.anObjectArray20 = local13000; - } else if (local226 == 1419) { + } else if (opcode == 1419) { local1182.anObjectArray14 = local13000; - } else if (local226 == 1420) { + } else if (opcode == 1420) { local1182.anObjectArray1 = local13000; - } else if (local226 == 1421) { + } else if (opcode == 1421) { local1182.anObjectArray28 = local13000; - } else if (local226 == 1422) { + } else if (opcode == 1422) { local1182.anObjectArray30 = local13000; - } else if (local226 == 1423) { + } else if (opcode == 1423) { local1182.anObjectArray12 = local13000; - } else if (local226 == 1424) { + } else if (opcode == 1424) { local1182.anObjectArray8 = local13000; - } else if (local226 == 1425) { + } else if (opcode == 1425) { local1182.anObjectArray21 = local13000; - } else if (local226 == 1426) { + } else if (opcode == 1426) { local1182.anObjectArray13 = local13000; - } else if (local226 == 1427) { + } else if (opcode == 1427) { local1182.anObjectArray17 = local13000; - } else if (local226 == 1428) { + } else if (opcode == 1428) { local1182.anObjectArray4 = local13000; local1182.anIntArray38 = local12937; - } else if (local226 == 1429) { + } else if (opcode == 1429) { local1182.anIntArray35 = local12937; local1182.anObjectArray15 = local13000; } continue; } - if (local226 < 1600) { + if (opcode < 1600) { local1182 = local1020 ? Static274.aClass13_24 : Static227.aClass13_25; - if (local226 == 1500) { - Static254.anIntArray487[local28++] = local1182.x; + if (opcode == 1500) { + Static254.intStack[isp++] = local1182.x; continue; } - if (local226 == 1501) { - Static254.anIntArray487[local28++] = local1182.y; + if (opcode == 1501) { + Static254.intStack[isp++] = local1182.y; continue; } - if (local226 == 1502) { - Static254.anIntArray487[local28++] = local1182.anInt445; + if (opcode == 1502) { + Static254.intStack[isp++] = local1182.anInt445; continue; } - if (local226 == 1503) { - Static254.anIntArray487[local28++] = local1182.anInt459; + if (opcode == 1503) { + Static254.intStack[isp++] = local1182.anInt459; continue; } - if (local226 == 1504) { - Static254.anIntArray487[local28++] = local1182.hidden ? 1 : 0; + if (opcode == 1504) { + Static254.intStack[isp++] = local1182.hidden ? 1 : 0; continue; } - if (local226 == 1505) { - Static254.anIntArray487[local28++] = local1182.layer; + if (opcode == 1505) { + Static254.intStack[isp++] = local1182.layer; continue; } - } else if (local226 < 1700) { + } else if (opcode < 1700) { local1182 = local1020 ? Static274.aClass13_24 : Static227.aClass13_25; - if (local226 == 1600) { - Static254.anIntArray487[local28++] = local1182.anInt489; + if (opcode == 1600) { + Static254.intStack[isp++] = local1182.anInt489; continue; } - if (local226 == 1601) { - Static254.anIntArray487[local28++] = local1182.scrollY; + if (opcode == 1601) { + Static254.intStack[isp++] = local1182.scrollY; continue; } - if (local226 == 1602) { - Static3.aClass100Array176[local26++] = local1182.aClass100_84; + if (opcode == 1602) { + Static3.stringStack[ssp++] = local1182.aClass100_84; continue; } - if (local226 == 1603) { - Static254.anIntArray487[local28++] = local1182.anInt486; + if (opcode == 1603) { + Static254.intStack[isp++] = local1182.anInt486; continue; } - if (local226 == 1604) { - Static254.anIntArray487[local28++] = local1182.anInt491; + if (opcode == 1604) { + Static254.intStack[isp++] = local1182.anInt491; continue; } - if (local226 == 1605) { - Static254.anIntArray487[local28++] = local1182.modelZoom; + if (opcode == 1605) { + Static254.intStack[isp++] = local1182.modelZoom; continue; } - if (local226 == 1606) { - Static254.anIntArray487[local28++] = local1182.modelXAngle; + if (opcode == 1606) { + Static254.intStack[isp++] = local1182.modelXAngle; continue; } - if (local226 == 1607) { - Static254.anIntArray487[local28++] = local1182.modelYOffset; + if (opcode == 1607) { + Static254.intStack[isp++] = local1182.modelYOffset; continue; } - if (local226 == 1608) { - Static254.anIntArray487[local28++] = local1182.modelYAngle; + if (opcode == 1608) { + Static254.intStack[isp++] = local1182.modelYAngle; continue; } - if (local226 == 1609) { - Static254.anIntArray487[local28++] = local1182.anInt476; + if (opcode == 1609) { + Static254.intStack[isp++] = local1182.anInt476; continue; } - if (local226 == 1610) { - Static254.anIntArray487[local28++] = local1182.modelXOffset; + if (opcode == 1610) { + Static254.intStack[isp++] = local1182.modelXOffset; continue; } - if (local226 == 1611) { - Static254.anIntArray487[local28++] = local1182.modelZOffset; + if (opcode == 1611) { + Static254.intStack[isp++] = local1182.modelZOffset; continue; } - if (local226 == 1612) { - Static254.anIntArray487[local28++] = local1182.anInt477; + if (opcode == 1612) { + Static254.intStack[isp++] = local1182.anInt477; continue; } - } else if (local226 < 1800) { + } else if (opcode < 1800) { local1182 = local1020 ? Static274.aClass13_24 : Static227.aClass13_25; - if (local226 == 1700) { - Static254.anIntArray487[local28++] = local1182.objId; + if (opcode == 1700) { + Static254.intStack[isp++] = local1182.objId; continue; } - if (local226 == 1701) { + if (opcode == 1701) { if (local1182.objId == -1) { - Static254.anIntArray487[local28++] = 0; + Static254.intStack[isp++] = 0; } else { - Static254.anIntArray487[local28++] = local1182.objCount; + Static254.intStack[isp++] = local1182.objCount; } continue; } - if (local226 == 1702) { - Static254.anIntArray487[local28++] = local1182.componentId; + if (opcode == 1702) { + Static254.intStack[isp++] = local1182.componentId; continue; } - } else if (local226 < 1900) { + } else if (opcode < 1900) { local1182 = local1020 ? Static274.aClass13_24 : Static227.aClass13_25; - if (local226 == 1800) { - Static254.anIntArray487[local28++] = Static36.method940(local1182).method512(); + if (opcode == 1800) { + Static254.intStack[isp++] = Static36.method940(local1182).method512(); continue; } - if (local226 == 1801) { - local28--; - local803 = Static254.anIntArray487[local28]; + if (opcode == 1801) { + isp--; + local803 = Static254.intStack[isp]; local803--; if (local1182.aClass100Array18 != null && local803 < local1182.aClass100Array18.length && local1182.aClass100Array18[local803] != null) { - Static3.aClass100Array176[local26++] = local1182.aClass100Array18[local803]; + Static3.stringStack[ssp++] = local1182.aClass100Array18[local803]; continue; } - Static3.aClass100Array176[local26++] = Static72.aClass100_447; + Static3.stringStack[ssp++] = Static72.aClass100_447; continue; } - if (local226 == 1802) { + if (opcode == 1802) { if (local1182.aClass100_88 == null) { - Static3.aClass100Array176[local26++] = Static72.aClass100_447; + Static3.stringStack[ssp++] = Static72.aClass100_447; } else { - Static3.aClass100Array176[local26++] = local1182.aClass100_88; + Static3.stringStack[ssp++] = local1182.aClass100_88; } continue; } - } else if (local226 < 2600) { - local28--; - local1182 = Static5.getComponent(Static254.anIntArray487[local28]); - if (local226 == 2500) { - Static254.anIntArray487[local28++] = local1182.x; + } else if (opcode < 2600) { + isp--; + local1182 = Static5.getComponent(Static254.intStack[isp]); + if (opcode == 2500) { + Static254.intStack[isp++] = local1182.x; continue; } - if (local226 == 2501) { - Static254.anIntArray487[local28++] = local1182.y; + if (opcode == 2501) { + Static254.intStack[isp++] = local1182.y; continue; } - if (local226 == 2502) { - Static254.anIntArray487[local28++] = local1182.anInt445; + if (opcode == 2502) { + Static254.intStack[isp++] = local1182.anInt445; continue; } - if (local226 == 2503) { - Static254.anIntArray487[local28++] = local1182.anInt459; + if (opcode == 2503) { + Static254.intStack[isp++] = local1182.anInt459; continue; } - if (local226 == 2504) { - Static254.anIntArray487[local28++] = local1182.hidden ? 1 : 0; + if (opcode == 2504) { + Static254.intStack[isp++] = local1182.hidden ? 1 : 0; continue; } - if (local226 == 2505) { - Static254.anIntArray487[local28++] = local1182.layer; + if (opcode == 2505) { + Static254.intStack[isp++] = local1182.layer; continue; } - } else if (local226 < 2700) { - local28--; - local1182 = Static5.getComponent(Static254.anIntArray487[local28]); - if (local226 == 2600) { - Static254.anIntArray487[local28++] = local1182.anInt489; + } else if (opcode < 2700) { + isp--; + local1182 = Static5.getComponent(Static254.intStack[isp]); + if (opcode == 2600) { + Static254.intStack[isp++] = local1182.anInt489; continue; } - if (local226 == 2601) { - Static254.anIntArray487[local28++] = local1182.scrollY; + if (opcode == 2601) { + Static254.intStack[isp++] = local1182.scrollY; continue; } - if (local226 == 2602) { - Static3.aClass100Array176[local26++] = local1182.aClass100_84; + if (opcode == 2602) { + Static3.stringStack[ssp++] = local1182.aClass100_84; continue; } - if (local226 == 2603) { - Static254.anIntArray487[local28++] = local1182.anInt486; + if (opcode == 2603) { + Static254.intStack[isp++] = local1182.anInt486; continue; } - if (local226 == 2604) { - Static254.anIntArray487[local28++] = local1182.anInt491; + if (opcode == 2604) { + Static254.intStack[isp++] = local1182.anInt491; continue; } - if (local226 == 2605) { - Static254.anIntArray487[local28++] = local1182.modelZoom; + if (opcode == 2605) { + Static254.intStack[isp++] = local1182.modelZoom; continue; } - if (local226 == 2606) { - Static254.anIntArray487[local28++] = local1182.modelXAngle; + if (opcode == 2606) { + Static254.intStack[isp++] = local1182.modelXAngle; continue; } - if (local226 == 2607) { - Static254.anIntArray487[local28++] = local1182.modelYOffset; + if (opcode == 2607) { + Static254.intStack[isp++] = local1182.modelYOffset; continue; } - if (local226 == 2608) { - Static254.anIntArray487[local28++] = local1182.modelYAngle; + if (opcode == 2608) { + Static254.intStack[isp++] = local1182.modelYAngle; continue; } - if (local226 == 2609) { - Static254.anIntArray487[local28++] = local1182.anInt476; + if (opcode == 2609) { + Static254.intStack[isp++] = local1182.anInt476; continue; } - if (local226 == 2610) { - Static254.anIntArray487[local28++] = local1182.modelXOffset; + if (opcode == 2610) { + Static254.intStack[isp++] = local1182.modelXOffset; continue; } - if (local226 == 2611) { - Static254.anIntArray487[local28++] = local1182.modelZOffset; + if (opcode == 2611) { + Static254.intStack[isp++] = local1182.modelZOffset; continue; } - if (local226 == 2612) { - Static254.anIntArray487[local28++] = local1182.anInt477; + if (opcode == 2612) { + Static254.intStack[isp++] = local1182.anInt477; continue; } - } else if (local226 < 2800) { - if (local226 == 2700) { - local28--; - local1182 = Static5.getComponent(Static254.anIntArray487[local28]); - Static254.anIntArray487[local28++] = local1182.objId; + } else if (opcode < 2800) { + if (opcode == 2700) { + isp--; + local1182 = Static5.getComponent(Static254.intStack[isp]); + Static254.intStack[isp++] = local1182.objId; continue; } - if (local226 == 2701) { - local28--; - local1182 = Static5.getComponent(Static254.anIntArray487[local28]); + if (opcode == 2701) { + isp--; + local1182 = Static5.getComponent(Static254.intStack[isp]); if (local1182.objId == -1) { - Static254.anIntArray487[local28++] = 0; + Static254.intStack[isp++] = 0; } else { - Static254.anIntArray487[local28++] = local1182.objCount; + Static254.intStack[isp++] = local1182.objCount; } continue; } - if (local226 == 2702) { - local28--; - local809 = Static254.anIntArray487[local28]; + if (opcode == 2702) { + isp--; + local809 = Static254.intStack[isp]; @Pc(12566) Class3_Sub31 local12566 = (Class3_Sub31) Static119.aClass133_9.method3863((long) local809); if (local12566 == null) { - Static254.anIntArray487[local28++] = 0; + Static254.intStack[isp++] = 0; } else { - Static254.anIntArray487[local28++] = 1; + Static254.intStack[isp++] = 1; } continue; } - if (local226 == 2703) { - local28--; - local1182 = Static5.getComponent(Static254.anIntArray487[local28]); + if (opcode == 2703) { + isp--; + local1182 = Static5.getComponent(Static254.intStack[isp]); if (local1182.createdComponents == null) { - Static254.anIntArray487[local28++] = 0; + Static254.intStack[isp++] = 0; continue; } local803 = local1182.createdComponents.length; @@ -1181,66 +1181,66 @@ public final class Static88 { break; } } - Static254.anIntArray487[local28++] = local803; + Static254.intStack[isp++] = local803; continue; } - if (local226 == 2704 || local226 == 2705) { - local28 -= 2; - local809 = Static254.anIntArray487[local28]; - local803 = Static254.anIntArray487[local28 + 1]; + if (opcode == 2704 || opcode == 2705) { + isp -= 2; + local809 = Static254.intStack[isp]; + local803 = Static254.intStack[isp + 1]; @Pc(12663) Class3_Sub31 local12663 = (Class3_Sub31) Static119.aClass133_9.method3863((long) local809); if (local12663 != null && local12663.anInt5878 == local803) { - Static254.anIntArray487[local28++] = 1; + Static254.intStack[isp++] = 1; continue; } - Static254.anIntArray487[local28++] = 0; + Static254.intStack[isp++] = 0; continue; } - } else if (local226 < 2900) { - local28--; - local1182 = Static5.getComponent(Static254.anIntArray487[local28]); - if (local226 == 2800) { - Static254.anIntArray487[local28++] = Static36.method940(local1182).method512(); + } else if (opcode < 2900) { + isp--; + local1182 = Static5.getComponent(Static254.intStack[isp]); + if (opcode == 2800) { + Static254.intStack[isp++] = Static36.method940(local1182).method512(); continue; } - if (local226 == 2801) { - local28--; - local803 = Static254.anIntArray487[local28]; + if (opcode == 2801) { + isp--; + local803 = Static254.intStack[isp]; local803--; if (local1182.aClass100Array18 != null && local1182.aClass100Array18.length > local803 && local1182.aClass100Array18[local803] != null) { - Static3.aClass100Array176[local26++] = local1182.aClass100Array18[local803]; + Static3.stringStack[ssp++] = local1182.aClass100Array18[local803]; continue; } - Static3.aClass100Array176[local26++] = Static72.aClass100_447; + Static3.stringStack[ssp++] = Static72.aClass100_447; continue; } - if (local226 == 2802) { + if (opcode == 2802) { if (local1182.aClass100_88 == null) { - Static3.aClass100Array176[local26++] = Static72.aClass100_447; + Static3.stringStack[ssp++] = Static72.aClass100_447; } else { - Static3.aClass100Array176[local26++] = local1182.aClass100_88; + Static3.stringStack[ssp++] = local1182.aClass100_88; } continue; } - } else if (local226 < 3200) { - if (local226 == 3100) { - local26--; - local609 = Static3.aClass100Array176[local26]; + } else if (opcode < 3200) { + if (opcode == 3100) { + ssp--; + local609 = Static3.stringStack[ssp]; Static103.method2231(Static72.aClass100_447, 0, local609); continue; } - if (local226 == 3101) { - local28 -= 2; - Static186.method3415(Static254.anIntArray487[local28 + 1], Static254.anIntArray487[local28], Static173.self); + if (opcode == 3101) { + isp -= 2; + Static186.method3415(Static254.intStack[isp + 1], Static254.intStack[isp], Static173.self); continue; } - if (local226 == 3103) { + if (opcode == 3103) { Static153.method2909(); continue; } - if (local226 == 3104) { - local26--; - local609 = Static3.aClass100Array176[local26]; + if (opcode == 3104) { + ssp--; + local609 = Static3.stringStack[ssp]; local803 = 0; if (local609.isInt()) { local803 = local609.parseInt(); @@ -1249,307 +1249,307 @@ public final class Static88 { Static6.outboundBuffer.p4(local803); continue; } - if (local226 == 3105) { - local26--; - local609 = Static3.aClass100Array176[local26]; + if (opcode == 3105) { + ssp--; + local609 = Static3.stringStack[ssp]; Static6.outboundBuffer.p1isaac(244); Static6.outboundBuffer.p8(local609.encode37()); continue; } - if (local226 == 3106) { - local26--; - local609 = Static3.aClass100Array176[local26]; + if (opcode == 3106) { + ssp--; + local609 = Static3.stringStack[ssp]; Static6.outboundBuffer.p1isaac(65); Static6.outboundBuffer.p1(local609.length() + 1); Static6.outboundBuffer.pjstr(local609); continue; } - if (local226 == 3107) { - local28--; - local809 = Static254.anIntArray487[local28]; - local26--; - local2522 = Static3.aClass100Array176[local26]; + if (opcode == 3107) { + isp--; + local809 = Static254.intStack[isp]; + ssp--; + local2522 = Static3.stringStack[ssp]; Static276.method4613(local809, local2522); continue; } - if (local226 == 3108) { - local28 -= 3; - local803 = Static254.anIntArray487[local28 + 1]; - local809 = Static254.anIntArray487[local28]; - local1052 = Static254.anIntArray487[local28 + 2]; + if (opcode == 3108) { + isp -= 3; + local803 = Static254.intStack[isp + 1]; + local809 = Static254.intStack[isp]; + local1052 = Static254.intStack[isp + 2]; local1063 = Static5.getComponent(local1052); Static40.method1015(local803, local809, local1063); continue; } - if (local226 == 3109) { - local28 -= 2; - local809 = Static254.anIntArray487[local28]; + if (opcode == 3109) { + isp -= 2; + local809 = Static254.intStack[isp]; local1256 = local1020 ? Static274.aClass13_24 : Static227.aClass13_25; - local803 = Static254.anIntArray487[local28 + 1]; + local803 = Static254.intStack[isp + 1]; Static40.method1015(local803, local809, local1256); continue; } - if (local226 == 3110) { - local28--; - local809 = Static254.anIntArray487[local28]; + if (opcode == 3110) { + isp--; + local809 = Static254.intStack[isp]; Static6.outboundBuffer.p1isaac(111); Static6.outboundBuffer.p2(local809); continue; } - } else if (local226 < 3300) { - if (local226 == 3200) { - local28 -= 3; - Static26.method744(Static254.anIntArray487[local28 + 1], Static254.anIntArray487[local28], Static254.anIntArray487[local28 + 2]); + } else if (opcode < 3300) { + if (opcode == 3200) { + isp -= 3; + Static26.method744(Static254.intStack[isp + 1], Static254.intStack[isp], Static254.intStack[isp + 2]); continue; } - if (local226 == 3201) { - local28--; - Static148.method2765(Static254.anIntArray487[local28]); + if (opcode == 3201) { + isp--; + Static148.method2765(Static254.intStack[isp]); continue; } - if (local226 == 3202) { - local28 -= 2; - Static278.method4650(Static254.anIntArray487[local28 + 1], Static254.anIntArray487[local28]); + if (opcode == 3202) { + isp -= 2; + Static278.method4650(Static254.intStack[isp + 1], Static254.intStack[isp]); continue; } - } else if (local226 < 3400) { - if (local226 == 3300) { - Static254.anIntArray487[local28++] = Static83.anInt372; + } else if (opcode < 3400) { + if (opcode == 3300) { + Static254.intStack[isp++] = Static83.loop; continue; } - if (local226 == 3301) { - local28 -= 2; - local809 = Static254.anIntArray487[local28]; - local803 = Static254.anIntArray487[local28 + 1]; - Static254.anIntArray487[local28++] = Static15.method484(local809, local803); + if (opcode == 3301) { + isp -= 2; + local809 = Static254.intStack[isp]; + local803 = Static254.intStack[isp + 1]; + Static254.intStack[isp++] = Static15.method484(local809, local803); continue; } - if (local226 == 3302) { - local28 -= 2; - local803 = Static254.anIntArray487[local28 + 1]; - local809 = Static254.anIntArray487[local28]; - Static254.anIntArray487[local28++] = Static23.method647(local809, local803); + if (opcode == 3302) { + isp -= 2; + local803 = Static254.intStack[isp + 1]; + local809 = Static254.intStack[isp]; + Static254.intStack[isp++] = Static23.method647(local809, local803); continue; } - if (local226 == 3303) { - local28 -= 2; - local803 = Static254.anIntArray487[local28 + 1]; - local809 = Static254.anIntArray487[local28]; - Static254.anIntArray487[local28++] = Static278.method4652(local809, local803); + if (opcode == 3303) { + isp -= 2; + local803 = Static254.intStack[isp + 1]; + local809 = Static254.intStack[isp]; + Static254.intStack[isp++] = Static278.method4652(local809, local803); continue; } - if (local226 == 3304) { - local28--; - local809 = Static254.anIntArray487[local28]; - Static254.anIntArray487[local28++] = Static246.method4241(local809).anInt3706; + if (opcode == 3304) { + isp--; + local809 = Static254.intStack[isp]; + Static254.intStack[isp++] = Static246.method4241(local809).anInt3706; continue; } - if (local226 == 3305) { - local28--; - local809 = Static254.anIntArray487[local28]; - Static254.anIntArray487[local28++] = Static99.anIntArray240[local809]; + if (opcode == 3305) { + isp--; + local809 = Static254.intStack[isp]; + Static254.intStack[isp++] = Static99.anIntArray240[local809]; continue; } - if (local226 == 3306) { - local28--; - local809 = Static254.anIntArray487[local28]; - Static254.anIntArray487[local28++] = Static141.anIntArray326[local809]; + if (opcode == 3306) { + isp--; + local809 = Static254.intStack[isp]; + Static254.intStack[isp++] = Static141.anIntArray326[local809]; continue; } - if (local226 == 3307) { - local28--; - local809 = Static254.anIntArray487[local28]; - Static254.anIntArray487[local28++] = Static227.anIntArray446[local809]; + if (opcode == 3307) { + isp--; + local809 = Static254.intStack[isp]; + Static254.intStack[isp++] = Static227.anIntArray446[local809]; continue; } - if (local226 == 3308) { + if (opcode == 3308) { local809 = Static55.level; local803 = Static225.originX + (Static173.self.anInt3412 >> 7); local1052 = (Static173.self.anInt3421 >> 7) + Static142.originZ; - Static254.anIntArray487[local28++] = (local809 << 28) - (-(local803 << 14) - local1052); + Static254.intStack[isp++] = (local809 << 28) - (-(local803 << 14) - local1052); continue; } - if (local226 == 3309) { - local28--; - local809 = Static254.anIntArray487[local28]; - Static254.anIntArray487[local28++] = local809 >> 14 & 0x3FFF; + if (opcode == 3309) { + isp--; + local809 = Static254.intStack[isp]; + Static254.intStack[isp++] = local809 >> 14 & 0x3FFF; continue; } - if (local226 == 3310) { - local28--; - local809 = Static254.anIntArray487[local28]; - Static254.anIntArray487[local28++] = local809 >> 28; + if (opcode == 3310) { + isp--; + local809 = Static254.intStack[isp]; + Static254.intStack[isp++] = local809 >> 28; continue; } - if (local226 == 3311) { - local28--; - local809 = Static254.anIntArray487[local28]; - Static254.anIntArray487[local28++] = local809 & 0x3FFF; + if (opcode == 3311) { + isp--; + local809 = Static254.intStack[isp]; + Static254.intStack[isp++] = local809 & 0x3FFF; continue; } - if (local226 == 3312) { - Static254.anIntArray487[local28++] = Static2.aBoolean1 ? 1 : 0; + if (opcode == 3312) { + Static254.intStack[isp++] = Static2.aBoolean1 ? 1 : 0; continue; } - if (local226 == 3313) { - local28 -= 2; - local809 = Static254.anIntArray487[local28] + 32768; - local803 = Static254.anIntArray487[local28 + 1]; - Static254.anIntArray487[local28++] = Static15.method484(local809, local803); + if (opcode == 3313) { + isp -= 2; + local809 = Static254.intStack[isp] + 32768; + local803 = Static254.intStack[isp + 1]; + Static254.intStack[isp++] = Static15.method484(local809, local803); continue; } - if (local226 == 3314) { - local28 -= 2; - local809 = Static254.anIntArray487[local28] + 32768; - local803 = Static254.anIntArray487[local28 + 1]; - Static254.anIntArray487[local28++] = Static23.method647(local809, local803); + if (opcode == 3314) { + isp -= 2; + local809 = Static254.intStack[isp] + 32768; + local803 = Static254.intStack[isp + 1]; + Static254.intStack[isp++] = Static23.method647(local809, local803); continue; } - if (local226 == 3315) { - local28 -= 2; - local809 = Static254.anIntArray487[local28] + 32768; - local803 = Static254.anIntArray487[local28 + 1]; - Static254.anIntArray487[local28++] = Static278.method4652(local809, local803); + if (opcode == 3315) { + isp -= 2; + local809 = Static254.intStack[isp] + 32768; + local803 = Static254.intStack[isp + 1]; + Static254.intStack[isp++] = Static278.method4652(local809, local803); continue; } - if (local226 == 3316) { + if (opcode == 3316) { if (Static191.staffModLevel < 2) { - Static254.anIntArray487[local28++] = 0; + Static254.intStack[isp++] = 0; } else { - Static254.anIntArray487[local28++] = Static191.staffModLevel; + Static254.intStack[isp++] = Static191.staffModLevel; } continue; } - if (local226 == 3317) { - Static254.anIntArray487[local28++] = Static60.rebootTimer; + if (opcode == 3317) { + Static254.intStack[isp++] = Static60.rebootTimer; continue; } - if (local226 == 3318) { - Static254.anIntArray487[local28++] = Static125.worldId; + if (opcode == 3318) { + Static254.intStack[isp++] = Static125.worldId; continue; } - if (local226 == 3321) { - Static254.anIntArray487[local28++] = Static12.anInt400; + if (opcode == 3321) { + Static254.intStack[isp++] = Static12.anInt400; continue; } - if (local226 == 3322) { - Static254.anIntArray487[local28++] = Static251.anInt5456; + if (opcode == 3322) { + Static254.intStack[isp++] = Static251.anInt5456; continue; } - if (local226 == 3323) { + if (opcode == 3323) { if (Static249.anInt5431 >= 5 && Static249.anInt5431 <= 9) { - Static254.anIntArray487[local28++] = 1; + Static254.intStack[isp++] = 1; continue; } - Static254.anIntArray487[local28++] = 0; + Static254.intStack[isp++] = 0; continue; } - if (local226 == 3324) { + if (opcode == 3324) { if (Static249.anInt5431 >= 5 && Static249.anInt5431 <= 9) { - Static254.anIntArray487[local28++] = Static249.anInt5431; + Static254.intStack[isp++] = Static249.anInt5431; continue; } - Static254.anIntArray487[local28++] = 0; + Static254.intStack[isp++] = 0; continue; } - if (local226 == 3325) { - Static254.anIntArray487[local28++] = Static202.aBoolean233 ? 1 : 0; + if (opcode == 3325) { + Static254.intStack[isp++] = Static202.aBoolean233 ? 1 : 0; continue; } - if (local226 == 3326) { - Static254.anIntArray487[local28++] = Static173.self.anInt1652; + if (opcode == 3326) { + Static254.intStack[isp++] = Static173.self.anInt1652; continue; } - if (local226 == 3327) { - Static254.anIntArray487[local28++] = Static173.self.aClass59_1.aBoolean141 ? 1 : 0; + if (opcode == 3327) { + Static254.intStack[isp++] = Static173.self.aClass59_1.aBoolean141 ? 1 : 0; continue; } - if (local226 == 3328) { - Static254.anIntArray487[local28++] = Static124.aBoolean157 && !Static207.aBoolean236 ? 1 : 0; + if (opcode == 3328) { + Static254.intStack[isp++] = Static124.aBoolean157 && !Static207.aBoolean236 ? 1 : 0; continue; } - if (local226 == 3329) { - Static254.anIntArray487[local28++] = Static86.aBoolean129 ? 1 : 0; + if (opcode == 3329) { + Static254.intStack[isp++] = Static86.aBoolean129 ? 1 : 0; continue; } - if (local226 == 3330) { - local28--; - local809 = Static254.anIntArray487[local28]; - Static254.anIntArray487[local28++] = Static11.method446(local809); + if (opcode == 3330) { + isp--; + local809 = Static254.intStack[isp]; + Static254.intStack[isp++] = Static11.method446(local809); continue; } - if (local226 == 3331) { - local28 -= 2; - local803 = Static254.anIntArray487[local28 + 1]; - local809 = Static254.anIntArray487[local28]; - Static254.anIntArray487[local28++] = Static178.method3319(false, local809, local803); + if (opcode == 3331) { + isp -= 2; + local803 = Static254.intStack[isp + 1]; + local809 = Static254.intStack[isp]; + Static254.intStack[isp++] = Static178.method3319(false, local809, local803); continue; } - if (local226 == 3332) { - local28 -= 2; - local809 = Static254.anIntArray487[local28]; - local803 = Static254.anIntArray487[local28 + 1]; - Static254.anIntArray487[local28++] = Static178.method3319(true, local809, local803); + if (opcode == 3332) { + isp -= 2; + local809 = Static254.intStack[isp]; + local803 = Static254.intStack[isp + 1]; + Static254.intStack[isp++] = Static178.method3319(true, local809, local803); continue; } - if (local226 == 3333) { - Static254.anIntArray487[local28++] = Static5.anInt39; + if (opcode == 3333) { + Static254.intStack[isp++] = Static5.anInt39; continue; } - if (local226 == 3335) { - Static254.anIntArray487[local28++] = Static141.anInt3470; + if (opcode == 3335) { + Static254.intStack[isp++] = Static141.anInt3470; continue; } - if (local226 == 3336) { - local28 -= 4; - local803 = Static254.anIntArray487[local28 + 1]; - local809 = Static254.anIntArray487[local28]; + if (opcode == 3336) { + isp -= 4; + local803 = Static254.intStack[isp + 1]; + local809 = Static254.intStack[isp]; local809 += local803 << 14; - local652 = Static254.anIntArray487[local28 + 3]; - local1052 = Static254.anIntArray487[local28 + 2]; + local652 = Static254.intStack[isp + 3]; + local1052 = Static254.intStack[isp + 2]; local809 += local1052 << 28; local809 += local652; - Static254.anIntArray487[local28++] = local809; + Static254.intStack[isp++] = local809; continue; } - if (local226 == 3337) { - Static254.anIntArray487[local28++] = Static204.anInt4760; + if (opcode == 3337) { + Static254.intStack[isp++] = Static204.anInt4760; continue; } - } else if (local226 < 3500) { + } else if (opcode < 3500) { @Pc(3422) EnumType local3422; - if (local226 == 3400) { - local28 -= 2; - local809 = Static254.anIntArray487[local28]; - local803 = Static254.anIntArray487[local28 + 1]; + if (opcode == 3400) { + isp -= 2; + local809 = Static254.intStack[isp]; + local803 = Static254.intStack[isp + 1]; local3422 = Static253.method4330(local809); if (local3422.anInt3950 == 115) { } - Static3.aClass100Array176[local26++] = local3422.method3085(local803); + Static3.stringStack[ssp++] = local3422.method3085(local803); continue; } - if (local226 == 3408) { - local28 -= 4; - local809 = Static254.anIntArray487[local28]; - local803 = Static254.anIntArray487[local28 + 1]; - local652 = Static254.anIntArray487[local28 + 3]; - local1052 = Static254.anIntArray487[local28 + 2]; + if (opcode == 3408) { + isp -= 4; + local809 = Static254.intStack[isp]; + local803 = Static254.intStack[isp + 1]; + local652 = Static254.intStack[isp + 3]; + local1052 = Static254.intStack[isp + 2]; @Pc(3469) EnumType local3469 = Static253.method4330(local1052); if (local3469.anInt3957 == local809 && local3469.anInt3950 == local803) { if (local803 == 115) { - Static3.aClass100Array176[local26++] = local3469.method3085(local652); + Static3.stringStack[ssp++] = local3469.method3085(local652); } else { - Static254.anIntArray487[local28++] = local3469.method3089(local652); + Static254.intStack[isp++] = local3469.method3089(local652); } continue; } throw new RuntimeException("C3408-1"); } - if (local226 == 3409) { - local28 -= 3; - local803 = Static254.anIntArray487[local28 + 1]; - local1052 = Static254.anIntArray487[local28 + 2]; - local809 = Static254.anIntArray487[local28]; + if (opcode == 3409) { + isp -= 3; + local803 = Static254.intStack[isp + 1]; + local1052 = Static254.intStack[isp + 2]; + local809 = Static254.intStack[isp]; if (local803 == -1) { throw new RuntimeException("C3409-2"); } @@ -1557,14 +1557,14 @@ public final class Static88 { if (local3549.anInt3950 != local809) { throw new RuntimeException("C3409-1"); } - Static254.anIntArray487[local28++] = local3549.method3090(local1052) ? 1 : 0; + Static254.intStack[isp++] = local3549.method3090(local1052) ? 1 : 0; continue; } - if (local226 == 3410) { - local28--; - local809 = Static254.anIntArray487[local28]; - local26--; - local2522 = Static3.aClass100Array176[local26]; + if (opcode == 3410) { + isp--; + local809 = Static254.intStack[isp]; + ssp--; + local2522 = Static3.stringStack[ssp]; if (local809 == -1) { throw new RuntimeException("C3410-2"); } @@ -1572,650 +1572,650 @@ public final class Static88 { if (local3422.anInt3950 != 115) { throw new RuntimeException("C3410-1"); } - Static254.anIntArray487[local28++] = local3422.method3086(local2522) ? 1 : 0; + Static254.intStack[isp++] = local3422.method3086(local2522) ? 1 : 0; continue; } - if (local226 == 3411) { - local28--; - local809 = Static254.anIntArray487[local28]; + if (opcode == 3411) { + isp--; + local809 = Static254.intStack[isp]; @Pc(3645) EnumType local3645 = Static253.method4330(local809); - Static254.anIntArray487[local28++] = local3645.aClass133_16.method3864(); + Static254.intStack[isp++] = local3645.aClass133_16.method3864(); continue; } - } else if (local226 < 3700) { - if (local226 == 3600) { + } else if (opcode < 3700) { + if (opcode == 3600) { if (Static166.anInt4054 == 0) { - Static254.anIntArray487[local28++] = -2; + Static254.intStack[isp++] = -2; } else if (Static166.anInt4054 == 1) { - Static254.anIntArray487[local28++] = -1; + Static254.intStack[isp++] = -1; } else { - Static254.anIntArray487[local28++] = Static9.anInt178; + Static254.intStack[isp++] = Static9.anInt178; } continue; } - if (local226 == 3601) { - local28--; - local809 = Static254.anIntArray487[local28]; + if (opcode == 3601) { + isp--; + local809 = Static254.intStack[isp]; if (Static166.anInt4054 == 2 && local809 < Static9.anInt178) { - Static3.aClass100Array176[local26++] = Static122.aClass100Array92[local809]; + Static3.stringStack[ssp++] = Static122.aClass100Array92[local809]; continue; } - Static3.aClass100Array176[local26++] = Static72.aClass100_447; + Static3.stringStack[ssp++] = Static72.aClass100_447; continue; } - if (local226 == 3602) { - local28--; - local809 = Static254.anIntArray487[local28]; + if (opcode == 3602) { + isp--; + local809 = Static254.intStack[isp]; if (Static166.anInt4054 == 2 && Static9.anInt178 > local809) { - Static254.anIntArray487[local28++] = Static104.anIntArray255[local809]; + Static254.intStack[isp++] = Static104.anIntArray255[local809]; continue; } - Static254.anIntArray487[local28++] = 0; + Static254.intStack[isp++] = 0; continue; } - if (local226 == 3603) { - local28--; - local809 = Static254.anIntArray487[local28]; + if (opcode == 3603) { + isp--; + local809 = Static254.intStack[isp]; if (Static166.anInt4054 == 2 && Static9.anInt178 > local809) { - Static254.anIntArray487[local28++] = Static106.anIntArray258[local809]; + Static254.intStack[isp++] = Static106.anIntArray258[local809]; continue; } - Static254.anIntArray487[local28++] = 0; + Static254.intStack[isp++] = 0; continue; } - if (local226 == 3604) { - local28--; - local803 = Static254.anIntArray487[local28]; - local26--; - local609 = Static3.aClass100Array176[local26]; + if (opcode == 3604) { + isp--; + local803 = Static254.intStack[isp]; + ssp--; + local609 = Static3.stringStack[ssp]; Static171.method3221(local609, local803); continue; } - if (local226 == 3605) { - local26--; - local609 = Static3.aClass100Array176[local26]; + if (opcode == 3605) { + ssp--; + local609 = Static3.stringStack[ssp]; Static64.method1496(local609.encode37()); continue; } - if (local226 == 3606) { - local26--; - local609 = Static3.aClass100Array176[local26]; + if (opcode == 3606) { + ssp--; + local609 = Static3.stringStack[ssp]; Static193.method3500(local609.encode37()); continue; } - if (local226 == 3607) { - local26--; - local609 = Static3.aClass100Array176[local26]; + if (opcode == 3607) { + ssp--; + local609 = Static3.stringStack[ssp]; Static140.method2707(local609.encode37()); continue; } - if (local226 == 3608) { - local26--; - local609 = Static3.aClass100Array176[local26]; + if (opcode == 3608) { + ssp--; + local609 = Static3.stringStack[ssp]; Static69.method1542(local609.encode37()); continue; } - if (local226 == 3609) { - local26--; - local609 = Static3.aClass100Array176[local26]; + if (opcode == 3609) { + ssp--; + local609 = Static3.stringStack[ssp]; if (local609.method3138(Static72.aClass100_446) || local609.method3138(Static101.aClass100_537)) { local609 = local609.method3136(7); } - Static254.anIntArray487[local28++] = Static98.method1965(local609) ? 1 : 0; + Static254.intStack[isp++] = Static98.method1965(local609) ? 1 : 0; continue; } - if (local226 == 3610) { - local28--; - local809 = Static254.anIntArray487[local28]; + if (opcode == 3610) { + isp--; + local809 = Static254.intStack[isp]; if (Static166.anInt4054 == 2 && Static9.anInt178 > local809) { - Static3.aClass100Array176[local26++] = Static214.aClass100Array170[local809]; + Static3.stringStack[ssp++] = Static214.aClass100Array170[local809]; continue; } - Static3.aClass100Array176[local26++] = Static72.aClass100_447; + Static3.stringStack[ssp++] = Static72.aClass100_447; continue; } - if (local226 == 3611) { + if (opcode == 3611) { if (Static15.aClass100_87 == null) { - Static3.aClass100Array176[local26++] = Static72.aClass100_447; + Static3.stringStack[ssp++] = Static72.aClass100_447; } else { - Static3.aClass100Array176[local26++] = Static15.aClass100_87.method3125(); + Static3.stringStack[ssp++] = Static15.aClass100_87.method3125(); } continue; } - if (local226 == 3612) { + if (opcode == 3612) { if (Static15.aClass100_87 == null) { - Static254.anIntArray487[local28++] = 0; + Static254.intStack[isp++] = 0; } else { - Static254.anIntArray487[local28++] = Static214.anInt5577; + Static254.intStack[isp++] = Static214.anInt5577; } continue; } - if (local226 == 3613) { - local28--; - local809 = Static254.anIntArray487[local28]; + if (opcode == 3613) { + isp--; + local809 = Static254.intStack[isp]; if (Static15.aClass100_87 != null && Static214.anInt5577 > local809) { - Static3.aClass100Array176[local26++] = Static199.aClass3_Sub22Array1[local809].aClass100_636.method3125(); + Static3.stringStack[ssp++] = Static199.aClass3_Sub22Array1[local809].aClass100_636.method3125(); continue; } - Static3.aClass100Array176[local26++] = Static72.aClass100_447; + Static3.stringStack[ssp++] = Static72.aClass100_447; continue; } - if (local226 == 3614) { - local28--; - local809 = Static254.anIntArray487[local28]; + if (opcode == 3614) { + isp--; + local809 = Static254.intStack[isp]; if (Static15.aClass100_87 != null && local809 < Static214.anInt5577) { - Static254.anIntArray487[local28++] = Static199.aClass3_Sub22Array1[local809].anInt3340; + Static254.intStack[isp++] = Static199.aClass3_Sub22Array1[local809].anInt3340; continue; } - Static254.anIntArray487[local28++] = 0; + Static254.intStack[isp++] = 0; continue; } - if (local226 == 3615) { - local28--; - local809 = Static254.anIntArray487[local28]; + if (opcode == 3615) { + isp--; + local809 = Static254.intStack[isp]; if (Static15.aClass100_87 != null && Static214.anInt5577 > local809) { - Static254.anIntArray487[local28++] = Static199.aClass3_Sub22Array1[local809].aByte9; + Static254.intStack[isp++] = Static199.aClass3_Sub22Array1[local809].aByte9; continue; } - Static254.anIntArray487[local28++] = 0; + Static254.intStack[isp++] = 0; continue; } - if (local226 == 3616) { - Static254.anIntArray487[local28++] = Static50.aByte6; + if (opcode == 3616) { + Static254.intStack[isp++] = Static50.aByte6; continue; } - if (local226 == 3617) { - local26--; - local609 = Static3.aClass100Array176[local26]; + if (opcode == 3617) { + ssp--; + local609 = Static3.stringStack[ssp]; Static178.method3318(local609); continue; } - if (local226 == 3618) { - Static254.anIntArray487[local28++] = Static160.aByte14; + if (opcode == 3618) { + Static254.intStack[isp++] = Static160.aByte14; continue; } - if (local226 == 3619) { - local26--; - local609 = Static3.aClass100Array176[local26]; + if (opcode == 3619) { + ssp--; + local609 = Static3.stringStack[ssp]; Static156.method2956(local609.encode37()); continue; } - if (local226 == 3620) { + if (opcode == 3620) { Static134.method2623(); continue; } - if (local226 == 3621) { + if (opcode == 3621) { if (Static166.anInt4054 == 0) { - Static254.anIntArray487[local28++] = -1; + Static254.intStack[isp++] = -1; } else { - Static254.anIntArray487[local28++] = Static35.anInt1093; + Static254.intStack[isp++] = Static35.anInt1093; } continue; } - if (local226 == 3622) { - local28--; - local809 = Static254.anIntArray487[local28]; + if (opcode == 3622) { + isp--; + local809 = Static254.intStack[isp]; if (Static166.anInt4054 != 0 && Static35.anInt1093 > local809) { - Static3.aClass100Array176[local26++] = Static79.decode37(Static190.aLongArray6[local809]).method3125(); + Static3.stringStack[ssp++] = Static79.decode37(Static190.aLongArray6[local809]).method3125(); continue; } - Static3.aClass100Array176[local26++] = Static72.aClass100_447; + Static3.stringStack[ssp++] = Static72.aClass100_447; continue; } - if (local226 == 3623) { - local26--; - local609 = Static3.aClass100Array176[local26]; + if (opcode == 3623) { + ssp--; + local609 = Static3.stringStack[ssp]; if (local609.method3138(Static72.aClass100_446) || local609.method3138(Static101.aClass100_537)) { local609 = local609.method3136(7); } - Static254.anIntArray487[local28++] = Static238.method4144(local609) ? 1 : 0; + Static254.intStack[isp++] = Static238.method4144(local609) ? 1 : 0; continue; } - if (local226 == 3624) { - local28--; - local809 = Static254.anIntArray487[local28]; + if (opcode == 3624) { + isp--; + local809 = Static254.intStack[isp]; if (Static199.aClass3_Sub22Array1 != null && Static214.anInt5577 > local809 && Static199.aClass3_Sub22Array1[local809].aClass100_636.method3111(Static173.self.aClass100_364)) { - Static254.anIntArray487[local28++] = 1; + Static254.intStack[isp++] = 1; continue; } - Static254.anIntArray487[local28++] = 0; + Static254.intStack[isp++] = 0; continue; } - if (local226 == 3625) { + if (opcode == 3625) { if (Static270.aClass100_1094 == null) { - Static3.aClass100Array176[local26++] = Static72.aClass100_447; + Static3.stringStack[ssp++] = Static72.aClass100_447; } else { - Static3.aClass100Array176[local26++] = Static270.aClass100_1094.method3125(); + Static3.stringStack[ssp++] = Static270.aClass100_1094.method3125(); } continue; } - if (local226 == 3626) { - local28--; - local809 = Static254.anIntArray487[local28]; + if (opcode == 3626) { + isp--; + local809 = Static254.intStack[isp]; if (Static15.aClass100_87 != null && Static214.anInt5577 > local809) { - Static3.aClass100Array176[local26++] = Static199.aClass3_Sub22Array1[local809].aClass100_635; + Static3.stringStack[ssp++] = Static199.aClass3_Sub22Array1[local809].aClass100_635; continue; } - Static3.aClass100Array176[local26++] = Static72.aClass100_447; + Static3.stringStack[ssp++] = Static72.aClass100_447; continue; } - if (local226 == 3627) { - local28--; - local809 = Static254.anIntArray487[local28]; + if (opcode == 3627) { + isp--; + local809 = Static254.intStack[isp]; if (Static166.anInt4054 == 2 && local809 >= 0 && local809 < Static9.anInt178) { - Static254.anIntArray487[local28++] = Static3.aBooleanArray135[local809] ? 1 : 0; + Static254.intStack[isp++] = Static3.aBooleanArray135[local809] ? 1 : 0; continue; } - Static254.anIntArray487[local28++] = 0; + Static254.intStack[isp++] = 0; continue; } - if (local226 == 3628) { - local26--; - local609 = Static3.aClass100Array176[local26]; + if (opcode == 3628) { + ssp--; + local609 = Static3.stringStack[ssp]; if (local609.method3138(Static72.aClass100_446) || local609.method3138(Static101.aClass100_537)) { local609 = local609.method3136(7); } - Static254.anIntArray487[local28++] = Static4.method25(local609); + Static254.intStack[isp++] = Static4.method25(local609); continue; } - if (local226 == 3629) { - Static254.anIntArray487[local28++] = Static279.anInt5880; + if (opcode == 3629) { + Static254.intStack[isp++] = Static279.anInt5880; continue; } - } else if (local226 < 4000) { - if (local226 == 3903) { - local28--; - local809 = Static254.anIntArray487[local28]; - Static254.anIntArray487[local28++] = Static229.aClass136Array1[local809].method3905(); + } else if (opcode < 4000) { + if (opcode == 3903) { + isp--; + local809 = Static254.intStack[isp]; + Static254.intStack[isp++] = Static229.aClass136Array1[local809].method3905(); continue; } - if (local226 == 3904) { - local28--; - local809 = Static254.anIntArray487[local28]; - Static254.anIntArray487[local28++] = Static229.aClass136Array1[local809].anInt5094; + if (opcode == 3904) { + isp--; + local809 = Static254.intStack[isp]; + Static254.intStack[isp++] = Static229.aClass136Array1[local809].anInt5094; continue; } - if (local226 == 3905) { - local28--; - local809 = Static254.anIntArray487[local28]; - Static254.anIntArray487[local28++] = Static229.aClass136Array1[local809].anInt5099; + if (opcode == 3905) { + isp--; + local809 = Static254.intStack[isp]; + Static254.intStack[isp++] = Static229.aClass136Array1[local809].anInt5099; continue; } - if (local226 == 3906) { - local28--; - local809 = Static254.anIntArray487[local28]; - Static254.anIntArray487[local28++] = Static229.aClass136Array1[local809].anInt5090; + if (opcode == 3906) { + isp--; + local809 = Static254.intStack[isp]; + Static254.intStack[isp++] = Static229.aClass136Array1[local809].anInt5090; continue; } - if (local226 == 3907) { - local28--; - local809 = Static254.anIntArray487[local28]; - Static254.anIntArray487[local28++] = Static229.aClass136Array1[local809].anInt5089; + if (opcode == 3907) { + isp--; + local809 = Static254.intStack[isp]; + Static254.intStack[isp++] = Static229.aClass136Array1[local809].anInt5089; continue; } - if (local226 == 3908) { - local28--; - local809 = Static254.anIntArray487[local28]; - Static254.anIntArray487[local28++] = Static229.aClass136Array1[local809].anInt5092; + if (opcode == 3908) { + isp--; + local809 = Static254.intStack[isp]; + Static254.intStack[isp++] = Static229.aClass136Array1[local809].anInt5092; continue; } - if (local226 == 3910) { - local28--; - local809 = Static254.anIntArray487[local28]; + if (opcode == 3910) { + isp--; + local809 = Static254.intStack[isp]; local803 = Static229.aClass136Array1[local809].method3904(); - Static254.anIntArray487[local28++] = local803 == 0 ? 1 : 0; + Static254.intStack[isp++] = local803 == 0 ? 1 : 0; continue; } - if (local226 == 3911) { - local28--; - local809 = Static254.anIntArray487[local28]; + if (opcode == 3911) { + isp--; + local809 = Static254.intStack[isp]; local803 = Static229.aClass136Array1[local809].method3904(); - Static254.anIntArray487[local28++] = local803 == 2 ? 1 : 0; + Static254.intStack[isp++] = local803 == 2 ? 1 : 0; continue; } - if (local226 == 3912) { - local28--; - local809 = Static254.anIntArray487[local28]; + if (opcode == 3912) { + isp--; + local809 = Static254.intStack[isp]; local803 = Static229.aClass136Array1[local809].method3904(); - Static254.anIntArray487[local28++] = local803 == 5 ? 1 : 0; + Static254.intStack[isp++] = local803 == 5 ? 1 : 0; continue; } - if (local226 == 3913) { - local28--; - local809 = Static254.anIntArray487[local28]; + if (opcode == 3913) { + isp--; + local809 = Static254.intStack[isp]; local803 = Static229.aClass136Array1[local809].method3904(); - Static254.anIntArray487[local28++] = local803 == 1 ? 1 : 0; + Static254.intStack[isp++] = local803 == 1 ? 1 : 0; continue; } - } else if (local226 < 4100) { - if (local226 == 4000) { - local28 -= 2; - local809 = Static254.anIntArray487[local28]; - local803 = Static254.anIntArray487[local28 + 1]; - Static254.anIntArray487[local28++] = local803 + local809; + } else if (opcode < 4100) { + if (opcode == 4000) { + isp -= 2; + local809 = Static254.intStack[isp]; + local803 = Static254.intStack[isp + 1]; + Static254.intStack[isp++] = local803 + local809; continue; } - if (local226 == 4001) { - local28 -= 2; - local809 = Static254.anIntArray487[local28]; - local803 = Static254.anIntArray487[local28 + 1]; - Static254.anIntArray487[local28++] = local809 - local803; + if (opcode == 4001) { + isp -= 2; + local809 = Static254.intStack[isp]; + local803 = Static254.intStack[isp + 1]; + Static254.intStack[isp++] = local809 - local803; continue; } - if (local226 == 4002) { - local28 -= 2; - local809 = Static254.anIntArray487[local28]; - local803 = Static254.anIntArray487[local28 + 1]; - Static254.anIntArray487[local28++] = local803 * local809; + if (opcode == 4002) { + isp -= 2; + local809 = Static254.intStack[isp]; + local803 = Static254.intStack[isp + 1]; + Static254.intStack[isp++] = local803 * local809; continue; } - if (local226 == 4003) { - local28 -= 2; - local809 = Static254.anIntArray487[local28]; - local803 = Static254.anIntArray487[local28 + 1]; - Static254.anIntArray487[local28++] = local809 / local803; + if (opcode == 4003) { + isp -= 2; + local809 = Static254.intStack[isp]; + local803 = Static254.intStack[isp + 1]; + Static254.intStack[isp++] = local809 / local803; continue; } - if (local226 == 4004) { - local28--; - local809 = Static254.anIntArray487[local28]; - Static254.anIntArray487[local28++] = (int) ((double) local809 * Math.random()); + if (opcode == 4004) { + isp--; + local809 = Static254.intStack[isp]; + Static254.intStack[isp++] = (int) ((double) local809 * Math.random()); continue; } - if (local226 == 4005) { - local28--; - local809 = Static254.anIntArray487[local28]; - Static254.anIntArray487[local28++] = (int) (Math.random() * (double) (local809 + 1)); + if (opcode == 4005) { + isp--; + local809 = Static254.intStack[isp]; + Static254.intStack[isp++] = (int) (Math.random() * (double) (local809 + 1)); continue; } - if (local226 == 4006) { - local28 -= 5; - local809 = Static254.anIntArray487[local28]; - local803 = Static254.anIntArray487[local28 + 1]; - local652 = Static254.anIntArray487[local28 + 3]; - local1052 = Static254.anIntArray487[local28 + 2]; - local4859 = Static254.anIntArray487[local28 + 4]; - Static254.anIntArray487[local28++] = (local803 - local809) * (local4859 + -local1052) / (local652 - local1052) + local809; + if (opcode == 4006) { + isp -= 5; + local809 = Static254.intStack[isp]; + local803 = Static254.intStack[isp + 1]; + local652 = Static254.intStack[isp + 3]; + local1052 = Static254.intStack[isp + 2]; + local4859 = Static254.intStack[isp + 4]; + Static254.intStack[isp++] = (local803 - local809) * (local4859 + -local1052) / (local652 - local1052) + local809; continue; } @Pc(4899) long local4899; @Pc(4892) long local4892; - if (local226 == 4007) { - local28 -= 2; - local4892 = Static254.anIntArray487[local28]; - local4899 = Static254.anIntArray487[local28 + 1]; - Static254.anIntArray487[local28++] = (int) (local4892 * local4899 / 100L + local4892); + if (opcode == 4007) { + isp -= 2; + local4892 = Static254.intStack[isp]; + local4899 = Static254.intStack[isp + 1]; + Static254.intStack[isp++] = (int) (local4892 * local4899 / 100L + local4892); continue; } - if (local226 == 4008) { - local28 -= 2; - local809 = Static254.anIntArray487[local28]; - local803 = Static254.anIntArray487[local28 + 1]; - Static254.anIntArray487[local28++] = local809 | 0x1 << local803; + if (opcode == 4008) { + isp -= 2; + local809 = Static254.intStack[isp]; + local803 = Static254.intStack[isp + 1]; + Static254.intStack[isp++] = local809 | 0x1 << local803; continue; } - if (local226 == 4009) { - local28 -= 2; - local809 = Static254.anIntArray487[local28]; - local803 = Static254.anIntArray487[local28 + 1]; - Static254.anIntArray487[local28++] = -(0x1 << local803) - 1 & local809; + if (opcode == 4009) { + isp -= 2; + local809 = Static254.intStack[isp]; + local803 = Static254.intStack[isp + 1]; + Static254.intStack[isp++] = -(0x1 << local803) - 1 & local809; continue; } - if (local226 == 4010) { - local28 -= 2; - local809 = Static254.anIntArray487[local28]; - local803 = Static254.anIntArray487[local28 + 1]; - Static254.anIntArray487[local28++] = (local809 & 0x1 << local803) == 0 ? 0 : 1; + if (opcode == 4010) { + isp -= 2; + local809 = Static254.intStack[isp]; + local803 = Static254.intStack[isp + 1]; + Static254.intStack[isp++] = (local809 & 0x1 << local803) == 0 ? 0 : 1; continue; } - if (local226 == 4011) { - local28 -= 2; - local803 = Static254.anIntArray487[local28 + 1]; - local809 = Static254.anIntArray487[local28]; - Static254.anIntArray487[local28++] = local809 % local803; + if (opcode == 4011) { + isp -= 2; + local803 = Static254.intStack[isp + 1]; + local809 = Static254.intStack[isp]; + Static254.intStack[isp++] = local809 % local803; continue; } - if (local226 == 4012) { - local28 -= 2; - local803 = Static254.anIntArray487[local28 + 1]; - local809 = Static254.anIntArray487[local28]; + if (opcode == 4012) { + isp -= 2; + local803 = Static254.intStack[isp + 1]; + local809 = Static254.intStack[isp]; if (local809 == 0) { - Static254.anIntArray487[local28++] = 0; + Static254.intStack[isp++] = 0; } else { - Static254.anIntArray487[local28++] = (int) Math.pow((double) local809, (double) local803); + Static254.intStack[isp++] = (int) Math.pow((double) local809, (double) local803); } continue; } - if (local226 == 4013) { - local28 -= 2; - local803 = Static254.anIntArray487[local28 + 1]; - local809 = Static254.anIntArray487[local28]; + if (opcode == 4013) { + isp -= 2; + local803 = Static254.intStack[isp + 1]; + local809 = Static254.intStack[isp]; if (local809 == 0) { - Static254.anIntArray487[local28++] = 0; + Static254.intStack[isp++] = 0; } else if (local803 == 0) { - Static254.anIntArray487[local28++] = Integer.MAX_VALUE; + Static254.intStack[isp++] = Integer.MAX_VALUE; } else { - Static254.anIntArray487[local28++] = (int) Math.pow((double) local809, 1.0D / (double) local803); + Static254.intStack[isp++] = (int) Math.pow((double) local809, 1.0D / (double) local803); } continue; } - if (local226 == 4014) { - local28 -= 2; - local803 = Static254.anIntArray487[local28 + 1]; - local809 = Static254.anIntArray487[local28]; - Static254.anIntArray487[local28++] = local803 & local809; + if (opcode == 4014) { + isp -= 2; + local803 = Static254.intStack[isp + 1]; + local809 = Static254.intStack[isp]; + Static254.intStack[isp++] = local803 & local809; continue; } - if (local226 == 4015) { - local28 -= 2; - local809 = Static254.anIntArray487[local28]; - local803 = Static254.anIntArray487[local28 + 1]; - Static254.anIntArray487[local28++] = local809 | local803; + if (opcode == 4015) { + isp -= 2; + local809 = Static254.intStack[isp]; + local803 = Static254.intStack[isp + 1]; + Static254.intStack[isp++] = local809 | local803; continue; } - if (local226 == 4016) { - local28 -= 2; - local809 = Static254.anIntArray487[local28]; - local803 = Static254.anIntArray487[local28 + 1]; - Static254.anIntArray487[local28++] = local809 < local803 ? local809 : local803; + if (opcode == 4016) { + isp -= 2; + local809 = Static254.intStack[isp]; + local803 = Static254.intStack[isp + 1]; + Static254.intStack[isp++] = local809 < local803 ? local809 : local803; continue; } - if (local226 == 4017) { - local28 -= 2; - local803 = Static254.anIntArray487[local28 + 1]; - local809 = Static254.anIntArray487[local28]; - Static254.anIntArray487[local28++] = local803 >= local809 ? local803 : local809; + if (opcode == 4017) { + isp -= 2; + local803 = Static254.intStack[isp + 1]; + local809 = Static254.intStack[isp]; + Static254.intStack[isp++] = local803 >= local809 ? local803 : local809; continue; } - if (local226 == 4018) { - local28 -= 3; - local4892 = Static254.anIntArray487[local28]; - local4899 = Static254.anIntArray487[local28 + 1]; - @Pc(5251) long local5251 = (long) Static254.anIntArray487[local28 + 2]; - Static254.anIntArray487[local28++] = (int) (local4892 * local5251 / local4899); + if (opcode == 4018) { + isp -= 3; + local4892 = Static254.intStack[isp]; + local4899 = Static254.intStack[isp + 1]; + @Pc(5251) long local5251 = (long) Static254.intStack[isp + 2]; + Static254.intStack[isp++] = (int) (local4892 * local5251 / local4899); continue; } - } else if (local226 >= 4200) { + } else if (opcode >= 4200) { @Pc(5294) Class3_Sub2_Sub12 local5294; - if (local226 < 4300) { - if (local226 == 4200) { - local28--; - local809 = Static254.anIntArray487[local28]; - Static3.aClass100Array176[local26++] = Static71.method1439(local809).aClass100_495; + if (opcode < 4300) { + if (opcode == 4200) { + isp--; + local809 = Static254.intStack[isp]; + Static3.stringStack[ssp++] = Static71.method1439(local809).aClass100_495; continue; } @Pc(11269) ObjType local11269; - if (local226 == 4201) { - local28 -= 2; - local809 = Static254.anIntArray487[local28]; - local803 = Static254.anIntArray487[local28 + 1]; + if (opcode == 4201) { + isp -= 2; + local809 = Static254.intStack[isp]; + local803 = Static254.intStack[isp + 1]; local11269 = Static71.method1439(local809); if (local803 >= 1 && local803 <= 5 && local11269.aClass100Array72[local803 - 1] != null) { - Static3.aClass100Array176[local26++] = local11269.aClass100Array72[local803 - 1]; + Static3.stringStack[ssp++] = local11269.aClass100Array72[local803 - 1]; continue; } - Static3.aClass100Array176[local26++] = Static72.aClass100_447; + Static3.stringStack[ssp++] = Static72.aClass100_447; continue; } - if (local226 == 4202) { - local28 -= 2; - local809 = Static254.anIntArray487[local28]; - local803 = Static254.anIntArray487[local28 + 1]; + if (opcode == 4202) { + isp -= 2; + local809 = Static254.intStack[isp]; + local803 = Static254.intStack[isp + 1]; local11269 = Static71.method1439(local809); if (local803 >= 1 && local803 <= 5 && local11269.aClass100Array71[local803 - 1] != null) { - Static3.aClass100Array176[local26++] = local11269.aClass100Array71[local803 - 1]; + Static3.stringStack[ssp++] = local11269.aClass100Array71[local803 - 1]; continue; } - Static3.aClass100Array176[local26++] = Static72.aClass100_447; + Static3.stringStack[ssp++] = Static72.aClass100_447; continue; } - if (local226 == 4203) { - local28--; - local809 = Static254.anIntArray487[local28]; - Static254.anIntArray487[local28++] = Static71.method1439(local809).anInt2325; + if (opcode == 4203) { + isp--; + local809 = Static254.intStack[isp]; + Static254.intStack[isp++] = Static71.method1439(local809).anInt2325; continue; } - if (local226 == 4204) { - local28--; - local809 = Static254.anIntArray487[local28]; - Static254.anIntArray487[local28++] = Static71.method1439(local809).anInt2336 == 1 ? 1 : 0; + if (opcode == 4204) { + isp--; + local809 = Static254.intStack[isp]; + Static254.intStack[isp++] = Static71.method1439(local809).anInt2336 == 1 ? 1 : 0; continue; } @Pc(11417) ObjType local11417; - if (local226 == 4205) { - local28--; - local809 = Static254.anIntArray487[local28]; + if (opcode == 4205) { + isp--; + local809 = Static254.intStack[isp]; local11417 = Static71.method1439(local809); if (local11417.anInt2358 == -1 && local11417.anInt2356 >= 0) { - Static254.anIntArray487[local28++] = local11417.anInt2356; + Static254.intStack[isp++] = local11417.anInt2356; continue; } - Static254.anIntArray487[local28++] = local809; + Static254.intStack[isp++] = local809; continue; } - if (local226 == 4206) { - local28--; - local809 = Static254.anIntArray487[local28]; + if (opcode == 4206) { + isp--; + local809 = Static254.intStack[isp]; local11417 = Static71.method1439(local809); if (local11417.anInt2358 >= 0 && local11417.anInt2356 >= 0) { - Static254.anIntArray487[local28++] = local11417.anInt2356; + Static254.intStack[isp++] = local11417.anInt2356; continue; } - Static254.anIntArray487[local28++] = local809; + Static254.intStack[isp++] = local809; continue; } - if (local226 == 4207) { - local28--; - local809 = Static254.anIntArray487[local28]; - Static254.anIntArray487[local28++] = Static71.method1439(local809).aBoolean131 ? 1 : 0; + if (opcode == 4207) { + isp--; + local809 = Static254.intStack[isp]; + Static254.intStack[isp++] = Static71.method1439(local809).aBoolean131 ? 1 : 0; continue; } - if (local226 == 4208) { - local28 -= 2; - local809 = Static254.anIntArray487[local28]; - local803 = Static254.anIntArray487[local28 + 1]; + if (opcode == 4208) { + isp -= 2; + local809 = Static254.intStack[isp]; + local803 = Static254.intStack[isp + 1]; local5294 = Static110.method2277(local803); if (local5294.method2078()) { - Static3.aClass100Array176[local26++] = Static71.method1439(local809).method1819(local5294.aClass100_544, local803); + Static3.stringStack[ssp++] = Static71.method1439(local809).method1819(local5294.aClass100_544, local803); } else { - Static254.anIntArray487[local28++] = Static71.method1439(local809).method1829(local5294.anInt2667, local803); + Static254.intStack[isp++] = Static71.method1439(local809).method1829(local5294.anInt2667, local803); } continue; } - if (local226 == 4210) { - local26--; - local609 = Static3.aClass100Array176[local26]; - local28--; - local803 = Static254.anIntArray487[local28]; + if (opcode == 4210) { + ssp--; + local609 = Static3.stringStack[ssp]; + isp--; + local803 = Static254.intStack[isp]; Static155.method2941(local803 == 1, local609); - Static254.anIntArray487[local28++] = Static111.anInt2905; + Static254.intStack[isp++] = Static111.anInt2905; continue; } - if (local226 == 4211) { + if (opcode == 4211) { if (Static169.aShortArray52 != null && Static67.anInt3356 < Static111.anInt2905) { - Static254.anIntArray487[local28++] = Static169.aShortArray52[Static67.anInt3356++] & 0xFFFF; + Static254.intStack[isp++] = Static169.aShortArray52[Static67.anInt3356++] & 0xFFFF; continue; } - Static254.anIntArray487[local28++] = -1; + Static254.intStack[isp++] = -1; continue; } - if (local226 == 4212) { + if (opcode == 4212) { Static67.anInt3356 = 0; continue; } - } else if (local226 < 4400) { - if (local226 == 4300) { - local28 -= 2; - local809 = Static254.anIntArray487[local28]; - local803 = Static254.anIntArray487[local28 + 1]; + } else if (opcode < 4400) { + if (opcode == 4300) { + isp -= 2; + local809 = Static254.intStack[isp]; + local803 = Static254.intStack[isp + 1]; local5294 = Static110.method2277(local803); if (local5294.method2078()) { - Static3.aClass100Array176[local26++] = Static214.method4363(local809).method2938(local803, local5294.aClass100_544); + Static3.stringStack[ssp++] = Static214.method4363(local809).method2938(local803, local5294.aClass100_544); } else { - Static254.anIntArray487[local28++] = Static214.method4363(local809).method2936(local803, local5294.anInt2667); + Static254.intStack[isp++] = Static214.method4363(local809).method2936(local803, local5294.anInt2667); } continue; } - } else if (local226 >= 4500) { - if (local226 >= 4600) { - if (local226 < 5100) { - if (local226 == 5000) { - Static254.anIntArray487[local28++] = Static59.anInt1812; + } else if (opcode >= 4500) { + if (opcode >= 4600) { + if (opcode < 5100) { + if (opcode == 5000) { + Static254.intStack[isp++] = Static59.anInt1812; continue; } - if (local226 == 5001) { - local28 -= 3; - Static59.anInt1812 = Static254.anIntArray487[local28]; - Static49.anInt1459 = Static254.anIntArray487[local28 + 1]; - Static84.anInt2256 = Static254.anIntArray487[local28 + 2]; + if (opcode == 5001) { + isp -= 3; + Static59.anInt1812 = Static254.intStack[isp]; + Static49.anInt1459 = Static254.intStack[isp + 1]; + Static84.anInt2256 = Static254.intStack[isp + 2]; Static6.outboundBuffer.p1isaac(157); Static6.outboundBuffer.p1(Static59.anInt1812); Static6.outboundBuffer.p1(Static49.anInt1459); Static6.outboundBuffer.p1(Static84.anInt2256); continue; } - if (local226 == 5002) { - local26--; - local609 = Static3.aClass100Array176[local26]; - local28 -= 2; - local803 = Static254.anIntArray487[local28]; - local1052 = Static254.anIntArray487[local28 + 1]; + if (opcode == 5002) { + ssp--; + local609 = Static3.stringStack[ssp]; + isp -= 2; + local803 = Static254.intStack[isp]; + local1052 = Static254.intStack[isp + 1]; Static6.outboundBuffer.p1isaac(99); Static6.outboundBuffer.p8(local609.encode37()); Static6.outboundBuffer.p1(local803 - 1); Static6.outboundBuffer.p1(local1052); continue; } - if (local226 == 5003) { + if (opcode == 5003) { local2522 = null; - local28--; - local809 = Static254.anIntArray487[local28]; + isp--; + local809 = Static254.intStack[isp]; if (local809 < 100) { local2522 = Static230.aClass100Array158[local809]; } if (local2522 == null) { local2522 = Static72.aClass100_447; } - Static3.aClass100Array176[local26++] = local2522; + Static3.stringStack[ssp++] = local2522; continue; } - if (local226 == 5004) { - local28--; - local809 = Static254.anIntArray487[local28]; + if (opcode == 5004) { + isp--; + local809 = Static254.intStack[isp]; local803 = -1; if (local809 < 100 && Static230.aClass100Array158[local809] != null) { local803 = Static26.anIntArray67[local809]; } - Static254.anIntArray487[local28++] = local803; + Static254.intStack[isp++] = local803; continue; } - if (local226 == 5005) { - Static254.anIntArray487[local28++] = Static49.anInt1459; + if (opcode == 5005) { + Static254.intStack[isp++] = Static49.anInt1459; continue; } - if (local226 == 5008) { - local26--; - local609 = Static3.aClass100Array176[local26]; + if (opcode == 5008) { + ssp--; + local609 = Static3.stringStack[ssp]; if (!local609.method3138(Static12.aClass100_74)) { if (Static191.staffModLevel == 0 && (Static124.aBoolean157 && !Static207.aBoolean236 || Static86.aBoolean129)) { continue; @@ -2344,10 +2344,10 @@ public final class Static88 { Static127.method2470(local609); continue; } - if (local226 == 5009) { - local26 -= 2; - local2522 = Static3.aClass100Array176[local26 + 1]; - local609 = Static3.aClass100Array176[local26]; + if (opcode == 5009) { + ssp -= 2; + local2522 = Static3.stringStack[ssp + 1]; + local609 = Static3.stringStack[ssp]; if (Static191.staffModLevel != 0 || (!Static124.aBoolean157 || Static207.aBoolean236) && !Static86.aBoolean129) { Static6.outboundBuffer.p1isaac(201); Static6.outboundBuffer.p1(0); @@ -2358,9 +2358,9 @@ public final class Static88 { } continue; } - if (local226 == 5010) { - local28--; - local809 = Static254.anIntArray487[local28]; + if (opcode == 5010) { + isp--; + local809 = Static254.intStack[isp]; local2522 = null; if (local809 < 100) { local2522 = Static153.aClass100Array112[local809]; @@ -2368,12 +2368,12 @@ public final class Static88 { if (local2522 == null) { local2522 = Static72.aClass100_447; } - Static3.aClass100Array176[local26++] = local2522; + Static3.stringStack[ssp++] = local2522; continue; } - if (local226 == 5011) { - local28--; - local809 = Static254.anIntArray487[local28]; + if (opcode == 5011) { + isp--; + local809 = Static254.intStack[isp]; local2522 = null; if (local809 < 100) { local2522 = Static64.aClass100Array62[local809]; @@ -2381,114 +2381,114 @@ public final class Static88 { if (local2522 == null) { local2522 = Static72.aClass100_447; } - Static3.aClass100Array176[local26++] = local2522; + Static3.stringStack[ssp++] = local2522; continue; } - if (local226 == 5012) { - local28--; - local809 = Static254.anIntArray487[local28]; + if (opcode == 5012) { + isp--; + local809 = Static254.intStack[isp]; local803 = -1; if (local809 < 100) { local803 = Static241.anIntArray521[local809]; } - Static254.anIntArray487[local28++] = local803; + Static254.intStack[isp++] = local803; continue; } - if (local226 == 5015) { + if (opcode == 5015) { if (Static173.self == null || Static173.self.aClass100_364 == null) { local609 = Static186.username; } else { local609 = Static173.self.method1264(); } - Static3.aClass100Array176[local26++] = local609; + Static3.stringStack[ssp++] = local609; continue; } - if (local226 == 5016) { - Static254.anIntArray487[local28++] = Static84.anInt2256; + if (opcode == 5016) { + Static254.intStack[isp++] = Static84.anInt2256; continue; } - if (local226 == 5017) { - Static254.anIntArray487[local28++] = Static62.anInt1941; + if (opcode == 5017) { + Static254.intStack[isp++] = Static62.anInt1941; continue; } - if (local226 == 5050) { - local28--; - local809 = Static254.anIntArray487[local28]; - Static3.aClass100Array176[local26++] = Static235.method4045(local809).aClass100_79; + if (opcode == 5050) { + isp--; + local809 = Static254.intStack[isp]; + Static3.stringStack[ssp++] = Static235.method4045(local809).aClass100_79; continue; } @Pc(6378) Class3_Sub2_Sub2 local6378; - if (local226 == 5051) { - local28--; - local809 = Static254.anIntArray487[local28]; + if (opcode == 5051) { + isp--; + local809 = Static254.intStack[isp]; local6378 = Static235.method4045(local809); if (local6378.anIntArray30 == null) { - Static254.anIntArray487[local28++] = 0; + Static254.intStack[isp++] = 0; } else { - Static254.anIntArray487[local28++] = local6378.anIntArray30.length; + Static254.intStack[isp++] = local6378.anIntArray30.length; } continue; } - if (local226 == 5052) { - local28 -= 2; - local809 = Static254.anIntArray487[local28]; - local803 = Static254.anIntArray487[local28 + 1]; + if (opcode == 5052) { + isp -= 2; + local809 = Static254.intStack[isp]; + local803 = Static254.intStack[isp + 1]; @Pc(6416) Class3_Sub2_Sub2 local6416 = Static235.method4045(local809); local652 = local6416.anIntArray30[local803]; - Static254.anIntArray487[local28++] = local652; + Static254.intStack[isp++] = local652; continue; } - if (local226 == 5053) { - local28--; - local809 = Static254.anIntArray487[local28]; + if (opcode == 5053) { + isp--; + local809 = Static254.intStack[isp]; local6378 = Static235.method4045(local809); if (local6378.anIntArray32 == null) { - Static254.anIntArray487[local28++] = 0; + Static254.intStack[isp++] = 0; } else { - Static254.anIntArray487[local28++] = local6378.anIntArray32.length; + Static254.intStack[isp++] = local6378.anIntArray32.length; } continue; } - if (local226 == 5054) { - local28 -= 2; - local803 = Static254.anIntArray487[local28 + 1]; - local809 = Static254.anIntArray487[local28]; - Static254.anIntArray487[local28++] = Static235.method4045(local809).anIntArray32[local803]; + if (opcode == 5054) { + isp -= 2; + local803 = Static254.intStack[isp + 1]; + local809 = Static254.intStack[isp]; + Static254.intStack[isp++] = Static235.method4045(local809).anIntArray32[local803]; continue; } - if (local226 == 5055) { - local28--; - local809 = Static254.anIntArray487[local28]; - Static3.aClass100Array176[local26++] = Static230.method3953(local809).method769(); + if (opcode == 5055) { + isp--; + local809 = Static254.intStack[isp]; + Static3.stringStack[ssp++] = Static230.method3953(local809).method769(); continue; } - if (local226 == 5056) { - local28--; - local809 = Static254.anIntArray487[local28]; + if (opcode == 5056) { + isp--; + local809 = Static254.intStack[isp]; @Pc(6527) Class3_Sub2_Sub6 local6527 = Static230.method3953(local809); if (local6527.anIntArray72 == null) { - Static254.anIntArray487[local28++] = 0; + Static254.intStack[isp++] = 0; } else { - Static254.anIntArray487[local28++] = local6527.anIntArray72.length; + Static254.intStack[isp++] = local6527.anIntArray72.length; } continue; } - if (local226 == 5057) { - local28 -= 2; - local803 = Static254.anIntArray487[local28 + 1]; - local809 = Static254.anIntArray487[local28]; - Static254.anIntArray487[local28++] = Static230.method3953(local809).anIntArray72[local803]; + if (opcode == 5057) { + isp -= 2; + local803 = Static254.intStack[isp + 1]; + local809 = Static254.intStack[isp]; + Static254.intStack[isp++] = Static230.method3953(local809).anIntArray72[local803]; continue; } - if (local226 == 5058) { + if (opcode == 5058) { Static122.aClass12_1 = new Class12(); - local28--; - Static122.aClass12_1.anInt439 = Static254.anIntArray487[local28]; + isp--; + Static122.aClass12_1.anInt439 = Static254.intStack[isp]; Static122.aClass12_1.aClass3_Sub2_Sub6_1 = Static230.method3953(Static122.aClass12_1.anInt439); Static122.aClass12_1.anIntArray33 = new int[Static122.aClass12_1.aClass3_Sub2_Sub6_1.method767()]; continue; } - if (local226 == 5059) { + if (opcode == 5059) { Static6.outboundBuffer.p1isaac(167); Static6.outboundBuffer.p1(0); local809 = Static6.outboundBuffer.offset; @@ -2498,9 +2498,9 @@ public final class Static88 { Static6.outboundBuffer.p1len(Static6.outboundBuffer.offset - local809); continue; } - if (local226 == 5060) { - local26--; - local609 = Static3.aClass100Array176[local26]; + if (opcode == 5060) { + ssp--; + local609 = Static3.stringStack[ssp]; Static6.outboundBuffer.p1isaac(178); Static6.outboundBuffer.p1(0); local803 = Static6.outboundBuffer.offset; @@ -2510,7 +2510,7 @@ public final class Static88 { Static6.outboundBuffer.p1len(Static6.outboundBuffer.offset - local803); continue; } - if (local226 == 5061) { + if (opcode == 5061) { Static6.outboundBuffer.p1isaac(167); Static6.outboundBuffer.p1(0); local809 = Static6.outboundBuffer.offset; @@ -2520,214 +2520,214 @@ public final class Static88 { Static6.outboundBuffer.p1len(Static6.outboundBuffer.offset - local809); continue; } - if (local226 == 5062) { - local28 -= 2; - local803 = Static254.anIntArray487[local28 + 1]; - local809 = Static254.anIntArray487[local28]; - Static254.anIntArray487[local28++] = Static235.method4045(local809).anIntArray31[local803]; + if (opcode == 5062) { + isp -= 2; + local803 = Static254.intStack[isp + 1]; + local809 = Static254.intStack[isp]; + Static254.intStack[isp++] = Static235.method4045(local809).anIntArray31[local803]; continue; } - if (local226 == 5063) { - local28 -= 2; - local803 = Static254.anIntArray487[local28 + 1]; - local809 = Static254.anIntArray487[local28]; - Static254.anIntArray487[local28++] = Static235.method4045(local809).anIntArray29[local803]; + if (opcode == 5063) { + isp -= 2; + local803 = Static254.intStack[isp + 1]; + local809 = Static254.intStack[isp]; + Static254.intStack[isp++] = Static235.method4045(local809).anIntArray29[local803]; continue; } - if (local226 == 5064) { - local28 -= 2; - local803 = Static254.anIntArray487[local28 + 1]; - local809 = Static254.anIntArray487[local28]; + if (opcode == 5064) { + isp -= 2; + local803 = Static254.intStack[isp + 1]; + local809 = Static254.intStack[isp]; if (local803 == -1) { - Static254.anIntArray487[local28++] = -1; + Static254.intStack[isp++] = -1; } else { - Static254.anIntArray487[local28++] = Static235.method4045(local809).method469(local803); + Static254.intStack[isp++] = Static235.method4045(local809).method469(local803); } continue; } - if (local226 == 5065) { - local28 -= 2; - local809 = Static254.anIntArray487[local28]; - local803 = Static254.anIntArray487[local28 + 1]; + if (opcode == 5065) { + isp -= 2; + local809 = Static254.intStack[isp]; + local803 = Static254.intStack[isp + 1]; if (local803 == -1) { - Static254.anIntArray487[local28++] = -1; + Static254.intStack[isp++] = -1; } else { - Static254.anIntArray487[local28++] = Static235.method4045(local809).method466(local803); + Static254.intStack[isp++] = Static235.method4045(local809).method466(local803); } continue; } - if (local226 == 5066) { - local28--; - local809 = Static254.anIntArray487[local28]; - Static254.anIntArray487[local28++] = Static230.method3953(local809).method767(); + if (opcode == 5066) { + isp--; + local809 = Static254.intStack[isp]; + Static254.intStack[isp++] = Static230.method3953(local809).method767(); continue; } - if (local226 == 5067) { - local28 -= 2; - local803 = Static254.anIntArray487[local28 + 1]; - local809 = Static254.anIntArray487[local28]; + if (opcode == 5067) { + isp -= 2; + local803 = Static254.intStack[isp + 1]; + local809 = Static254.intStack[isp]; local1052 = Static230.method3953(local809).method765(local803); - Static254.anIntArray487[local28++] = local1052; + Static254.intStack[isp++] = local1052; continue; } - if (local226 == 5068) { - local28 -= 2; - local809 = Static254.anIntArray487[local28]; - local803 = Static254.anIntArray487[local28 + 1]; + if (opcode == 5068) { + isp -= 2; + local809 = Static254.intStack[isp]; + local803 = Static254.intStack[isp + 1]; Static122.aClass12_1.anIntArray33[local809] = local803; continue; } - if (local226 == 5069) { - local28 -= 2; - local809 = Static254.anIntArray487[local28]; - local803 = Static254.anIntArray487[local28 + 1]; + if (opcode == 5069) { + isp -= 2; + local809 = Static254.intStack[isp]; + local803 = Static254.intStack[isp + 1]; Static122.aClass12_1.anIntArray33[local809] = local803; continue; } - if (local226 == 5070) { - local28 -= 3; - local809 = Static254.anIntArray487[local28]; - local1052 = Static254.anIntArray487[local28 + 2]; - local803 = Static254.anIntArray487[local28 + 1]; + if (opcode == 5070) { + isp -= 3; + local809 = Static254.intStack[isp]; + local1052 = Static254.intStack[isp + 2]; + local803 = Static254.intStack[isp + 1]; @Pc(6996) Class3_Sub2_Sub6 local6996 = Static230.method3953(local809); if (local6996.method765(local803) != 0) { throw new RuntimeException("bad command"); } - Static254.anIntArray487[local28++] = local6996.method764(local1052, local803); + Static254.intStack[isp++] = local6996.method764(local1052, local803); continue; } - if (local226 == 5071) { - local26--; - local609 = Static3.aClass100Array176[local26]; - local28--; - local1552 = Static254.anIntArray487[local28] == 1; + if (opcode == 5071) { + ssp--; + local609 = Static3.stringStack[ssp]; + isp--; + local1552 = Static254.intStack[isp] == 1; Static24.method668(local1552, local609); - Static254.anIntArray487[local28++] = Static111.anInt2905; + Static254.intStack[isp++] = Static111.anInt2905; continue; } - if (local226 == 5072) { + if (opcode == 5072) { if (Static169.aShortArray52 != null && Static67.anInt3356 < Static111.anInt2905) { - Static254.anIntArray487[local28++] = Static169.aShortArray52[Static67.anInt3356++] & 0xFFFF; + Static254.intStack[isp++] = Static169.aShortArray52[Static67.anInt3356++] & 0xFFFF; continue; } - Static254.anIntArray487[local28++] = -1; + Static254.intStack[isp++] = -1; continue; } - if (local226 == 5073) { + if (opcode == 5073) { Static67.anInt3356 = 0; continue; } - } else if (local226 < 5200) { - if (local226 == 5100) { + } else if (opcode < 5200) { + if (opcode == 5100) { if (Static187.pressedKeys[86]) { - Static254.anIntArray487[local28++] = 1; + Static254.intStack[isp++] = 1; } else { - Static254.anIntArray487[local28++] = 0; + Static254.intStack[isp++] = 0; } continue; } - if (local226 == 5101) { + if (opcode == 5101) { if (Static187.pressedKeys[82]) { - Static254.anIntArray487[local28++] = 1; + Static254.intStack[isp++] = 1; } else { - Static254.anIntArray487[local28++] = 0; + Static254.intStack[isp++] = 0; } continue; } - if (local226 == 5102) { + if (opcode == 5102) { if (Static187.pressedKeys[81]) { - Static254.anIntArray487[local28++] = 1; + Static254.intStack[isp++] = 1; } else { - Static254.anIntArray487[local28++] = 0; + Static254.intStack[isp++] = 0; } continue; } } else { @Pc(7566) boolean local7566; - if (local226 < 5300) { - if (local226 == 5200) { - local28--; - Static155.method2940(Static254.anIntArray487[local28]); + if (opcode < 5300) { + if (opcode == 5200) { + isp--; + Static155.method2940(Static254.intStack[isp]); continue; } - if (local226 == 5201) { - Static254.anIntArray487[local28++] = Static91.method1874(); + if (opcode == 5201) { + Static254.intStack[isp++] = Static91.method1874(); continue; } - if (local226 == 5202) { - local28--; - Static258.method4444(Static254.anIntArray487[local28]); + if (opcode == 5202) { + isp--; + Static258.method4444(Static254.intStack[isp]); continue; } - if (local226 == 5203) { - local26--; - Static3.method4656(Static3.aClass100Array176[local26]); + if (opcode == 5203) { + ssp--; + Static3.method4656(Static3.stringStack[ssp]); continue; } - if (local226 == 5204) { - Static3.aClass100Array176[local26 - 1] = Static211.method923(Static3.aClass100Array176[local26 - 1]); + if (opcode == 5204) { + Static3.stringStack[ssp - 1] = Static211.method923(Static3.stringStack[ssp - 1]); continue; } - if (local226 == 5205) { - local26--; - Static90.method1853(Static3.aClass100Array176[local26]); + if (opcode == 5205) { + ssp--; + Static90.method1853(Static3.stringStack[ssp]); continue; } - if (local226 == 5206) { - local28--; - local809 = Static254.anIntArray487[local28]; + if (opcode == 5206) { + isp--; + local809 = Static254.intStack[isp]; @Pc(7264) Map local7264 = Static29.method803(local809 >> 14 & 0x3FFF, local809 & 0x3FFF); if (local7264 == null) { - Static3.aClass100Array176[local26++] = Static72.aClass100_447; + Static3.stringStack[ssp++] = Static72.aClass100_447; } else { - Static3.aClass100Array176[local26++] = local7264.aClass100_138; + Static3.stringStack[ssp++] = local7264.aClass100_138; } continue; } @Pc(7293) Map local7293; - if (local226 == 5207) { - local26--; - local7293 = Static124.method2434(Static3.aClass100Array176[local26]); + if (opcode == 5207) { + ssp--; + local7293 = Static124.method2434(Static3.stringStack[ssp]); if (local7293 != null && local7293.aClass100_137 != null) { - Static3.aClass100Array176[local26++] = local7293.aClass100_137; + Static3.stringStack[ssp++] = local7293.aClass100_137; continue; } - Static3.aClass100Array176[local26++] = Static72.aClass100_447; + Static3.stringStack[ssp++] = Static72.aClass100_447; continue; } - if (local226 == 5208) { - Static254.anIntArray487[local28++] = Static89.anInt2387; - Static254.anIntArray487[local28++] = Static37.anInt1176; + if (opcode == 5208) { + Static254.intStack[isp++] = Static89.anInt2387; + Static254.intStack[isp++] = Static37.anInt1176; continue; } - if (local226 == 5209) { - Static254.anIntArray487[local28++] = Static158.anInt3846 + Static13.anInt435; - Static254.anIntArray487[local28++] = Static2.anInt13 + Static181.anInt4296 - Static28.anInt919 - 1; + if (opcode == 5209) { + Static254.intStack[isp++] = Static158.anInt3846 + Static13.anInt435; + Static254.intStack[isp++] = Static2.anInt13 + Static181.anInt4296 - Static28.anInt919 - 1; continue; } - if (local226 == 5210) { + if (opcode == 5210) { local7293 = Static214.method4361(); if (local7293 == null) { - Static254.anIntArray487[local28++] = 0; - Static254.anIntArray487[local28++] = 0; + Static254.intStack[isp++] = 0; + Static254.intStack[isp++] = 0; } else { - Static254.anIntArray487[local28++] = local7293.anInt769 * 64; - Static254.anIntArray487[local28++] = local7293.anInt764 * 64; + Static254.intStack[isp++] = local7293.anInt769 * 64; + Static254.intStack[isp++] = local7293.anInt764 * 64; } continue; } - if (local226 == 5211) { + if (opcode == 5211) { local7293 = Static214.method4361(); if (local7293 == null) { - Static254.anIntArray487[local28++] = 0; - Static254.anIntArray487[local28++] = 0; + Static254.intStack[isp++] = 0; + Static254.intStack[isp++] = 0; } else { - Static254.anIntArray487[local28++] = local7293.anInt770 - local7293.anInt763; - Static254.anIntArray487[local28++] = local7293.anInt758 - local7293.anInt771; + Static254.intStack[isp++] = local7293.anInt770 - local7293.anInt763; + Static254.intStack[isp++] = local7293.anInt758 - local7293.anInt771; } continue; } - if (local226 == 5212) { + if (opcode == 5212) { local809 = Static118.method2352(); local1052 = 0; if (local809 == -1) { @@ -2737,11 +2737,11 @@ public final class Static88 { local1052 = Static203.aClass134_1.method3894(local809); } local2522 = local2522.method3140(Static67.aClass100_639, Static5.aClass100_10); - Static3.aClass100Array176[local26++] = local2522; - Static254.anIntArray487[local28++] = local1052; + Static3.stringStack[ssp++] = local2522; + Static254.intStack[isp++] = local1052; continue; } - if (local226 == 5213) { + if (opcode == 5213) { local1052 = 0; local809 = Static119.method2385(); if (local809 == -1) { @@ -2751,21 +2751,21 @@ public final class Static88 { local1052 = Static203.aClass134_1.method3894(local809); } local2522 = local2522.method3140(Static67.aClass100_639, Static5.aClass100_10); - Static3.aClass100Array176[local26++] = local2522; - Static254.anIntArray487[local28++] = local1052; + Static3.stringStack[ssp++] = local2522; + Static254.intStack[isp++] = local1052; continue; } - if (local226 == 5214) { - local28--; - local809 = Static254.anIntArray487[local28]; + if (opcode == 5214) { + isp--; + local809 = Static254.intStack[isp]; Static80.method3616(local809 >> 14 & 0x3FFF, local809 & 0x3FFF); continue; } - if (local226 == 5215) { - local28--; - local809 = Static254.anIntArray487[local28]; - local26--; - local2522 = Static3.aClass100Array176[local26]; + if (opcode == 5215) { + isp--; + local809 = Static254.intStack[isp]; + ssp--; + local2522 = Static3.stringStack[ssp]; local7566 = false; @Pc(7577) SecondaryLinkedList local7577 = Static183.method3333(local809 >> 14 & 0x3FFF, local809 & 0x3FFF); for (@Pc(7582) Map local7582 = (Map) local7577.method795(); local7582 != null; local7582 = (Map) local7577.method797()) { @@ -2775,75 +2775,75 @@ public final class Static88 { } } if (local7566) { - Static254.anIntArray487[local28++] = 1; + Static254.intStack[isp++] = 1; } else { - Static254.anIntArray487[local28++] = 0; + Static254.intStack[isp++] = 0; } continue; } - if (local226 == 5216) { - local28--; - local809 = Static254.anIntArray487[local28]; + if (opcode == 5216) { + isp--; + local809 = Static254.intStack[isp]; Static253.method4332(local809); continue; } - if (local226 == 5217) { - local28--; - local809 = Static254.anIntArray487[local28]; + if (opcode == 5217) { + isp--; + local809 = Static254.intStack[isp]; if (Static90.method1855(local809)) { - Static254.anIntArray487[local28++] = 1; + Static254.intStack[isp++] = 1; } else { - Static254.anIntArray487[local28++] = 0; + Static254.intStack[isp++] = 0; } continue; } - if (local226 == 5218) { + if (opcode == 5218) { local7293 = Static214.method4361(); if (local7293 == null) { - Static254.anIntArray487[local28++] = -1; + Static254.intStack[isp++] = -1; } else { - Static254.anIntArray487[local28++] = local7293.anInt772; + Static254.intStack[isp++] = local7293.anInt772; } continue; } - if (local226 == 5219) { - local26--; - Static44.method1149(Static3.aClass100Array176[local26]); + if (opcode == 5219) { + ssp--; + Static44.method1149(Static3.stringStack[ssp]); continue; } - if (local226 == 5220) { - Static254.anIntArray487[local28++] = Static41.anInt1309 == 100 ? 1 : 0; + if (opcode == 5220) { + Static254.intStack[isp++] = Static41.anInt1309 == 100 ? 1 : 0; continue; } - } else if (local226 < 5400) { - if (local226 == 5300) { - local28 -= 2; - local803 = Static254.anIntArray487[local28 + 1]; - local809 = Static254.anIntArray487[local28]; + } else if (opcode < 5400) { + if (opcode == 5300) { + isp -= 2; + local803 = Static254.intStack[isp + 1]; + local809 = Static254.intStack[isp]; Static241.setWindowMode(false, 3, local809, local803); - Static254.anIntArray487[local28++] = GameShell.fullScreenFrame == null ? 0 : 1; + Static254.intStack[isp++] = GameShell.fullScreenFrame == null ? 0 : 1; continue; } - if (local226 == 5301) { + if (opcode == 5301) { if (GameShell.fullScreenFrame != null) { Static241.setWindowMode(false, Static214.windowMode, -1, -1); } continue; } - if (local226 == 5302) { + if (opcode == 5302) { @Pc(7780) Class114[] local7780 = Static3.method4660(); - Static254.anIntArray487[local28++] = local7780.length; + Static254.intStack[isp++] = local7780.length; continue; } - if (local226 == 5303) { - local28--; - local809 = Static254.anIntArray487[local28]; + if (opcode == 5303) { + isp--; + local809 = Static254.intStack[isp]; @Pc(7800) Class114[] local7800 = Static3.method4660(); - Static254.anIntArray487[local28++] = local7800[local809].anInt4248; - Static254.anIntArray487[local28++] = local7800[local809].anInt4250; + Static254.intStack[isp++] = local7800[local809].anInt4248; + Static254.intStack[isp++] = local7800[local809].anInt4250; continue; } - if (local226 == 5305) { + if (opcode == 5305) { local803 = Static22.anInt729; local809 = Static114.anInt5831; local1052 = -1; @@ -2855,29 +2855,29 @@ public final class Static88 { break; } } - Static254.anIntArray487[local28++] = local1052; + Static254.intStack[isp++] = local1052; continue; } - if (local226 == 5306) { - Static254.anIntArray487[local28++] = Static144.method2736(); + if (opcode == 5306) { + Static254.intStack[isp++] = Static144.method2736(); continue; } - if (local226 == 5307) { - local28--; - local809 = Static254.anIntArray487[local28]; + if (opcode == 5307) { + isp--; + local809 = Static254.intStack[isp]; if (local809 < 0 || local809 > 2) { local809 = 0; } Static241.setWindowMode(false, local809, -1, -1); continue; } - if (local226 == 5308) { - Static254.anIntArray487[local28++] = Static214.windowMode; + if (opcode == 5308) { + Static254.intStack[isp++] = Static214.windowMode; continue; } - if (local226 == 5309) { - local28--; - local809 = Static254.anIntArray487[local28]; + if (opcode == 5309) { + isp--; + local809 = Static254.intStack[isp]; if (local809 < 0 || local809 > 2) { local809 = 0; } @@ -2885,13 +2885,13 @@ public final class Static88 { Static203.write(GameShell.signLink); continue; } - } else if (local226 < 5500) { - if (local226 == 5400) { - local26 -= 2; - local609 = Static3.aClass100Array176[local26]; - local2522 = Static3.aClass100Array176[local26 + 1]; - local28--; - local1052 = Static254.anIntArray487[local28]; + } else if (opcode < 5500) { + if (opcode == 5400) { + ssp -= 2; + local609 = Static3.stringStack[ssp]; + local2522 = Static3.stringStack[ssp + 1]; + isp--; + local1052 = Static254.intStack[isp]; Static6.outboundBuffer.p1isaac(117); Static6.outboundBuffer.p1(Static229.method3937(local609) + Static229.method3937(local2522) + 1); Static6.outboundBuffer.pjstr(local609); @@ -2899,9 +2899,9 @@ public final class Static88 { Static6.outboundBuffer.p1(local1052); continue; } - if (local226 == 5401) { - local28 -= 2; - Static259.aShortArray88[Static254.anIntArray487[local28]] = (short) Static105.method2253(Static254.anIntArray487[local28 + 1]); + if (opcode == 5401) { + isp -= 2; + Static259.aShortArray88[Static254.intStack[isp]] = (short) Static105.method2253(Static254.intStack[isp + 1]); Static211.method924(); Static269.method2172(); Static278.method4649(); @@ -2909,37 +2909,37 @@ public final class Static88 { Static87.method1807(); continue; } - if (local226 == 5405) { - local28 -= 2; - local809 = Static254.anIntArray487[local28]; - local803 = Static254.anIntArray487[local28 + 1]; + if (opcode == 5405) { + isp -= 2; + local809 = Static254.intStack[isp]; + local803 = Static254.intStack[isp + 1]; if (local809 >= 0 && local809 < 2) { Static107.anIntArrayArrayArray9[local809] = new int[local803 << 1][4]; } continue; } - if (local226 == 5406) { - local28 -= 7; - local809 = Static254.anIntArray487[local28]; - local803 = Static254.anIntArray487[local28 + 1] << 1; - local652 = Static254.anIntArray487[local28 + 3]; - local1052 = Static254.anIntArray487[local28 + 2]; - local4859 = Static254.anIntArray487[local28 + 4]; - @Pc(8108) int local8108 = Static254.anIntArray487[local28 + 6]; - local1087 = Static254.anIntArray487[local28 + 5]; + if (opcode == 5406) { + isp -= 7; + local809 = Static254.intStack[isp]; + local803 = Static254.intStack[isp + 1] << 1; + local652 = Static254.intStack[isp + 3]; + local1052 = Static254.intStack[isp + 2]; + local4859 = Static254.intStack[isp + 4]; + @Pc(8108) int local8108 = Static254.intStack[isp + 6]; + local1087 = Static254.intStack[isp + 5]; if (local809 >= 0 && local809 < 2 && Static107.anIntArrayArrayArray9[local809] != null && local803 >= 0 && Static107.anIntArrayArrayArray9[local809].length > local803) { Static107.anIntArrayArrayArray9[local809][local803] = new int[] { (local1052 >> 14 & 0x3FFF) * 128, local652, (local1052 & 0x3FFF) * 128, local8108 }; Static107.anIntArrayArrayArray9[local809][local803 + 1] = new int[] { (local4859 >> 14 & 0x3FFF) * 128, local1087, (local4859 & 0x3FFF) * 128 }; } continue; } - if (local226 == 5407) { - local28--; - local809 = Static107.anIntArrayArrayArray9[Static254.anIntArray487[local28]].length >> 1; - Static254.anIntArray487[local28++] = local809; + if (opcode == 5407) { + isp--; + local809 = Static107.anIntArrayArrayArray9[Static254.intStack[isp]].length >> 1; + Static254.intStack[isp++] = local809; continue; } - if (local226 == 5411) { + if (opcode == 5411) { if (GameShell.fullScreenFrame != null) { Static241.setWindowMode(false, Static214.windowMode, -1, -1); } @@ -2950,7 +2950,7 @@ public final class Static88 { } continue; } - if (local226 == 5419) { + if (opcode == 5419) { local609 = Static72.aClass100_447; if (Static232.aClass212_5 != null) { local609 = Static181.method3341(Static232.aClass212_5.intArg2); @@ -2962,21 +2962,21 @@ public final class Static88 { } catch (@Pc(8290) UnsupportedEncodingException local8290) { } } - Static3.aClass100Array176[local26++] = local609; + Static3.stringStack[ssp++] = local609; continue; } - if (local226 == 5420) { - Static254.anIntArray487[local28++] = SignLink.anInt5928 == 3 ? 1 : 0; + if (opcode == 5420) { + Static254.intStack[isp++] = SignLink.anInt5928 == 3 ? 1 : 0; continue; } - if (local226 == 5421) { + if (opcode == 5421) { if (GameShell.fullScreenFrame != null) { Static241.setWindowMode(false, Static214.windowMode, -1, -1); } - local28--; - local1552 = Static254.anIntArray487[local28] == 1; - local26--; - local609 = Static3.aClass100Array176[local26]; + isp--; + local1552 = Static254.intStack[isp] == 1; + ssp--; + local609 = Static3.stringStack[ssp]; @Pc(8356) JagString local8356 = Static34.concatenate(new JagString[] { Static15.method479(), local609 }); if (GameShell.frame != null || local1552 && SignLink.anInt5928 != 3 && SignLink.osName.startsWith("win") && !Static178.aBoolean203) { Static164.newTab = local1552; @@ -2987,12 +2987,12 @@ public final class Static88 { Static169.openUrl(local8356, local1552); continue; } - if (local226 == 5422) { - local28--; - local1052 = Static254.anIntArray487[local28]; - local26 -= 2; - local2522 = Static3.aClass100Array176[local26 + 1]; - local609 = Static3.aClass100Array176[local26]; + if (opcode == 5422) { + isp--; + local1052 = Static254.intStack[isp]; + ssp -= 2; + local2522 = Static3.stringStack[ssp + 1]; + local609 = Static3.stringStack[ssp]; if (local609.length() > 0) { if (Static103.aClass100Array88 == null) { Static103.aClass100Array88 = new JagString[Static132.anIntArray309[Static266.game]]; @@ -3007,24 +3007,24 @@ public final class Static88 { } continue; } - if (local226 == 5423) { - local26--; - Static3.aClass100Array176[local26].method3129(); + if (opcode == 5423) { + ssp--; + Static3.stringStack[ssp].method3129(); continue; } - if (local226 == 5424) { - local28 -= 11; - Static40.anInt1275 = Static254.anIntArray487[local28]; - Static111.anInt2910 = Static254.anIntArray487[local28 + 1]; - Static251.anInt5457 = Static254.anIntArray487[local28 + 2]; - Static232.anInt5208 = Static254.anIntArray487[local28 + 3]; - Static55.anInt1736 = Static254.anIntArray487[local28 + 4]; - Static169.anInt4073 = Static254.anIntArray487[local28 + 5]; - Static85.anInt2261 = Static254.anIntArray487[local28 + 6]; - Static136.anInt3324 = Static254.anIntArray487[local28 + 7]; - Static254.anInt5556 = Static254.anIntArray487[local28 + 8]; - Static195.anInt4581 = Static254.anIntArray487[local28 + 9]; - Static262.anInt5752 = Static254.anIntArray487[local28 + 10]; + if (opcode == 5424) { + isp -= 11; + Static40.anInt1275 = Static254.intStack[isp]; + Static111.anInt2910 = Static254.intStack[isp + 1]; + Static251.anInt5457 = Static254.intStack[isp + 2]; + Static232.anInt5208 = Static254.intStack[isp + 3]; + Static55.anInt1736 = Static254.intStack[isp + 4]; + Static169.anInt4073 = Static254.intStack[isp + 5]; + Static85.anInt2261 = Static254.intStack[isp + 6]; + Static136.anInt3324 = Static254.intStack[isp + 7]; + Static254.anInt5556 = Static254.intStack[isp + 8]; + Static195.anInt4581 = Static254.intStack[isp + 9]; + Static262.anInt5752 = Static254.intStack[isp + 10]; Static209.js5Archive8.method4506(Static55.anInt1736); Static209.js5Archive8.method4506(Static169.anInt4073); Static209.js5Archive8.method4506(Static85.anInt2261); @@ -3033,169 +3033,169 @@ public final class Static88 { Static261.aBoolean298 = true; continue; } - if (local226 == 5425) { + if (opcode == 5425) { Static114.method4637(); Static261.aBoolean298 = false; continue; } - if (local226 == 5426) { - local28--; - Static270.anInt5794 = Static254.anIntArray487[local28]; + if (opcode == 5426) { + isp--; + Static270.anInt5794 = Static254.intStack[isp]; continue; } - if (local226 == 5427) { - local28 -= 2; - Static169.anInt4075 = Static254.anIntArray487[local28]; - Static225.anInt5073 = Static254.anIntArray487[local28 + 1]; + if (opcode == 5427) { + isp -= 2; + Static169.anInt4075 = Static254.intStack[isp]; + Static225.anInt5073 = Static254.intStack[isp + 1]; continue; } - } else if (local226 < 5600) { - if (local226 == 5500) { - local28 -= 4; - local809 = Static254.anIntArray487[local28]; - local652 = Static254.anIntArray487[local28 + 3]; - local1052 = Static254.anIntArray487[local28 + 2]; - local803 = Static254.anIntArray487[local28 + 1]; + } else if (opcode < 5600) { + if (opcode == 5500) { + isp -= 4; + local809 = Static254.intStack[isp]; + local652 = Static254.intStack[isp + 3]; + local1052 = Static254.intStack[isp + 2]; + local803 = Static254.intStack[isp + 1]; Static141.method2722(false, local1052, local803, local652, (local809 & 0x3FFF) - Static142.originZ, (local809 >> 14 & 0x3FFF) - Static225.originX); continue; } - if (local226 == 5501) { - local28 -= 4; - local803 = Static254.anIntArray487[local28 + 1]; - local809 = Static254.anIntArray487[local28]; - local652 = Static254.anIntArray487[local28 + 3]; - local1052 = Static254.anIntArray487[local28 + 2]; + if (opcode == 5501) { + isp -= 4; + local803 = Static254.intStack[isp + 1]; + local809 = Static254.intStack[isp]; + local652 = Static254.intStack[isp + 3]; + local1052 = Static254.intStack[isp + 2]; Static260.method3849(local803, (local809 & 0x3FFF) - Static142.originZ, local1052, (local809 >> 14 & 0x3FFF) - Static225.originX, local652); continue; } - if (local226 == 5502) { - local28 -= 6; - local809 = Static254.anIntArray487[local28]; + if (opcode == 5502) { + isp -= 6; + local809 = Static254.intStack[isp]; if (local809 >= 2) { throw new RuntimeException(); } Static155.anInt3718 = local809; - local803 = Static254.anIntArray487[local28 + 1]; + local803 = Static254.intStack[isp + 1]; if (Static107.anIntArrayArrayArray9[Static155.anInt3718].length >> 1 <= local803 + 1) { throw new RuntimeException(); } Static127.anInt3125 = local803; Static233.anInt5224 = 0; - Static228.anInt5101 = Static254.anIntArray487[local28 + 2]; - Static114.anInt5843 = Static254.anIntArray487[local28 + 3]; - local1052 = Static254.anIntArray487[local28 + 4]; + Static228.anInt5101 = Static254.intStack[isp + 2]; + Static114.anInt5843 = Static254.intStack[isp + 3]; + local1052 = Static254.intStack[isp + 4]; if (local1052 >= 2) { throw new RuntimeException(); } Static52.anInt1694 = local1052; - local652 = Static254.anIntArray487[local28 + 5]; + local652 = Static254.intStack[isp + 5]; if (Static107.anIntArrayArrayArray9[Static52.anInt1694].length >> 1 <= local652 + 1) { throw new RuntimeException(); } Static75.anInt2119 = local652; - Static227.anInt5096 = 3; + Static227.cameraType = 3; continue; } - if (local226 == 5503) { - Static35.method902(); + if (opcode == 5503) { + Static35.resetCameraEffects(); continue; } - if (local226 == 5504) { - local28 -= 2; - Static72.anInt2031 = Static254.anIntArray487[local28]; - Static57.anInt1747 = Static254.anIntArray487[local28 + 1]; - if (Static227.anInt5096 == 2) { - Static184.anInt4358 = Static57.anInt1747; - Static240.anInt5333 = Static72.anInt2031; + if (opcode == 5504) { + isp -= 2; + Static72.pitchTarget = Static254.intStack[isp]; + Static57.yawTarget = Static254.intStack[isp + 1]; + if (Static227.cameraType == 2) { + Static184.cameraYaw = Static57.yawTarget; + Static240.cameraPitch = Static72.pitchTarget; } - Static87.method1812(); + Static87.clampCameraAngle(); continue; } - if (local226 == 5505) { - Static254.anIntArray487[local28++] = Static72.anInt2031; + if (opcode == 5505) { + Static254.intStack[isp++] = Static72.pitchTarget; continue; } - if (local226 == 5506) { - Static254.anIntArray487[local28++] = Static57.anInt1747; + if (opcode == 5506) { + Static254.intStack[isp++] = Static57.yawTarget; continue; } - } else if (local226 < 5700) { - if (local226 == 5600) { - local26 -= 2; - local609 = Static3.aClass100Array176[local26]; - local2522 = Static3.aClass100Array176[local26 + 1]; - local28--; - local1052 = Static254.anIntArray487[local28]; - if (Static244.anInt5370 == 10 && Static219.anInt4937 == 0 && Static184.anInt4348 == 0 && Static179.anInt4261 == 0 && Static82.anInt2231 == 0) { + } else if (opcode < 5700) { + if (opcode == 5600) { + ssp -= 2; + local609 = Static3.stringStack[ssp]; + local2522 = Static3.stringStack[ssp + 1]; + isp--; + local1052 = Static254.intStack[isp]; + if (Static244.gameState == 10 && Static219.anInt4937 == 0 && Static184.loginStep == 0 && Static179.accountCreationStep == 0 && Static82.anInt2231 == 0) { Static225.method3896(local609, local2522, local1052); } continue; } - if (local226 == 5601) { + if (opcode == 5601) { Static185.method3395(); continue; } - if (local226 == 5602) { - if (Static184.anInt4348 == 0) { - Static266.anInt5336 = -2; + if (opcode == 5602) { + if (Static184.loginStep == 0) { + Static266.returnCode = -2; } continue; } - if (local226 == 5603) { - local28 -= 4; - if (Static244.anInt5370 == 10 && Static219.anInt4937 == 0 && Static184.anInt4348 == 0 && Static179.anInt4261 == 0 && Static82.anInt2231 == 0) { - Static125.method2448(Static254.anIntArray487[local28 + 2], Static254.anIntArray487[local28 + 3], Static254.anIntArray487[local28], Static254.anIntArray487[local28 + 1]); + if (opcode == 5603) { + isp -= 4; + if (Static244.gameState == 10 && Static219.anInt4937 == 0 && Static184.loginStep == 0 && Static179.accountCreationStep == 0 && Static82.anInt2231 == 0) { + Static125.method2448(Static254.intStack[isp + 2], Static254.intStack[isp + 3], Static254.intStack[isp], Static254.intStack[isp + 1]); } continue; } - if (local226 == 5604) { - local26--; - if (Static244.anInt5370 == 10 && Static219.anInt4937 == 0 && Static184.anInt4348 == 0 && Static179.anInt4261 == 0 && Static82.anInt2231 == 0) { - Static78.method1691(Static3.aClass100Array176[local26].encode37()); + if (opcode == 5604) { + ssp--; + if (Static244.gameState == 10 && Static219.anInt4937 == 0 && Static184.loginStep == 0 && Static179.accountCreationStep == 0 && Static82.anInt2231 == 0) { + Static78.method1691(Static3.stringStack[ssp].encode37()); } continue; } - if (local226 == 5605) { - local28 -= 4; - local26 -= 2; - if (Static244.anInt5370 == 10 && Static219.anInt4937 == 0 && Static184.anInt4348 == 0 && Static179.anInt4261 == 0 && Static82.anInt2231 == 0) { - Static40.method1016(Static254.anIntArray487[local28], Static254.anIntArray487[local28 + 3], Static254.anIntArray487[local28 + 1], Static3.aClass100Array176[local26 + 1], Static3.aClass100Array176[local26].encode37(), Static254.anIntArray487[local28 + 2]); + if (opcode == 5605) { + isp -= 4; + ssp -= 2; + if (Static244.gameState == 10 && Static219.anInt4937 == 0 && Static184.loginStep == 0 && Static179.accountCreationStep == 0 && Static82.anInt2231 == 0) { + Static40.method1016(Static254.intStack[isp], Static254.intStack[isp + 3], Static254.intStack[isp + 1], Static3.stringStack[ssp + 1], Static3.stringStack[ssp].encode37(), Static254.intStack[isp + 2]); } continue; } - if (local226 == 5606) { - if (Static179.anInt4261 == 0) { + if (opcode == 5606) { + if (Static179.accountCreationStep == 0) { Static223.anInt5034 = -2; } continue; } - if (local226 == 5607) { - Static254.anIntArray487[local28++] = Static266.anInt5336; + if (opcode == 5607) { + Static254.intStack[isp++] = Static266.returnCode; continue; } - if (local226 == 5608) { - Static254.anIntArray487[local28++] = Static231.anInt5202; + if (opcode == 5608) { + Static254.intStack[isp++] = Static231.anInt5202; continue; } - if (local226 == 5609) { - Static254.anIntArray487[local28++] = Static223.anInt5034; + if (opcode == 5609) { + Static254.intStack[isp++] = Static223.anInt5034; continue; } - if (local226 == 5610) { + if (opcode == 5610) { for (local809 = 0; local809 < 5; local809++) { - Static3.aClass100Array176[local26++] = Static229.aClass100Array156.length > local809 ? Static229.aClass100Array156[local809].method3125() : Static72.aClass100_447; + Static3.stringStack[ssp++] = Static229.aClass100Array156.length > local809 ? Static229.aClass100Array156[local809].method3125() : Static72.aClass100_447; } Static229.aClass100Array156 = null; continue; } - if (local226 == 5611) { - Static254.anIntArray487[local28++] = Static204.anInt4765; + if (opcode == 5611) { + Static254.intStack[isp++] = Static204.anInt4765; continue; } - } else if (local226 < 6100) { - if (local226 == 6001) { - local28--; - local809 = Static254.anIntArray487[local28]; + } else if (opcode < 6100) { + if (opcode == 6001) { + isp--; + local809 = Static254.intStack[isp]; if (local809 < 1) { local809 = 1; } @@ -3228,9 +3228,9 @@ public final class Static88 { Static18.sentToServer = false; continue; } - if (local226 == 6002) { - local28--; - Static53.method1293(Static254.anIntArray487[local28] == 1); + if (opcode == 6002) { + isp--; + Static53.method1293(Static254.intStack[isp] == 1); Static90.method1854(); Static145.method2742(); Static269.method2218(); @@ -3238,61 +3238,61 @@ public final class Static88 { Static18.sentToServer = false; continue; } - if (local226 == 6003) { - local28--; - Static80.aBoolean231 = Static254.anIntArray487[local28] == 1; + if (opcode == 6003) { + isp--; + Static80.aBoolean231 = Static254.intStack[isp] == 1; Static269.method2218(); Static203.write(GameShell.signLink); Static18.sentToServer = false; continue; } - if (local226 == 6005) { - local28--; - Static250.aBoolean283 = Static254.anIntArray487[local28] == 1; + if (opcode == 6005) { + isp--; + Static250.aBoolean283 = Static254.intStack[isp] == 1; Static145.method2742(); Static203.write(GameShell.signLink); Static18.sentToServer = false; continue; } - if (local226 == 6006) { - local28--; - Static53.highDetailTextures = Static254.anIntArray487[local28] == 1; + if (opcode == 6006) { + isp--; + Static53.highDetailTextures = Static254.intStack[isp] == 1; ((Js5GlTextureProvider) Rasteriser.textureProvider).method3245(!Static53.highDetailTextures); Static203.write(GameShell.signLink); Static18.sentToServer = false; continue; } - if (local226 == 6007) { - local28--; - Static15.aBoolean33 = Static254.anIntArray487[local28] == 1; + if (opcode == 6007) { + isp--; + Static15.aBoolean33 = Static254.intStack[isp] == 1; Static203.write(GameShell.signLink); Static18.sentToServer = false; continue; } - if (local226 == 6008) { - local28--; - Static11.aBoolean15 = Static254.anIntArray487[local28] == 1; + if (opcode == 6008) { + isp--; + Static11.aBoolean15 = Static254.intStack[isp] == 1; Static203.write(GameShell.signLink); Static18.sentToServer = false; continue; } - if (local226 == 6009) { - local28--; - Static159.aBoolean189 = Static254.anIntArray487[local28] == 1; + if (opcode == 6009) { + isp--; + Static159.aBoolean189 = Static254.intStack[isp] == 1; Static203.write(GameShell.signLink); Static18.sentToServer = false; continue; } - if (local226 == 6010) { - local28--; - Static209.aBoolean240 = Static254.anIntArray487[local28] == 1; + if (opcode == 6010) { + isp--; + Static209.aBoolean240 = Static254.intStack[isp] == 1; Static203.write(GameShell.signLink); Static18.sentToServer = false; continue; } - if (local226 == 6011) { - local28--; - local809 = Static254.anIntArray487[local28]; + if (opcode == 6011) { + isp--; + local809 = Static254.intStack[isp]; if (local809 < 0 || local809 > 2) { local809 = 0; } @@ -3301,12 +3301,12 @@ public final class Static88 { Static18.sentToServer = false; continue; } - if (local226 == 6012) { + if (opcode == 6012) { if (GlRenderer.enabled) { Static27.setMaterial(0, 0); } - local28--; - Static178.highDetailLighting = Static254.anIntArray487[local28] == 1; + isp--; + Static178.highDetailLighting = Static254.intStack[isp] == 1; if (GlRenderer.enabled && Static178.highDetailLighting) { Rasteriser.setBrightness(0.7F); } else { @@ -3328,9 +3328,9 @@ public final class Static88 { Static18.sentToServer = false; continue; } - if (local226 == 6014) { - local28--; - Static220.aBoolean244 = Static254.anIntArray487[local28] == 1; + if (opcode == 6014) { + isp--; + Static220.highWaterDetail = Static254.intStack[isp] == 1; if (GlRenderer.enabled) { Static145.method2742(); } @@ -3338,9 +3338,9 @@ public final class Static88 { Static18.sentToServer = false; continue; } - if (local226 == 6015) { - local28--; - Static71.aBoolean107 = Static254.anIntArray487[local28] == 1; + if (opcode == 6015) { + isp--; + Static71.aBoolean107 = Static254.intStack[isp] == 1; if (GlRenderer.enabled) { Static86.method1799(); } @@ -3348,9 +3348,9 @@ public final class Static88 { Static18.sentToServer = false; continue; } - if (local226 == 6016) { - local28--; - local809 = Static254.anIntArray487[local28]; + if (opcode == 6016) { + isp--; + local809 = Static254.intStack[isp]; if (GlRenderer.enabled) { GameShell.replaceCanvas = true; } @@ -3360,17 +3360,17 @@ public final class Static88 { Static186.antiAliasingMode = local809; continue; } - if (local226 == 6017) { - local28--; - Static99.stereo = Static254.anIntArray487[local28] == 1; + if (opcode == 6017) { + isp--; + Static99.stereo = Static254.intStack[isp] == 1; Static211.method930(); Static203.write(GameShell.signLink); Static18.sentToServer = false; continue; } - if (local226 == 6018) { - local28--; - local809 = Static254.anIntArray487[local28]; + if (opcode == 6018) { + isp--; + local809 = Static254.intStack[isp]; if (local809 < 0) { local809 = 0; } @@ -3382,9 +3382,9 @@ public final class Static88 { Static18.sentToServer = false; continue; } - if (local226 == 6019) { - local28--; - local809 = Static254.anIntArray487[local28]; + if (opcode == 6019) { + isp--; + local809 = Static254.intStack[isp]; if (local809 < 0) { local809 = 0; } @@ -3407,9 +3407,9 @@ public final class Static88 { Static18.sentToServer = false; continue; } - if (local226 == 6020) { - local28--; - local809 = Static254.anIntArray487[local28]; + if (opcode == 6020) { + isp--; + local809 = Static254.intStack[isp]; if (local809 < 0) { local809 = 0; } @@ -3421,15 +3421,15 @@ public final class Static88 { Static18.sentToServer = false; continue; } - if (local226 == 6021) { - local28--; - Static127.aBoolean160 = Static254.anIntArray487[local28] == 1; + if (opcode == 6021) { + isp--; + Static127.aBoolean160 = Static254.intStack[isp] == 1; Static269.method2218(); continue; } - if (local226 == 6023) { - local28--; - local809 = Static254.anIntArray487[local28]; + if (opcode == 6023) { + isp--; + local809 = Static254.intStack[isp]; if (local809 < 0) { local809 = 0; } @@ -3444,12 +3444,12 @@ public final class Static88 { Static76.method1645(local809); Static203.write(GameShell.signLink); Static18.sentToServer = false; - Static254.anIntArray487[local28++] = local1552 ? 0 : 1; + Static254.intStack[isp++] = local1552 ? 0 : 1; continue; } - if (local226 == 6024) { - local28--; - local809 = Static254.anIntArray487[local28]; + if (opcode == 6024) { + isp--; + local809 = Static254.intStack[isp]; if (local809 < 0 || local809 > 2) { local809 = 0; } @@ -3457,147 +3457,147 @@ public final class Static88 { Static203.write(GameShell.signLink); continue; } - if (local226 == 6028) { - local28--; - Static64.aBoolean111 = Static254.anIntArray487[local28] != 0; + if (opcode == 6028) { + isp--; + Static64.aBoolean111 = Static254.intStack[isp] != 0; Static203.write(GameShell.signLink); continue; } - } else if (local226 < 6200) { - if (local226 == 6101) { - Static254.anIntArray487[local28++] = Static113.brightness; + } else if (opcode < 6200) { + if (opcode == 6101) { + Static254.intStack[isp++] = Static113.brightness; continue; } - if (local226 == 6102) { - Static254.anIntArray487[local28++] = Static138.method2697() ? 1 : 0; + if (opcode == 6102) { + Static254.intStack[isp++] = Static138.allLevelsAreVisible() ? 1 : 0; continue; } - if (local226 == 6103) { - Static254.anIntArray487[local28++] = Static80.aBoolean231 ? 1 : 0; + if (opcode == 6103) { + Static254.intStack[isp++] = Static80.aBoolean231 ? 1 : 0; continue; } - if (local226 == 6105) { - Static254.anIntArray487[local28++] = Static250.aBoolean283 ? 1 : 0; + if (opcode == 6105) { + Static254.intStack[isp++] = Static250.aBoolean283 ? 1 : 0; continue; } - if (local226 == 6106) { - Static254.anIntArray487[local28++] = Static53.highDetailTextures ? 1 : 0; + if (opcode == 6106) { + Static254.intStack[isp++] = Static53.highDetailTextures ? 1 : 0; continue; } - if (local226 == 6107) { - Static254.anIntArray487[local28++] = Static15.aBoolean33 ? 1 : 0; + if (opcode == 6107) { + Static254.intStack[isp++] = Static15.aBoolean33 ? 1 : 0; continue; } - if (local226 == 6108) { - Static254.anIntArray487[local28++] = Static11.aBoolean15 ? 1 : 0; + if (opcode == 6108) { + Static254.intStack[isp++] = Static11.aBoolean15 ? 1 : 0; continue; } - if (local226 == 6109) { - Static254.anIntArray487[local28++] = Static159.aBoolean189 ? 1 : 0; + if (opcode == 6109) { + Static254.intStack[isp++] = Static159.aBoolean189 ? 1 : 0; continue; } - if (local226 == 6110) { - Static254.anIntArray487[local28++] = Static209.aBoolean240 ? 1 : 0; + if (opcode == 6110) { + Static254.intStack[isp++] = Static209.aBoolean240 ? 1 : 0; continue; } - if (local226 == 6111) { - Static254.anIntArray487[local28++] = Static139.anInt3451; + if (opcode == 6111) { + Static254.intStack[isp++] = Static139.anInt3451; continue; } - if (local226 == 6112) { - Static254.anIntArray487[local28++] = Static178.highDetailLighting ? 1 : 0; + if (opcode == 6112) { + Static254.intStack[isp++] = Static178.highDetailLighting ? 1 : 0; continue; } - if (local226 == 6114) { - Static254.anIntArray487[local28++] = Static220.aBoolean244 ? 1 : 0; + if (opcode == 6114) { + Static254.intStack[isp++] = Static220.highWaterDetail ? 1 : 0; continue; } - if (local226 == 6115) { - Static254.anIntArray487[local28++] = Static71.aBoolean107 ? 1 : 0; + if (opcode == 6115) { + Static254.intStack[isp++] = Static71.aBoolean107 ? 1 : 0; continue; } - if (local226 == 6116) { - Static254.anIntArray487[local28++] = Static186.antiAliasingMode; + if (opcode == 6116) { + Static254.intStack[isp++] = Static186.antiAliasingMode; continue; } - if (local226 == 6117) { - Static254.anIntArray487[local28++] = Static99.stereo ? 1 : 0; + if (opcode == 6117) { + Static254.intStack[isp++] = Static99.stereo ? 1 : 0; continue; } - if (local226 == 6118) { - Static254.anIntArray487[local28++] = Static125.anInt3104; + if (opcode == 6118) { + Static254.intStack[isp++] = Static125.anInt3104; continue; } - if (local226 == 6119) { - Static254.anIntArray487[local28++] = Static12.anInt391; + if (opcode == 6119) { + Static254.intStack[isp++] = Static12.anInt391; continue; } - if (local226 == 6120) { - Static254.anIntArray487[local28++] = Static30.anInt978; + if (opcode == 6120) { + Static254.intStack[isp++] = Static30.anInt978; continue; } - if (local226 == 6121) { + if (opcode == 6121) { if (GlRenderer.enabled) { - Static254.anIntArray487[local28++] = GlRenderer.arbMultisampleSupported ? 1 : 0; + Static254.intStack[isp++] = GlRenderer.arbMultisampleSupported ? 1 : 0; } else { - Static254.anIntArray487[local28++] = 0; + Static254.intStack[isp++] = 0; } continue; } - if (local226 == 6123) { - Static254.anIntArray487[local28++] = Static76.method1644(); + if (opcode == 6123) { + Static254.intStack[isp++] = Static76.method1644(); continue; } - if (local226 == 6124) { - Static254.anIntArray487[local28++] = Static102.windowMode; + if (opcode == 6124) { + Static254.intStack[isp++] = Static102.windowMode; continue; } - if (local226 == 6128) { - Static254.anIntArray487[local28++] = Static64.aBoolean111 ? 1 : 0; + if (opcode == 6128) { + Static254.intStack[isp++] = Static64.aBoolean111 ? 1 : 0; continue; } - } else if (local226 < 6300) { - if (local226 == 6200) { - local28 -= 2; - Static178.aShort25 = (short) Static254.anIntArray487[local28]; + } else if (opcode < 6300) { + if (opcode == 6200) { + isp -= 2; + Static178.aShort25 = (short) Static254.intStack[isp]; if (Static178.aShort25 <= 0) { Static178.aShort25 = 256; } - Static10.aShort9 = (short) Static254.anIntArray487[local28 + 1]; + Static10.aShort9 = (short) Static254.intStack[isp + 1]; if (Static10.aShort9 <= 0) { Static10.aShort9 = 205; } continue; } - if (local226 == 6201) { - local28 -= 2; - Static263.aShort30 = (short) Static254.anIntArray487[local28]; + if (opcode == 6201) { + isp -= 2; + Static263.aShort30 = (short) Static254.intStack[isp]; if (Static263.aShort30 <= 0) { Static263.aShort30 = 256; } - Static187.aShort27 = (short) Static254.anIntArray487[local28 + 1]; + Static187.aShort27 = (short) Static254.intStack[isp + 1]; if (Static187.aShort27 <= 0) { Static187.aShort27 = 320; } continue; } - if (local226 == 6202) { - local28 -= 4; - Static153.aShort22 = (short) Static254.anIntArray487[local28]; + if (opcode == 6202) { + isp -= 4; + Static153.aShort22 = (short) Static254.intStack[isp]; if (Static153.aShort22 <= 0) { Static153.aShort22 = 1; } - Static4.aShort1 = (short) Static254.anIntArray487[local28 + 1]; + Static4.aShort1 = (short) Static254.intStack[isp + 1]; if (Static4.aShort1 <= 0) { Static4.aShort1 = 32767; } else if (Static153.aShort22 > Static4.aShort1) { Static4.aShort1 = Static153.aShort22; } - Static55.aShort12 = (short) Static254.anIntArray487[local28 + 2]; + Static55.aShort12 = (short) Static254.intStack[isp + 2]; if (Static55.aShort12 <= 0) { Static55.aShort12 = 1; } - Static131.aShort21 = (short) Static254.anIntArray487[local28 + 3]; + Static131.aShort21 = (short) Static254.intStack[isp + 3]; if (Static131.aShort21 <= 0) { Static131.aShort21 = 32767; } else if (Static131.aShort21 < Static55.aShort12) { @@ -3605,52 +3605,52 @@ public final class Static88 { } continue; } - if (local226 == 6203) { + if (opcode == 6203) { Static115.method2314(Static280.aClass13_26.anInt445, 0, Static280.aClass13_26.anInt459, 0, false); - Static254.anIntArray487[local28++] = Static166.anInt4055; - Static254.anIntArray487[local28++] = Static245.anInt5377; + Static254.intStack[isp++] = Static166.anInt4055; + Static254.intStack[isp++] = Static245.anInt5377; continue; } - if (local226 == 6204) { - Static254.anIntArray487[local28++] = Static263.aShort30; - Static254.anIntArray487[local28++] = Static187.aShort27; + if (opcode == 6204) { + Static254.intStack[isp++] = Static263.aShort30; + Static254.intStack[isp++] = Static187.aShort27; continue; } - if (local226 == 6205) { - Static254.anIntArray487[local28++] = Static178.aShort25; - Static254.anIntArray487[local28++] = Static10.aShort9; + if (opcode == 6205) { + Static254.intStack[isp++] = Static178.aShort25; + Static254.intStack[isp++] = Static10.aShort9; continue; } - } else if (local226 < 6400) { - if (local226 == 6300) { - Static254.anIntArray487[local28++] = (int) (MonotonicClock.currentTimeMillis() / 60000L); + } else if (opcode < 6400) { + if (opcode == 6300) { + Static254.intStack[isp++] = (int) (MonotonicClock.currentTimeMillis() / 60000L); continue; } - if (local226 == 6301) { - Static254.anIntArray487[local28++] = (int) (MonotonicClock.currentTimeMillis() / 86400000L) - 11745; + if (opcode == 6301) { + Static254.intStack[isp++] = (int) (MonotonicClock.currentTimeMillis() / 86400000L) - 11745; continue; } - if (local226 == 6302) { - local28 -= 3; - local1052 = Static254.anIntArray487[local28 + 2]; - local803 = Static254.anIntArray487[local28 + 1]; - local809 = Static254.anIntArray487[local28]; + if (opcode == 6302) { + isp -= 3; + local1052 = Static254.intStack[isp + 2]; + local803 = Static254.intStack[isp + 1]; + local809 = Static254.intStack[isp]; Static102.aCalendar2.clear(); Static102.aCalendar2.set(11, 12); Static102.aCalendar2.set(local1052, local803, local809); - Static254.anIntArray487[local28++] = (int) (Static102.aCalendar2.getTime().getTime() / 86400000L) - 11745; + Static254.intStack[isp++] = (int) (Static102.aCalendar2.getTime().getTime() / 86400000L) - 11745; continue; } - if (local226 == 6303) { + if (opcode == 6303) { Static102.aCalendar2.clear(); Static102.aCalendar2.setTime(new Date(MonotonicClock.currentTimeMillis())); - Static254.anIntArray487[local28++] = Static102.aCalendar2.get(1); + Static254.intStack[isp++] = Static102.aCalendar2.get(1); continue; } - if (local226 == 6304) { + if (opcode == 6304) { local1552 = true; - local28--; - local809 = Static254.anIntArray487[local28]; + isp--; + local809 = Static254.intStack[isp]; if (local809 < 0) { local1552 = (local809 + 1) % 4 == 0; } else if (local809 < 1582) { @@ -3662,311 +3662,311 @@ public final class Static88 { } else if (local809 % 400 != 0) { local1552 = false; } - Static254.anIntArray487[local28++] = local1552 ? 1 : 0; + Static254.intStack[isp++] = local1552 ? 1 : 0; continue; } - } else if (local226 < 6500) { - if (local226 == 6405) { - Static254.anIntArray487[local28++] = Static87.method1802() ? 1 : 0; + } else if (opcode < 6500) { + if (opcode == 6405) { + Static254.intStack[isp++] = Static87.method1802() ? 1 : 0; continue; } - if (local226 == 6406) { - Static254.anIntArray487[local28++] = Static267.method4527() ? 1 : 0; + if (opcode == 6406) { + Static254.intStack[isp++] = Static267.method4527() ? 1 : 0; continue; } - } else if (local226 < 6600) { - if (local226 == 6500) { - if (Static244.anInt5370 == 10 && Static219.anInt4937 == 0 && Static184.anInt4348 == 0 && Static179.anInt4261 == 0) { - Static254.anIntArray487[local28++] = Static207.fetch() == -1 ? 0 : 1; + } else if (opcode < 6600) { + if (opcode == 6500) { + if (Static244.gameState == 10 && Static219.anInt4937 == 0 && Static184.loginStep == 0 && Static179.accountCreationStep == 0) { + Static254.intStack[isp++] = Static207.fetch() == -1 ? 0 : 1; continue; } - Static254.anIntArray487[local28++] = 1; + Static254.intStack[isp++] = 1; continue; } @Pc(10247) Class32 local10247; @Pc(10191) World local10191; - if (local226 == 6501) { + if (opcode == 6501) { local10191 = Static18.method556(); if (local10191 == null) { - Static254.anIntArray487[local28++] = -1; - Static254.anIntArray487[local28++] = 0; - Static3.aClass100Array176[local26++] = Static72.aClass100_447; - Static254.anIntArray487[local28++] = 0; - Static3.aClass100Array176[local26++] = Static72.aClass100_447; - Static254.anIntArray487[local28++] = 0; + Static254.intStack[isp++] = -1; + Static254.intStack[isp++] = 0; + Static3.stringStack[ssp++] = Static72.aClass100_447; + Static254.intStack[isp++] = 0; + Static3.stringStack[ssp++] = Static72.aClass100_447; + Static254.intStack[isp++] = 0; } else { - Static254.anIntArray487[local28++] = local10191.anInt382; - Static254.anIntArray487[local28++] = local10191.anInt381; - Static3.aClass100Array176[local26++] = local10191.aClass100_69; + Static254.intStack[isp++] = local10191.anInt382; + Static254.intStack[isp++] = local10191.anInt381; + Static3.stringStack[ssp++] = local10191.aClass100_69; local10247 = local10191.method445(); - Static254.anIntArray487[local28++] = local10247.anInt1739; - Static3.aClass100Array176[local26++] = local10247.aClass100_378; - Static254.anIntArray487[local28++] = local10191.anInt379; + Static254.intStack[isp++] = local10247.anInt1739; + Static3.stringStack[ssp++] = local10247.aClass100_378; + Static254.intStack[isp++] = local10191.anInt379; } continue; } - if (local226 == 6502) { + if (opcode == 6502) { local10191 = method1821(); if (local10191 == null) { - Static254.anIntArray487[local28++] = -1; - Static254.anIntArray487[local28++] = 0; - Static3.aClass100Array176[local26++] = Static72.aClass100_447; - Static254.anIntArray487[local28++] = 0; - Static3.aClass100Array176[local26++] = Static72.aClass100_447; - Static254.anIntArray487[local28++] = 0; + Static254.intStack[isp++] = -1; + Static254.intStack[isp++] = 0; + Static3.stringStack[ssp++] = Static72.aClass100_447; + Static254.intStack[isp++] = 0; + Static3.stringStack[ssp++] = Static72.aClass100_447; + Static254.intStack[isp++] = 0; } else { - Static254.anIntArray487[local28++] = local10191.anInt382; - Static254.anIntArray487[local28++] = local10191.anInt381; - Static3.aClass100Array176[local26++] = local10191.aClass100_69; + Static254.intStack[isp++] = local10191.anInt382; + Static254.intStack[isp++] = local10191.anInt381; + Static3.stringStack[ssp++] = local10191.aClass100_69; local10247 = local10191.method445(); - Static254.anIntArray487[local28++] = local10247.anInt1739; - Static3.aClass100Array176[local26++] = local10247.aClass100_378; - Static254.anIntArray487[local28++] = local10191.anInt379; + Static254.intStack[isp++] = local10247.anInt1739; + Static3.stringStack[ssp++] = local10247.aClass100_378; + Static254.intStack[isp++] = local10191.anInt379; } continue; } - if (local226 == 6503) { - local28--; - local809 = Static254.anIntArray487[local28]; - if (Static244.anInt5370 == 10 && Static219.anInt4937 == 0 && Static184.anInt4348 == 0 && Static179.anInt4261 == 0) { - Static254.anIntArray487[local28++] = Static176.method3303(local809) ? 1 : 0; + if (opcode == 6503) { + isp--; + local809 = Static254.intStack[isp]; + if (Static244.gameState == 10 && Static219.anInt4937 == 0 && Static184.loginStep == 0 && Static179.accountCreationStep == 0) { + Static254.intStack[isp++] = Static176.method3303(local809) ? 1 : 0; continue; } - Static254.anIntArray487[local28++] = 0; + Static254.intStack[isp++] = 0; continue; } - if (local226 == 6504) { - local28--; - Static164.anInt3988 = Static254.anIntArray487[local28]; + if (opcode == 6504) { + isp--; + Static164.anInt3988 = Static254.intStack[isp]; Static203.write(GameShell.signLink); continue; } - if (local226 == 6505) { - Static254.anIntArray487[local28++] = Static164.anInt3988; + if (opcode == 6505) { + Static254.intStack[isp++] = Static164.anInt3988; continue; } - if (local226 == 6506) { - local28--; - local809 = Static254.anIntArray487[local28]; + if (opcode == 6506) { + isp--; + local809 = Static254.intStack[isp]; @Pc(10440) World local10440 = Static54.method1310(local809); if (local10440 == null) { - Static254.anIntArray487[local28++] = -1; - Static3.aClass100Array176[local26++] = Static72.aClass100_447; - Static254.anIntArray487[local28++] = 0; - Static3.aClass100Array176[local26++] = Static72.aClass100_447; - Static254.anIntArray487[local28++] = 0; + Static254.intStack[isp++] = -1; + Static3.stringStack[ssp++] = Static72.aClass100_447; + Static254.intStack[isp++] = 0; + Static3.stringStack[ssp++] = Static72.aClass100_447; + Static254.intStack[isp++] = 0; } else { - Static254.anIntArray487[local28++] = local10440.anInt381; - Static3.aClass100Array176[local26++] = local10440.aClass100_69; + Static254.intStack[isp++] = local10440.anInt381; + Static3.stringStack[ssp++] = local10440.aClass100_69; @Pc(10458) Class32 local10458 = local10440.method445(); - Static254.anIntArray487[local28++] = local10458.anInt1739; - Static3.aClass100Array176[local26++] = local10458.aClass100_378; - Static254.anIntArray487[local28++] = local10440.anInt379; + Static254.intStack[isp++] = local10458.anInt1739; + Static3.stringStack[ssp++] = local10458.aClass100_378; + Static254.intStack[isp++] = local10440.anInt379; } continue; } - if (local226 == 6507) { - local28 -= 4; - local1052 = Static254.anIntArray487[local28 + 2]; - local809 = Static254.anIntArray487[local28]; - local7566 = Static254.anIntArray487[local28 + 3] == 1; - local1552 = Static254.anIntArray487[local28 + 1] == 1; + if (opcode == 6507) { + isp -= 4; + local1052 = Static254.intStack[isp + 2]; + local809 = Static254.intStack[isp]; + local7566 = Static254.intStack[isp + 3] == 1; + local1552 = Static254.intStack[isp + 1] == 1; Static228.method3908(local1052, local1552, local809, local7566); continue; } - } else if (local226 < 6700) { - if (local226 == 6600) { - local28--; - Static33.aBoolean63 = Static254.anIntArray487[local28] == 1; + } else if (opcode < 6700) { + if (opcode == 6600) { + isp--; + Static33.aBoolean63 = Static254.intStack[isp] == 1; Static203.write(GameShell.signLink); continue; } - if (local226 == 6601) { - Static254.anIntArray487[local28++] = Static33.aBoolean63 ? 1 : 0; + if (opcode == 6601) { + Static254.intStack[isp++] = Static33.aBoolean63 ? 1 : 0; continue; } } } - } else if (local226 == 4500) { - local28 -= 2; - local809 = Static254.anIntArray487[local28]; - local803 = Static254.anIntArray487[local28 + 1]; + } else if (opcode == 4500) { + isp -= 2; + local809 = Static254.intStack[isp]; + local803 = Static254.intStack[isp + 1]; local5294 = Static110.method2277(local803); if (local5294.method2078()) { - Static3.aClass100Array176[local26++] = Static123.method2417(local809).method2802(local5294.aClass100_544, local803); + Static3.stringStack[ssp++] = Static123.method2417(local809).method2802(local5294.aClass100_544, local803); } else { - Static254.anIntArray487[local28++] = Static123.method2417(local809).method2798(local803, local5294.anInt2667); + Static254.intStack[isp++] = Static123.method2417(local809).method2798(local803, local5294.anInt2667); } continue; } - } else if (local226 == 4400) { - local28 -= 2; - local803 = Static254.anIntArray487[local28 + 1]; - local809 = Static254.anIntArray487[local28]; + } else if (opcode == 4400) { + isp -= 2; + local803 = Static254.intStack[isp + 1]; + local809 = Static254.intStack[isp]; local5294 = Static110.method2277(local803); if (local5294.method2078()) { - Static3.aClass100Array176[local26++] = Static271.method4601(local809).method3430(local5294.aClass100_544, local803); + Static3.stringStack[ssp++] = Static271.method4601(local809).method3430(local5294.aClass100_544, local803); } else { - Static254.anIntArray487[local28++] = Static271.method4601(local809).method3423(local5294.anInt2667, local803); + Static254.intStack[isp++] = Static271.method4601(local809).method3423(local5294.anInt2667, local803); } continue; } } else { - if (local226 == 4100) { - local26--; - local609 = Static3.aClass100Array176[local26]; - local28--; - local803 = Static254.anIntArray487[local28]; - Static3.aClass100Array176[local26++] = Static34.concatenate(new JagString[] { local609, Static123.parseInt(local803) }); + if (opcode == 4100) { + ssp--; + local609 = Static3.stringStack[ssp]; + isp--; + local803 = Static254.intStack[isp]; + Static3.stringStack[ssp++] = Static34.concatenate(new JagString[] { local609, Static123.parseInt(local803) }); continue; } - if (local226 == 4101) { - local26 -= 2; - local2522 = Static3.aClass100Array176[local26 + 1]; - local609 = Static3.aClass100Array176[local26]; - Static3.aClass100Array176[local26++] = Static34.concatenate(new JagString[] { local609, local2522 }); + if (opcode == 4101) { + ssp -= 2; + local2522 = Static3.stringStack[ssp + 1]; + local609 = Static3.stringStack[ssp]; + Static3.stringStack[ssp++] = Static34.concatenate(new JagString[] { local609, local2522 }); continue; } - if (local226 == 4102) { - local26--; - local609 = Static3.aClass100Array176[local26]; - local28--; - local803 = Static254.anIntArray487[local28]; - Static3.aClass100Array176[local26++] = Static34.concatenate(new JagString[] { local609, Static110.method2285(local803) }); + if (opcode == 4102) { + ssp--; + local609 = Static3.stringStack[ssp]; + isp--; + local803 = Static254.intStack[isp]; + Static3.stringStack[ssp++] = Static34.concatenate(new JagString[] { local609, Static110.method2285(local803) }); continue; } - if (local226 == 4103) { - local26--; - local609 = Static3.aClass100Array176[local26]; - Static3.aClass100Array176[local26++] = local609.toLowerCase(); + if (opcode == 4103) { + ssp--; + local609 = Static3.stringStack[ssp]; + Static3.stringStack[ssp++] = local609.toLowerCase(); continue; } - if (local226 == 4104) { - local28--; - local809 = Static254.anIntArray487[local28]; + if (opcode == 4104) { + isp--; + local809 = Static254.intStack[isp]; @Pc(11770) long local11770 = (long) local809 * 86400000L + 1014768000000L; Static102.aCalendar2.setTime(new Date(local11770)); local652 = Static102.aCalendar2.get(5); local4859 = Static102.aCalendar2.get(2); local1087 = Static102.aCalendar2.get(1); - Static3.aClass100Array176[local26++] = Static34.concatenate(new JagString[] { Static123.parseInt(local652), Static163.aClass100_767, Static34.aClass100Array40[local4859], Static163.aClass100_767, Static123.parseInt(local1087) }); + Static3.stringStack[ssp++] = Static34.concatenate(new JagString[] { Static123.parseInt(local652), Static163.aClass100_767, Static34.aClass100Array40[local4859], Static163.aClass100_767, Static123.parseInt(local1087) }); continue; } - if (local226 == 4105) { - local26 -= 2; - local2522 = Static3.aClass100Array176[local26 + 1]; - local609 = Static3.aClass100Array176[local26]; + if (opcode == 4105) { + ssp -= 2; + local2522 = Static3.stringStack[ssp + 1]; + local609 = Static3.stringStack[ssp]; if (Static173.self.aClass59_1 != null && Static173.self.aClass59_1.aBoolean141) { - Static3.aClass100Array176[local26++] = local2522; + Static3.stringStack[ssp++] = local2522; continue; } - Static3.aClass100Array176[local26++] = local609; + Static3.stringStack[ssp++] = local609; continue; } - if (local226 == 4106) { - local28--; - local809 = Static254.anIntArray487[local28]; - Static3.aClass100Array176[local26++] = Static123.parseInt(local809); + if (opcode == 4106) { + isp--; + local809 = Static254.intStack[isp]; + Static3.stringStack[ssp++] = Static123.parseInt(local809); continue; } - if (local226 == 4107) { - local26 -= 2; - Static254.anIntArray487[local28++] = Static3.aClass100Array176[local26].method3126(Static3.aClass100Array176[local26 + 1]); + if (opcode == 4107) { + ssp -= 2; + Static254.intStack[isp++] = Static3.stringStack[ssp].method3126(Static3.stringStack[ssp + 1]); continue; } - if (local226 == 4108) { - local26--; - local609 = Static3.aClass100Array176[local26]; - local28 -= 2; - local1052 = Static254.anIntArray487[local28 + 1]; - local803 = Static254.anIntArray487[local28]; - Static254.anIntArray487[local28++] = Static148.method2768(local1052).method2860(local609, local803); + if (opcode == 4108) { + ssp--; + local609 = Static3.stringStack[ssp]; + isp -= 2; + local1052 = Static254.intStack[isp + 1]; + local803 = Static254.intStack[isp]; + Static254.intStack[isp++] = Static148.method2768(local1052).method2860(local609, local803); continue; } - if (local226 == 4109) { - local28 -= 2; - local26--; - local609 = Static3.aClass100Array176[local26]; - local1052 = Static254.anIntArray487[local28 + 1]; - local803 = Static254.anIntArray487[local28]; - Static254.anIntArray487[local28++] = Static148.method2768(local1052).method2856(local609, local803); + if (opcode == 4109) { + isp -= 2; + ssp--; + local609 = Static3.stringStack[ssp]; + local1052 = Static254.intStack[isp + 1]; + local803 = Static254.intStack[isp]; + Static254.intStack[isp++] = Static148.method2768(local1052).method2856(local609, local803); continue; } - if (local226 == 4110) { - local26 -= 2; - local609 = Static3.aClass100Array176[local26]; - local2522 = Static3.aClass100Array176[local26 + 1]; - local28--; - if (Static254.anIntArray487[local28] == 1) { - Static3.aClass100Array176[local26++] = local609; + if (opcode == 4110) { + ssp -= 2; + local609 = Static3.stringStack[ssp]; + local2522 = Static3.stringStack[ssp + 1]; + isp--; + if (Static254.intStack[isp] == 1) { + Static3.stringStack[ssp++] = local609; } else { - Static3.aClass100Array176[local26++] = local2522; + Static3.stringStack[ssp++] = local2522; } continue; } - if (local226 == 4111) { - local26--; - local609 = Static3.aClass100Array176[local26]; - Static3.aClass100Array176[local26++] = Static218.method2862(local609); + if (opcode == 4111) { + ssp--; + local609 = Static3.stringStack[ssp]; + Static3.stringStack[ssp++] = Static218.method2862(local609); continue; } - if (local226 == 4112) { - local26--; - local609 = Static3.aClass100Array176[local26]; - local28--; - local803 = Static254.anIntArray487[local28]; + if (opcode == 4112) { + ssp--; + local609 = Static3.stringStack[ssp]; + isp--; + local803 = Static254.intStack[isp]; if (local803 == -1) { throw new RuntimeException("null char"); } - Static3.aClass100Array176[local26++] = local609.method3128(local803); + Static3.stringStack[ssp++] = local609.method3128(local803); continue; } - if (local226 == 4113) { - local28--; - local809 = Static254.anIntArray487[local28]; - Static254.anIntArray487[local28++] = Static273.method3213(local809) ? 1 : 0; + if (opcode == 4113) { + isp--; + local809 = Static254.intStack[isp]; + Static254.intStack[isp++] = Static273.method3213(local809) ? 1 : 0; continue; } - if (local226 == 4114) { - local28--; - local809 = Static254.anIntArray487[local28]; - Static254.anIntArray487[local28++] = Static83.method433(local809) ? 1 : 0; + if (opcode == 4114) { + isp--; + local809 = Static254.intStack[isp]; + Static254.intStack[isp++] = Static83.method433(local809) ? 1 : 0; continue; } - if (local226 == 4115) { - local28--; - local809 = Static254.anIntArray487[local28]; - Static254.anIntArray487[local28++] = Static258.method4428(local809) ? 1 : 0; + if (opcode == 4115) { + isp--; + local809 = Static254.intStack[isp]; + Static254.intStack[isp++] = Static258.method4428(local809) ? 1 : 0; continue; } - if (local226 == 4116) { - local28--; - local809 = Static254.anIntArray487[local28]; - Static254.anIntArray487[local28++] = Static24.method671(local809) ? 1 : 0; + if (opcode == 4116) { + isp--; + local809 = Static254.intStack[isp]; + Static254.intStack[isp++] = Static24.method671(local809) ? 1 : 0; continue; } - if (local226 == 4117) { - local26--; - local609 = Static3.aClass100Array176[local26]; + if (opcode == 4117) { + ssp--; + local609 = Static3.stringStack[ssp]; if (local609 == null) { - Static254.anIntArray487[local28++] = 0; + Static254.intStack[isp++] = 0; } else { - Static254.anIntArray487[local28++] = local609.length(); + Static254.intStack[isp++] = local609.length(); } continue; } - if (local226 == 4118) { - local28 -= 2; - local26--; - local609 = Static3.aClass100Array176[local26]; - local803 = Static254.anIntArray487[local28]; - local1052 = Static254.anIntArray487[local28 + 1]; - Static3.aClass100Array176[local26++] = local609.substring(local1052, local803); + if (opcode == 4118) { + isp -= 2; + ssp--; + local609 = Static3.stringStack[ssp]; + local803 = Static254.intStack[isp]; + local1052 = Static254.intStack[isp + 1]; + Static3.stringStack[ssp++] = local609.substring(local1052, local803); continue; } - if (local226 == 4119) { - local26--; - local609 = Static3.aClass100Array176[local26]; + if (opcode == 4119) { + ssp--; + local609 = Static3.stringStack[ssp]; local2522 = Static87.method1804(local609.length()); @Pc(12220) boolean local12220 = false; for (local652 = 0; local652 < local609.length(); local652++) { @@ -3980,68 +3980,68 @@ public final class Static88 { } } local2522.method3156(); - Static3.aClass100Array176[local26++] = local2522; + Static3.stringStack[ssp++] = local2522; continue; } - if (local226 == 4120) { - local28 -= 2; - local26--; - local609 = Static3.aClass100Array176[local26]; - local803 = Static254.anIntArray487[local28]; - local1052 = Static254.anIntArray487[local28 + 1]; - Static254.anIntArray487[local28++] = local609.method3135(local803, local1052); + if (opcode == 4120) { + isp -= 2; + ssp--; + local609 = Static3.stringStack[ssp]; + local803 = Static254.intStack[isp]; + local1052 = Static254.intStack[isp + 1]; + Static254.intStack[isp++] = local609.method3135(local803, local1052); continue; } - if (local226 == 4121) { - local26 -= 2; - local609 = Static3.aClass100Array176[local26]; - local2522 = Static3.aClass100Array176[local26 + 1]; - local28--; - local1052 = Static254.anIntArray487[local28]; - Static254.anIntArray487[local28++] = local609.method3146(local2522, local1052); + if (opcode == 4121) { + ssp -= 2; + local609 = Static3.stringStack[ssp]; + local2522 = Static3.stringStack[ssp + 1]; + isp--; + local1052 = Static254.intStack[isp]; + Static254.intStack[isp++] = local609.method3146(local2522, local1052); continue; } - if (local226 == 4122) { - local28--; - local809 = Static254.anIntArray487[local28]; - Static254.anIntArray487[local28++] = Static231.method3984(local809); + if (opcode == 4122) { + isp--; + local809 = Static254.intStack[isp]; + Static254.intStack[isp++] = Static231.method3984(local809); continue; } - if (local226 == 4123) { - local28--; - local809 = Static254.anIntArray487[local28]; - Static254.anIntArray487[local28++] = Static143.method2733(local809); + if (opcode == 4123) { + isp--; + local809 = Static254.intStack[isp]; + Static254.intStack[isp++] = Static143.method2733(local809); continue; } - if (local226 == 4124) { - local28--; - local12388 = Static254.anIntArray487[local28] != 0; - local28--; - local803 = Static254.anIntArray487[local28]; - Static3.aClass100Array176[local26++] = Static182.method3360(Static141.anInt3470, local12388, 0, (long) local803); + if (opcode == 4124) { + isp--; + local12388 = Static254.intStack[isp] != 0; + isp--; + local803 = Static254.intStack[isp]; + Static3.stringStack[ssp++] = Static182.method3360(Static141.anInt3470, local12388, 0, (long) local803); continue; } } } } else { - if (local226 < 2000) { + if (opcode < 2000) { local1182 = local1020 ? Static274.aClass13_24 : Static227.aClass13_25; } else { - local28--; - local1182 = Static5.getComponent(Static254.anIntArray487[local28]); - local226 -= 1000; + isp--; + local1182 = Static5.getComponent(Static254.intStack[isp]); + opcode -= 1000; } - if (local226 == 1000) { - local28 -= 4; - local1182.baseX = Static254.anIntArray487[local28]; - local1182.baseY = Static254.anIntArray487[local28 + 1]; - local1052 = Static254.anIntArray487[local28 + 3]; + if (opcode == 1000) { + isp -= 4; + local1182.baseX = Static254.intStack[isp]; + local1182.baseY = Static254.intStack[isp + 1]; + local1052 = Static254.intStack[isp + 3]; if (local1052 < 0) { local1052 = 0; } else if (local1052 > 5) { local1052 = 5; } - local803 = Static254.anIntArray487[local28 + 2]; + local803 = Static254.intStack[isp + 2]; if (local803 < 0) { local803 = 0; } else if (local803 > 5) { @@ -4056,14 +4056,14 @@ public final class Static88 { } continue; } - if (local226 == 1001) { - local28 -= 4; - local1182.baseWidth = Static254.anIntArray487[local28]; - local1182.anInt488 = Static254.anIntArray487[local28 + 1]; + if (opcode == 1001) { + isp -= 4; + local1182.baseWidth = Static254.intStack[isp]; + local1182.anInt488 = Static254.intStack[isp + 1]; local1182.anInt451 = 0; local1182.anInt526 = 0; - local803 = Static254.anIntArray487[local28 + 2]; - local1052 = Static254.anIntArray487[local28 + 3]; + local803 = Static254.intStack[isp + 2]; + local1052 = Static254.intStack[isp + 3]; if (local1052 < 0) { local1052 = 0; } else if (local1052 > 4) { @@ -4083,9 +4083,9 @@ public final class Static88 { } continue; } - if (local226 == 1003) { - local28--; - local1552 = Static254.anIntArray487[local28] == 1; + if (opcode == 1003) { + isp--; + local1552 = Static254.intStack[isp] == 1; if (local1552 != local1182.hidden) { local1182.hidden = local1552; Static43.method1143(local1182); @@ -4095,10 +4095,10 @@ public final class Static88 { } continue; } - if (local226 == 1004) { - local28 -= 2; - local1182.anInt473 = Static254.anIntArray487[local28]; - local1182.anInt442 = Static254.anIntArray487[local28 + 1]; + if (opcode == 1004) { + isp -= 2; + local1182.anInt473 = Static254.intStack[isp]; + local1182.anInt442 = Static254.intStack[isp + 1]; Static43.method1143(local1182); Static74.method1625(local1182); if (local1182.anInt452 == 0) { @@ -4106,9 +4106,9 @@ public final class Static88 { } continue; } - if (local226 == 1005) { - local28--; - local1182.aBoolean29 = Static254.anIntArray487[local28] == 1; + if (opcode == 1005) { + isp--; + local1182.aBoolean29 = Static254.intStack[isp] == 1; continue; } } @@ -4117,25 +4117,25 @@ public final class Static88 { throw new IllegalStateException(); } } catch (@Pc(14378) Exception local14378) { - if (local14.aClass100_880 == null) { + if (script.aClass100_880 == null) { if (Static83.modeWhere != 0) { Static103.method2231(Static72.aClass100_447, 0, Static136.aClass100_633); } - Static89.report("CS2 - scr:" + local14.aLong192 + " op:" + local44, local14378); + Static89.report("CS2 - scr:" + script.aLong192 + " op:" + local44, local14378); } else { @Pc(14385) JagString local14385 = Static87.method1804(30); - local14385.method3113(Static219.aClass100_928).method3113(local14.aClass100_880); - for (local58 = Static138.anInt3445 - 1; local58 >= 0; local58--) { - local14385.method3113(Static40.aClass100_253).method3113(Static67.aClass61Array3[local58].aClass3_Sub2_Sub17_1.aClass100_880); + local14385.method3113(Static219.aClass100_928).method3113(script.aClass100_880); + for (cycles = Static138.fp - 1; cycles >= 0; cycles--) { + local14385.method3113(Static40.aClass100_253).method3113(Static67.callStack[cycles].script.aClass100_880); } if (local44 == 40) { - local58 = local33[local30]; - local14385.method3113(Static176.aClass100_802).method3113(Static123.parseInt(local58)); + cycles = intOperands[pc]; + local14385.method3113(Static176.aClass100_802).method3113(Static123.parseInt(cycles)); } if (Static83.modeWhere != 0) { - Static103.method2231(Static72.aClass100_447, 0, Static34.concatenate(new JagString[] { Static167.aClass100_780, local14.aClass100_880 })); + Static103.method2231(Static72.aClass100_447, 0, Static34.concatenate(new JagString[] { Static167.aClass100_780, script.aClass100_880 })); } - Static89.report("CS2 - scr:" + local14.aLong192 + " op:" + local44 + new String(local14385.method3148()), local14378); + Static89.report("CS2 - scr:" + script.aLong192 + " op:" + local44 + new String(local14385.method3148()), local14378); } } } diff --git a/client/src/main/java/Static89.java b/client/src/main/java/Static89.java index 7bfbbda..60887b9 100644 --- a/client/src/main/java/Static89.java +++ b/client/src/main/java/Static89.java @@ -31,9 +31,9 @@ public final class Static89 { @Pc(13) byte[][] local13; if (GlRenderer.enabled && arg0) { local11 = 1; - local13 = Static186.aByteArrayArray14; + local13 = Static186.underWaterMapFilesBuffer; } else { - local13 = Static273.aByteArrayArray13; + local13 = Static273.mapFilesBuffer; local11 = 4; } for (@Pc(21) int local21 = 0; local21 < local11; local21++) { @@ -49,8 +49,8 @@ public final class Static89 { @Pc(82) int local82 = local52 >> 1 & 0x3; @Pc(88) int local88 = local52 >> 14 & 0x3FF; @Pc(98) int local98 = (local88 / 8 << 8) + local76 / 8; - for (@Pc(100) int local100 = 0; local100 < Static238.anIntArray470.length; local100++) { - if (Static238.anIntArray470[local100] == local98 && local13[local100] != null) { + for (@Pc(100) int local100 = 0; local100 < Static238.regionBitPacked.length; local100++) { + if (Static238.regionBitPacked[local100] == local98 && local13[local100] != null) { Static245.method4228(local82, local32 * 8, local21, Static148.collisionMaps, local39 * 8, local13[local100], local65, (local76 & 0x7) * 8, (local88 & 0x7) * 8, arg0); local54 = true; break; @@ -168,8 +168,8 @@ public final class Static89 { Static39.aShortArray6[0] = 1005; Static190.anIntArray382[0] = Static35.anInt1092; } - if (Static154.topLevelInterace != -1) { - Static96.method1949(Static154.topLevelInterace); + if (Static154.topLevelInterface != -1) { + Static96.method1949(Static154.topLevelInterface); } @Pc(60) int local60; for (local60 = 0; local60 < Static24.anInt766; local60++) { @@ -186,8 +186,8 @@ public final class Static89 { if (GlRenderer.enabled) { Static263.aBoolean299 = true; } - Static182.anInt4311 = Static83.anInt372; - if (Static154.topLevelInterace != -1) { + Static182.anInt4311 = Static83.loop; + if (Static154.topLevelInterface != -1) { Static24.anInt766 = 0; Static9.method182(); } diff --git a/client/src/main/java/Static9.java b/client/src/main/java/Static9.java index a8625c7..0e40230 100644 --- a/client/src/main/java/Static9.java +++ b/client/src/main/java/Static9.java @@ -48,17 +48,17 @@ public final class Static9 { local96 = arg5 + (local28 >> 1); local100 = (local28 + 1 >> 1) + arg5; } - @Pc(120) int[][] local120 = Static83.anIntArrayArrayArray4[arg7]; + @Pc(120) int[][] local120 = Static83.activeTileHeightMap[arg7]; @Pc(122) int local122 = 0; @Pc(148) int local148 = local120[local96][local51] + local120[local96][local53] + local120[local100][local53] + local120[local100][local51] >> 2; @Pc(158) int[][] local158; if (arg7 != 0) { - local158 = Static83.anIntArrayArrayArray4[0]; + local158 = Static83.activeTileHeightMap[0]; local122 = local148 - (local158[local96][local51] + local158[local100][local53] + local158[local96][local53] + local158[local100][local51] >> 2); } local158 = null; if (arg7 < 3) { - local158 = Static83.anIntArrayArrayArray4[arg7 + 1]; + local158 = Static83.activeTileHeightMap[arg7 + 1]; } @Pc(215) Class139 local215 = arg0.method3428(arg2, local80, local120, arg4, local148, local158, false, null, true, local88); Static242.method4207(local215.aClass36_Sub1_3, local80 - arg3, local122, local88 - arg1); @@ -67,7 +67,7 @@ public final class Static9 { @OriginalMember(owner = "client!al", name = "a", descriptor = "(Z)V") public static void method182() { Static241.aClass13Array13 = null; - Static6.method86(Static154.topLevelInterace, 0, GameShell.canvasWidth, 0, -1, GameShell.canvasHeight, 0, 0); + Static6.method86(Static154.topLevelInterface, 0, GameShell.canvasWidth, 0, -1, GameShell.canvasHeight, 0, 0); if (Static241.aClass13Array13 != null) { Static87.method1809(0, Static127.anInt3126, Static80.anInt4696, Static241.aClass13Array13, GameShell.canvasWidth, -1412584499, 0, GameShell.canvasHeight, Static4.aClass13_1.anInt517); Static241.aClass13Array13 = null; @@ -124,7 +124,7 @@ public final class Static9 { } else { @Pc(22) int local22 = arg1 << 7; @Pc(26) int local26 = arg2 << 7; - if (Static256.method4394(local22 + 1, Static83.anIntArrayArrayArray4[arg0][arg1][arg2], local26 + 1) && Static256.method4394(local22 + 128 - 1, Static83.anIntArrayArrayArray4[arg0][arg1 + 1][arg2], local26 + 1) && Static256.method4394(local22 + 128 - 1, Static83.anIntArrayArrayArray4[arg0][arg1 + 1][arg2 + 1], local26 + 128 - 1) && Static256.method4394(local22 + 1, Static83.anIntArrayArrayArray4[arg0][arg1][arg2 + 1], local26 + 128 - 1)) { + if (Static256.method4394(local22 + 1, Static83.activeTileHeightMap[arg0][arg1][arg2], local26 + 1) && Static256.method4394(local22 + 128 - 1, Static83.activeTileHeightMap[arg0][arg1 + 1][arg2], local26 + 1) && Static256.method4394(local22 + 128 - 1, Static83.activeTileHeightMap[arg0][arg1 + 1][arg2 + 1], local26 + 128 - 1) && Static256.method4394(local22 + 1, Static83.activeTileHeightMap[arg0][arg1][arg2 + 1], local26 + 128 - 1)) { Static140.anIntArrayArrayArray12[arg0][arg1][arg2] = Static13.anInt437; return true; } else { diff --git a/client/src/main/java/Static90.java b/client/src/main/java/Static90.java index 27a4ecc..a613f4d 100644 --- a/client/src/main/java/Static90.java +++ b/client/src/main/java/Static90.java @@ -35,7 +35,7 @@ public final class Static90 { if (local10 != null) { return local10; } - @Pc(21) byte[] local21 = Static167.aClass153_62.method4495(32, arg0); + @Pc(21) byte[] local21 = Static167.aClass153_62.getFile(32, arg0); local10 = new BasType(); if (local21 != null) { local10.method880(new Buffer(local21)); diff --git a/client/src/main/java/Static91.java b/client/src/main/java/Static91.java index d025a41..5d39744 100644 --- a/client/src/main/java/Static91.java +++ b/client/src/main/java/Static91.java @@ -26,12 +26,12 @@ public final class Static91 { } @OriginalMember(owner = "client!hc", name = "a", descriptor = "(IB)Lclient!qc;") - public static ClientScript method1875(@OriginalArg(0) int arg0) { + public static ClientScript getCs2ById(@OriginalArg(0) int arg0) { @Pc(12) ClientScript local12 = (ClientScript) Static105.aClass54_9.method1806((long) arg0); if (local12 != null) { return local12; } - @Pc(22) byte[] local22 = Static16.js5Archive12.method4495(arg0, 0); + @Pc(22) byte[] local22 = Static16.js5Archive12.getFile(arg0, 0); if (local22 == null) { return null; } @@ -64,20 +64,20 @@ public final class Static91 { } local42.offset = 0; local12.aClass100_880 = local42.gjstrFast(); - local12.anIntArray415 = new int[local70]; - local12.aClass100Array140 = new JagString[local70]; + local12.opcodes = new int[local70]; + local12.stringOperands = new JagString[local70]; local107 = 0; - local12.anIntArray416 = new int[local70]; + local12.intOperands = new int[local70]; while (local63 > local42.offset) { local114 = local42.g2(); if (local114 == 3) { - local12.aClass100Array140[local107] = local42.gjstr(); + local12.stringOperands[local107] = local42.gjstr(); } else if (local114 >= 100 || local114 == 21 || local114 == 38 || local114 == 39) { - local12.anIntArray416[local107] = local42.g1(); + local12.intOperands[local107] = local42.g1(); } else { - local12.anIntArray416[local107] = local42.g4(); + local12.intOperands[local107] = local42.g4(); } - local12.anIntArray415[local107++] = local114; + local12.opcodes[local107++] = local114; } Static105.aClass54_9.method1811(local12, (long) arg0); return local12; diff --git a/client/src/main/java/Static97.java b/client/src/main/java/Static97.java index 95f0ea1..3bf3558 100644 --- a/client/src/main/java/Static97.java +++ b/client/src/main/java/Static97.java @@ -35,7 +35,7 @@ public final class Static97 { return; } local30 -= 10; - @Pc(58) int local58 = Static59.anInt1814 + Static57.anInt1747 & 0x7FF; + @Pc(58) int local58 = Static59.anInt1814 + Static57.yawTarget & 0x7FF; @Pc(62) int local62 = MathUtils.anIntArray225[local58]; @Pc(66) int local66 = MathUtils.anIntArray223[local58]; @Pc(74) int local74 = local66 * 256 / (Static273.anInt4130 + 256); diff --git a/client/src/main/java/Static99.java b/client/src/main/java/Static99.java index f8123d4..2e724b1 100644 --- a/client/src/main/java/Static99.java +++ b/client/src/main/java/Static99.java @@ -3,10 +3,10 @@ import org.openrs2.deob.annotation.OriginalMember; public final class Static99 { @OriginalMember(owner = "client!hk", name = "Y", descriptor = "I") - public static int anInt2550; + public static int mapSizeZ; @OriginalMember(owner = "client!hk", name = "bb", descriptor = "[I") - public static int[] anIntArray239; + public static int[] underWaterMapFileIds; @OriginalMember(owner = "client!hk", name = "W", descriptor = "Lclient!ih;") public static final LinkedList aClass69_64 = new LinkedList(); diff --git a/client/src/main/java/client.java b/client/src/main/java/client.java index 4d410e6..73ff9c1 100644 --- a/client/src/main/java/client.java +++ b/client/src/main/java/client.java @@ -3,6 +3,7 @@ import java.awt.Graphics; import java.awt.Insets; import java.io.IOException; import java.net.Socket; +import java.util.Calendar; import java.util.GregorianCalendar; import org.openrs2.deob.annotation.OriginalArg; @@ -77,14 +78,14 @@ public final class client extends GameShell { @OriginalMember(owner = "client!client", name = "f", descriptor = "(I)V") @Override protected final void mainRedraw() { - if (Static244.anInt5370 == 1000) { + if (Static244.gameState == 1000) { return; } @Pc(15) boolean local15 = Static138.method2699(); if (local15 && Static144.aBoolean173 && Static11.musicChannel != null) { Static11.musicChannel.method3570(); } - if ((Static244.anInt5370 == 30 || Static244.anInt5370 == 10) && (GameShell.replaceCanvas || Static97.aLong89 != 0L && Static97.aLong89 < MonotonicClock.currentTimeMillis())) { + if ((Static244.gameState == 30 || Static244.gameState == 10) && (GameShell.replaceCanvas || Static97.aLong89 != 0L && Static97.aLong89 < MonotonicClock.currentTimeMillis())) { Static241.setWindowMode(GameShell.replaceCanvas, Static144.method2736(), Static114.anInt5831, Static22.anInt729); } @Pc(80) int local80; @@ -110,7 +111,7 @@ public final class client extends GameShell { Static97.aLong89 = MonotonicClock.currentTimeMillis() + 500L; } } - if (GameShell.fullScreenFrame != null && !GameShell.focus && (Static244.anInt5370 == 30 || Static244.anInt5370 == 10)) { + if (GameShell.fullScreenFrame != null && !GameShell.focus && (Static244.gameState == 30 || Static244.gameState == 10)) { Static241.setWindowMode(false, Static214.windowMode, -1, -1); } @Pc(158) boolean local158 = false; @@ -126,41 +127,41 @@ public final class client extends GameShell { Static186.aBooleanArray100[local80] = true; } } - if (Static244.anInt5370 == 0) { + if (Static244.gameState == 0) { Static13.method473(null, local158, Static126.mainLoadSecondaryText, Static199.mainLoadPercentage); - } else if (Static244.anInt5370 == 5) { + } else if (Static244.gameState == 5) { Static182.method3359(false, Static280.aClass3_Sub2_Sub9_43); - } else if (Static244.anInt5370 == 10) { + } else if (Static244.gameState == 10) { Static126.method2460(); - } else if (Static244.anInt5370 == 25 || Static244.anInt5370 == 28) { - if (Static233.anInt5223 == 1) { - if (Static230.anInt5150 < Static175.anInt4220) { - Static230.anInt5150 = Static175.anInt4220; + } else if (Static244.gameState == 25 || Static244.gameState == 28) { + if (Static233.loadingScreenState == 1) { + if (Static230.anInt5150 < Static175.mapFilesMissingCount) { + Static230.anInt5150 = Static175.mapFilesMissingCount; } - local80 = (Static230.anInt5150 - Static175.anInt4220) * 50 / Static230.anInt5150; - Static114.method4636(false, Static34.concatenate(new JagString[] { LocalizedText.LOADING, Static229.aClass100_974, Static123.parseInt(local80), Static14.aClass100_80 })); - } else if (Static233.anInt5223 == 2) { + local80 = (Static230.anInt5150 - Static175.mapFilesMissingCount) * 50 / Static230.anInt5150; + Static114.drawTextOnScreen(false, Static34.concatenate(new JagString[] { LocalizedText.LOADING, Static229.aClass100_974, Static123.parseInt(local80), Static14.aClass100_80 })); + } else if (Static233.loadingScreenState == 2) { if (Static38.anInt1196 < Static271.anInt5804) { Static38.anInt1196 = Static271.anInt5804; } local80 = (Static38.anInt1196 - Static271.anInt5804) * 50 / Static38.anInt1196 + 50; - Static114.method4636(false, Static34.concatenate(new JagString[] { LocalizedText.LOADING, Static229.aClass100_974, Static123.parseInt(local80), Static14.aClass100_80 })); + Static114.drawTextOnScreen(false, Static34.concatenate(new JagString[] { LocalizedText.LOADING, Static229.aClass100_974, Static123.parseInt(local80), Static14.aClass100_80 })); } else { - Static114.method4636(false, LocalizedText.LOADING); + Static114.drawTextOnScreen(false, LocalizedText.LOADING); } - } else if (Static244.anInt5370 == 30) { + } else if (Static244.gameState == 30) { Static89.method1841(); - } else if (Static244.anInt5370 == 40) { - Static114.method4636(false, Static34.concatenate(new JagString[] { LocalizedText.CONLOST, Static269.aClass100_556, LocalizedText.ATTEMPT_TO_REESTABLISH})); + } else if (Static244.gameState == 40) { + Static114.drawTextOnScreen(false, Static34.concatenate(new JagString[] { LocalizedText.CONLOST, Static269.aClass100_556, LocalizedText.ATTEMPT_TO_REESTABLISH})); } - if (GlRenderer.enabled && Static244.anInt5370 != 0) { + if (GlRenderer.enabled && Static244.gameState != 0) { GlRenderer.method4153(); for (local80 = 0; local80 < Static24.anInt766; local80++) { Static31.aBooleanArray29[local80] = false; } } else { @Pc(388) Graphics local388; - if ((Static244.anInt5370 == 30 || Static244.anInt5370 == 10) && Static199.anInt4672 == 0 && !local158) { + if ((Static244.gameState == 30 || Static244.gameState == 10) && Static199.anInt4672 == 0 && !local158) { try { local388 = GameShell.canvas.getGraphics(); for (local84 = 0; local84 < Static24.anInt766; local84++) { @@ -172,7 +173,7 @@ public final class client extends GameShell { } catch (@Pc(423) Exception local423) { GameShell.canvas.repaint(); } - } else if (Static244.anInt5370 != 0) { + } else if (Static244.gameState != 0) { try { local388 = GameShell.canvas.getGraphics(); Static260.frameBuffer.draw(local388); @@ -187,7 +188,7 @@ public final class client extends GameShell { if (Static107.clean) { Static213.method3729(); } - if (Static164.safeMode && Static244.anInt5370 == 10 && Static154.topLevelInterace != -1) { + if (Static164.safeMode && Static244.gameState == 10 && Static154.topLevelInterface != -1) { Static164.safeMode = false; Static203.write(GameShell.signLink); } @@ -424,8 +425,8 @@ public final class client extends GameShell { Static205.keyChars[Static182.keyQueueSize] = Static193.keyChar; } Static178.anInt4247++; - if (Static154.topLevelInterace != -1) { - Static57.method1320(0, 0, 0, GameShell.canvasWidth, Static154.topLevelInterace, 0, GameShell.canvasHeight); + if (Static154.topLevelInterface != -1) { + Static57.method1320(0, 0, 0, GameShell.canvasWidth, Static154.topLevelInterface, 0, GameShell.canvasHeight); } Static119.transmitTimer++; if (GlRenderer.enabled) { @@ -464,31 +465,31 @@ public final class client extends GameShell { } if (!GlRenderer.enabled) { Static269.method2170(); - } else if (Static184.anInt4348 == 0 && Static179.anInt4261 == 0) { - if (Static227.anInt5096 == 2) { - Static125.method2450(); + } else if (Static184.loginStep == 0 && Static179.accountCreationStep == 0) { + if (Static227.cameraType == 2) { + Static125.updateLockedCamera(); } else { - Static40.method1008(); + Static40.updateLoginScreenCamera(); } - if (Static138.anInt3439 >> 7 < 14 || Static138.anInt3439 >> 7 >= 90 || Static134.anInt3302 >> 7 < 14 || Static134.anInt3302 >> 7 >= 90) { - Static26.method740(); + if (Static138.renderX >> 7 < 14 || Static138.renderX >> 7 >= 90 || Static134.renderZ >> 7 < 14 || Static134.renderZ >> 7 >= 90) { + Static26.setupLoadingScreenRegion(); } } while (true) { - @Pc(374) HookRequest local374; - @Pc(379) Component local379; - @Pc(387) Component local387; + @Pc(374) HookRequest priorityRequest; + @Pc(379) Component prioritySource; + @Pc(387) Component priorityComponent; do { - local374 = (HookRequest) Static4.aClass69_2.method2287(); - if (local374 == null) { + priorityRequest = (HookRequest) Static4.highPriorityRequests.removeHead(); + if (priorityRequest == null) { while (true) { do { - local374 = (HookRequest) Static115.aClass69_70.method2287(); - if (local374 == null) { + priorityRequest = (HookRequest) Static115.mediumPriorityRequests.removeHead(); + if (priorityRequest == null) { while (true) { do { - local374 = (HookRequest) Static185.aClass69_101.method2287(); - if (local374 == null) { + priorityRequest = (HookRequest) Static185.lowPriorityRequests.removeHead(); + if (priorityRequest == null) { if (Static105.aClass13_14 != null) { Static4.method28(); } @@ -500,36 +501,36 @@ public final class client extends GameShell { Static175.url = null; Static33.openUrlRequest = null; } - if (Static83.anInt372 % 1500 == 0) { - Static123.method2418(); + if (Static83.loop % 1500 == 0) { + Static123.topBannerRefresh(); } return; } - local379 = local374.source; - if (local379.componentId < 0) { + prioritySource = priorityRequest.source; + if (prioritySource.componentId < 0) { break; } - local387 = Static5.getComponent(local379.layer); - } while (local387 == null || local387.createdComponents == null || local387.createdComponents.length <= local379.componentId || local379 != local387.createdComponents[local379.componentId]); - Static82.method1767(local374); + priorityComponent = Static5.getComponent(prioritySource.layer); + } while (priorityComponent == null || priorityComponent.createdComponents == null || priorityComponent.createdComponents.length <= prioritySource.componentId || prioritySource != priorityComponent.createdComponents[prioritySource.componentId]); + Static82.method1767(priorityRequest); } } - local379 = local374.source; - if (local379.componentId < 0) { + prioritySource = priorityRequest.source; + if (prioritySource.componentId < 0) { break; } - local387 = Static5.getComponent(local379.layer); - } while (local387 == null || local387.createdComponents == null || local379.componentId >= local387.createdComponents.length || local379 != local387.createdComponents[local379.componentId]); - Static82.method1767(local374); + priorityComponent = Static5.getComponent(prioritySource.layer); + } while (priorityComponent == null || priorityComponent.createdComponents == null || prioritySource.componentId >= priorityComponent.createdComponents.length || prioritySource != priorityComponent.createdComponents[prioritySource.componentId]); + Static82.method1767(priorityRequest); } } - local379 = local374.source; - if (local379.componentId < 0) { + prioritySource = priorityRequest.source; + if (prioritySource.componentId < 0) { break; } - local387 = Static5.getComponent(local379.layer); - } while (local387 == null || local387.createdComponents == null || local387.createdComponents.length <= local379.componentId || local379 != local387.createdComponents[local379.componentId]); - Static82.method1767(local374); + priorityComponent = Static5.getComponent(prioritySource.layer); + } while (priorityComponent == null || priorityComponent.createdComponents == null || priorityComponent.createdComponents.length <= prioritySource.componentId || prioritySource != priorityComponent.createdComponents[prioritySource.componentId]); + Static82.method1767(priorityRequest); } } @@ -555,15 +556,15 @@ public final class client extends GameShell { } if (Static107.js5NetQueue.errors >= 2 && Static107.js5NetQueue.response == 6) { this.error("js5connect_outofdate"); - Static244.anInt5370 = 1000; + Static244.gameState = 1000; return; } if (Static107.js5NetQueue.errors >= 4 && Static107.js5NetQueue.response == -1) { this.error("js5crc"); - Static244.anInt5370 = 1000; + Static244.gameState = 1000; return; } - if (Static107.js5NetQueue.errors >= 4 && (Static244.anInt5370 == 0 || Static244.anInt5370 == 5)) { + if (Static107.js5NetQueue.errors >= 4 && (Static244.gameState == 0 || Static244.gameState == 5)) { if (Static107.js5NetQueue.response == 7 || Static107.js5NetQueue.response == 9) { this.error("js5connect_full"); } else if (Static107.js5NetQueue.response > 0) { @@ -571,7 +572,7 @@ public final class client extends GameShell { } else { this.error("js5io"); } - Static244.anInt5370 = 1000; + Static244.gameState = 1000; return; } } @@ -604,7 +605,7 @@ public final class client extends GameShell { Static217.js5ConnectTime = MonotonicClock.currentTimeMillis(); } if (Static4.js5ConnectState == 3) { - if (Static244.anInt5370 == 0 || Static244.anInt5370 == 5 || Static206.js5Socket.available() > 0) { + if (Static244.gameState == 0 || Static244.gameState == 5 || Static206.js5Socket.available() > 0) { @Pc(258) int response = Static206.js5Socket.read(); if (response != 0) { this.setJs5Response(response); @@ -617,7 +618,7 @@ public final class client extends GameShell { } } if (Static4.js5ConnectState == 4) { - @Pc(296) boolean loggedOut = Static244.anInt5370 == 5 || Static244.anInt5370 == 10 || Static244.anInt5370 == 28; + @Pc(296) boolean loggedOut = Static244.gameState == 5 || Static244.gameState == 10 || Static244.gameState == 28; Static107.js5NetQueue.loggedOut(!loggedOut, Static206.js5Socket); Static206.js5Socket = null; Static37.js5SocketRequest = null; @@ -640,6 +641,7 @@ public final class client extends GameShell { Static164.safeMode = true; } } + @Pc(43) int i; if (Static166.mainLoadState == 0) { @Pc(34) Runtime runtime = Runtime.getRuntime(); @@ -770,7 +772,7 @@ public final class client extends GameShell { Static102.load(Static261.js5Archive13, Static209.js5Archive8); Static199.mainLoadPercentage = 45; Static126.mainLoadSecondaryText = LocalizedText.MAINLOAD65B; - Static196.method3534(5); + Static196.setGameState(5); Static166.mainLoadState = 70; } else if (Static166.mainLoadState == 70) { Static274.js5Archive2.fetchAll(); @@ -891,7 +893,7 @@ public final class client extends GameShell { } else if (!Static261.js5Archive13.fetchAll()) { Static126.mainLoadSecondaryText = Static34.concatenate(new JagString[] { LocalizedText.MAINLOAD130, Static123.parseInt(Static261.js5Archive13.getPercentageComplete() / 20 + 85), Static49.PERCENT_SIGN}); Static199.mainLoadPercentage = 85; - } else if (Static227.js5Archive23.method4489(Static165.DETAILS)) { + } else if (Static227.js5Archive23.allFilesComplete(Static165.DETAILS)) { Static234.method4018(Static173.aClass3_Sub2_Sub1_Sub1Array9, Static227.js5Archive23); Static199.mainLoadPercentage = 95; Static126.mainLoadSecondaryText = LocalizedText.MAINLOAD130B; @@ -907,14 +909,14 @@ public final class client extends GameShell { Static126.mainLoadSecondaryText = LocalizedText.MAINLOAD135; } else if (percentage == 7 || percentage == 9) { this.error("worldlistfull"); - Static196.method3534(1000); + Static196.setGameState(1000); } else if (Static61.aBoolean109) { Static126.mainLoadSecondaryText = LocalizedText.MAINLOAD135B; Static166.mainLoadState = 140; Static199.mainLoadPercentage = 96; } else { this.error("worldlistio_" + percentage); - Static196.method3534(1000); + Static196.setGameState(1000); } } else if (Static166.mainLoadState == 140) { Static156.loginScreenId = Static41.js5Archive3.getGroupId(Static138.LOGINSCREEN); @@ -950,14 +952,14 @@ public final class client extends GameShell { @OriginalMember(owner = "client!client", name = "a", descriptor = "(B)V") @Override protected final void mainLoop() { - if (Static244.anInt5370 == 1000) { + if (Static244.gameState == 1000) { return; } - Static83.anInt372++; - if (Static83.anInt372 % 1000 == 1) { - @Pc(24) GregorianCalendar local24 = new GregorianCalendar(); - Static60.anInt1895 = local24.get(11) * 600 + local24.get(12) * 10 + local24.get(13) / 6; - Static39.aRandom1.setSeed((long) Static60.anInt1895); + Static83.loop++; + if (Static83.loop % 1000 == 1) { + @Pc(24) GregorianCalendar gregorianCalendar = new GregorianCalendar(); + Static60.gregorianDateSeed = gregorianCalendar.get(Calendar.HOUR_OF_DAY) * 600 + gregorianCalendar.get(Calendar.MINUTE) * 10 + gregorianCalendar.get(Calendar.SECOND) / 6; + Static39.aRandom1.setSeed(Static60.gregorianDateSeed); } this.js5NetworkLoop(); if (Static257.js5MasterIndex != null) { @@ -965,38 +967,38 @@ public final class client extends GameShell { } Static230.method3948(); Static107.method2261(); - Static65.method1501(); - Static111.method2292(); + Static65.handleKeyboard(); + Static111.handleMouse(); if (GlRenderer.enabled) { - Static63.method1490(); + Static63.process(); } if (Static71.mouseWheel != null) { - @Pc(75) int local75 = Static71.mouseWheel.method3287(); - Static58.wheelRotation = local75; + @Pc(75) int wheelRotation = Static71.mouseWheel.getRotation(); + Static58.wheelRotation = wheelRotation; } - if (Static244.anInt5370 == 0) { + if (Static244.gameState == 0) { this.mainLoad(); Static234.method4020(); - } else if (Static244.anInt5370 == 5) { + } else if (Static244.gameState == 5) { this.mainLoad(); Static234.method4020(); - } else if (Static244.anInt5370 == 25 || Static244.anInt5370 == 28) { - Static78.method1696(); + } else if (Static244.gameState == 25 || Static244.gameState == 28) { + Static78.rebuildMap(); } - if (Static244.anInt5370 == 10) { + if (Static244.gameState == 10) { this.method943(); - Static158.method3008(); + Static158.handleAccountCreation(); Static31.method848(); - Static216.method1639(); - } else if (Static244.anInt5370 == 30) { + Static216.handleLogin(); + } else if (Static244.gameState == 30) { Static81.method1756(); - } else if (Static244.anInt5370 == 40) { - Static216.method1639(); - if (Static266.anInt5336 != -3) { - if (Static266.anInt5336 == 15) { + } else if (Static244.gameState == 40) { + Static216.handleLogin(); + if (Static266.returnCode != -3) { + if (Static266.returnCode == 15) { Static44.method1146(); - } else if (Static266.anInt5336 != 2) { - Static278.method4653(); + } else if (Static266.returnCode != 2) { + Static278.processLogout(); } } }