diff --git a/client/src/main/java/AnimBase.java b/client/src/main/java/AnimBase.java index d284af4..bf7280c 100644 --- a/client/src/main/java/AnimBase.java +++ b/client/src/main/java/AnimBase.java @@ -28,27 +28,27 @@ public final class AnimBase extends Node { public AnimBase(@OriginalArg(0) int arg0, @OriginalArg(1) byte[] arg1) { this.anInt3113 = arg0; @Pc(9) Buffer local9 = new Buffer(arg1); - this.anInt3116 = local9.method2229(); + this.anInt3116 = local9.g1(); this.anIntArrayArray23 = new int[this.anInt3116][]; this.anIntArray291 = new int[this.anInt3116]; this.aBooleanArray70 = new boolean[this.anInt3116]; this.anIntArray290 = new int[this.anInt3116]; @Pc(36) int local36; for (local36 = 0; local36 < this.anInt3116; local36++) { - this.anIntArray291[local36] = local9.method2229(); + this.anIntArray291[local36] = local9.g1(); } for (local36 = 0; local36 < this.anInt3116; local36++) { - this.aBooleanArray70[local36] = local9.method2229() == 1; + this.aBooleanArray70[local36] = local9.g1() == 1; } for (local36 = 0; local36 < this.anInt3116; local36++) { - this.anIntArray290[local36] = local9.method2163(); + this.anIntArray290[local36] = local9.g2(); } for (local36 = 0; local36 < this.anInt3116; local36++) { - this.anIntArrayArray23[local36] = new int[local9.method2229()]; + this.anIntArrayArray23[local36] = new int[local9.g1()]; } for (local36 = 0; local36 < this.anInt3116; local36++) { for (@Pc(118) int local118 = 0; local118 < this.anIntArrayArray23[local36].length; local118++) { - this.anIntArrayArray23[local36][local118] = local9.method2229(); + this.anIntArrayArray23[local36][local118] = local9.g1(); } } } diff --git a/client/src/main/java/AnimFrame.java b/client/src/main/java/AnimFrame.java index 7e572c4..185eb8d 100644 --- a/client/src/main/java/AnimFrame.java +++ b/client/src/main/java/AnimFrame.java @@ -41,19 +41,19 @@ public final class AnimFrame { this.aClass3_Sub20_1 = arg1; @Pc(21) Buffer local21 = new Buffer(arg0); @Pc(26) Buffer local26 = new Buffer(arg0); - local21.anInt2792 = 2; - @Pc(33) int local33 = local21.method2229(); + local21.offset = 2; + @Pc(33) int local33 = local21.g1(); @Pc(35) int local35 = 0; @Pc(37) int local37 = -1; @Pc(39) int local39 = -1; - local26.anInt2792 = local21.anInt2792 + local33; + local26.offset = local21.offset + local33; @Pc(47) int local47; for (local47 = 0; local47 < local33; local47++) { @Pc(56) int local56 = this.aClass3_Sub20_1.anIntArray291[local47]; if (local56 == 0) { local37 = local47; } - @Pc(64) int local64 = local21.method2229(); + @Pc(64) int local64 = local21.g1(); if (local64 > 0) { if (local56 == 0) { local39 = local47; @@ -66,17 +66,17 @@ public final class AnimFrame { if ((local64 & 0x1) == 0) { Static168.aShortArray48[local35] = local77; } else { - Static168.aShortArray48[local35] = (short) local26.method2223(); + Static168.aShortArray48[local35] = (short) local26.gSmart1or2s(); } if ((local64 & 0x2) == 0) { Static168.aShortArray46[local35] = local77; } else { - Static168.aShortArray46[local35] = (short) local26.method2223(); + Static168.aShortArray46[local35] = (short) local26.gSmart1or2s(); } if ((local64 & 0x4) == 0) { Static168.aShortArray45[local35] = local77; } else { - Static168.aShortArray45[local35] = (short) local26.method2223(); + Static168.aShortArray45[local35] = (short) local26.gSmart1or2s(); } Static168.aByteArray54[local35] = (byte) (local64 >>> 3 & 0x3); if (local56 == 2) { @@ -98,7 +98,7 @@ public final class AnimFrame { local35++; } } - if (local26.anInt2792 != arg0.length) { + if (local26.offset != arg0.length) { throw new RuntimeException(); } this.anInt4070 = local35; diff --git a/client/src/main/java/BasType.java b/client/src/main/java/BasType.java index 74f3f37..f7ab367 100644 --- a/client/src/main/java/BasType.java +++ b/client/src/main/java/BasType.java @@ -94,7 +94,7 @@ public final class BasType { @OriginalMember(owner = "client!ck", name = "a", descriptor = "(ILclient!wa;)V") public final void method880(@OriginalArg(1) Buffer arg0) { while (true) { - @Pc(16) int local16 = arg0.method2229(); + @Pc(16) int local16 = arg0.g1(); if (local16 == 0) { return; } @@ -105,8 +105,8 @@ public final class BasType { @OriginalMember(owner = "client!ck", name = "a", descriptor = "(IBLclient!wa;)V") private void method881(@OriginalArg(0) int arg0, @OriginalArg(2) Buffer arg1) { if (arg0 == 1) { - this.anInt1037 = arg1.method2163(); - this.anInt1051 = arg1.method2163(); + this.anInt1037 = arg1.g2(); + this.anInt1051 = arg1.g2(); if (this.anInt1051 == 65535) { this.anInt1051 = -1; } @@ -114,67 +114,67 @@ public final class BasType { this.anInt1037 = -1; } } else if (arg0 == 2) { - this.anInt1062 = arg1.method2163(); + this.anInt1062 = arg1.g2(); } else if (arg0 == 3) { - this.anInt1042 = arg1.method2163(); + this.anInt1042 = arg1.g2(); } else if (arg0 == 4) { - this.anInt1066 = arg1.method2163(); + this.anInt1066 = arg1.g2(); } else if (arg0 == 5) { - this.anInt1048 = arg1.method2163(); + this.anInt1048 = arg1.g2(); } else if (arg0 == 6) { - this.anInt1058 = arg1.method2163(); + this.anInt1058 = arg1.g2(); } else if (arg0 == 7) { - this.anInt1054 = arg1.method2163(); + this.anInt1054 = arg1.g2(); } else if (arg0 == 8) { - this.anInt1043 = arg1.method2163(); + this.anInt1043 = arg1.g2(); } else if (arg0 == 9) { - this.anInt1045 = arg1.method2163(); + this.anInt1045 = arg1.g2(); } else if (arg0 == 26) { - this.anInt1059 = (short) (arg1.method2229() * 4); - this.anInt1050 = (short) (arg1.method2229() * 4); + this.anInt1059 = (short) (arg1.g1() * 4); + this.anInt1050 = (short) (arg1.g1() * 4); } else if (arg0 == 27) { if (this.anIntArrayArray7 == null) { this.anIntArrayArray7 = new int[12][]; } - @Pc(306) int local306 = arg1.method2229(); + @Pc(306) int local306 = arg1.g1(); this.anIntArrayArray7[local306] = new int[6]; for (@Pc(314) int local314 = 0; local314 < 6; local314++) { - this.anIntArrayArray7[local306][local314] = arg1.method2213(); + this.anIntArrayArray7[local306][local314] = arg1.g2s(); } } else if (arg0 == 29) { - this.anInt1038 = arg1.method2229(); + this.anInt1038 = arg1.g1(); } else if (arg0 == 30) { - this.anInt1031 = arg1.method2163(); + this.anInt1031 = arg1.g2(); } else if (arg0 == 31) { - this.anInt1055 = arg1.method2229(); + this.anInt1055 = arg1.g1(); } else if (arg0 == 32) { - this.anInt1040 = arg1.method2163(); + this.anInt1040 = arg1.g2(); } else if (arg0 == 33) { - this.anInt1064 = arg1.method2213(); + this.anInt1064 = arg1.g2s(); } else if (arg0 == 34) { - this.anInt1065 = arg1.method2229(); + this.anInt1065 = arg1.g1(); } else if (arg0 == 35) { - this.anInt1063 = arg1.method2163(); + this.anInt1063 = arg1.g2(); } else if (arg0 == 36) { - this.anInt1041 = arg1.method2213(); + this.anInt1041 = arg1.g2s(); } else if (arg0 == 37) { - this.anInt1032 = arg1.method2229(); + this.anInt1032 = arg1.g1(); } else if (arg0 == 38) { - this.anInt1036 = arg1.method2163(); + this.anInt1036 = arg1.g2(); } else if (arg0 == 39) { - this.anInt1067 = arg1.method2163(); + this.anInt1067 = arg1.g2(); } else if (arg0 == 40) { - this.anInt1056 = arg1.method2163(); + this.anInt1056 = arg1.g2(); } else if (arg0 == 41) { - this.anInt1057 = arg1.method2163(); + this.anInt1057 = arg1.g2(); } else if (arg0 == 42) { - this.anInt1035 = arg1.method2163(); + this.anInt1035 = arg1.g2(); } else if (arg0 == 43) { - arg1.method2163(); + arg1.g2(); } else if (arg0 == 44) { - arg1.method2163(); + arg1.g2(); } else if (arg0 == 45) { - arg1.method2163(); + arg1.g2(); } } } diff --git a/client/src/main/java/Buffer.java b/client/src/main/java/Buffer.java index e639d98..61bd894 100644 --- a/client/src/main/java/Buffer.java +++ b/client/src/main/java/Buffer.java @@ -4,486 +4,522 @@ import org.openrs2.deob.annotation.OriginalClass; import org.openrs2.deob.annotation.OriginalMember; import org.openrs2.deob.annotation.Pc; +// Buffer access nomenclature: +// Operation +// g - get +// p - put +// Type +// bytes or special type i.e. 8, VarLong, Bytes, jstr, ... +// Endianness (optional) +// (none) - Big Endian +// le - Little Endian +// me - "Middle" Endian, only used with ints +// rme - "Reverse-Middle" Endian, only used with ints +// Signedness +// (none) - Unsigned +// s - Signed +// Transformation (optional) +// add - add 128 to the lowest byte +// sub - subtract lowest byte from 128 +// neg - negate, only used on bytes +// Rev - reverse, only used on byte arrays + +// Types: +// 1 - byte +// 2 - short +// 3 - medium +// 4 - int +// 8 - long +// Float - 4-byte float +// Smart1or2 - byte if below 128, short otherwise, holds exactly half the capacity (0-128, 0-32768) +// Bytes - byte array +// jstr - Jagex string (null terminated) +// VarLong - variable long +// VarInt - variable int +// Crc32 - checksum + @OriginalClass("client!wa") public class Buffer extends Node { @OriginalMember(owner = "client!wa", name = "y", descriptor = "[B") - public byte[] aByteArray40; + public byte[] data; @OriginalMember(owner = "client!wa", name = "T", descriptor = "I") - public int anInt2792; + public int offset; @OriginalMember(owner = "client!wa", name = "", descriptor = "(I)V") - public Buffer(@OriginalArg(0) int arg0) { - this.aByteArray40 = Static228.method3907(arg0); - this.anInt2792 = 0; + public Buffer(@OriginalArg(0) int size) { + this.data = Static228.allocate(size); + this.offset = 0; } @OriginalMember(owner = "client!wa", name = "", descriptor = "([B)V") - public Buffer(@OriginalArg(0) byte[] arg0) { - this.anInt2792 = 0; - this.aByteArray40 = arg0; + public Buffer(@OriginalArg(0) byte[] src) { + this.offset = 0; + this.data = src; } @OriginalMember(owner = "client!wa", name = "c", descriptor = "(I)I") - public final int method2163() { - this.anInt2792 += 2; - return ((this.aByteArray40[this.anInt2792 - 2] & 0xFF) << 8) + (this.aByteArray40[this.anInt2792 - 1] & 0xFF); + public final int g2() { + this.offset += 2; + return ((this.data[this.offset - 2] & 0xFF) << 8) + (this.data[this.offset - 1] & 0xFF); } @OriginalMember(owner = "client!wa", name = "b", descriptor = "(II)V") - public final void method2164(@OriginalArg(1) int arg0) { - this.aByteArray40[this.anInt2792++] = (byte) (arg0 >> 24); - this.aByteArray40[this.anInt2792++] = (byte) (arg0 >> 16); - this.aByteArray40[this.anInt2792++] = (byte) (arg0 >> 8); - this.aByteArray40[this.anInt2792++] = (byte) arg0; + public final void p4(@OriginalArg(1) int value) { + this.data[this.offset++] = (byte) (value >> 24); + this.data[this.offset++] = (byte) (value >> 16); + this.data[this.offset++] = (byte) (value >> 8); + this.data[this.offset++] = (byte) value; } @OriginalMember(owner = "client!wa", name = "a", descriptor = "(IIJ)V") - public final void method2165(@OriginalArg(1) int arg0, @OriginalArg(2) long arg1) { - @Pc(2) int local2 = arg0 - 1; - if (local2 < 0 || local2 > 7) { + public final void pVarLong(@OriginalArg(1) int size, @OriginalArg(2) long value) { + @Pc(2) int bytes = size - 1; + if (bytes < 0 || bytes > 7) { throw new IllegalArgumentException(); } - for (@Pc(27) int local27 = local2 * 8; local27 >= 0; local27 -= 8) { - this.aByteArray40[this.anInt2792++] = (byte) (arg1 >> local27); + for (@Pc(27) int shift = bytes * 8; shift >= 0; shift -= 8) { + this.data[this.offset++] = (byte) (value >> shift); } } @OriginalMember(owner = "client!wa", name = "a", descriptor = "(JI)V") - public final void method2166(@OriginalArg(0) long arg0) { - this.aByteArray40[this.anInt2792++] = (byte) (arg0 >> 56); - this.aByteArray40[this.anInt2792++] = (byte) (arg0 >> 48); - this.aByteArray40[this.anInt2792++] = (byte) (arg0 >> 40); - this.aByteArray40[this.anInt2792++] = (byte) (arg0 >> 32); - this.aByteArray40[this.anInt2792++] = (byte) (arg0 >> 24); - this.aByteArray40[this.anInt2792++] = (byte) (arg0 >> 16); - this.aByteArray40[this.anInt2792++] = (byte) (arg0 >> 8); - this.aByteArray40[this.anInt2792++] = (byte) arg0; + public final void p8(@OriginalArg(0) long value) { + this.data[this.offset++] = (byte) (value >> 56); + this.data[this.offset++] = (byte) (value >> 48); + this.data[this.offset++] = (byte) (value >> 40); + this.data[this.offset++] = (byte) (value >> 32); + this.data[this.offset++] = (byte) (value >> 24); + this.data[this.offset++] = (byte) (value >> 16); + this.data[this.offset++] = (byte) (value >> 8); + this.data[this.offset++] = (byte) value; } @OriginalMember(owner = "client!wa", name = "d", descriptor = "(B)I") - public final int method2167() { - @Pc(12) byte local12 = this.aByteArray40[this.anInt2792++]; - @Pc(24) int local24 = 0; - while (local12 < 0) { - local24 = (local12 & 0x7F | local24) << 7; - local12 = this.aByteArray40[this.anInt2792++]; + public final int gVarInt() { + @Pc(12) byte b = this.data[this.offset++]; + @Pc(24) int value = 0; + while (b < 0) { + value = (b & 0x7F | value) << 7; + b = this.data[this.offset++]; } - return local12 | local24; + return b | value; } @OriginalMember(owner = "client!wa", name = "c", descriptor = "(II)V") - public final void method2168(@OriginalArg(1) int arg0) { - this.aByteArray40[this.anInt2792 - arg0 - 4] = (byte) (arg0 >> 24); - this.aByteArray40[this.anInt2792 - arg0 - 3] = (byte) (arg0 >> 16); - this.aByteArray40[this.anInt2792 - arg0 - 2] = (byte) (arg0 >> 8); - this.aByteArray40[this.anInt2792 - arg0 - 1] = (byte) arg0; + public final void p4len(@OriginalArg(1) int len) { + this.data[this.offset - len - 4] = (byte) (len >> 24); + this.data[this.offset - len - 3] = (byte) (len >> 16); + this.data[this.offset - len - 2] = (byte) (len >> 8); + this.data[this.offset - len - 1] = (byte) len; } @OriginalMember(owner = "client!wa", name = "d", descriptor = "(II)V") - public final void method2169(@OriginalArg(1) int arg0) { - this.aByteArray40[this.anInt2792++] = (byte) (128 - arg0); + public final void p1sub(@OriginalArg(1) int value) { + this.data[this.offset++] = (byte) (128 - value); } @OriginalMember(owner = "client!wa", name = "a", descriptor = "(ILclient!na;)V") - public final void method2171(@OriginalArg(1) JagString arg0) { - this.anInt2792 += arg0.method3160(this.aByteArray40, this.anInt2792, arg0.method3120()); - this.aByteArray40[this.anInt2792++] = 0; + public final void pjstr(@OriginalArg(1) JagString value) { + this.offset += value.encodeString(this.data, this.offset, value.length()); + this.data[this.offset++] = 0; } @OriginalMember(owner = "client!wa", name = "d", descriptor = "(I)I") - public final int method2173() { - this.anInt2792 += 2; - @Pc(34) int local34 = ((this.aByteArray40[this.anInt2792 - 2] & 0xFF) << 8) + (this.aByteArray40[this.anInt2792 - 1] - 128 & 0xFF); - if (local34 > 32767) { - local34 -= 65536; + public final int g2sadd() { + this.offset += 2; + @Pc(34) int value = ((this.data[this.offset - 2] & 0xFF) << 8) + (this.data[this.offset - 1] - 128 & 0xFF); + if (value > 32767) { + value -= 65536; } - return local34; + return value; } @OriginalMember(owner = "client!wa", name = "e", descriptor = "(I)I") - public final int method2174() { - this.anInt2792 += 4; - return ((this.aByteArray40[this.anInt2792 - 4] & 0xFF) << 24) + ((this.aByteArray40[this.anInt2792 - 3] & 0xFF) << 16) + ((this.aByteArray40[this.anInt2792 - 2] & 0xFF) << 8) + (this.aByteArray40[this.anInt2792 - 1] & 0xFF); + public final int g4() { + this.offset += 4; + return ((this.data[this.offset - 4] & 0xFF) << 24) + ((this.data[this.offset - 3] & 0xFF) << 16) + ((this.data[this.offset - 2] & 0xFF) << 8) + (this.data[this.offset - 1] & 0xFF); } @OriginalMember(owner = "client!wa", name = "b", descriptor = "(Z)B") - public final byte method2175() { - return (byte) (128 - this.aByteArray40[this.anInt2792++]); + public final byte g1sub() { + return (byte) (128 - this.data[this.offset++]); } @OriginalMember(owner = "client!wa", name = "f", descriptor = "(B)Lclient!na;") - public final JagString method2176() { - if (this.aByteArray40[this.anInt2792] == 0) { - this.anInt2792++; + public final JagString gjstrFast() { + if (this.data[this.offset] == 0) { + this.offset++; return null; } else { - return this.method2202(); + return this.gjstr(); } } @OriginalMember(owner = "client!wa", name = "g", descriptor = "(B)I") - public final int method2177() { - return this.aByteArray40[this.anInt2792++] - 128 & 0xFF; + public final int g1add() { + return this.data[this.offset++] - 128 & 0xFF; } @OriginalMember(owner = "client!wa", name = "a", descriptor = "(BI)V") - public final void method2178(@OriginalArg(1) int arg0) { - this.aByteArray40[this.anInt2792++] = (byte) arg0; + public final void p1(@OriginalArg(1) int value) { + this.data[this.offset++] = (byte) value; } @OriginalMember(owner = "client!wa", name = "a", descriptor = "([BIII)V") - public final void method2179(@OriginalArg(0) byte[] arg0, @OriginalArg(2) int arg1) { - for (@Pc(7) int local7 = 0; local7 < arg1; local7++) { - this.aByteArray40[this.anInt2792++] = arg0[local7]; + public final void pBytes(@OriginalArg(0) byte[] src, @OriginalArg(2) int len) { + for (@Pc(7) int i = 0; i < len; i++) { + this.data[this.offset++] = src[i]; } } @OriginalMember(owner = "client!wa", name = "c", descriptor = "(Z)I") - public final int method2180() { - return 128 - this.aByteArray40[this.anInt2792++] & 0xFF; + public final int g1ssub() { + return 128 - this.data[this.offset++] & 0xFF; } @OriginalMember(owner = "client!wa", name = "h", descriptor = "(B)I") - public final int method2181() { - this.anInt2792 += 3; - return ((this.aByteArray40[this.anInt2792 - 2] & 0xFF) << 8) + ((this.aByteArray40[this.anInt2792 - 1] & 0xFF) << 16) + (this.aByteArray40[this.anInt2792 + -3] & 0xFF); + public final int g3le() { + this.offset += 3; + return (((this.data[this.offset - 1] & 0xFF) << 16) + (this.data[this.offset - 2] & 0xFF) << 8) + (this.data[this.offset - 3] & 0xFF); } @OriginalMember(owner = "client!wa", name = "f", descriptor = "(I)J") - public final long method2182() { - @Pc(11) long local11 = (long) this.method2174() & 0xFFFFFFFFL; - @Pc(18) long local18 = (long) this.method2174() & 0xFFFFFFFFL; - return local18 + (local11 << 32); + public final long g8() { + @Pc(11) long low = (long) this.g4() & 0xFFFFFFFFL; + @Pc(18) long high = (long) this.g4() & 0xFFFFFFFFL; + return high + (low << 32); } @OriginalMember(owner = "client!wa", name = "e", descriptor = "(II)V") - public final void method2183(@OriginalArg(0) int arg0) { - this.aByteArray40[this.anInt2792++] = (byte) arg0; - this.aByteArray40[this.anInt2792++] = (byte) (arg0 >> 8); - this.aByteArray40[this.anInt2792++] = (byte) (arg0 >> 16); - this.aByteArray40[this.anInt2792++] = (byte) (arg0 >> 24); + public final void p4le(@OriginalArg(0) int value) { + this.data[this.offset++] = (byte) value; + this.data[this.offset++] = (byte) (value >> 8); + this.data[this.offset++] = (byte) (value >> 16); + this.data[this.offset++] = (byte) (value >> 24); } @OriginalMember(owner = "client!wa", name = "g", descriptor = "(I)I") - public final int method2184() { - this.anInt2792 += 2; - return (this.aByteArray40[this.anInt2792 - 1] - 128 & 0xFF) + ((this.aByteArray40[this.anInt2792 - 2] & 0xFF) << 8); + public final int g2sub() { + this.offset += 2; + return ((this.data[this.offset - 2] & 0xFF) << 8) + (this.data[this.offset - 1] - 128 & 0xFF); } @OriginalMember(owner = "client!wa", name = "f", descriptor = "(II)V") - public final void method2185(@OriginalArg(1) int arg0) { - this.aByteArray40[this.anInt2792++] = (byte) (arg0 >> 16); - this.aByteArray40[this.anInt2792++] = (byte) (arg0 >> 24); - this.aByteArray40[this.anInt2792++] = (byte) arg0; - this.aByteArray40[this.anInt2792++] = (byte) (arg0 >> 8); + public final void p4me(@OriginalArg(1) int value) { + this.data[this.offset++] = (byte) (value >> 16); + this.data[this.offset++] = (byte) (value >> 24); + this.data[this.offset++] = (byte) value; + this.data[this.offset++] = (byte) (value >> 8); } @OriginalMember(owner = "client!wa", name = "d", descriptor = "(Z)B") - public final byte method2186() { - return this.aByteArray40[this.anInt2792++]; + public final byte g1s() { + return this.data[this.offset++]; } @OriginalMember(owner = "client!wa", name = "h", descriptor = "(I)Lclient!na;") - public final JagString method2187() { - @Pc(10) byte local10 = this.aByteArray40[this.anInt2792++]; - if (local10 != 0) { + public final JagString gjstr2() { + @Pc(10) byte version = this.data[this.offset++]; + if (version != 0) { throw new IllegalStateException("Bad version number in gjstr2"); } - @Pc(32) int local32 = this.anInt2792; - while (this.aByteArray40[this.anInt2792++] != 0) { + @Pc(32) int off = this.offset; + while (this.data[this.offset++] != 0) { } - return Static10.method346(this.aByteArray40, this.anInt2792 - local32 - 1, local32); + return Static10.decodeString(this.data, this.offset - off - 1, off); } @OriginalMember(owner = "client!wa", name = "a", descriptor = "(FB)V") - public final void method2188(@OriginalArg(0) float arg0) { - @Pc(2) int local2 = Float.floatToRawIntBits(arg0); - this.aByteArray40[this.anInt2792++] = (byte) local2; - this.aByteArray40[this.anInt2792++] = (byte) (local2 >> 8); - this.aByteArray40[this.anInt2792++] = (byte) (local2 >> 16); - this.aByteArray40[this.anInt2792++] = (byte) (local2 >> 24); + public final void gFloat(@OriginalArg(0) float value) { + @Pc(2) int valueInt = Float.floatToRawIntBits(value); + this.data[this.offset++] = (byte) valueInt; + this.data[this.offset++] = (byte) (valueInt >> 8); + this.data[this.offset++] = (byte) (valueInt >> 16); + this.data[this.offset++] = (byte) (valueInt >> 24); } @OriginalMember(owner = "client!wa", name = "i", descriptor = "(B)B") - public final byte method2189() { - return (byte) -this.aByteArray40[this.anInt2792++]; + public final byte g1neg() { + return (byte) -this.data[this.offset++]; } @OriginalMember(owner = "client!wa", name = "a", descriptor = "(II[BB)V") - public final void method2190(@OriginalArg(1) int arg0, @OriginalArg(2) byte[] arg1) { - for (@Pc(8) int local8 = 0; local8 < arg0; local8++) { - arg1[local8] = this.aByteArray40[this.anInt2792++]; + public final void gBytes(@OriginalArg(1) int len, @OriginalArg(2) byte[] dest) { + for (@Pc(8) int i = 0; i < len; i++) { + dest[i] = this.data[this.offset++]; } } @OriginalMember(owner = "client!wa", name = "a", descriptor = "(IB)V") - public final void method2191(@OriginalArg(0) int arg0) { - this.aByteArray40[this.anInt2792++] = (byte) (arg0 + 128); - this.aByteArray40[this.anInt2792++] = (byte) (arg0 >> 8); + public final void p2leadd(@OriginalArg(0) int value) { + this.data[this.offset++] = (byte) (value + 128); + this.data[this.offset++] = (byte) (value >> 8); } @OriginalMember(owner = "client!wa", name = "i", descriptor = "(I)I") - public final int method2192() { - this.anInt2792 += 2; - return (this.aByteArray40[this.anInt2792 - 2] & 0xFF) + ((this.aByteArray40[this.anInt2792 - 1] & 0xFF) << 8); + public final int g2le() { + this.offset += 2; + return ((this.data[this.offset - 1] & 0xFF) << 8) + (this.data[this.offset - 2] & 0xFF); } @OriginalMember(owner = "client!wa", name = "g", descriptor = "(II)V") - public final void method2194(@OriginalArg(1) int arg0) { - if (arg0 >= 0 && arg0 < 128) { - this.method2178(arg0); - } else if (arg0 >= 0 && arg0 < 32768) { - this.method2230(arg0 + 32768); + public final void pSmart1or2(@OriginalArg(1) int value) { + if (value >= 0 && value < 128) { + this.p1(value); + } else if (value >= 0 && value < 0x8000) { + this.p2(value + 0x8000); } else { throw new IllegalArgumentException(); } } @OriginalMember(owner = "client!wa", name = "b", descriptor = "(BI)V") - public final void method2195(@OriginalArg(1) int arg0) { - this.aByteArray40[this.anInt2792 - arg0 - 1] = (byte) arg0; + public final void p1len(@OriginalArg(1) int length) { + this.data[this.offset - length - 1] = (byte) length; } @OriginalMember(owner = "client!wa", name = "a", descriptor = "([IIII)V") - public final void method2196(@OriginalArg(0) int[] arg0, @OriginalArg(3) int arg1) { - @Pc(6) int local6 = this.anInt2792; - this.anInt2792 = 5; - @Pc(16) int local16 = (arg1 - 5) / 8; - for (@Pc(18) int local18 = 0; local18 < local16; local18++) { - @Pc(23) int local23 = -957401312; - @Pc(27) int local27 = this.method2174(); - @Pc(31) int local31 = this.method2174(); - @Pc(33) int local33 = 32; - while (local33-- > 0) { - local31 -= arg0[local23 >>> 11 & 0x3] + local23 ^ local27 + (local27 >>> 5 ^ local27 << 4); - local23 -= -1640531527; - local27 -= (local31 >>> 5 ^ local31 << 4) + local31 ^ arg0[local23 & 0x3] + local23; + public final void decryptXtea(@OriginalArg(0) int[] key, @OriginalArg(3) int len) { + @Pc(6) int start = this.offset; + this.offset = 5; + @Pc(16) int blocks = (len - 5) / 8; + for (@Pc(18) int i = 0; i < blocks; i++) { + @Pc(23) int sum = -957401312; + @Pc(27) int v0 = this.g4(); + @Pc(31) int v1 = this.g4(); + @Pc(33) int rounds = 32; + while (rounds-- > 0) { + v1 -= key[sum >>> 11 & 0x3] + sum ^ v0 + (v0 >>> 5 ^ v0 << 4); + sum -= -1640531527; + v0 -= (v1 >>> 5 ^ v1 << 4) + v1 ^ key[sum & 0x3] + sum; } - this.anInt2792 -= 8; - this.method2164(local27); - this.method2164(local31); + this.offset -= 8; + this.p4(v0); + this.p4(v1); } - this.anInt2792 = local6; + this.offset = start; } @OriginalMember(owner = "client!wa", name = "h", descriptor = "(II)V") - public final void method2197(@OriginalArg(1) int arg0) { - if ((arg0 & 0xFFFFFF80) != 0) { - if ((-16384 & arg0) != 0) { - if ((arg0 & 0xFFE00000) != 0) { - if ((arg0 & 0xF0000000) != 0) { - this.method2178(arg0 >>> 28 | 0x80); + public final void pVarInt(@OriginalArg(1) int value) { + if ((value & 0xFFFFFF80) != 0) { + if ((-16384 & value) != 0) { + if ((value & 0xFFE00000) != 0) { + if ((value & 0xF0000000) != 0) { + this.p1(value >>> 28 | 0x80); } - this.method2178(arg0 >>> 21 | 0x80); + this.p1(value >>> 21 | 0x80); } - this.method2178(arg0 >>> 14 | 0x80); + this.p1(value >>> 14 | 0x80); } - this.method2178(arg0 >>> 7 | 0x80); + this.p1(value >>> 7 | 0x80); } - this.method2178(arg0 & 0x7F); + this.p1(value & 0x7F); } @OriginalMember(owner = "client!wa", name = "i", descriptor = "(II)J") - public final long method2198(@OriginalArg(0) int arg0) { - @Pc(2) int local2 = arg0 - 1; - if (local2 < 0 || local2 > 7) { + public final long gVarLong(@OriginalArg(0) int len) { + @Pc(2) int bytes = len - 1; + if (bytes < 0 || bytes > 7) { throw new IllegalArgumentException(); } - @Pc(21) long local21 = 0L; - for (@Pc(25) int local25 = local2 * 8; local25 >= 0; local25 -= 8) { - local21 |= ((long) this.aByteArray40[this.anInt2792++] & 0xFFL) << local25; + @Pc(21) long value = 0L; + for (@Pc(25) int shift = bytes * 8; shift >= 0; shift -= 8) { + value |= ((long) this.data[this.offset++] & 0xFFL) << shift; } - return local21; + return value; } @OriginalMember(owner = "client!wa", name = "j", descriptor = "(B)I") - public final int method2199() { - @Pc(14) int local14 = this.method2204(); - @Pc(16) int local16 = 0; - while (local14 == 32767) { - local14 = this.method2204(); - local16 += 32767; + public final int gVarSmart() { + @Pc(14) int value = this.gSmart1or2(); + @Pc(16) int value2 = 0; + while (value == 32767) { + value = this.gSmart1or2(); + value2 += 32767; } - return local16 + local14; + return value2 + value; } @OriginalMember(owner = "client!wa", name = "a", descriptor = "(II[BI)V") - public final void method2200(@OriginalArg(1) int arg0, @OriginalArg(2) byte[] arg1) { - for (@Pc(12) int local12 = arg0 - 1; local12 >= 0; local12--) { - arg1[local12] = this.aByteArray40[this.anInt2792++]; + public final void gBytesRev(@OriginalArg(1) int offset, @OriginalArg(2) byte[] dest) { + for (@Pc(12) int i = offset - 1; i >= 0; i--) { + dest[i] = this.data[this.offset++]; } } @OriginalMember(owner = "client!wa", name = "j", descriptor = "(II)V") - public final void method2201(@OriginalArg(0) int arg0) { - this.aByteArray40[this.anInt2792++] = (byte) (arg0 >> 8); - this.aByteArray40[this.anInt2792++] = (byte) arg0; - this.aByteArray40[this.anInt2792++] = (byte) (arg0 >> 24); - this.aByteArray40[this.anInt2792++] = (byte) (arg0 >> 16); + public final void p4rme(@OriginalArg(0) int value) { + this.data[this.offset++] = (byte) (value >> 8); + this.data[this.offset++] = (byte) value; + this.data[this.offset++] = (byte) (value >> 24); + this.data[this.offset++] = (byte) (value >> 16); } @OriginalMember(owner = "client!wa", name = "e", descriptor = "(Z)Lclient!na;") - public final JagString method2202() { - @Pc(12) int local12 = this.anInt2792; - while (this.aByteArray40[this.anInt2792++] != 0) { + public final JagString gjstr() { + @Pc(12) int local12 = this.offset; + while (this.data[this.offset++] != 0) { } - return Static10.method346(this.aByteArray40, this.anInt2792 - local12 - 1, local12); + return Static10.decodeString(this.data, this.offset - local12 - 1, local12); } @OriginalMember(owner = "client!wa", name = "f", descriptor = "(Z)I") - public final int method2204() { - @Pc(17) int local17 = this.aByteArray40[this.anInt2792] & 0xFF; - return local17 >= 128 ? this.method2163() - 32768 : this.method2229(); + public final int gSmart1or2() { + @Pc(17) int local17 = this.data[this.offset] & 0xFF; + return local17 >= 128 ? this.g2() - 0x8000 : this.g1(); } @OriginalMember(owner = "client!wa", name = "k", descriptor = "(II)V") - public final void method2205(@OriginalArg(0) int arg0) { - this.aByteArray40[this.anInt2792++] = (byte) (arg0 >> 16); - this.aByteArray40[this.anInt2792++] = (byte) (arg0 >> 8); - this.aByteArray40[this.anInt2792++] = (byte) arg0; + public final void p3(@OriginalArg(0) int value) { + this.data[this.offset++] = (byte) (value >> 16); + this.data[this.offset++] = (byte) (value >> 8); + this.data[this.offset++] = (byte) value; } @OriginalMember(owner = "client!wa", name = "k", descriptor = "(I)I") - public final int method2206() { - this.anInt2792 += 4; - return ((this.aByteArray40[this.anInt2792 - 2] & 0xFF) << 24) + ((this.aByteArray40[this.anInt2792 - 1] & 0xFF) << 16) + ((this.aByteArray40[this.anInt2792 + -4] & 0xFF) << 8) + (this.aByteArray40[this.anInt2792 + -3] & 0xFF); + public final int g4rme() { + this.offset += 4; + return ((this.data[this.offset - 2] & 0xFF) << 24) + ((this.data[this.offset - 1] & 0xFF) << 16) + ((this.data[this.offset - 4] & 0xFF) << 8) + (this.data[this.offset - 3] & 0xFF); } @OriginalMember(owner = "client!wa", name = "k", descriptor = "(B)I") - public final int method2207() { - this.anInt2792 += 2; - return ((this.aByteArray40[this.anInt2792 - 1] & 0xFF) << 8) + (this.aByteArray40[this.anInt2792 - 2] - 128 & 0xFF); + public final int g2leadd() { + this.offset += 2; + return ((this.data[this.offset - 1] & 0xFF) << 8) + (this.data[this.offset - 2] - 128 & 0xFF); } @OriginalMember(owner = "client!wa", name = "l", descriptor = "(I)I") - public final int method2208() { - this.anInt2792 += 4; - return (this.aByteArray40[this.anInt2792 - 4] & 0xFF) + ((this.aByteArray40[this.anInt2792 - 2] & 0xFF) << 16) + ((this.aByteArray40[this.anInt2792 + -1] & 0xFF) << 24) + ((this.aByteArray40[this.anInt2792 + -3] & 0xFF) << 8); + public final int g4me() { + this.offset += 4; + return ((this.data[this.offset - 2] & 0xFF) << 16) + ((this.data[this.offset - 1] & 0xFF) << 24) + ((this.data[this.offset - 3] & 0xFF) << 8) + (this.data[this.offset - 4] & 0xFF); } @OriginalMember(owner = "client!wa", name = "l", descriptor = "(II)V") - public final void method2209(@OriginalArg(0) int arg0) { - this.aByteArray40[this.anInt2792++] = (byte) (arg0 >> 8); - this.aByteArray40[this.anInt2792++] = (byte) (arg0 + 128); + public final void p2add(@OriginalArg(0) int value) { + this.data[this.offset++] = (byte) (value >> 8); + this.data[this.offset++] = (byte) (value + 128); } @OriginalMember(owner = "client!wa", name = "b", descriptor = "(IB)V") - public final void method2211(@OriginalArg(0) int arg0) { - this.aByteArray40[this.anInt2792++] = (byte) arg0; - this.aByteArray40[this.anInt2792++] = (byte) (arg0 >> 8); - this.aByteArray40[this.anInt2792++] = (byte) (arg0 >> 16); - this.aByteArray40[this.anInt2792++] = (byte) (arg0 >> 24); + public final void p4le2(@OriginalArg(0) int value) { + this.data[this.offset++] = (byte) value; + this.data[this.offset++] = (byte) (value >> 8); + this.data[this.offset++] = (byte) (value >> 16); + this.data[this.offset++] = (byte) (value >> 24); } @OriginalMember(owner = "client!wa", name = "g", descriptor = "(Z)I") - public final int method2212() { - return -this.aByteArray40[this.anInt2792++] & 0xFF; + public final int p1neg() { + return -this.data[this.offset++] & 0xFF; } @OriginalMember(owner = "client!wa", name = "l", descriptor = "(B)I") - public final int method2213() { - this.anInt2792 += 2; - @Pc(27) int local27 = (this.aByteArray40[this.anInt2792 - 1] & 0xFF) + ((this.aByteArray40[this.anInt2792 - 2] & 0xFF) << 8); - if (local27 > 32767) { - local27 -= 65536; + public final int g2s() { + this.offset += 2; + @Pc(27) int value = ((this.data[this.offset - 2] & 0xFF) << 8) + (this.data[this.offset - 1] & 0xFF); + if (value > 32767) { + value -= 0x10000; } - return local27; + return value; } @OriginalMember(owner = "client!wa", name = "m", descriptor = "(I)I") - public final int method2214() { - this.anInt2792 += 2; - @Pc(34) int local34 = ((this.aByteArray40[this.anInt2792 - 1] & 0xFF) << 8) + (this.aByteArray40[this.anInt2792 - 2] - 128 & 0xFF); - if (local34 > 32767) { - local34 -= 65536; + public final int g2lesadd() { + this.offset += 2; + @Pc(34) int value = ((this.data[this.offset - 1] & 0xFF) << 8) + (this.data[this.offset - 2] - 128 & 0xFF); + if (value > 32767) { + value -= 0x10000; } - return local34; + return value; } @OriginalMember(owner = "client!wa", name = "n", descriptor = "(I)B") - public final byte method2215() { - return (byte) (this.aByteArray40[this.anInt2792++] - 128); + public final byte p1sub() { + return (byte) (this.data[this.offset++] - 128); } @OriginalMember(owner = "client!wa", name = "m", descriptor = "(II)V") - public final void method2216(@OriginalArg(0) int arg0) { - this.aByteArray40[this.anInt2792++] = (byte) (arg0 + 128); + public final void p1a(@OriginalArg(0) int value) { + this.data[this.offset++] = (byte) (value + 128); } @OriginalMember(owner = "client!wa", name = "m", descriptor = "(B)I") - public final int method2217() { - this.anInt2792 += 2; - @Pc(38) int local38 = (this.aByteArray40[this.anInt2792 - 2] & 0xFF) + ((this.aByteArray40[this.anInt2792 - 1] & 0xFF) << 8); - if (local38 > 32767) { - local38 -= 65536; + public final int g2les() { + this.offset += 2; + @Pc(38) int value = (this.data[this.offset - 2] & 0xFF) + ((this.data[this.offset - 1] & 0xFF) << 8); + if (value > 32767) { + value -= 0x10000; } - return local38; + return value; } @OriginalMember(owner = "client!wa", name = "c", descriptor = "(BI)I") - public final int method2219(@OriginalArg(1) int arg0) { - @Pc(16) int local16 = Static169.method3178(arg0, this.anInt2792, this.aByteArray40); - this.method2164(local16); - return local16; + public final int pCrc32(@OriginalArg(1) int off) { + @Pc(16) int checksum = Static169.crc32(off, this.offset, this.data); + this.p4(checksum); + return checksum; } @OriginalMember(owner = "client!wa", name = "n", descriptor = "(B)I") - public final int method2220() { - this.anInt2792 += 3; - return ((this.aByteArray40[this.anInt2792 - 3] & 0xFF) << 16) + ((this.aByteArray40[this.anInt2792 - 2] << 8 & 0xFF00) + (this.aByteArray40[this.anInt2792 - 1] & 0xFF)); + public final int g3() { + this.offset += 3; + return ((this.data[this.offset - 3] & 0xFF) << 16) + ((this.data[this.offset - 2] << 8 & 0xFF00) + (this.data[this.offset - 1] & 0xFF)); } @OriginalMember(owner = "client!wa", name = "n", descriptor = "(II)V") - public final void method2222(@OriginalArg(1) int arg0) { - this.aByteArray40[this.anInt2792++] = (byte) arg0; - this.aByteArray40[this.anInt2792++] = (byte) (arg0 >> 8); + public final void p2le(@OriginalArg(1) int value) { + this.data[this.offset++] = (byte) value; + this.data[this.offset++] = (byte) (value >> 8); } + // range: -16384 to 16383 @OriginalMember(owner = "client!wa", name = "p", descriptor = "(I)I") - public final int method2223() { - @Pc(11) int local11 = this.aByteArray40[this.anInt2792] & 0xFF; - return local11 < 128 ? this.method2229() - 64 : this.method2163() - 49152; + public final int gSmart1or2s() { + @Pc(11) int value = this.data[this.offset] & 0xFF; + return value < 128 ? this.g1() - 64 : this.g2() - 0xc000; } + // reverse "middle-endian" @OriginalMember(owner = "client!wa", name = "o", descriptor = "(B)I") - public final int method2224() { - this.anInt2792 += 4; - return ((this.aByteArray40[this.anInt2792 - 3] & 0xFF) << 24) + ((this.aByteArray40[this.anInt2792 - 4] & 0xFF) << 16) + ((this.aByteArray40[this.anInt2792 + -1] & 0xFF) << 8) + (this.aByteArray40[this.anInt2792 + -2] & 0xFF); + public final int p4rme() { + this.offset += 4; + return ((this.data[this.offset - 3] & 0xFF) << 24) + ((this.data[this.offset - 4] & 0xFF) << 16) + ((this.data[this.offset - 1] & 0xFF) << 8) + (this.data[this.offset - 2] & 0xFF); } @OriginalMember(owner = "client!wa", name = "a", descriptor = "(Ljava/math/BigInteger;Ljava/math/BigInteger;I)V") - public final void method2226(@OriginalArg(0) BigInteger arg0, @OriginalArg(1) BigInteger arg1) { - @Pc(2) int local2 = this.anInt2792; - this.anInt2792 = 0; - @Pc(8) byte[] local8 = new byte[local2]; - this.method2190(local2, local8); - @Pc(23) BigInteger local23 = new BigInteger(local8); - @Pc(28) BigInteger local28 = local23.modPow(arg0, arg1); - @Pc(38) byte[] local38 = local28.toByteArray(); - this.anInt2792 = 0; - this.method2178(local38.length); - this.method2179(local38, local38.length); + public final void encryptRsa(@OriginalArg(0) BigInteger exp, @OriginalArg(1) BigInteger mod) { + @Pc(2) int len = this.offset; + this.offset = 0; + @Pc(8) byte[] plaintextBytes = new byte[len]; + this.gBytes(len, plaintextBytes); + @Pc(23) BigInteger plaintext = new BigInteger(plaintextBytes); + @Pc(28) BigInteger ciphertext = plaintext.modPow(exp, mod); + @Pc(38) byte[] ciphertextBytes = ciphertext.toByteArray(); + this.offset = 0; + this.p1(ciphertextBytes.length); + this.pBytes(ciphertextBytes, ciphertextBytes.length); } @OriginalMember(owner = "client!wa", name = "a", descriptor = "(IF)V") - public final void method2227(@OriginalArg(1) float arg0) { - @Pc(6) int local6 = Float.floatToRawIntBits(arg0); - this.aByteArray40[this.anInt2792++] = (byte) (local6 >> 24); - this.aByteArray40[this.anInt2792++] = (byte) (local6 >> 16); - this.aByteArray40[this.anInt2792++] = (byte) (local6 >> 8); - this.aByteArray40[this.anInt2792++] = (byte) local6; + public final void pFloat(@OriginalArg(1) float value) { + @Pc(6) int floatInt = Float.floatToRawIntBits(value); + this.data[this.offset++] = (byte) (floatInt >> 24); + this.data[this.offset++] = (byte) (floatInt >> 16); + this.data[this.offset++] = (byte) (floatInt >> 8); + this.data[this.offset++] = (byte) floatInt; } @OriginalMember(owner = "client!wa", name = "p", descriptor = "(B)I") - public final int method2229() { - return this.aByteArray40[this.anInt2792++] & 0xFF; + public final int g1() { + return this.data[this.offset++] & 0xFF; } @OriginalMember(owner = "client!wa", name = "o", descriptor = "(II)V") - public final void method2230(@OriginalArg(1) int arg0) { - this.aByteArray40[this.anInt2792++] = (byte) (arg0 >> 8); - this.aByteArray40[this.anInt2792++] = (byte) arg0; + public final void p2(@OriginalArg(1) int value) { + this.data[this.offset++] = (byte) (value >> 8); + this.data[this.offset++] = (byte) value; } } diff --git a/client/src/main/java/Class165.java b/client/src/main/java/Class165.java index fc0d8fe..dc4c587 100644 --- a/client/src/main/java/Class165.java +++ b/client/src/main/java/Class165.java @@ -51,56 +51,56 @@ public final class Class165 { for (@Pc(6) int local6 = 0; local6 <= 8; local6++) { for (local11 = 0; local11 <= 8; local11++) { if (Static239.aBoolean263) { - local4.method2227((float) local11 / 8.0F); - local4.method2227((float) local6 / 8.0F); - local4.method2227((float) (local11 * 128)); - local4.method2227((float) arg0[local11 + arg1][local6 + arg2]); - local4.method2227((float) (local6 * 128)); + local4.pFloat((float) local11 / 8.0F); + local4.pFloat((float) local6 / 8.0F); + local4.pFloat((float) (local11 * 128)); + local4.pFloat((float) arg0[local11 + arg1][local6 + arg2]); + local4.pFloat((float) (local6 * 128)); } else { - local4.method2188((float) local11 / 8.0F); - local4.method2188((float) local6 / 8.0F); - local4.method2188((float) (local11 * 128)); - local4.method2188((float) arg0[local11 + arg1][local6 + arg2]); - local4.method2188((float) (local6 * 128)); + local4.gFloat((float) local11 / 8.0F); + local4.gFloat((float) local6 / 8.0F); + local4.gFloat((float) (local11 * 128)); + local4.gFloat((float) arg0[local11 + arg1][local6 + arg2]); + local4.gFloat((float) (local6 * 128)); } } } if (Static239.aBoolean271) { - @Pc(112) ByteBuffer local112 = ByteBuffer.wrap(local4.aByteArray40, 0, local4.anInt2792); + @Pc(112) ByteBuffer local112 = ByteBuffer.wrap(local4.data, 0, local4.offset); this.aClass155_7 = new GlVertexBufferObject(); this.aClass155_7.method4519(local112); } else { - this.aByteBuffer12 = ByteBuffer.allocateDirect(local4.anInt2792).order(ByteOrder.nativeOrder()); - this.aByteBuffer12.put(local4.aByteArray40, 0, local4.anInt2792); + this.aByteBuffer12 = ByteBuffer.allocateDirect(local4.offset).order(ByteOrder.nativeOrder()); + this.aByteBuffer12.put(local4.data, 0, local4.offset); this.aByteBuffer12.flip(); } @Pc(147) Buffer local147 = new Buffer(1536); for (local11 = 0; local11 < 8; local11++) { for (@Pc(154) int local154 = 0; local154 < 8; local154++) { if (Static239.aBoolean263) { - local147.method2164(local154 + (local11 + 1) * 9); - local147.method2164(local154 + local11 * 9); - local147.method2164(local154 + local11 * 9 + 1); - local147.method2164(local154 + (local11 + 1) * 9); - local147.method2164(local154 + local11 * 9 + 1); - local147.method2164(local154 + (local11 + 1) * 9 + 1); + local147.p4(local154 + (local11 + 1) * 9); + local147.p4(local154 + local11 * 9); + local147.p4(local154 + local11 * 9 + 1); + local147.p4(local154 + (local11 + 1) * 9); + local147.p4(local154 + local11 * 9 + 1); + local147.p4(local154 + (local11 + 1) * 9 + 1); } else { - local147.method2183(local154 + (local11 + 1) * 9); - local147.method2183(local154 + local11 * 9); - local147.method2183(local154 + local11 * 9 + 1); - local147.method2183(local154 + (local11 + 1) * 9); - local147.method2183(local154 + local11 * 9 + 1); - local147.method2183(local154 + (local11 + 1) * 9 + 1); + local147.p4le(local154 + (local11 + 1) * 9); + local147.p4le(local154 + local11 * 9); + local147.p4le(local154 + local11 * 9 + 1); + local147.p4le(local154 + (local11 + 1) * 9); + local147.p4le(local154 + local11 * 9 + 1); + local147.p4le(local154 + (local11 + 1) * 9 + 1); } } } if (Static239.aBoolean271) { - @Pc(293) ByteBuffer local293 = ByteBuffer.wrap(local147.aByteArray40, 0, local147.anInt2792); + @Pc(293) ByteBuffer local293 = ByteBuffer.wrap(local147.data, 0, local147.offset); this.aClass155_6 = new GlVertexBufferObject(); this.aClass155_6.method4517(local293); } else { - this.aByteBuffer11 = ByteBuffer.allocateDirect(local147.anInt2792).order(ByteOrder.nativeOrder()); - this.aByteBuffer11.put(local147.aByteArray40, 0, local147.anInt2792); + this.aByteBuffer11 = ByteBuffer.allocateDirect(local147.offset).order(ByteOrder.nativeOrder()); + this.aByteBuffer11.put(local147.data, 0, local147.offset); this.aByteBuffer11.flip(); } } diff --git a/client/src/main/java/Class2.java b/client/src/main/java/Class2.java index 8177bd6..9879289 100644 --- a/client/src/main/java/Class2.java +++ b/client/src/main/java/Class2.java @@ -18,7 +18,7 @@ public final class Class2 { @OriginalMember(owner = "client!aa", name = "a", descriptor = "(BLclient!wa;I)V") public final void method6(@OriginalArg(1) Buffer arg0, @OriginalArg(2) int arg1) { while (true) { - @Pc(5) int local5 = arg0.method2229(); + @Pc(5) int local5 = arg0.g1(); if (local5 == 0) { return; } @@ -49,9 +49,9 @@ public final class Class2 { @OriginalMember(owner = "client!aa", name = "a", descriptor = "(ILclient!wa;II)V") private void method11(@OriginalArg(0) int arg0, @OriginalArg(1) Buffer arg1, @OriginalArg(2) int arg2) { if (arg0 == 1) { - this.anInt12 = arg1.method2163(); + this.anInt12 = arg1.g2(); } else if (arg0 == 2) { - this.anInt11 = arg1.method2220(); + this.anInt11 = arg1.g3(); } else if (arg0 == 3) { this.aBoolean2 = true; } else if (arg0 == 4) { diff --git a/client/src/main/java/Class35.java b/client/src/main/java/Class35.java index 8ec8ebb..47a1fcf 100644 --- a/client/src/main/java/Class35.java +++ b/client/src/main/java/Class35.java @@ -12,7 +12,7 @@ public final class Class35 { @OriginalMember(owner = "client!eh", name = "a", descriptor = "(ILclient!wa;)V") public final void method1323(@OriginalArg(1) Buffer arg0) { while (true) { - @Pc(5) int local5 = arg0.method2229(); + @Pc(5) int local5 = arg0.g1(); if (local5 == 0) { return; } @@ -23,7 +23,7 @@ public final class Class35 { @OriginalMember(owner = "client!eh", name = "a", descriptor = "(Lclient!wa;BI)V") private void method1325(@OriginalArg(0) Buffer arg0, @OriginalArg(2) int arg1) { if (arg1 == 5) { - this.anInt1765 = arg0.method2163(); + this.anInt1765 = arg0.g2(); } } } diff --git a/client/src/main/java/Class3_Sub14.java b/client/src/main/java/Class3_Sub14.java index 73c170a..76f1e8d 100644 --- a/client/src/main/java/Class3_Sub14.java +++ b/client/src/main/java/Class3_Sub14.java @@ -159,40 +159,40 @@ public final class Class3_Sub14 extends Node { @Pc(12) Buffer local12 = new Buffer((this.aBoolean139 ? 40 : 36) * this.anInt2483); for (@Pc(14) int local14 = 0; local14 < this.anInt2483; local14++) { if (Static239.aBoolean263) { - local12.method2227((float) this.anIntArray232[local14]); - local12.method2227((float) this.anIntArray230[local14]); - local12.method2227((float) this.anIntArray229[local14]); - local12.method2164(this.anIntArray226[local14]); - local12.method2227(this.aFloatArray7[local14]); - local12.method2227(this.aFloatArray6[local14]); - local12.method2227(this.aFloatArray5[local14]); - local12.method2227((float) this.anIntArray232[local14] / this.aFloat12); - local12.method2227((float) this.anIntArray229[local14] / this.aFloat12); + local12.pFloat((float) this.anIntArray232[local14]); + local12.pFloat((float) this.anIntArray230[local14]); + local12.pFloat((float) this.anIntArray229[local14]); + local12.p4(this.anIntArray226[local14]); + local12.pFloat(this.aFloatArray7[local14]); + local12.pFloat(this.aFloatArray6[local14]); + local12.pFloat(this.aFloatArray5[local14]); + local12.pFloat((float) this.anIntArray232[local14] / this.aFloat12); + local12.pFloat((float) this.anIntArray229[local14] / this.aFloat12); if (this.aBoolean139) { - local12.method2227(this.aFloatArray4[local14]); + local12.pFloat(this.aFloatArray4[local14]); } } else { - local12.method2188((float) this.anIntArray232[local14]); - local12.method2188((float) this.anIntArray230[local14]); - local12.method2188((float) this.anIntArray229[local14]); - local12.method2164(this.anIntArray226[local14]); - local12.method2188(this.aFloatArray7[local14]); - local12.method2188(this.aFloatArray6[local14]); - local12.method2188(this.aFloatArray5[local14]); - local12.method2188((float) this.anIntArray232[local14] / this.aFloat12); - local12.method2188((float) this.anIntArray229[local14] / this.aFloat12); + local12.gFloat((float) this.anIntArray232[local14]); + local12.gFloat((float) this.anIntArray230[local14]); + local12.gFloat((float) this.anIntArray229[local14]); + local12.p4(this.anIntArray226[local14]); + local12.gFloat(this.aFloatArray7[local14]); + local12.gFloat(this.aFloatArray6[local14]); + local12.gFloat(this.aFloatArray5[local14]); + local12.gFloat((float) this.anIntArray232[local14] / this.aFloat12); + local12.gFloat((float) this.anIntArray229[local14] / this.aFloat12); if (this.aBoolean139) { - local12.method2188(this.aFloatArray4[local14]); + local12.gFloat(this.aFloatArray4[local14]); } } } if (Static239.aBoolean271) { - @Pc(200) ByteBuffer local200 = ByteBuffer.wrap(local12.aByteArray40, 0, local12.anInt2792); + @Pc(200) ByteBuffer local200 = ByteBuffer.wrap(local12.data, 0, local12.offset); this.aClass155_3 = new GlVertexBufferObject(); this.aClass155_3.method4519(local200); } else { - this.aByteBuffer3 = ByteBuffer.allocateDirect(local12.anInt2792).order(ByteOrder.nativeOrder()); - this.aByteBuffer3.put(local12.aByteArray40, 0, local12.anInt2792); + this.aByteBuffer3 = ByteBuffer.allocateDirect(local12.offset).order(ByteOrder.nativeOrder()); + this.aByteBuffer3.put(local12.data, 0, local12.offset); this.aByteBuffer3.flip(); } this.anIntArray232 = null; @@ -208,15 +208,15 @@ public final class Class3_Sub14 extends Node { @OriginalMember(owner = "client!hg", name = "a", descriptor = "([[[Lclient!bj;FZ)V") public final void method1944(@OriginalArg(0) Tile[][][] arg0, @OriginalArg(1) float arg1, @OriginalArg(2) boolean arg2) { - if (Static95.aClass3_Sub15_3 == null || Static95.aClass3_Sub15_3.aByteArray40.length < this.anInt2488 * 4) { + if (Static95.aClass3_Sub15_3 == null || Static95.aClass3_Sub15_3.data.length < this.anInt2488 * 4) { Static95.aClass3_Sub15_3 = new Buffer(this.anInt2488 * 4); } else { - Static95.aClass3_Sub15_3.anInt2792 = 0; + Static95.aClass3_Sub15_3.offset = 0; } - if (Static95.aClass3_Sub15_2 == null || Static95.aClass3_Sub15_2.aByteArray40.length < this.anInt2487 * 4) { + if (Static95.aClass3_Sub15_2 == null || Static95.aClass3_Sub15_2.data.length < this.anInt2487 * 4) { Static95.aClass3_Sub15_2 = new Buffer(this.anInt2487 * 4); } else { - Static95.aClass3_Sub15_2.anInt2792 = 0; + Static95.aClass3_Sub15_2.offset = 0; } @Pc(47) int local47; @Pc(68) Tile local68; @@ -234,7 +234,7 @@ public final class Class3_Sub14 extends Node { local86 = this.anIntArrayArray18[local47]; if (local86 != null) { for (local90 = 0; local90 < local86.length; local90++) { - Static95.aClass3_Sub15_2.method2164(local86[local90]); + Static95.aClass3_Sub15_2.p4(local86[local90]); } } local111 = this.aBooleanArray54[local47] ? Static95.aClass3_Sub15_2 : Static95.aClass3_Sub15_3; @@ -242,9 +242,9 @@ public final class Class3_Sub14 extends Node { local111 = Static95.aClass3_Sub15_3; } for (local116 = 1; local116 < local78.length - 1; local116++) { - local111.method2164(local78[0]); - local111.method2164(local78[local116]); - local111.method2164(local78[local116 + 1]); + local111.p4(local78[0]); + local111.p4(local78[local116]); + local111.p4(local78[local116 + 1]); } } } @@ -257,7 +257,7 @@ public final class Class3_Sub14 extends Node { local86 = this.anIntArrayArray18[local47]; if (local86 != null) { for (local90 = 0; local90 < local86.length; local90++) { - Static95.aClass3_Sub15_2.method2183(local86[local90]); + Static95.aClass3_Sub15_2.p4le(local86[local90]); } } local111 = this.aBooleanArray54[local47] ? Static95.aClass3_Sub15_2 : Static95.aClass3_Sub15_3; @@ -265,14 +265,14 @@ public final class Class3_Sub14 extends Node { local111 = Static95.aClass3_Sub15_3; } for (local116 = 1; local116 < local78.length - 1; local116++) { - local111.method2183(local78[0]); - local111.method2183(local78[local116]); - local111.method2183(local78[local116 + 1]); + local111.p4le(local78[0]); + local111.p4le(local78[local116]); + local111.p4le(local78[local116 + 1]); } } } } - if (Static95.aClass3_Sub15_3.anInt2792 == 0 && Static95.aClass3_Sub15_2.anInt2792 == 0) { + if (Static95.aClass3_Sub15_3.offset == 0 && Static95.aClass3_Sub15_2.offset == 0) { return; } @Pc(257) GL local257 = Static239.aGL1; @@ -320,30 +320,30 @@ public final class Class3_Sub14 extends Node { if (Static239.aBoolean271) { local257.glBindBufferARB(GL.GL_ELEMENT_ARRAY_BUFFER, 0); } - if (Static95.aClass3_Sub15_3.anInt2792 != 0) { - if (Static95.aByteBuffer5 == null || Static95.aByteBuffer5.capacity() < Static95.aClass3_Sub15_3.anInt2792) { - Static95.aByteBuffer5 = ByteBuffer.allocateDirect(Static95.aClass3_Sub15_3.anInt2792).order(ByteOrder.nativeOrder()); + if (Static95.aClass3_Sub15_3.offset != 0) { + if (Static95.aByteBuffer5 == null || Static95.aByteBuffer5.capacity() < Static95.aClass3_Sub15_3.offset) { + Static95.aByteBuffer5 = ByteBuffer.allocateDirect(Static95.aClass3_Sub15_3.offset).order(ByteOrder.nativeOrder()); } else { Static95.aByteBuffer5.clear(); } - Static95.aByteBuffer5.put(Static95.aClass3_Sub15_3.aByteArray40, 0, Static95.aClass3_Sub15_3.anInt2792); + Static95.aByteBuffer5.put(Static95.aClass3_Sub15_3.data, 0, Static95.aClass3_Sub15_3.offset); Static95.aByteBuffer5.flip(); Static239.method4159(arg1); - local257.glDrawElements(GL.GL_TRIANGLES, Static95.aClass3_Sub15_3.anInt2792 / 4, GL.GL_UNSIGNED_INT, Static95.aByteBuffer5); + local257.glDrawElements(GL.GL_TRIANGLES, Static95.aClass3_Sub15_3.offset / 4, GL.GL_UNSIGNED_INT, Static95.aByteBuffer5); } - if (Static95.aClass3_Sub15_2.anInt2792 == 0) { + if (Static95.aClass3_Sub15_2.offset == 0) { return; } - if (Static95.aByteBuffer4 == null || Static95.aByteBuffer4.capacity() < Static95.aClass3_Sub15_2.anInt2792) { - Static95.aByteBuffer4 = ByteBuffer.allocateDirect(Static95.aClass3_Sub15_2.anInt2792).order(ByteOrder.nativeOrder()); + if (Static95.aByteBuffer4 == null || Static95.aByteBuffer4.capacity() < Static95.aClass3_Sub15_2.offset) { + Static95.aByteBuffer4 = ByteBuffer.allocateDirect(Static95.aClass3_Sub15_2.offset).order(ByteOrder.nativeOrder()); } else { Static95.aByteBuffer4.clear(); } - Static95.aByteBuffer4.put(Static95.aClass3_Sub15_2.aByteArray40, 0, Static95.aClass3_Sub15_2.anInt2792); + Static95.aByteBuffer4.put(Static95.aClass3_Sub15_2.data, 0, Static95.aClass3_Sub15_2.offset); Static95.aByteBuffer4.flip(); Static239.method4159(arg1 - 100.0F); Static239.method4178(); - local257.glDrawElements(GL.GL_TRIANGLES, Static95.aClass3_Sub15_2.anInt2792 / 4, GL.GL_UNSIGNED_INT, Static95.aByteBuffer4); + local257.glDrawElements(GL.GL_TRIANGLES, Static95.aClass3_Sub15_2.offset / 4, GL.GL_UNSIGNED_INT, Static95.aByteBuffer4); Static239.method4157(); } diff --git a/client/src/main/java/Class3_Sub2_Sub12.java b/client/src/main/java/Class3_Sub2_Sub12.java index d299bb6..fb5d93c 100644 --- a/client/src/main/java/Class3_Sub2_Sub12.java +++ b/client/src/main/java/Class3_Sub2_Sub12.java @@ -18,18 +18,18 @@ public final class Class3_Sub2_Sub12 extends SecondaryNode { @OriginalMember(owner = "client!hn", name = "a", descriptor = "(ILclient!wa;I)V") private void method2072(@OriginalArg(0) int arg0, @OriginalArg(1) Buffer arg1) { if (arg0 == 1) { - this.anInt2669 = arg1.method2229(); + this.anInt2669 = arg1.g1(); } else if (arg0 == 2) { - this.anInt2667 = arg1.method2174(); + this.anInt2667 = arg1.g4(); } else if (arg0 == 5) { - this.aClass100_544 = arg1.method2202(); + this.aClass100_544 = arg1.gjstr(); } } @OriginalMember(owner = "client!hn", name = "a", descriptor = "(ILclient!wa;)V") public final void method2076(@OriginalArg(1) Buffer arg0) { while (true) { - @Pc(13) int local13 = arg0.method2229(); + @Pc(13) int local13 = arg0.g1(); if (local13 == 0) { return; } diff --git a/client/src/main/java/Class3_Sub2_Sub14.java b/client/src/main/java/Class3_Sub2_Sub14.java index c87ab04..7c630c3 100644 --- a/client/src/main/java/Class3_Sub2_Sub14.java +++ b/client/src/main/java/Class3_Sub2_Sub14.java @@ -12,7 +12,7 @@ public final class Class3_Sub2_Sub14 extends SecondaryNode { @OriginalMember(owner = "client!md", name = "a", descriptor = "(Lclient!wa;I)V") public final void method2927(@OriginalArg(0) Buffer arg0) { while (true) { - @Pc(10) int local10 = arg0.method2229(); + @Pc(10) int local10 = arg0.g1(); if (local10 == 0) { return; } @@ -23,7 +23,7 @@ public final class Class3_Sub2_Sub14 extends SecondaryNode { @OriginalMember(owner = "client!md", name = "a", descriptor = "(Lclient!wa;IZ)V") private void method2931(@OriginalArg(0) Buffer arg0, @OriginalArg(1) int arg1) { if (arg1 == 2) { - this.anInt3706 = arg0.method2163(); + this.anInt3706 = arg0.g2(); } } } diff --git a/client/src/main/java/Class3_Sub2_Sub2.java b/client/src/main/java/Class3_Sub2_Sub2.java index 6b45365..75597ec 100644 --- a/client/src/main/java/Class3_Sub2_Sub2.java +++ b/client/src/main/java/Class3_Sub2_Sub2.java @@ -52,26 +52,26 @@ public final class Class3_Sub2_Sub2 extends SecondaryNode { @OriginalMember(owner = "client!bc", name = "a", descriptor = "(Lclient!wa;II)V") private void method467(@OriginalArg(0) Buffer arg0, @OriginalArg(2) int arg1) { if (arg1 == 1) { - this.aClass100_79 = arg0.method2202(); + this.aClass100_79 = arg0.gjstr(); return; } @Pc(28) int local28; @Pc(38) int local38; if (arg1 == 2) { - local28 = arg0.method2229(); + local28 = arg0.g1(); this.anIntArray30 = new int[local28]; this.anIntArray31 = new int[local28]; for (local38 = 0; local38 < local28; local38++) { - this.anIntArray30[local38] = arg0.method2163(); - this.anIntArray31[local38] = Static229.method3933(arg0.method2186()); + this.anIntArray30[local38] = arg0.g2(); + this.anIntArray31[local38] = Static229.method3933(arg0.g1s()); } } else if (arg1 == 3) { - local28 = arg0.method2229(); + local28 = arg0.g1(); this.anIntArray32 = new int[local28]; this.anIntArray29 = new int[local28]; for (local38 = 0; local38 < local28; local38++) { - this.anIntArray32[local38] = arg0.method2163(); - this.anIntArray29[local38] = Static229.method3933(arg0.method2186()); + this.anIntArray32[local38] = arg0.g2(); + this.anIntArray29[local38] = Static229.method3933(arg0.g1s()); } } else if (arg1 == 4) { } @@ -93,7 +93,7 @@ public final class Class3_Sub2_Sub2 extends SecondaryNode { @OriginalMember(owner = "client!bc", name = "a", descriptor = "(Lclient!wa;B)V") public final void method470(@OriginalArg(0) Buffer arg0) { while (true) { - @Pc(12) int local12 = arg0.method2229(); + @Pc(12) int local12 = arg0.g1(); if (local12 == 0) { return; } diff --git a/client/src/main/java/Class3_Sub2_Sub6.java b/client/src/main/java/Class3_Sub2_Sub6.java index 80d3d0c..6e3e003 100644 --- a/client/src/main/java/Class3_Sub2_Sub6.java +++ b/client/src/main/java/Class3_Sub2_Sub6.java @@ -29,7 +29,7 @@ public final class Class3_Sub2_Sub6 extends SecondaryNode { for (@Pc(14) int local14 = 0; this.anIntArray71.length > local14 && local14 < arg1.length; local14++) { @Pc(38) int local38 = Static143.anIntArray329[this.method765(local14)]; if (local38 > 0) { - arg0.method2165(local38, (long) arg1[local14]); + arg0.pVarLong(local38, (long) arg1[local14]); } } } @@ -37,7 +37,7 @@ public final class Class3_Sub2_Sub6 extends SecondaryNode { @OriginalMember(owner = "client!cb", name = "a", descriptor = "(Lclient!wa;I)V") public final void method761(@OriginalArg(0) Buffer arg0) { while (true) { - @Pc(9) int local9 = arg0.method2229(); + @Pc(9) int local9 = arg0.g1(); if (local9 == 0) { return; } @@ -78,27 +78,27 @@ public final class Class3_Sub2_Sub6 extends SecondaryNode { @OriginalMember(owner = "client!cb", name = "a", descriptor = "(Lclient!wa;II)V") private void method768(@OriginalArg(0) Buffer arg0, @OriginalArg(1) int arg1) { if (arg1 == 1) { - this.aClass100Array35 = arg0.method2202().method3147(60); + this.aClass100Array35 = arg0.gjstr().method3147(60); return; } @Pc(32) int local32; @Pc(42) int local42; if (arg1 == 2) { - local32 = arg0.method2229(); + local32 = arg0.g1(); this.anIntArray72 = new int[local32]; for (local42 = 0; local42 < local32; local42++) { - this.anIntArray72[local42] = arg0.method2163(); + this.anIntArray72[local42] = arg0.g2(); } } else if (arg1 == 3) { - local32 = arg0.method2229(); + local32 = arg0.g1(); this.anIntArray71 = new int[local32]; this.anIntArrayArray5 = new int[local32][]; for (local42 = 0; local42 < local32; local42++) { - @Pc(49) int local49 = arg0.method2163(); + @Pc(49) int local49 = arg0.g2(); this.anIntArray71[local42] = local49; this.anIntArrayArray5[local42] = new int[Static264.anIntArray412[local49]]; for (@Pc(64) int local64 = 0; local64 < Static264.anIntArray412[local49]; local64++) { - this.anIntArrayArray5[local42][local64] = arg0.method2163(); + this.anIntArrayArray5[local42][local64] = arg0.g2(); } } } else if (arg1 == 4) { @@ -126,7 +126,7 @@ public final class Class3_Sub2_Sub6 extends SecondaryNode { if (this.anIntArray71 != null) { for (@Pc(22) int local22 = 0; local22 < this.anIntArray71.length; local22++) { local17.method3113(this.aClass100Array35[local22]); - local17.method3113(Static89.method1838(this.anIntArrayArray5[local22], arg0.method2198(Static16.anIntArray51[this.anIntArray71[local22]]), this.anIntArray71[local22])); + local17.method3113(Static89.method1838(this.anIntArrayArray5[local22], arg0.gVarLong(Static16.anIntArray51[this.anIntArray71[local22]]), this.anIntArray71[local22])); } } local17.method3113(this.aClass100Array35[this.aClass100Array35.length - 1]); diff --git a/client/src/main/java/Class45.java b/client/src/main/java/Class45.java index 470f8a5..2efab94 100644 --- a/client/src/main/java/Class45.java +++ b/client/src/main/java/Class45.java @@ -117,44 +117,44 @@ public final class Class45 { @Pc(19) int local19; if (Static239.aBoolean263) { for (local19 = 0; local19 < this.anInt2017; local19++) { - local15.method2178(this.aByteArray25[local19]); - local15.method2178(this.aByteArray23[local19]); - local15.method2178(this.aByteArray24[local19]); - local15.method2178(255); - local15.method2227((float) this.anIntArray178[local19]); - local15.method2227((float) this.anIntArray180[local19]); - local15.method2227((float) this.anIntArray179[local19]); + local15.p1(this.aByteArray25[local19]); + local15.p1(this.aByteArray23[local19]); + local15.p1(this.aByteArray24[local19]); + local15.p1(255); + local15.pFloat((float) this.anIntArray178[local19]); + local15.pFloat((float) this.anIntArray180[local19]); + local15.pFloat((float) this.anIntArray179[local19]); } for (local19 = 0; local19 < this.anInt2018; local19++) { - local7.method2164(this.anIntArray177[local19]); + local7.p4(this.anIntArray177[local19]); } } else { for (local19 = 0; local19 < this.anInt2017; local19++) { - local15.method2178(this.aByteArray25[local19]); - local15.method2178(this.aByteArray23[local19]); - local15.method2178(this.aByteArray24[local19]); - local15.method2178(255); - local15.method2188((float) this.anIntArray178[local19]); - local15.method2188((float) this.anIntArray180[local19]); - local15.method2188((float) this.anIntArray179[local19]); + local15.p1(this.aByteArray25[local19]); + local15.p1(this.aByteArray23[local19]); + local15.p1(this.aByteArray24[local19]); + local15.p1(255); + local15.gFloat((float) this.anIntArray178[local19]); + local15.gFloat((float) this.anIntArray180[local19]); + local15.gFloat((float) this.anIntArray179[local19]); } for (local19 = 0; local19 < this.anInt2018; local19++) { - local7.method2183(this.anIntArray177[local19]); + local7.p4le(this.anIntArray177[local19]); } } if (Static239.aBoolean271) { this.aClass155_1 = new GlVertexBufferObject(); - @Pc(173) ByteBuffer local173 = ByteBuffer.wrap(local15.aByteArray40); + @Pc(173) ByteBuffer local173 = ByteBuffer.wrap(local15.data); this.aClass155_1.method4519(local173); this.aClass155_2 = new GlVertexBufferObject(); - @Pc(186) ByteBuffer local186 = ByteBuffer.wrap(local7.aByteArray40); + @Pc(186) ByteBuffer local186 = ByteBuffer.wrap(local7.data); this.aClass155_2.method4517(local186); } else { - this.aByteBuffer1 = ByteBuffer.allocateDirect(local15.anInt2792); - this.aByteBuffer1.put(local15.aByteArray40); + this.aByteBuffer1 = ByteBuffer.allocateDirect(local15.offset); + this.aByteBuffer1.put(local15.data); this.aByteBuffer1.flip(); - this.aByteBuffer2 = ByteBuffer.allocateDirect(local7.anInt2792); - this.aByteBuffer2.put(local7.aByteArray40); + this.aByteBuffer2 = ByteBuffer.allocateDirect(local7.offset); + this.aByteBuffer2.put(local7.data); this.aByteBuffer2.flip(); } this.anIntArray178 = null; diff --git a/client/src/main/java/Class63.java b/client/src/main/java/Class63.java index 0a08eb4..c4786ec 100644 --- a/client/src/main/java/Class63.java +++ b/client/src/main/java/Class63.java @@ -31,7 +31,7 @@ public final class Class63 { @OriginalMember(owner = "client!ia", name = "a", descriptor = "(Lclient!wa;IB)V") public final void method2249(@OriginalArg(0) Buffer arg0, @OriginalArg(1) int arg1) { while (true) { - @Pc(18) int local18 = arg0.method2229(); + @Pc(18) int local18 = arg0.g1(); if (local18 == 0) { return; } @@ -42,10 +42,10 @@ public final class Class63 { @OriginalMember(owner = "client!ia", name = "a", descriptor = "(IIILclient!wa;)V") private void method2250(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) Buffer arg2) { if (arg1 == 1) { - this.anInt2857 = arg2.method2163(); + this.anInt2857 = arg2.g2(); } else if (arg1 == 2) { - this.anInt2852 = arg2.method2229(); - this.anInt2850 = arg2.method2229(); + this.anInt2852 = arg2.g1(); + this.anInt2850 = arg2.g1(); } } } diff --git a/client/src/main/java/Class85.java b/client/src/main/java/Class85.java index f0893d1..042ac08 100644 --- a/client/src/main/java/Class85.java +++ b/client/src/main/java/Class85.java @@ -18,7 +18,7 @@ public final class Class85 { @OriginalMember(owner = "client!kk", name = "a", descriptor = "(Lclient!wa;I)V") public final void method2651(@OriginalArg(0) Buffer arg0) { while (true) { - @Pc(9) int local9 = arg0.method2229(); + @Pc(9) int local9 = arg0.g1(); if (local9 == 0) { return; } @@ -29,9 +29,9 @@ public final class Class85 { @OriginalMember(owner = "client!kk", name = "a", descriptor = "(Lclient!wa;II)V") private void method2653(@OriginalArg(0) Buffer arg0, @OriginalArg(2) int arg1) { if (arg1 == 1) { - this.anInt3327 = arg0.method2163(); - this.anInt3318 = arg0.method2229(); - this.anInt3323 = arg0.method2229(); + this.anInt3327 = arg0.g2(); + this.anInt3318 = arg0.g1(); + this.anInt3323 = arg0.g1(); } } } diff --git a/client/src/main/java/Component.java b/client/src/main/java/Component.java index 8b68cdd..f960128 100644 --- a/client/src/main/java/Component.java +++ b/client/src/main/java/Component.java @@ -546,49 +546,49 @@ public final class Component { @OriginalMember(owner = "client!be", name = "a", descriptor = "(ILclient!wa;)V") public final void method481(@OriginalArg(1) Buffer arg0) { this.aBoolean32 = false; - this.anInt452 = arg0.method2229(); - this.anInt530 = arg0.method2229(); - this.anInt453 = arg0.method2163(); - this.anInt529 = arg0.method2213(); - this.anInt444 = arg0.method2213(); - this.anInt446 = arg0.method2163(); - this.anInt488 = arg0.method2163(); + this.anInt452 = arg0.g1(); + this.anInt530 = arg0.g1(); + this.anInt453 = arg0.g2(); + this.anInt529 = arg0.g2s(); + this.anInt444 = arg0.g2s(); + this.anInt446 = arg0.g2(); + this.anInt488 = arg0.g2(); this.aByte5 = 0; this.aByte3 = 0; this.aByte4 = 0; this.aByte2 = 0; - this.anInt476 = arg0.method2229(); - this.anInt456 = arg0.method2163(); + this.anInt476 = arg0.g1(); + this.anInt456 = arg0.g2(); if (this.anInt456 == 65535) { this.anInt456 = -1; } else { this.anInt456 += this.anInt507 & 0xFFFF0000; } - this.anInt470 = arg0.method2163(); + this.anInt470 = arg0.g2(); if (this.anInt470 == 65535) { this.anInt470 = -1; } - @Pc(109) int local109 = arg0.method2229(); + @Pc(109) int local109 = arg0.g1(); @Pc(125) int local125; if (local109 > 0) { this.anIntArray48 = new int[local109]; this.anIntArray43 = new int[local109]; for (local125 = 0; local125 < local109; local125++) { - this.anIntArray43[local125] = arg0.method2229(); - this.anIntArray48[local125] = arg0.method2163(); + this.anIntArray43[local125] = arg0.g1(); + this.anIntArray48[local125] = arg0.g2(); } } - local125 = arg0.method2229(); + local125 = arg0.g1(); @Pc(164) int local164; @Pc(175) int local175; @Pc(183) int local183; if (local125 > 0) { this.anIntArrayArray4 = new int[local125][]; for (local164 = 0; local164 < local125; local164++) { - local175 = arg0.method2163(); + local175 = arg0.g2(); this.anIntArrayArray4[local164] = new int[local175]; for (local183 = 0; local183 < local175; local183++) { - this.anIntArrayArray4[local164][local183] = arg0.method2163(); + this.anIntArrayArray4[local164][local183] = arg0.g2(); if (this.anIntArrayArray4[local164][local183] == 65535) { this.anIntArrayArray4[local164][local183] = -1; } @@ -596,12 +596,12 @@ public final class Component { } } if (this.anInt452 == 0) { - this.anInt491 = arg0.method2163(); - this.aBoolean17 = arg0.method2229() == 1; + this.anInt491 = arg0.g2(); + this.aBoolean17 = arg0.g1() == 1; } if (this.anInt452 == 1) { - arg0.method2163(); - arg0.method2229(); + arg0.g2(); + arg0.g1(); } local164 = 0; if (this.anInt452 == 2) { @@ -609,138 +609,138 @@ public final class Component { this.anIntArray50 = new int[this.anInt446 * this.anInt488]; this.anIntArray40 = new int[this.anInt488 * this.anInt446]; this.aByte5 = 3; - local175 = arg0.method2229(); - local183 = arg0.method2229(); + local175 = arg0.g1(); + local183 = arg0.g1(); if (local175 == 1) { local164 = 268435456; } - @Pc(312) int local312 = arg0.method2229(); + @Pc(312) int local312 = arg0.g1(); if (local183 == 1) { local164 |= 0x40000000; } if (local312 == 1) { local164 |= Integer.MIN_VALUE; } - @Pc(333) int local333 = arg0.method2229(); + @Pc(333) int local333 = arg0.g1(); if (local333 == 1) { local164 |= 0x20000000; } - this.anInt512 = arg0.method2229(); - this.anInt516 = arg0.method2229(); + this.anInt512 = arg0.g1(); + this.anInt516 = arg0.g1(); this.anIntArray47 = new int[20]; this.anIntArray41 = new int[20]; this.anIntArray36 = new int[20]; @Pc(364) int local364; for (local364 = 0; local364 < 20; local364++) { - @Pc(371) int local371 = arg0.method2229(); + @Pc(371) int local371 = arg0.g1(); if (local371 == 1) { - this.anIntArray41[local364] = arg0.method2213(); - this.anIntArray47[local364] = arg0.method2213(); - this.anIntArray36[local364] = arg0.method2174(); + this.anIntArray41[local364] = arg0.g2s(); + this.anIntArray47[local364] = arg0.g2s(); + this.anIntArray36[local364] = arg0.g4(); } else { this.anIntArray36[local364] = -1; } } this.aClass100Array19 = new JagString[5]; for (local364 = 0; local364 < 5; local364++) { - @Pc(418) JagString local418 = arg0.method2202(); - if (local418.method3120() > 0) { + @Pc(418) JagString local418 = arg0.gjstr(); + if (local418.length() > 0) { this.aClass100Array19[local364] = local418; local164 |= 0x1 << local364 + 23; } } } if (this.anInt452 == 3) { - this.aBoolean30 = arg0.method2229() == 1; + this.aBoolean30 = arg0.g1() == 1; } if (this.anInt452 == 4 || this.anInt452 == 1) { - this.anInt460 = arg0.method2229(); - this.anInt478 = arg0.method2229(); - this.anInt467 = arg0.method2229(); - this.anInt502 = arg0.method2163(); + this.anInt460 = arg0.g1(); + this.anInt478 = arg0.g1(); + this.anInt467 = arg0.g1(); + this.anInt502 = arg0.g2(); if (this.anInt502 == 65535) { this.anInt502 = -1; } - this.aBoolean28 = arg0.method2229() == 1; + this.aBoolean28 = arg0.g1() == 1; } if (this.anInt452 == 4) { - this.aClass100_84 = arg0.method2202(); - this.aClass100_82 = arg0.method2202(); + this.aClass100_84 = arg0.gjstr(); + this.aClass100_82 = arg0.gjstr(); } if (this.anInt452 == 1 || this.anInt452 == 3 || this.anInt452 == 4) { - this.anInt474 = arg0.method2174(); + this.anInt474 = arg0.g4(); } if (this.anInt452 == 3 || this.anInt452 == 4) { - this.anInt492 = arg0.method2174(); - this.anInt480 = arg0.method2174(); - this.anInt475 = arg0.method2174(); + this.anInt492 = arg0.g4(); + this.anInt480 = arg0.g4(); + this.anInt475 = arg0.g4(); } if (this.anInt452 == 5) { - this.anInt477 = arg0.method2174(); - this.anInt519 = arg0.method2174(); + this.anInt477 = arg0.g4(); + this.anInt519 = arg0.g4(); } if (this.anInt452 == 6) { this.anInt464 = 1; - this.anInt463 = arg0.method2163(); + this.anInt463 = arg0.g2(); this.anInt518 = 1; if (this.anInt463 == 65535) { this.anInt463 = -1; } - this.anInt461 = arg0.method2163(); + this.anInt461 = arg0.g2(); if (this.anInt461 == 65535) { this.anInt461 = -1; } - this.anInt522 = arg0.method2163(); + this.anInt522 = arg0.g2(); if (this.anInt522 == 65535) { this.anInt522 = -1; } - this.anInt462 = arg0.method2163(); + this.anInt462 = arg0.g2(); if (this.anInt462 == 65535) { this.anInt462 = -1; } - this.anInt443 = arg0.method2163(); - this.anInt450 = arg0.method2163(); - this.anInt524 = arg0.method2163(); + this.anInt443 = arg0.g2(); + this.anInt450 = arg0.g2(); + this.anInt524 = arg0.g2(); } if (this.anInt452 == 7) { this.aByte3 = 3; this.aByte5 = 3; this.anIntArray50 = new int[this.anInt488 * this.anInt446]; this.anIntArray40 = new int[this.anInt446 * this.anInt488]; - this.anInt460 = arg0.method2229(); - this.anInt502 = arg0.method2163(); + this.anInt460 = arg0.g1(); + this.anInt502 = arg0.g2(); if (this.anInt502 == 65535) { this.anInt502 = -1; } - this.aBoolean28 = arg0.method2229() == 1; - this.anInt474 = arg0.method2174(); - this.anInt512 = arg0.method2213(); - this.anInt516 = arg0.method2213(); - local175 = arg0.method2229(); + this.aBoolean28 = arg0.g1() == 1; + this.anInt474 = arg0.g4(); + this.anInt512 = arg0.g2s(); + this.anInt516 = arg0.g2s(); + local175 = arg0.g1(); if (local175 == 1) { local164 |= 0x40000000; } this.aClass100Array19 = new JagString[5]; for (local183 = 0; local183 < 5; local183++) { - @Pc(756) JagString local756 = arg0.method2202(); - if (local756.method3120() > 0) { + @Pc(756) JagString local756 = arg0.gjstr(); + if (local756.length() > 0) { this.aClass100Array19[local183] = local756; local164 |= 0x1 << local183 + 23; } } } if (this.anInt452 == 8) { - this.aClass100_84 = arg0.method2202(); + this.aClass100_84 = arg0.gjstr(); } if (this.anInt530 == 2 || this.anInt452 == 2) { - this.aClass100_86 = arg0.method2202(); - this.aClass100_85 = arg0.method2202(); - local175 = arg0.method2163() & 0x3F; + this.aClass100_86 = arg0.gjstr(); + this.aClass100_85 = arg0.gjstr(); + local175 = arg0.g2() & 0x3F; local164 |= local175 << 11; } if (this.anInt530 == 1 || this.anInt530 == 4 || this.anInt530 == 5 || this.anInt530 == 6) { - this.aClass100_89 = arg0.method2202(); - if (this.aClass100_89.method3120() == 0) { + this.aClass100_89 = arg0.gjstr(); + if (this.aClass100_89.length() == 0) { if (this.anInt530 == 1) { this.aClass100_89 = Static192.aClass100_849; } @@ -789,17 +789,17 @@ public final class Component { @OriginalMember(owner = "client!be", name = "b", descriptor = "(ILclient!wa;)[Ljava/lang/Object;") private Object[] method485(@OriginalArg(1) Buffer arg0) { - @Pc(11) int local11 = arg0.method2229(); + @Pc(11) int local11 = arg0.g1(); if (local11 == 0) { return null; } @Pc(26) Object[] local26 = new Object[local11]; for (@Pc(28) int local28 = 0; local28 < local11; local28++) { - @Pc(35) int local35 = arg0.method2229(); + @Pc(35) int local35 = arg0.g1(); if (local35 == 0) { - local26[local28] = Integer.valueOf(arg0.method2174()); + local26[local28] = Integer.valueOf(arg0.g4()); } else if (local35 == 1) { - local26[local28] = arg0.method2202(); + local26[local28] = arg0.gjstr(); } } this.aBoolean25 = true; @@ -808,13 +808,13 @@ public final class Component { @OriginalMember(owner = "client!be", name = "a", descriptor = "(Lclient!wa;Z)[I") private int[] method486(@OriginalArg(0) Buffer arg0) { - @Pc(9) int local9 = arg0.method2229(); + @Pc(9) int local9 = arg0.g1(); if (local9 == 0) { return null; } @Pc(19) int[] local19 = new int[local9]; for (@Pc(26) int local26 = 0; local26 < local9; local26++) { - local19[local26] = arg0.method2174(); + local19[local26] = arg0.g4(); } return local19; } @@ -976,97 +976,97 @@ public final class Component { @OriginalMember(owner = "client!be", name = "c", descriptor = "(ILclient!wa;)V") public final void method490(@OriginalArg(1) Buffer arg0) { this.aBoolean32 = true; - arg0.anInt2792++; - this.anInt452 = arg0.method2229(); + arg0.offset++; + this.anInt452 = arg0.g1(); if ((this.anInt452 & 0x80) != 0) { this.anInt452 &= 0x7F; - arg0.method2202(); + arg0.gjstr(); } - this.anInt453 = arg0.method2163(); - this.anInt529 = arg0.method2213(); - this.anInt444 = arg0.method2213(); - this.anInt446 = arg0.method2163(); - this.anInt488 = arg0.method2163(); - this.aByte5 = arg0.method2186(); - this.aByte3 = arg0.method2186(); - this.aByte4 = arg0.method2186(); - this.aByte2 = arg0.method2186(); - this.anInt456 = arg0.method2163(); + this.anInt453 = arg0.g2(); + this.anInt529 = arg0.g2s(); + this.anInt444 = arg0.g2s(); + this.anInt446 = arg0.g2(); + this.anInt488 = arg0.g2(); + this.aByte5 = arg0.g1s(); + this.aByte3 = arg0.g1s(); + this.aByte4 = arg0.g1s(); + this.aByte2 = arg0.g1s(); + this.anInt456 = arg0.g2(); if (this.anInt456 == 65535) { this.anInt456 = -1; } else { this.anInt456 = (this.anInt507 & 0xFFFF0000) + this.anInt456; } - this.aBoolean17 = arg0.method2229() == 1; + this.aBoolean17 = arg0.g1() == 1; if (this.anInt452 == 0) { - this.anInt486 = arg0.method2163(); - this.anInt491 = arg0.method2163(); - this.aBoolean29 = arg0.method2229() == 1; + this.anInt486 = arg0.g2(); + this.anInt491 = arg0.g2(); + this.aBoolean29 = arg0.g1() == 1; } @Pc(175) int local175; if (this.anInt452 == 5) { - this.anInt477 = arg0.method2174(); - this.anInt521 = arg0.method2163(); - local175 = arg0.method2229(); + this.anInt477 = arg0.g4(); + this.anInt521 = arg0.g2(); + local175 = arg0.g1(); this.aBoolean18 = (local175 & 0x2) != 0; this.aBoolean23 = (local175 & 0x1) != 0; - this.anInt476 = arg0.method2229(); - this.anInt514 = arg0.method2229(); - this.anInt513 = arg0.method2174(); - this.aBoolean21 = arg0.method2229() == 1; - this.aBoolean26 = arg0.method2229() == 1; + this.anInt476 = arg0.g1(); + this.anInt514 = arg0.g1(); + this.anInt513 = arg0.g4(); + this.aBoolean21 = arg0.g1() == 1; + this.aBoolean26 = arg0.g1() == 1; } if (this.anInt452 == 6) { this.anInt464 = 1; - this.anInt463 = arg0.method2163(); + this.anInt463 = arg0.g2(); if (this.anInt463 == 65535) { this.anInt463 = -1; } - this.anInt495 = arg0.method2213(); - this.anInt481 = arg0.method2213(); - this.anInt450 = arg0.method2163(); - this.anInt524 = arg0.method2163(); - this.anInt508 = arg0.method2163(); - this.anInt443 = arg0.method2163(); - this.anInt522 = arg0.method2163(); + this.anInt495 = arg0.g2s(); + this.anInt481 = arg0.g2s(); + this.anInt450 = arg0.g2(); + this.anInt524 = arg0.g2(); + this.anInt508 = arg0.g2(); + this.anInt443 = arg0.g2(); + this.anInt522 = arg0.g2(); if (this.anInt522 == 65535) { this.anInt522 = -1; } - this.aBoolean22 = arg0.method2229() == 1; - this.aShort11 = (short) arg0.method2163(); - this.aShort10 = (short) arg0.method2163(); - this.aBoolean34 = arg0.method2229() == 1; + this.aBoolean22 = arg0.g1() == 1; + this.aShort11 = (short) arg0.g2(); + this.aShort10 = (short) arg0.g2(); + this.aBoolean34 = arg0.g1() == 1; if (this.aByte5 != 0) { - this.anInt451 = arg0.method2163(); + this.anInt451 = arg0.g2(); } if (this.aByte3 != 0) { - this.anInt526 = arg0.method2163(); + this.anInt526 = arg0.g2(); } } if (this.anInt452 == 4) { - this.anInt502 = arg0.method2163(); + this.anInt502 = arg0.g2(); if (this.anInt502 == 65535) { this.anInt502 = -1; } - this.aClass100_84 = arg0.method2202(); - this.anInt467 = arg0.method2229(); - this.anInt460 = arg0.method2229(); - this.anInt478 = arg0.method2229(); - this.aBoolean28 = arg0.method2229() == 1; - this.anInt474 = arg0.method2174(); + this.aClass100_84 = arg0.gjstr(); + this.anInt467 = arg0.g1(); + this.anInt460 = arg0.g1(); + this.anInt478 = arg0.g1(); + this.aBoolean28 = arg0.g1() == 1; + this.anInt474 = arg0.g4(); } if (this.anInt452 == 3) { - this.anInt474 = arg0.method2174(); - this.aBoolean30 = arg0.method2229() == 1; - this.anInt476 = arg0.method2229(); + this.anInt474 = arg0.g4(); + this.aBoolean30 = arg0.g1() == 1; + this.anInt476 = arg0.g1(); } if (this.anInt452 == 9) { - this.anInt490 = arg0.method2229(); - this.anInt474 = arg0.method2174(); - this.aBoolean20 = arg0.method2229() == 1; + this.anInt490 = arg0.g1(); + this.anInt474 = arg0.g4(); + this.aBoolean20 = arg0.g1() == 1; } - local175 = arg0.method2220(); - @Pc(471) int local471 = arg0.method2229(); + local175 = arg0.g3(); + @Pc(471) int local471 = arg0.g1(); @Pc(497) int local497; if (local471 != 0) { this.anIntArray46 = new int[10]; @@ -1074,56 +1074,56 @@ public final class Component { this.aByteArray7 = new byte[10]; while (local471 != 0) { local497 = (local471 >> 4) - 1; - local471 = arg0.method2229() | local471 << 8; + local471 = arg0.g1() | local471 << 8; local471 &= 0xFFF; if (local471 == 4095) { this.anIntArray46[local497] = -1; } else { this.anIntArray46[local497] = local471; } - this.aByteArray8[local497] = arg0.method2186(); - this.aByteArray7[local497] = arg0.method2186(); - local471 = arg0.method2229(); + this.aByteArray8[local497] = arg0.g1s(); + this.aByteArray7[local497] = arg0.g1s(); + local471 = arg0.g1(); } } - this.aClass100_88 = arg0.method2202(); - local497 = arg0.method2229(); + this.aClass100_88 = arg0.gjstr(); + local497 = arg0.g1(); @Pc(557) int local557 = local497 & 0xF; @Pc(567) int local567; if (local557 > 0) { this.aClass100Array18 = new JagString[local557]; for (local567 = 0; local567 < local557; local567++) { - this.aClass100Array18[local567] = arg0.method2202(); + this.aClass100Array18[local567] = arg0.gjstr(); } } @Pc(584) int local584 = local497 >> 4; if (local584 > 0) { - local567 = arg0.method2229(); + local567 = arg0.g1(); this.anIntArray39 = new int[local567 + 1]; for (@Pc(599) int local599 = 0; local599 < this.anIntArray39.length; local599++) { this.anIntArray39[local599] = -1; } - this.anIntArray39[local567] = arg0.method2163(); + this.anIntArray39[local567] = arg0.g2(); } if (local584 > 1) { - local567 = arg0.method2229(); - this.anIntArray39[local567] = arg0.method2163(); + local567 = arg0.g1(); + this.anIntArray39[local567] = arg0.g2(); } - this.anInt472 = arg0.method2229(); - this.anInt447 = arg0.method2229(); - this.aBoolean27 = arg0.method2229() == 1; + this.anInt472 = arg0.g1(); + this.anInt447 = arg0.g1(); + this.aBoolean27 = arg0.g1() == 1; local567 = -1; - this.aClass100_86 = arg0.method2202(); + this.aClass100_86 = arg0.gjstr(); if (Static199.method3594(local175) != 0) { - local567 = arg0.method2163(); - this.anInt499 = arg0.method2163(); + local567 = arg0.g2(); + this.anInt499 = arg0.g2(); if (local567 == 65535) { local567 = -1; } if (this.anInt499 == 65535) { this.anInt499 = -1; } - this.anInt484 = arg0.method2163(); + this.anInt484 = arg0.g2(); if (this.anInt484 == 65535) { this.anInt484 = -1; } diff --git a/client/src/main/java/EnumType.java b/client/src/main/java/EnumType.java index 033a0e2..016e7bb 100644 --- a/client/src/main/java/EnumType.java +++ b/client/src/main/java/EnumType.java @@ -27,23 +27,23 @@ public final class EnumType extends SecondaryNode { @OriginalMember(owner = "client!ml", name = "a", descriptor = "(ILclient!wa;B)V") private void method3084(@OriginalArg(0) int arg0, @OriginalArg(1) Buffer arg1) { if (arg0 == 1) { - this.anInt3957 = arg1.method2229(); + this.anInt3957 = arg1.g1(); } else if (arg0 == 2) { - this.anInt3950 = arg1.method2229(); + this.anInt3950 = arg1.g1(); } else if (arg0 == 3) { - this.aClass100_766 = arg1.method2202(); + this.aClass100_766 = arg1.gjstr(); } else if (arg0 == 4) { - this.anInt3960 = arg1.method2174(); + this.anInt3960 = arg1.g4(); } else if (arg0 == 5 || arg0 == 6) { - @Pc(41) int local41 = arg1.method2163(); + @Pc(41) int local41 = arg1.g2(); this.aClass133_16 = new HashTable(Static165.method3164(local41)); for (@Pc(51) int local51 = 0; local51 < local41; local51++) { - @Pc(58) int local58 = arg1.method2174(); + @Pc(58) int local58 = arg1.g4(); @Pc(70) Node local70; if (arg0 == 5) { - local70 = new StringNode(arg1.method2202()); + local70 = new StringNode(arg1.gjstr()); } else { - local70 = new IntNode(arg1.method2174()); + local70 = new IntNode(arg1.g4()); } this.aClass133_16.method3862(local70, (long) local58); } @@ -119,7 +119,7 @@ public final class EnumType extends SecondaryNode { @OriginalMember(owner = "client!ml", name = "a", descriptor = "(Lclient!wa;I)V") public final void method3094(@OriginalArg(0) Buffer arg0) { while (true) { - @Pc(9) int local9 = arg0.method2229(); + @Pc(9) int local9 = arg0.g1(); if (local9 == 0) { return; } diff --git a/client/src/main/java/Environment.java b/client/src/main/java/Environment.java index 32f7a4f..25c2471 100644 --- a/client/src/main/java/Environment.java +++ b/client/src/main/java/Environment.java @@ -48,45 +48,45 @@ public final class Environment { @OriginalMember(owner = "client!li", name = "", descriptor = "(Lclient!wa;)V") public Environment(@OriginalArg(0) Buffer arg0) { - @Pc(7) int local7 = arg0.method2229(); + @Pc(7) int local7 = arg0.g1(); if ((local7 & 0x1) == 0) { this.anInt3526 = Static161.anInt3923; } else { - this.anInt3526 = arg0.method2174(); + this.anInt3526 = arg0.g4(); } if ((local7 & 0x2) == 0) { this.aFloat16 = 1.1523438F; } else { - this.aFloat16 = (float) arg0.method2163() / 256.0F; + this.aFloat16 = (float) arg0.g2() / 256.0F; } if ((local7 & 0x4) == 0) { this.aFloat18 = 0.69921875F; } else { - this.aFloat18 = (float) arg0.method2163() / 256.0F; + this.aFloat18 = (float) arg0.g2() / 256.0F; } if ((local7 & 0x8) == 0) { this.aFloat17 = 1.2F; } else { - this.aFloat17 = (float) arg0.method2163() / 256.0F; + this.aFloat17 = (float) arg0.g2() / 256.0F; } if ((local7 & 0x10) == 0) { this.anInt3527 = -50; this.anInt3530 = -50; this.anInt3528 = -60; } else { - this.anInt3530 = arg0.method2213(); - this.anInt3528 = arg0.method2213(); - this.anInt3527 = arg0.method2213(); + this.anInt3530 = arg0.g2s(); + this.anInt3528 = arg0.g2s(); + this.anInt3527 = arg0.g2s(); } if ((local7 & 0x20) == 0) { this.anInt3525 = Static161.anInt3922; } else { - this.anInt3525 = arg0.method2174(); + this.anInt3525 = arg0.g4(); } if ((local7 & 0x40) == 0) { this.anInt3529 = 0; } else { - this.anInt3529 = arg0.method2163(); + this.anInt3529 = arg0.g2(); } } } diff --git a/client/src/main/java/FloType.java b/client/src/main/java/FloType.java index 1e2104e..cc9dd60 100644 --- a/client/src/main/java/FloType.java +++ b/client/src/main/java/FloType.java @@ -39,7 +39,7 @@ public final class FloType { @OriginalMember(owner = "client!wl", name = "a", descriptor = "(ILclient!wa;I)V") public final void method4669(@OriginalArg(1) Buffer arg0, @OriginalArg(2) int arg1) { while (true) { - @Pc(5) int local5 = arg0.method2229(); + @Pc(5) int local5 = arg0.g1(); if (local5 == 0) { return; } @@ -50,32 +50,32 @@ public final class FloType { @OriginalMember(owner = "client!wl", name = "a", descriptor = "(IILclient!wa;I)V") private void method4674(@OriginalArg(1) int arg0, @OriginalArg(2) Buffer arg1, @OriginalArg(3) int arg2) { if (arg0 == 1) { - this.anInt5899 = Static15.method492(arg1.method2220()); + this.anInt5899 = Static15.method492(arg1.g3()); } else if (arg0 == 2) { - this.anInt5892 = arg1.method2229(); + this.anInt5892 = arg1.g1(); } else if (arg0 == 3) { - this.anInt5892 = arg1.method2163(); + this.anInt5892 = arg1.g2(); if (this.anInt5892 == 65535) { this.anInt5892 = -1; } } else if (arg0 == 5) { this.aBoolean312 = false; } else if (arg0 == 7) { - this.anInt5894 = Static15.method492(arg1.method2220()); + this.anInt5894 = Static15.method492(arg1.g3()); } else if (arg0 == 8) { Static26.anInt865 = arg2; } else if (arg0 == 9) { - this.anInt5885 = arg1.method2163(); + this.anInt5885 = arg1.g2(); } else if (arg0 == 10) { this.aBoolean311 = false; } else if (arg0 == 11) { - this.anInt5897 = arg1.method2229(); + this.anInt5897 = arg1.g1(); } else if (arg0 == 12) { this.aBoolean310 = true; } else if (arg0 == 13) { - this.anInt5889 = arg1.method2220(); + this.anInt5889 = arg1.g3(); } else if (arg0 == 14) { - this.anInt5898 = arg1.method2229(); + this.anInt5898 = arg1.g1(); } } } diff --git a/client/src/main/java/FluType.java b/client/src/main/java/FluType.java index bdce00e..12213a0 100644 --- a/client/src/main/java/FluType.java +++ b/client/src/main/java/FluType.java @@ -94,7 +94,7 @@ public final class FluType { @OriginalMember(owner = "client!ni", name = "a", descriptor = "(ILclient!wa;I)V") public final void method3217(@OriginalArg(0) int arg0, @OriginalArg(1) Buffer arg1) { while (true) { - @Pc(7) int local7 = arg1.method2229(); + @Pc(7) int local7 = arg1.g1(); if (local7 == 0) { return; } @@ -105,15 +105,15 @@ public final class FluType { @OriginalMember(owner = "client!ni", name = "a", descriptor = "(BILclient!wa;I)V") private void method3220(@OriginalArg(1) int arg0, @OriginalArg(2) Buffer arg1, @OriginalArg(3) int arg2) { if (arg0 == 1) { - this.anInt4147 = arg1.method2220(); + this.anInt4147 = arg1.g3(); this.method3216(this.anInt4147); } else if (arg0 == 2) { - this.anInt4155 = arg1.method2163(); + this.anInt4155 = arg1.g2(); if (this.anInt4155 == 65535) { this.anInt4155 = -1; } } else if (arg0 == 3) { - this.anInt4156 = arg1.method2163(); + this.anInt4156 = arg1.g2(); } else if (arg0 == 4) { this.aBoolean198 = false; } diff --git a/client/src/main/java/Font.java b/client/src/main/java/Font.java index 255943c..3fb798b 100644 --- a/client/src/main/java/Font.java +++ b/client/src/main/java/Font.java @@ -76,7 +76,7 @@ public abstract class Font extends SecondaryNode { @Pc(4) int local4 = arg2 - this.anInt3626; @Pc(6) int local6 = -1; @Pc(8) int local8 = 0; - @Pc(12) int local12 = arg0.method3120(); + @Pc(12) int local12 = arg0.length(); for (@Pc(14) int local14 = 0; local14 < local12; local14++) { @Pc(22) int local22 = arg0.method3149(local14); if (local22 == 60) { @@ -204,7 +204,7 @@ public abstract class Font extends SecondaryNode { @Pc(5) int local5 = -1; @Pc(7) int local7 = 0; @Pc(9) int local9 = 0; - @Pc(13) int local13 = arg0.method3120(); + @Pc(13) int local13 = arg0.length(); for (@Pc(15) int local15 = 0; local15 < local13; local15++) { @Pc(23) int local23 = arg0.method3149(local15); if (local23 == 60) { @@ -261,7 +261,7 @@ public abstract class Font extends SecondaryNode { } arg3.setSeed((long) arg4); this.method2877(16777215, 0, (arg3.nextInt() & 0x1F) + 192); - @Pc(21) int local21 = arg0.method3120(); + @Pc(21) int local21 = arg0.length(); @Pc(24) int[] local24 = new int[local21]; @Pc(26) int local26 = 0; for (@Pc(28) int local28 = 0; local28 < local21; local28++) { @@ -332,7 +332,7 @@ public abstract class Font extends SecondaryNode { private void method2866(@OriginalArg(0) JagString arg0, @OriginalArg(1) int arg1) { @Pc(1) int local1 = 0; @Pc(3) boolean local3 = false; - @Pc(7) int local7 = arg0.method3120(); + @Pc(7) int local7 = arg0.length(); for (@Pc(9) int local9 = 0; local9 < local7; local9++) { @Pc(17) int local17 = arg0.method3149(local9); if (local17 == 60) { @@ -362,7 +362,7 @@ public abstract class Font extends SecondaryNode { @Pc(19) int local19 = -1; @Pc(21) int local21 = 0; @Pc(23) int local23 = 0; - @Pc(27) int local27 = arg0.method3120(); + @Pc(27) int local27 = arg0.length(); for (@Pc(29) int local29 = 0; local29 < local27; local29++) { @Pc(37) int local37 = arg0.method3149(local29); if (local37 == 60) { @@ -376,13 +376,13 @@ public abstract class Font extends SecondaryNode { Static218.aClass100_720.method3152(62); if (local57.method3108(Static218.aClass100_713)) { if (arg2[local23] == null) { - arg2[local23] = Static218.aClass100_720.method3143().method3137(Static218.aClass100_720.method3120(), local11); + arg2[local23] = Static218.aClass100_720.method3143().method3137(Static218.aClass100_720.length(), local11); } else { arg2[local23].method3133(0); - arg2[local23].method3122(Static218.aClass100_720, local11, Static218.aClass100_720.method3120()); + arg2[local23].method3122(Static218.aClass100_720, local11, Static218.aClass100_720.length()); } local23++; - local11 = Static218.aClass100_720.method3120(); + local11 = Static218.aClass100_720.length(); local9 = 0; local13 = -1; local21 = 0; @@ -454,7 +454,7 @@ public abstract class Font extends SecondaryNode { local21 = local37; } if (local37 == 32) { - local13 = Static218.aClass100_720.method3120(); + local13 = Static218.aClass100_720.length(); local15 = local9; local17 = 1; } @@ -472,19 +472,19 @@ public abstract class Font extends SecondaryNode { local21 = 0; } if (local37 == 45) { - local13 = Static218.aClass100_720.method3120(); + local13 = Static218.aClass100_720.length(); local15 = local9; local17 = 0; } } } } - if (Static218.aClass100_720.method3120() > local11) { + if (Static218.aClass100_720.length() > local11) { if (arg2[local23] == null) { - arg2[local23] = Static218.aClass100_720.method3143().method3137(Static218.aClass100_720.method3120(), local11); + arg2[local23] = Static218.aClass100_720.method3143().method3137(Static218.aClass100_720.length(), local11); } else { arg2[local23].method3133(0); - arg2[local23] = arg2[local23].method3122(Static218.aClass100_720, local11, Static218.aClass100_720.method3120()); + arg2[local23] = arg2[local23].method3122(Static218.aClass100_720, local11, Static218.aClass100_720.length()); } local23++; } @@ -501,7 +501,7 @@ public abstract class Font extends SecondaryNode { if (local13 < 0.0D) { local13 = 0.0D; } - @Pc(23) int local23 = arg0.method3120(); + @Pc(23) int local23 = arg0.length(); @Pc(26) int[] local26 = new int[local23]; for (@Pc(28) int local28 = 0; local28 < local23; local28++) { local26[local28] = (int) (Math.sin((double) local28 / 1.5D + (double) arg4 / 1.0D) * local13); @@ -567,7 +567,7 @@ public abstract class Font extends SecondaryNode { return; } this.method2874(arg3, 0); - @Pc(10) int local10 = arg0.method3120(); + @Pc(10) int local10 = arg0.length(); @Pc(13) int[] local13 = new int[local10]; @Pc(16) int[] local16 = new int[local10]; for (@Pc(18) int local18 = 0; local18 < local10; local18++) { @@ -583,7 +583,7 @@ public abstract class Font extends SecondaryNode { return; } this.method2874(arg3, 0); - @Pc(10) int local10 = arg0.method3120(); + @Pc(10) int local10 = arg0.length(); @Pc(13) int[] local13 = new int[local10]; for (@Pc(15) int local15 = 0; local15 < local10; local15++) { local13[local15] = (int) (Math.sin((double) local15 / 2.0D + (double) arg4 / 5.0D) * 5.0D); @@ -700,7 +700,7 @@ public abstract class Font extends SecondaryNode { } arg9.setSeed((long) arg10); this.method2877(arg5, arg6, (arg9.nextInt() & 0x1F) + 192); - @Pc(21) int local21 = arg0.method3120(); + @Pc(21) int local21 = arg0.length(); @Pc(24) int[] local24 = new int[local21]; @Pc(26) int local26 = 0; @Pc(28) int local28; @@ -744,7 +744,7 @@ public abstract class Font extends SecondaryNode { @Pc(6) int local6 = -1; @Pc(8) int local8 = 0; @Pc(10) int local10 = 0; - @Pc(14) int local14 = arg0.method3120(); + @Pc(14) int local14 = arg0.length(); for (@Pc(16) int local16 = 0; local16 < local14; local16++) { @Pc(24) int local24 = arg0.method3149(local16); if (local24 == 60) { diff --git a/client/src/main/java/GlModel.java b/client/src/main/java/GlModel.java index de4b032..110ff77 100644 --- a/client/src/main/java/GlModel.java +++ b/client/src/main/java/GlModel.java @@ -1672,28 +1672,28 @@ public final class GlModel extends Model { @OriginalMember(owner = "client!td", name = "q", descriptor = "()V") private void method4103() { - if (Static237.aClass3_Sub15_8.aByteArray40.length < this.anInt5296 * 12) { + if (Static237.aClass3_Sub15_8.data.length < this.anInt5296 * 12) { Static237.aClass3_Sub15_8 = new Buffer((this.anInt5296 + 100) * 12); } else { - Static237.aClass3_Sub15_8.anInt2792 = 0; + Static237.aClass3_Sub15_8.offset = 0; } @Pc(25) int local25; if (Static239.aBoolean263) { for (local25 = 0; local25 < this.anInt5297; local25++) { - Static237.aClass3_Sub15_8.method2164(this.aShortArray77[local25]); - Static237.aClass3_Sub15_8.method2164(this.aShortArray82[local25]); - Static237.aClass3_Sub15_8.method2164(this.aShortArray83[local25]); + Static237.aClass3_Sub15_8.p4(this.aShortArray77[local25]); + Static237.aClass3_Sub15_8.p4(this.aShortArray82[local25]); + Static237.aClass3_Sub15_8.p4(this.aShortArray83[local25]); } } else { for (local25 = 0; local25 < this.anInt5297; local25++) { - Static237.aClass3_Sub15_8.method2183(this.aShortArray77[local25]); - Static237.aClass3_Sub15_8.method2183(this.aShortArray82[local25]); - Static237.aClass3_Sub15_8.method2183(this.aShortArray83[local25]); + Static237.aClass3_Sub15_8.p4le(this.aShortArray77[local25]); + Static237.aClass3_Sub15_8.p4le(this.aShortArray82[local25]); + Static237.aClass3_Sub15_8.p4le(this.aShortArray83[local25]); } } if (!Static239.aBoolean271) { - @Pc(115) ByteBuffer local115 = ByteBuffer.allocateDirect(Static237.aClass3_Sub15_8.anInt2792); - local115.put(Static237.aClass3_Sub15_8.aByteArray40, 0, Static237.aClass3_Sub15_8.anInt2792); + @Pc(115) ByteBuffer local115 = ByteBuffer.allocateDirect(Static237.aClass3_Sub15_8.offset); + local115.put(Static237.aClass3_Sub15_8.data, 0, Static237.aClass3_Sub15_8.offset); local115.flip(); this.aClass127_5.aBoolean235 = true; this.aClass127_5.aByteBuffer8 = local115; @@ -1701,7 +1701,7 @@ public final class GlModel extends Model { return; } @Pc(88) GlVertexBufferObject local88 = new GlVertexBufferObject(); - @Pc(95) ByteBuffer local95 = ByteBuffer.wrap(Static237.aClass3_Sub15_8.aByteArray40, 0, Static237.aClass3_Sub15_8.anInt2792); + @Pc(95) ByteBuffer local95 = ByteBuffer.wrap(Static237.aClass3_Sub15_8.data, 0, Static237.aClass3_Sub15_8.offset); local88.method4519(local95); this.aClass127_5.aBoolean235 = true; this.aClass127_5.aByteBuffer8 = null; @@ -2021,10 +2021,10 @@ public final class GlModel extends Model { if (local1 == 0) { return; } - if (Static237.aClass3_Sub15_8.aByteArray40.length < this.anInt5296 * local1) { + if (Static237.aClass3_Sub15_8.data.length < this.anInt5296 * local1) { Static237.aClass3_Sub15_8 = new Buffer((this.anInt5296 + 100) * local1); } else { - Static237.aClass3_Sub15_8.anInt2792 = 0; + Static237.aClass3_Sub15_8.offset = 0; } @Pc(60) int local60; @Pc(71) int local71; @@ -2047,10 +2047,10 @@ public final class GlModel extends Model { if (local109 == -1) { break; } - Static237.aClass3_Sub15_8.anInt2792 = local109 * local1; - Static237.aClass3_Sub15_8.method2164(local71); - Static237.aClass3_Sub15_8.method2164(local78); - Static237.aClass3_Sub15_8.method2164(local85); + Static237.aClass3_Sub15_8.offset = local109 * local1; + Static237.aClass3_Sub15_8.p4(local71); + Static237.aClass3_Sub15_8.p4(local78); + Static237.aClass3_Sub15_8.p4(local85); } } } else { @@ -2065,10 +2065,10 @@ public final class GlModel extends Model { if (local109 == -1) { break; } - Static237.aClass3_Sub15_8.anInt2792 = local109 * local1; - Static237.aClass3_Sub15_8.method2183(local71); - Static237.aClass3_Sub15_8.method2183(local78); - Static237.aClass3_Sub15_8.method2183(local85); + Static237.aClass3_Sub15_8.offset = local109 * local1; + Static237.aClass3_Sub15_8.p4le(local71); + Static237.aClass3_Sub15_8.p4le(local78); + Static237.aClass3_Sub15_8.p4le(local85); } } } @@ -2077,12 +2077,12 @@ public final class GlModel extends Model { if (Static178.aBoolean202) { for (local60 = 0; local60 < this.anInt5297; local60++) { local71 = Static237.method4096(this.aShortArray75[local60], this.aShortArray80[local60], this.aShort29, this.aByteArray71[local60]); - Static237.aClass3_Sub15_8.anInt2792 = this.aClass127_1.anInt4777 + this.aShortArray77[local60] * local1; - Static237.aClass3_Sub15_8.method2164(local71); - Static237.aClass3_Sub15_8.anInt2792 = this.aClass127_1.anInt4777 + this.aShortArray82[local60] * local1; - Static237.aClass3_Sub15_8.method2164(local71); - Static237.aClass3_Sub15_8.anInt2792 = this.aClass127_1.anInt4777 + this.aShortArray83[local60] * local1; - Static237.aClass3_Sub15_8.method2164(local71); + Static237.aClass3_Sub15_8.offset = this.aClass127_1.anInt4777 + this.aShortArray77[local60] * local1; + Static237.aClass3_Sub15_8.p4(local71); + Static237.aClass3_Sub15_8.offset = this.aClass127_1.anInt4777 + this.aShortArray82[local60] * local1; + Static237.aClass3_Sub15_8.p4(local71); + Static237.aClass3_Sub15_8.offset = this.aClass127_1.anInt4777 + this.aShortArray83[local60] * local1; + Static237.aClass3_Sub15_8.p4(local71); } } else { local60 = (int) Static161.aFloatArray18[0]; @@ -2149,12 +2149,12 @@ public final class GlModel extends Model { @Pc(562) int local562 = Static237.method4096(this.aShortArray75[local99], this.aShortArray80[local99], local281, this.aByteArray71[local99]); @Pc(577) int local577 = Static237.method4096(this.aShortArray75[local99], this.aShortArray80[local99], local375, this.aByteArray71[local99]); @Pc(592) int local592 = Static237.method4096(this.aShortArray75[local99], this.aShortArray80[local99], local469, this.aByteArray71[local99]); - Static237.aClass3_Sub15_8.anInt2792 = this.aClass127_1.anInt4777 + local270 * local1; - Static237.aClass3_Sub15_8.method2164(local562); - Static237.aClass3_Sub15_8.anInt2792 = this.aClass127_1.anInt4777 + local364 * local1; - Static237.aClass3_Sub15_8.method2164(local577); - Static237.aClass3_Sub15_8.anInt2792 = this.aClass127_1.anInt4777 + local458 * local1; - Static237.aClass3_Sub15_8.method2164(local592); + Static237.aClass3_Sub15_8.offset = this.aClass127_1.anInt4777 + local270 * local1; + Static237.aClass3_Sub15_8.p4(local562); + Static237.aClass3_Sub15_8.offset = this.aClass127_1.anInt4777 + local364 * local1; + Static237.aClass3_Sub15_8.p4(local577); + Static237.aClass3_Sub15_8.offset = this.aClass127_1.anInt4777 + local458 * local1; + Static237.aClass3_Sub15_8.p4(local592); } this.aShortArray76 = null; this.aShortArray79 = null; @@ -2164,62 +2164,62 @@ public final class GlModel extends Model { if (arg3) { @Pc(723) float local723 = 3.0F / (float) this.aShort28; @Pc(734) float local734 = 3.0F / (float) (this.aShort28 + this.aShort28 / 2); - Static237.aClass3_Sub15_8.anInt2792 = this.aClass127_2.anInt4777; + Static237.aClass3_Sub15_8.offset = this.aClass127_2.anInt4777; @Pc(752) short local752; @Pc(790) float local790; if (Static239.aBoolean263) { for (local78 = 0; local78 < this.anInt5296; local78++) { local752 = this.aShortArray86[local78]; if (local752 == 0) { - Static237.aClass3_Sub15_8.method2227((float) this.aShortArray76[local78] * local734); - Static237.aClass3_Sub15_8.method2227((float) this.aShortArray79[local78] * local734); - Static237.aClass3_Sub15_8.method2227((float) this.aShortArray85[local78] * local734); + Static237.aClass3_Sub15_8.pFloat((float) this.aShortArray76[local78] * local734); + Static237.aClass3_Sub15_8.pFloat((float) this.aShortArray79[local78] * local734); + Static237.aClass3_Sub15_8.pFloat((float) this.aShortArray85[local78] * local734); } else { local790 = local723 / (float) local752; - Static237.aClass3_Sub15_8.method2227((float) this.aShortArray76[local78] * local790); - Static237.aClass3_Sub15_8.method2227((float) this.aShortArray79[local78] * local790); - Static237.aClass3_Sub15_8.method2227((float) this.aShortArray85[local78] * local790); + Static237.aClass3_Sub15_8.pFloat((float) this.aShortArray76[local78] * local790); + Static237.aClass3_Sub15_8.pFloat((float) this.aShortArray79[local78] * local790); + Static237.aClass3_Sub15_8.pFloat((float) this.aShortArray85[local78] * local790); } - Static237.aClass3_Sub15_8.anInt2792 += local1 - 12; + Static237.aClass3_Sub15_8.offset += local1 - 12; } } else { for (local78 = 0; local78 < this.anInt5296; local78++) { local752 = this.aShortArray86[local78]; if (local752 == 0) { - Static237.aClass3_Sub15_8.method2188((float) this.aShortArray76[local78] * local734); - Static237.aClass3_Sub15_8.method2188((float) this.aShortArray79[local78] * local734); - Static237.aClass3_Sub15_8.method2188((float) this.aShortArray85[local78] * local734); + Static237.aClass3_Sub15_8.gFloat((float) this.aShortArray76[local78] * local734); + Static237.aClass3_Sub15_8.gFloat((float) this.aShortArray79[local78] * local734); + Static237.aClass3_Sub15_8.gFloat((float) this.aShortArray85[local78] * local734); } else { local790 = local723 / (float) local752; - Static237.aClass3_Sub15_8.method2188((float) this.aShortArray76[local78] * local790); - Static237.aClass3_Sub15_8.method2188((float) this.aShortArray79[local78] * local790); - Static237.aClass3_Sub15_8.method2188((float) this.aShortArray85[local78] * local790); + Static237.aClass3_Sub15_8.gFloat((float) this.aShortArray76[local78] * local790); + Static237.aClass3_Sub15_8.gFloat((float) this.aShortArray79[local78] * local790); + Static237.aClass3_Sub15_8.gFloat((float) this.aShortArray85[local78] * local790); } - Static237.aClass3_Sub15_8.anInt2792 += local1 - 12; + Static237.aClass3_Sub15_8.offset += local1 - 12; } } } if (arg4) { - Static237.aClass3_Sub15_8.anInt2792 = this.aClass127_3.anInt4777; + Static237.aClass3_Sub15_8.offset = this.aClass127_3.anInt4777; if (Static239.aBoolean263) { for (local60 = 0; local60 < this.anInt5296; local60++) { - Static237.aClass3_Sub15_8.method2227(this.aFloatArray25[local60]); - Static237.aClass3_Sub15_8.method2227(this.aFloatArray26[local60]); - Static237.aClass3_Sub15_8.anInt2792 += local1 - 8; + Static237.aClass3_Sub15_8.pFloat(this.aFloatArray25[local60]); + Static237.aClass3_Sub15_8.pFloat(this.aFloatArray26[local60]); + Static237.aClass3_Sub15_8.offset += local1 - 8; } } else { for (local60 = 0; local60 < this.anInt5296; local60++) { - Static237.aClass3_Sub15_8.method2188(this.aFloatArray25[local60]); - Static237.aClass3_Sub15_8.method2188(this.aFloatArray26[local60]); - Static237.aClass3_Sub15_8.anInt2792 += local1 - 8; + Static237.aClass3_Sub15_8.gFloat(this.aFloatArray25[local60]); + Static237.aClass3_Sub15_8.gFloat(this.aFloatArray26[local60]); + Static237.aClass3_Sub15_8.offset += local1 - 8; } } } - Static237.aClass3_Sub15_8.anInt2792 = local1 * this.anInt5296; + Static237.aClass3_Sub15_8.offset = local1 * this.anInt5296; @Pc(1007) ByteBuffer local1007; if (arg0) { if (Static239.aBoolean273) { - local1007 = ByteBuffer.wrap(Static237.aClass3_Sub15_8.aByteArray40, 0, Static237.aClass3_Sub15_8.anInt2792); + local1007 = ByteBuffer.wrap(Static237.aClass3_Sub15_8.data, 0, Static237.aClass3_Sub15_8.offset); if (this.aClass155_5 == null) { this.aClass155_5 = new GlVertexBufferObject(true); this.aClass155_5.method4519(local1007); @@ -2251,12 +2251,12 @@ public final class GlModel extends Model { this.aClass127_3.anInt4782 = local1; } } else { - if (Static237.aByteBuffer9 == null || Static237.aByteBuffer9.capacity() < Static237.aClass3_Sub15_8.anInt2792) { - Static237.aByteBuffer9 = ByteBuffer.allocateDirect(Static237.aClass3_Sub15_8.anInt2792 + local1 * 100); + if (Static237.aByteBuffer9 == null || Static237.aByteBuffer9.capacity() < Static237.aClass3_Sub15_8.offset) { + Static237.aByteBuffer9 = ByteBuffer.allocateDirect(Static237.aClass3_Sub15_8.offset + local1 * 100); } else { Static237.aByteBuffer9.clear(); } - Static237.aByteBuffer9.put(Static237.aClass3_Sub15_8.aByteArray40, 0, Static237.aClass3_Sub15_8.anInt2792); + Static237.aByteBuffer9.put(Static237.aClass3_Sub15_8.data, 0, Static237.aClass3_Sub15_8.offset); Static237.aByteBuffer9.flip(); if (arg1) { this.aClass127_4.aBoolean235 = true; @@ -2285,7 +2285,7 @@ public final class GlModel extends Model { } } else if (Static239.aBoolean271) { @Pc(1211) GlVertexBufferObject local1211 = new GlVertexBufferObject(); - @Pc(1218) ByteBuffer local1218 = ByteBuffer.wrap(Static237.aClass3_Sub15_8.aByteArray40, 0, Static237.aClass3_Sub15_8.anInt2792); + @Pc(1218) ByteBuffer local1218 = ByteBuffer.wrap(Static237.aClass3_Sub15_8.data, 0, Static237.aClass3_Sub15_8.offset); local1211.method4519(local1218); if (arg1) { this.aClass127_4.aBoolean235 = true; @@ -2312,8 +2312,8 @@ public final class GlModel extends Model { this.aClass127_3.anInt4782 = local1; } } else { - local1007 = ByteBuffer.allocateDirect(Static237.aClass3_Sub15_8.anInt2792); - local1007.put(Static237.aClass3_Sub15_8.aByteArray40, 0, Static237.aClass3_Sub15_8.anInt2792); + local1007 = ByteBuffer.allocateDirect(Static237.aClass3_Sub15_8.offset); + local1007.put(Static237.aClass3_Sub15_8.data, 0, Static237.aClass3_Sub15_8.offset); local1007.flip(); if (arg1) { this.aClass127_4.aBoolean235 = true; diff --git a/client/src/main/java/GlTexture.java b/client/src/main/java/GlTexture.java index cabebcd..67c4e2e 100644 --- a/client/src/main/java/GlTexture.java +++ b/client/src/main/java/GlTexture.java @@ -57,15 +57,15 @@ public final class GlTexture extends SecondaryNode { @OriginalMember(owner = "client!uh", name = "", descriptor = "(Lclient!wa;)V") public GlTexture(@OriginalArg(0) Buffer arg0) { this.aClass88_1 = new Texture(arg0); - this.aBoolean286 = arg0.method2229() == 1; - this.aBoolean288 = arg0.method2229() == 1; - this.aBoolean285 = arg0.method2229() == 1; - this.aBoolean284 = arg0.method2229() == 1; - @Pc(68) int local68 = arg0.method2229() & 0x3; - this.anInt5485 = arg0.method2186(); - this.anInt5497 = arg0.method2186(); - @Pc(82) int local82 = arg0.method2229(); - arg0.method2229(); + this.aBoolean286 = arg0.g1() == 1; + this.aBoolean288 = arg0.g1() == 1; + this.aBoolean285 = arg0.g1() == 1; + this.aBoolean284 = arg0.g1() == 1; + @Pc(68) int local68 = arg0.g1() & 0x3; + this.anInt5485 = arg0.g1s(); + this.anInt5497 = arg0.g1s(); + @Pc(82) int local82 = arg0.g1(); + arg0.g1(); if (local68 == 1) { this.anInt5486 = 2; } else if (local68 == 2) { diff --git a/client/src/main/java/GzipDecompressor.java b/client/src/main/java/GzipDecompressor.java index b64f91b..169ce4e 100644 --- a/client/src/main/java/GzipDecompressor.java +++ b/client/src/main/java/GzipDecompressor.java @@ -21,14 +21,14 @@ public final class GzipDecompressor { @OriginalMember(owner = "client!ha", name = "a", descriptor = "([BLclient!wa;Z)V") public final void method1842(@OriginalArg(0) byte[] arg0, @OriginalArg(1) Buffer arg1) { - if (arg1.aByteArray40[arg1.anInt2792] != 31 || arg1.aByteArray40[arg1.anInt2792 + 1] != -117) { + if (arg1.data[arg1.offset] != 31 || arg1.data[arg1.offset + 1] != -117) { throw new RuntimeException("Invalid GZIP header!"); } if (this.anInflater1 == null) { this.anInflater1 = new Inflater(true); } try { - this.anInflater1.setInput(arg1.aByteArray40, arg1.anInt2792 + 10, -8 - (arg1.anInt2792 + 10) + arg1.aByteArray40.length); + this.anInflater1.setInput(arg1.data, arg1.offset + 10, -8 - (arg1.offset + 10) + arg1.data.length); this.anInflater1.inflate(arg0); } catch (@Pc(64) Exception local64) { this.anInflater1.reset(); diff --git a/client/src/main/java/IdkType.java b/client/src/main/java/IdkType.java index 114dcda..d37f7e0 100644 --- a/client/src/main/java/IdkType.java +++ b/client/src/main/java/IdkType.java @@ -71,37 +71,37 @@ public final class IdkType { @OriginalMember(owner = "client!dm", name = "a", descriptor = "(BLclient!wa;I)V") private void method1203(@OriginalArg(1) Buffer arg0, @OriginalArg(2) int arg1) { if (arg1 == 1) { - this.anInt1457 = arg0.method2229(); + this.anInt1457 = arg0.g1(); return; } @Pc(22) int local22; @Pc(28) int local28; if (arg1 == 2) { - local22 = arg0.method2229(); + local22 = arg0.g1(); this.anIntArray112 = new int[local22]; for (local28 = 0; local28 < local22; local28++) { - this.anIntArray112[local28] = arg0.method2163(); + this.anIntArray112[local28] = arg0.g2(); } } else if (arg1 == 3) { this.aBoolean85 = true; } else if (arg1 == 40) { - local22 = arg0.method2229(); + local22 = arg0.g1(); this.aShortArray11 = new short[local22]; this.aShortArray12 = new short[local22]; for (local28 = 0; local28 < local22; local28++) { - this.aShortArray12[local28] = (short) arg0.method2163(); - this.aShortArray11[local28] = (short) arg0.method2163(); + this.aShortArray12[local28] = (short) arg0.g2(); + this.aShortArray11[local28] = (short) arg0.g2(); } } else if (arg1 == 41) { - local22 = arg0.method2229(); + local22 = arg0.g1(); this.aShortArray14 = new short[local22]; this.aShortArray13 = new short[local22]; for (local28 = 0; local28 < local22; local28++) { - this.aShortArray14[local28] = (short) arg0.method2163(); - this.aShortArray13[local28] = (short) arg0.method2163(); + this.aShortArray14[local28] = (short) arg0.g2(); + this.aShortArray13[local28] = (short) arg0.g2(); } } else if (arg1 >= 60 && arg1 < 70) { - this.anIntArray113[arg1 - 60] = arg0.method2163(); + this.anIntArray113[arg1 - 60] = arg0.g2(); } } @@ -148,7 +148,7 @@ public final class IdkType { @OriginalMember(owner = "client!dm", name = "a", descriptor = "(ILclient!wa;)V") public final void method1209(@OriginalArg(1) Buffer arg0) { while (true) { - @Pc(13) int local13 = arg0.method2229(); + @Pc(13) int local13 = arg0.g1(); if (local13 == 0) { return; } diff --git a/client/src/main/java/JagString.java b/client/src/main/java/JagString.java index a920bb4..2719f43 100644 --- a/client/src/main/java/JagString.java +++ b/client/src/main/java/JagString.java @@ -198,7 +198,7 @@ public final class JagString implements StringInterface { } @OriginalMember(owner = "client!na", name = "d", descriptor = "(I)I") - public final int method3120() { + public final int length() { return this.anInt4030; } @@ -781,7 +781,7 @@ public final class JagString implements StringInterface { @Pc(17) Object local17 = Static287.method1757(local12, arg0); if (local17 instanceof String) { @Pc(24) byte[] local24 = ((String) local17).getBytes(); - local17 = Static10.method346(local24, local24.length, 0); + local17 = Static10.decodeString(local24, local24.length, 0); } return local17; } @@ -813,7 +813,7 @@ public final class JagString implements StringInterface { } @OriginalMember(owner = "client!na", name = "a", descriptor = "(Z[BIII)I") - public final int method3160(@OriginalArg(1) byte[] arg0, @OriginalArg(2) int arg1, @OriginalArg(4) int arg2) { + public final int encodeString(@OriginalArg(1) byte[] arg0, @OriginalArg(2) int arg1, @OriginalArg(4) int arg2) { Static289.method2612(this.aByteArray52, 0, arg0, arg1, arg2); return arg2; } diff --git a/client/src/main/java/Js5.java b/client/src/main/java/Js5.java index 9c5b2c7..7ea6ba5 100644 --- a/client/src/main/java/Js5.java +++ b/client/src/main/java/Js5.java @@ -282,7 +282,7 @@ public final class Js5 { } else { local114 = Static138.method2696(this.anObjectArray32[arg0], true); @Pc(128) Buffer local128 = new Buffer(local114); - local128.method2196(arg1, local128.aByteArray40.length); + local128.decryptXtea(arg1, local128.data.length); } @Pc(140) byte[] local140; try { @@ -301,14 +301,14 @@ public final class Js5 { @Pc(220) int local220 = local140[local216] & 0xFF; @Pc(228) int local228 = local216 - local31 * local220 * 4; @Pc(233) Buffer local233 = new Buffer(local140); - local233.anInt2792 = local228; + local233.offset = local228; @Pc(239) int[] local239 = new int[local31]; @Pc(250) int local250; @Pc(252) int local252; for (@Pc(241) int local241 = 0; local241 < local220; local241++) { local250 = 0; for (local252 = 0; local252 < local31; local252++) { - local250 += local233.method2174(); + local250 += local233.g4(); if (local25 == null) { } local239[local252] += local250; @@ -319,13 +319,13 @@ public final class Js5 { local282[local250] = new byte[local239[local250]]; local239[local250] = 0; } - local233.anInt2792 = local228; + local233.offset = local228; local250 = 0; @Pc(320) int local320; for (local252 = 0; local252 < local220; local252++) { local320 = 0; for (@Pc(322) int local322 = 0; local322 < local31; local322++) { - local320 += local233.method2174(); + local320 += local233.g4(); Static289.method2612(local140, local250, local282[local322], local239[local322], local320); local250 += local320; local239[local322] += local320; diff --git a/client/src/main/java/Js5GlTextureProvider.java b/client/src/main/java/Js5GlTextureProvider.java index 4e0c041..258b556 100644 --- a/client/src/main/java/Js5GlTextureProvider.java +++ b/client/src/main/java/Js5GlTextureProvider.java @@ -67,7 +67,7 @@ public final class Js5GlTextureProvider implements GlTextureProvider { this.aClass54_11 = null; } @Pc(51) Buffer local51 = new Buffer(arg1.method4495(0, 0)); - @Pc(55) int local55 = local51.method2163(); + @Pc(55) int local55 = local51.g2(); this.aByteArray61 = new byte[local55]; this.aByteArray60 = new byte[local55]; this.aByteArray59 = new byte[local55]; @@ -80,51 +80,51 @@ public final class Js5GlTextureProvider implements GlTextureProvider { this.aBooleanArray93 = new boolean[local55]; @Pc(97) int local97; for (local97 = 0; local97 < local55; local97++) { - this.aBooleanArray92[local97] = local51.method2229() == 1; + this.aBooleanArray92[local97] = local51.g1() == 1; } for (local97 = 0; local97 < local55; local97++) { if (this.aBooleanArray92[local97]) { - this.aBooleanArray90[local97] = local51.method2229() == 1; + this.aBooleanArray90[local97] = local51.g1() == 1; } } for (local97 = 0; local97 < local55; local97++) { if (this.aBooleanArray92[local97]) { - this.aBooleanArray91[local97] = local51.method2229() == 1; + this.aBooleanArray91[local97] = local51.g1() == 1; } } for (local97 = 0; local97 < local55; local97++) { if (this.aBooleanArray92[local97]) { - this.aBooleanArray89[local97] = local51.method2229() == 1; + this.aBooleanArray89[local97] = local51.g1() == 1; } } for (local97 = 0; local97 < local55; local97++) { if (this.aBooleanArray92[local97]) { - this.aBooleanArray93[local97] = local51.method2229() == 1; + this.aBooleanArray93[local97] = local51.g1() == 1; } } for (local97 = 0; local97 < local55; local97++) { if (this.aBooleanArray92[local97]) { - this.aByteArray59[local97] = local51.method2186(); + this.aByteArray59[local97] = local51.g1s(); } } for (local97 = 0; local97 < local55; local97++) { if (this.aBooleanArray92[local97]) { - this.aByteArray60[local97] = local51.method2186(); + this.aByteArray60[local97] = local51.g1s(); } } for (local97 = 0; local97 < local55; local97++) { if (this.aBooleanArray92[local97]) { - this.aByteArray62[local97] = local51.method2186(); + this.aByteArray62[local97] = local51.g1s(); } } for (local97 = 0; local97 < local55; local97++) { if (this.aBooleanArray92[local97]) { - this.aByteArray61[local97] = local51.method2186(); + this.aByteArray61[local97] = local51.g1s(); } } for (local97 = 0; local97 < local55; local97++) { if (this.aBooleanArray92[local97]) { - this.aShortArray59[local97] = (short) local51.method2163(); + this.aShortArray59[local97] = (short) local51.g2(); } } } diff --git a/client/src/main/java/Js5Index.java b/client/src/main/java/Js5Index.java index 47a9d5a..633ae66 100644 --- a/client/src/main/java/Js5Index.java +++ b/client/src/main/java/Js5Index.java @@ -60,23 +60,23 @@ public final class Js5Index { @OriginalMember(owner = "client!ii", name = "a", descriptor = "(I[B)V") private void method2293(@OriginalArg(1) byte[] arg0) { @Pc(12) Buffer local12 = new Buffer(Static162.method3092(arg0)); - @Pc(16) int local16 = local12.method2229(); + @Pc(16) int local16 = local12.g1(); if (local16 != 5 && local16 != 6) { throw new RuntimeException(); } if (local16 >= 6) { - this.anInt2908 = local12.method2174(); + this.anInt2908 = local12.g4(); } else { this.anInt2908 = 0; } - @Pc(48) int local48 = local12.method2229(); + @Pc(48) int local48 = local12.g1(); @Pc(50) int local50 = 0; - this.anInt2902 = local12.method2163(); + this.anInt2902 = local12.g2(); @Pc(59) int local59 = -1; this.anIntArray269 = new int[this.anInt2902]; @Pc(66) int local66; for (local66 = 0; local66 < this.anInt2902; local66++) { - this.anIntArray269[local66] = local50 += local12.method2163(); + this.anIntArray269[local66] = local50 += local12.g2(); if (this.anIntArray269[local66] > local59) { local59 = this.anIntArray269[local66]; } @@ -93,18 +93,18 @@ public final class Js5Index { this.anIntArray271[local66] = -1; } for (local66 = 0; local66 < this.anInt2902; local66++) { - this.anIntArray271[this.anIntArray269[local66]] = local12.method2174(); + this.anIntArray271[this.anIntArray269[local66]] = local12.g4(); } this.aClass76_1 = new IntHashTable(this.anIntArray271); } for (local66 = 0; local66 < this.anInt2902; local66++) { - this.anIntArray268[this.anIntArray269[local66]] = local12.method2174(); + this.anIntArray268[this.anIntArray269[local66]] = local12.g4(); } for (local66 = 0; local66 < this.anInt2902; local66++) { - this.anIntArray273[this.anIntArray269[local66]] = local12.method2174(); + this.anIntArray273[this.anIntArray269[local66]] = local12.g4(); } for (local66 = 0; local66 < this.anInt2902; local66++) { - this.anIntArray272[this.anIntArray269[local66]] = local12.method2163(); + this.anIntArray272[this.anIntArray269[local66]] = local12.g2(); } @Pc(273) int local273; @Pc(278) int local278; @@ -117,7 +117,7 @@ public final class Js5Index { local280 = -1; this.anIntArrayArray22[local273] = new int[local278]; for (local288 = 0; local288 < local278; local288++) { - @Pc(306) int local306 = this.anIntArrayArray22[local273][local288] = local50 += local12.method2163(); + @Pc(306) int local306 = this.anIntArrayArray22[local273][local288] = local50 += local12.g2(); if (local306 > local280) { local280 = local306; } @@ -145,7 +145,7 @@ public final class Js5Index { } else { local288 = this.anIntArrayArray22[local273][local280]; } - this.anIntArrayArray21[local273][local288] = local12.method2174(); + this.anIntArrayArray21[local273][local288] = local12.g4(); } this.aClass76Array1[local273] = new IntHashTable(this.anIntArrayArray21[local273]); } diff --git a/client/src/main/java/Js5MasterIndex.java b/client/src/main/java/Js5MasterIndex.java index 8e9078a..6689a43 100644 --- a/client/src/main/java/Js5MasterIndex.java +++ b/client/src/main/java/Js5MasterIndex.java @@ -45,7 +45,7 @@ public final class Js5MasterIndex { return false; } else { this.aClass3_Sub15_1 = new Buffer(this.aClass3_Sub2_Sub5_Sub2_1.method3554()); - this.aClass14_Sub1Array1 = new Js5CachedResourceProvider[(this.aClass3_Sub15_1.aByteArray40.length - 5) / 8]; + this.aClass14_Sub1Array1 = new Js5CachedResourceProvider[(this.aClass3_Sub15_1.data.length - 5) / 8]; return true; } } @@ -78,12 +78,12 @@ public final class Js5MasterIndex { if (this.aClass3_Sub15_1 == null) { throw new RuntimeException(); } - this.aClass3_Sub15_1.anInt2792 = arg1 * 8 + 5; - if (this.aClass3_Sub15_1.aByteArray40.length <= this.aClass3_Sub15_1.anInt2792) { + this.aClass3_Sub15_1.offset = arg1 * 8 + 5; + if (this.aClass3_Sub15_1.data.length <= this.aClass3_Sub15_1.offset) { throw new RuntimeException(); } else if (this.aClass14_Sub1Array1[arg1] == null) { - @Pc(56) int local56 = this.aClass3_Sub15_1.method2174(); - @Pc(61) int local61 = this.aClass3_Sub15_1.method2174(); + @Pc(56) int local56 = this.aClass3_Sub15_1.g4(); + @Pc(61) int local61 = this.aClass3_Sub15_1.g4(); @Pc(75) Js5CachedResourceProvider local75 = new Js5CachedResourceProvider(arg1, arg0, arg2, this.aClass73_1, this.aClass80_1, local56, local61, true); this.aClass14_Sub1Array1[arg1] = local75; return local75; diff --git a/client/src/main/java/Js5NetQueue.java b/client/src/main/java/Js5NetQueue.java index 184cca7..de38492 100644 --- a/client/src/main/java/Js5NetQueue.java +++ b/client/src/main/java/Js5NetQueue.java @@ -77,17 +77,17 @@ public final class Js5NetQueue { this.aClass95_1.method2832(); @Pc(75) Js5NetRequest local75; for (local75 = (Js5NetRequest) this.aClass16_2.method795(); local75 != null; local75 = (Js5NetRequest) this.aClass16_2.method797()) { - this.aClass3_Sub15_4.anInt2792 = 0; - this.aClass3_Sub15_4.method2178(1); - this.aClass3_Sub15_4.method2205((int) local75.aLong185); - this.aClass95_1.method2830(this.aClass3_Sub15_4.aByteArray40, 4); + this.aClass3_Sub15_4.offset = 0; + this.aClass3_Sub15_4.p1(1); + this.aClass3_Sub15_4.p3((int) local75.aLong185); + this.aClass95_1.method2830(this.aClass3_Sub15_4.data, 4); this.aClass16_3.method798(local75); } for (local75 = (Js5NetRequest) this.aClass16_4.method795(); local75 != null; local75 = (Js5NetRequest) this.aClass16_4.method797()) { - this.aClass3_Sub15_4.anInt2792 = 0; - this.aClass3_Sub15_4.method2178(0); - this.aClass3_Sub15_4.method2205((int) local75.aLong185); - this.aClass95_1.method2830(this.aClass3_Sub15_4.aByteArray40, 4); + this.aClass3_Sub15_4.offset = 0; + this.aClass3_Sub15_4.p1(0); + this.aClass3_Sub15_4.p3((int) local75.aLong185); + this.aClass95_1.method2830(this.aClass3_Sub15_4.data, 4); this.aClass16_5.method798(local75); } for (@Pc(172) int local172 = 0; local172 < 100; local172++) { @@ -109,23 +109,23 @@ public final class Js5NetQueue { @Pc(235) int local235; @Pc(283) int local283; if (local196 <= 0) { - local228 = this.aClass3_Sub2_Sub5_Sub2_2.aClass3_Sub15_7.aByteArray40.length - this.aClass3_Sub2_Sub5_Sub2_2.aByte16; + local228 = this.aClass3_Sub2_Sub5_Sub2_2.aClass3_Sub15_7.data.length - this.aClass3_Sub2_Sub5_Sub2_2.aByte16; local235 = 512 - this.aClass3_Sub2_Sub5_Sub2_2.anInt4617; - if (local235 > local228 - this.aClass3_Sub2_Sub5_Sub2_2.aClass3_Sub15_7.anInt2792) { - local235 = local228 - this.aClass3_Sub2_Sub5_Sub2_2.aClass3_Sub15_7.anInt2792; + if (local235 > local228 - this.aClass3_Sub2_Sub5_Sub2_2.aClass3_Sub15_7.offset) { + local235 = local228 - this.aClass3_Sub2_Sub5_Sub2_2.aClass3_Sub15_7.offset; } if (local235 > local19) { local235 = local19; } - this.aClass95_1.method2827(this.aClass3_Sub2_Sub5_Sub2_2.aClass3_Sub15_7.anInt2792, local235, this.aClass3_Sub2_Sub5_Sub2_2.aClass3_Sub15_7.aByteArray40); + this.aClass95_1.method2827(this.aClass3_Sub2_Sub5_Sub2_2.aClass3_Sub15_7.offset, local235, this.aClass3_Sub2_Sub5_Sub2_2.aClass3_Sub15_7.data); if (this.aByte8 != 0) { for (local283 = 0; local283 < local235; local283++) { - this.aClass3_Sub2_Sub5_Sub2_2.aClass3_Sub15_7.aByteArray40[this.aClass3_Sub2_Sub5_Sub2_2.aClass3_Sub15_7.anInt2792 + local283] = (byte) (this.aClass3_Sub2_Sub5_Sub2_2.aClass3_Sub15_7.aByteArray40[this.aClass3_Sub2_Sub5_Sub2_2.aClass3_Sub15_7.anInt2792 + local283] ^ this.aByte8); + this.aClass3_Sub2_Sub5_Sub2_2.aClass3_Sub15_7.data[this.aClass3_Sub2_Sub5_Sub2_2.aClass3_Sub15_7.offset + local283] = (byte) (this.aClass3_Sub2_Sub5_Sub2_2.aClass3_Sub15_7.data[this.aClass3_Sub2_Sub5_Sub2_2.aClass3_Sub15_7.offset + local283] ^ this.aByte8); } } this.aClass3_Sub2_Sub5_Sub2_2.anInt4617 += local235; - this.aClass3_Sub2_Sub5_Sub2_2.aClass3_Sub15_7.anInt2792 += local235; - if (this.aClass3_Sub2_Sub5_Sub2_2.aClass3_Sub15_7.anInt2792 == local228) { + this.aClass3_Sub2_Sub5_Sub2_2.aClass3_Sub15_7.offset += local235; + if (this.aClass3_Sub2_Sub5_Sub2_2.aClass3_Sub15_7.offset == local228) { this.aClass3_Sub2_Sub5_Sub2_2.method4365(); this.aClass3_Sub2_Sub5_Sub2_2.aBoolean226 = false; this.aClass3_Sub2_Sub5_Sub2_2 = null; @@ -133,24 +133,24 @@ public final class Js5NetQueue { this.aClass3_Sub2_Sub5_Sub2_2.anInt4617 = 0; } } else { - local228 = local196 - this.aClass3_Sub15_5.anInt2792; + local228 = local196 - this.aClass3_Sub15_5.offset; if (local19 < local228) { local228 = local19; } - this.aClass95_1.method2827(this.aClass3_Sub15_5.anInt2792, local228, this.aClass3_Sub15_5.aByteArray40); + this.aClass95_1.method2827(this.aClass3_Sub15_5.offset, local228, this.aClass3_Sub15_5.data); if (this.aByte8 != 0) { for (local235 = 0; local235 < local228; local235++) { - this.aClass3_Sub15_5.aByteArray40[local235 + this.aClass3_Sub15_5.anInt2792] ^= this.aByte8; + this.aClass3_Sub15_5.data[local235 + this.aClass3_Sub15_5.offset] ^= this.aByte8; } } - this.aClass3_Sub15_5.anInt2792 += local228; - if (this.aClass3_Sub15_5.anInt2792 >= local196) { + this.aClass3_Sub15_5.offset += local228; + if (this.aClass3_Sub15_5.offset >= local196) { if (this.aClass3_Sub2_Sub5_Sub2_2 == null) { - this.aClass3_Sub15_5.anInt2792 = 0; - local235 = this.aClass3_Sub15_5.method2229(); - local283 = this.aClass3_Sub15_5.method2163(); - @Pc(471) int local471 = this.aClass3_Sub15_5.method2229(); - @Pc(476) int local476 = this.aClass3_Sub15_5.method2174(); + this.aClass3_Sub15_5.offset = 0; + local235 = this.aClass3_Sub15_5.g1(); + local283 = this.aClass3_Sub15_5.g2(); + @Pc(471) int local471 = this.aClass3_Sub15_5.g1(); + @Pc(476) int local476 = this.aClass3_Sub15_5.g4(); @Pc(480) int local480 = local471 & 0x7F; @Pc(491) boolean local491 = (local471 & 0x80) != 0; @Pc(501) long local501 = (long) ((local235 << 16) + local283); @@ -168,15 +168,15 @@ public final class Js5NetQueue { @Pc(568) int local568 = local480 == 0 ? 5 : 9; this.aClass3_Sub2_Sub5_Sub2_2 = local509; this.aClass3_Sub2_Sub5_Sub2_2.aClass3_Sub15_7 = new Buffer(local476 + local568 + this.aClass3_Sub2_Sub5_Sub2_2.aByte16); - this.aClass3_Sub2_Sub5_Sub2_2.aClass3_Sub15_7.method2178(local480); - this.aClass3_Sub2_Sub5_Sub2_2.aClass3_Sub15_7.method2164(local476); + this.aClass3_Sub2_Sub5_Sub2_2.aClass3_Sub15_7.p1(local480); + this.aClass3_Sub2_Sub5_Sub2_2.aClass3_Sub15_7.p4(local476); this.aClass3_Sub2_Sub5_Sub2_2.anInt4617 = 8; - this.aClass3_Sub15_5.anInt2792 = 0; + this.aClass3_Sub15_5.offset = 0; } else if (this.aClass3_Sub2_Sub5_Sub2_2.anInt4617 != 0) { throw new IOException(); - } else if (this.aClass3_Sub15_5.aByteArray40[0] == -1) { + } else if (this.aClass3_Sub15_5.data[0] == -1) { this.aClass3_Sub2_Sub5_Sub2_2.anInt4617 = 1; - this.aClass3_Sub15_5.anInt2792 = 0; + this.aClass3_Sub15_5.offset = 0; } else { this.aClass3_Sub2_Sub5_Sub2_2 = null; } @@ -202,10 +202,10 @@ public final class Js5NetQueue { return; } try { - this.aClass3_Sub15_4.anInt2792 = 0; - this.aClass3_Sub15_4.method2178(7); - this.aClass3_Sub15_4.method2205(0); - this.aClass95_1.method2830(this.aClass3_Sub15_4.aByteArray40, 4); + this.aClass3_Sub15_4.offset = 0; + this.aClass3_Sub15_4.p1(7); + this.aClass3_Sub15_4.p3(0); + this.aClass95_1.method2830(this.aClass3_Sub15_4.data, 4); } catch (@Pc(39) IOException local39) { try { this.aClass95_1.method2834(); @@ -228,10 +228,10 @@ public final class Js5NetQueue { return; } try { - this.aClass3_Sub15_4.anInt2792 = 0; - this.aClass3_Sub15_4.method2178(arg0 ? 2 : 3); - this.aClass3_Sub15_4.method2205(0); - this.aClass95_1.method2830(this.aClass3_Sub15_4.aByteArray40, 4); + this.aClass3_Sub15_4.offset = 0; + this.aClass3_Sub15_4.p1(arg0 ? 2 : 3); + this.aClass3_Sub15_4.p3(0); + this.aClass95_1.method2830(this.aClass3_Sub15_4.data, 4); } catch (@Pc(42) IOException local42) { try { this.aClass95_1.method2834(); @@ -262,7 +262,7 @@ public final class Js5NetQueue { this.aClass95_1 = arg1; this.method2331(); this.method2322(arg0); - this.aClass3_Sub15_5.anInt2792 = 0; + this.aClass3_Sub15_5.offset = 0; this.aClass3_Sub2_Sub5_Sub2_2 = null; while (true) { @Pc(44) Js5NetRequest local44 = (Js5NetRequest) this.aClass16_3.method796(); @@ -272,11 +272,11 @@ public final class Js5NetQueue { if (local44 == null) { if (this.aByte8 != 0) { try { - this.aClass3_Sub15_4.anInt2792 = 0; - this.aClass3_Sub15_4.method2178(4); - this.aClass3_Sub15_4.method2178(this.aByte8); - this.aClass3_Sub15_4.method2230(0); - this.aClass95_1.method2830(this.aClass3_Sub15_4.aByteArray40, 4); + this.aClass3_Sub15_4.offset = 0; + this.aClass3_Sub15_4.p1(4); + this.aClass3_Sub15_4.p1(this.aByte8); + this.aClass3_Sub15_4.p2(0); + this.aClass95_1.method2830(this.aClass3_Sub15_4.data, 4); } catch (@Pc(107) IOException local107) { try { this.aClass95_1.method2834(); @@ -353,10 +353,10 @@ public final class Js5NetQueue { return; } try { - this.aClass3_Sub15_4.anInt2792 = 0; - this.aClass3_Sub15_4.method2178(6); - this.aClass3_Sub15_4.method2205(3); - this.aClass95_1.method2830(this.aClass3_Sub15_4.aByteArray40, 4); + this.aClass3_Sub15_4.offset = 0; + this.aClass3_Sub15_4.p1(6); + this.aClass3_Sub15_4.p3(3); + this.aClass95_1.method2830(this.aClass3_Sub15_4.data, 4); } catch (@Pc(37) IOException local37) { try { this.aClass95_1.method2834(); diff --git a/client/src/main/java/Js5NetRequest.java b/client/src/main/java/Js5NetRequest.java index 5ce69c3..ee2704d 100644 --- a/client/src/main/java/Js5NetRequest.java +++ b/client/src/main/java/Js5NetRequest.java @@ -16,15 +16,15 @@ public final class Js5NetRequest extends Js5Request { @OriginalMember(owner = "client!pm", name = "a", descriptor = "(Z)I") @Override public final int method3553() { - return this.aClass3_Sub15_7 == null ? 0 : this.aClass3_Sub15_7.anInt2792 * 100 / (this.aClass3_Sub15_7.aByteArray40.length - this.aByte16); + return this.aClass3_Sub15_7 == null ? 0 : this.aClass3_Sub15_7.offset * 100 / (this.aClass3_Sub15_7.data.length - this.aByte16); } @OriginalMember(owner = "client!pm", name = "b", descriptor = "(Z)[B") @Override public final byte[] method3554() { - if (this.aBoolean226 || this.aClass3_Sub15_7.anInt2792 < this.aClass3_Sub15_7.aByteArray40.length - this.aByte16) { + if (this.aBoolean226 || this.aClass3_Sub15_7.offset < this.aClass3_Sub15_7.data.length - this.aByte16) { throw new RuntimeException(); } - return this.aClass3_Sub15_7.aByteArray40; + return this.aClass3_Sub15_7.data; } } diff --git a/client/src/main/java/Light.java b/client/src/main/java/Light.java index 31bf6e0..5b10106 100644 --- a/client/src/main/java/Light.java +++ b/client/src/main/java/Light.java @@ -71,22 +71,22 @@ public final class Light { if (Static62.anIntArray150 == null) { Static84.method1771(); } - this.anInt2241 = arg0.method2229(); + this.anInt2241 = arg0.g1(); this.aBoolean124 = (this.anInt2241 & 0x10) != 0; this.aBoolean126 = (this.anInt2241 & 0x8) != 0; this.anInt2241 &= 0x7; - this.anInt2240 = arg0.method2163(); - this.anInt2245 = arg0.method2163(); - this.anInt2235 = arg0.method2163(); - this.anInt2236 = arg0.method2229(); + this.anInt2240 = arg0.g2(); + this.anInt2245 = arg0.g2(); + this.anInt2235 = arg0.g2(); + this.anInt2236 = arg0.g1(); this.method1763(); this.aShortArray30 = new short[this.anInt2236 * 2 + 1]; @Pc(87) int local87; for (local87 = 0; local87 < this.aShortArray30.length; local87++) { - this.aShortArray30[local87] = (short) arg0.method2163(); + this.aShortArray30[local87] = (short) arg0.g2(); } - this.anInt2247 = Rasteriser.anIntArray220[arg0.method2163()]; - local87 = arg0.method2229(); + this.anInt2247 = Rasteriser.anIntArray220[arg0.g2()]; + local87 = arg0.g1(); this.anInt2249 = (local87 & 0xE0) << 3; this.anInt2243 = local87 & 0x1F; if (this.anInt2243 != 31) { diff --git a/client/src/main/java/LightType.java b/client/src/main/java/LightType.java index 297aeb3..3f65ea8 100644 --- a/client/src/main/java/LightType.java +++ b/client/src/main/java/LightType.java @@ -21,7 +21,7 @@ public final class LightType { @OriginalMember(owner = "client!ic", name = "a", descriptor = "(ILclient!wa;I)V") public final void method2257(@OriginalArg(1) Buffer arg0, @OriginalArg(2) int arg1) { while (true) { - @Pc(5) int local5 = arg0.method2229(); + @Pc(5) int local5 = arg0.g1(); if (local5 == 0) { return; } @@ -32,13 +32,13 @@ public final class LightType { @OriginalMember(owner = "client!ic", name = "a", descriptor = "(ILclient!wa;IZ)V") private void method2258(@OriginalArg(0) int arg0, @OriginalArg(1) Buffer arg1, @OriginalArg(2) int arg2) { if (arg0 == 1) { - this.anInt2865 = arg1.method2229(); + this.anInt2865 = arg1.g1(); } else if (arg0 == 2) { - this.anInt2873 = arg1.method2163(); + this.anInt2873 = arg1.g2(); } else if (arg0 == 3) { - this.anInt2867 = arg1.method2163(); + this.anInt2867 = arg1.g2(); } else if (arg0 == 4) { - this.anInt2872 = arg1.method2213(); + this.anInt2872 = arg1.g2s(); } } } diff --git a/client/src/main/java/LiquidMaterialRenderer.java b/client/src/main/java/LiquidMaterialRenderer.java index 4477947..dae27bb 100644 --- a/client/src/main/java/LiquidMaterialRenderer.java +++ b/client/src/main/java/LiquidMaterialRenderer.java @@ -37,20 +37,20 @@ public final class LiquidMaterialRenderer implements MaterialRenderer { @Pc(71) int[] local71 = local53[local60]; for (@Pc(73) int local73 = 0; local73 < 64; local73++) { if (Static239.aBoolean263) { - local58.method2227((float) local67[local73] / 4096.0F); - local58.method2227((float) local71[local73] / 4096.0F); - local58.method2227(1.0F); - local58.method2227(1.0F); + local58.pFloat((float) local67[local73] / 4096.0F); + local58.pFloat((float) local71[local73] / 4096.0F); + local58.pFloat(1.0F); + local58.pFloat(1.0F); } else { - local58.method2188((float) local67[local73] / 4096.0F); - local58.method2188((float) local71[local73] / 4096.0F); - local58.method2188(1.0F); - local58.method2188(1.0F); + local58.gFloat((float) local67[local73] / 4096.0F); + local58.gFloat((float) local71[local73] / 4096.0F); + local58.gFloat(1.0F); + local58.gFloat(1.0F); } } } - @Pc(141) ByteBuffer local141 = ByteBuffer.allocateDirect(local58.anInt2792).order(ByteOrder.nativeOrder()); - local141.put(local58.aByteArray40, 0, local58.anInt2792); + @Pc(141) ByteBuffer local141 = ByteBuffer.allocateDirect(local58.offset).order(ByteOrder.nativeOrder()); + local141.put(local58.data, 0, local58.offset); local141.flip(); this.aFloatBuffer1 = local141.asFloatBuffer().asReadOnlyBuffer(); this.method3719(); diff --git a/client/src/main/java/LocType.java b/client/src/main/java/LocType.java index 8caf62b..51f26fe 100644 --- a/client/src/main/java/LocType.java +++ b/client/src/main/java/LocType.java @@ -385,7 +385,7 @@ public final class LocType { @OriginalMember(owner = "client!pb", name = "a", descriptor = "(ILclient!wa;)V") public final void method3424(@OriginalArg(1) Buffer arg0) { while (true) { - @Pc(9) int local9 = arg0.method2229(); + @Pc(9) int local9 = arg0.g1(); if (local9 == 0) { return; } @@ -398,45 +398,45 @@ public final class LocType { @Pc(18) int local18; @Pc(38) int local38; if (arg1 == 1) { - local18 = arg0.method2229(); + local18 = arg0.g1(); if (local18 > 0) { if (this.anIntArray379 == null || Static87.aBoolean130) { this.anIntArray378 = new int[local18]; this.anIntArray379 = new int[local18]; for (local38 = 0; local38 < local18; local38++) { - this.anIntArray379[local38] = arg0.method2163(); - this.anIntArray378[local38] = arg0.method2229(); + this.anIntArray379[local38] = arg0.g2(); + this.anIntArray378[local38] = arg0.g1(); } } else { - arg0.anInt2792 += local18 * 3; + arg0.offset += local18 * 3; } } } else if (arg1 == 2) { - this.aClass100_830 = arg0.method2202(); + this.aClass100_830 = arg0.gjstr(); } else if (arg1 == 5) { - local18 = arg0.method2229(); + local18 = arg0.g1(); if (local18 > 0) { if (this.anIntArray379 == null || Static87.aBoolean130) { this.anIntArray379 = new int[local18]; this.anIntArray378 = null; for (local38 = 0; local38 < local18; local38++) { - this.anIntArray379[local38] = arg0.method2163(); + this.anIntArray379[local38] = arg0.g2(); } } else { - arg0.anInt2792 += local18 * 2; + arg0.offset += local18 * 2; } } } else if (arg1 == 14) { - this.anInt4397 = arg0.method2229(); + this.anInt4397 = arg0.g1(); } else if (arg1 == 15) { - this.anInt4403 = arg0.method2229(); + this.anInt4403 = arg0.g1(); } else if (arg1 == 17) { this.anInt4435 = 0; this.aBoolean207 = false; } else if (arg1 == 18) { this.aBoolean207 = false; } else if (arg1 == 19) { - this.anInt4429 = arg0.method2229(); + this.anInt4429 = arg0.g1(); } else if (arg1 == 21) { this.aByte15 = 1; } else if (arg1 == 22) { @@ -444,111 +444,111 @@ public final class LocType { } else if (arg1 == 23) { this.aBoolean220 = true; } else if (arg1 == 24) { - this.anInt4430 = arg0.method2163(); + this.anInt4430 = arg0.g2(); if (this.anInt4430 == 65535) { this.anInt4430 = -1; } } else if (arg1 == 27) { this.anInt4435 = 1; } else if (arg1 == 28) { - this.anInt4428 = arg0.method2229(); + this.anInt4428 = arg0.g1(); } else if (arg1 == 29) { - this.anInt4407 = arg0.method2186(); + this.anInt4407 = arg0.g1s(); } else if (arg1 == 39) { - this.anInt4405 = arg0.method2186() * 5; + this.anInt4405 = arg0.g1s() * 5; } else if (arg1 >= 30 && arg1 < 35) { - this.aClass100Array130[arg1 - 30] = arg0.method2202(); + this.aClass100Array130[arg1 - 30] = arg0.gjstr(); if (this.aClass100Array130[arg1 - 30].method3111(Static10.aClass100_64)) { this.aClass100Array130[arg1 - 30] = null; } } else if (arg1 == 40) { - local18 = arg0.method2229(); + local18 = arg0.g1(); this.aShortArray61 = new short[local18]; this.aShortArray63 = new short[local18]; for (local38 = 0; local38 < local18; local38++) { - this.aShortArray61[local38] = (short) arg0.method2163(); - this.aShortArray63[local38] = (short) arg0.method2163(); + this.aShortArray61[local38] = (short) arg0.g2(); + this.aShortArray63[local38] = (short) arg0.g2(); } } else if (arg1 == 41) { - local18 = arg0.method2229(); + local18 = arg0.g1(); this.aShortArray62 = new short[local18]; this.aShortArray60 = new short[local18]; for (local38 = 0; local38 < local18; local38++) { - this.aShortArray60[local38] = (short) arg0.method2163(); - this.aShortArray62[local38] = (short) arg0.method2163(); + this.aShortArray60[local38] = (short) arg0.g2(); + this.aShortArray62[local38] = (short) arg0.g2(); } } else if (arg1 == 42) { - local18 = arg0.method2229(); + local18 = arg0.g1(); this.aByteArray63 = new byte[local18]; for (local38 = 0; local38 < local18; local38++) { - this.aByteArray63[local38] = arg0.method2186(); + this.aByteArray63[local38] = arg0.g1s(); } } else if (arg1 == 60) { - this.anInt4400 = arg0.method2163(); + this.anInt4400 = arg0.g2(); } else if (arg1 == 62) { this.aBoolean217 = true; } else if (arg1 == 64) { this.aBoolean215 = false; } else if (arg1 == 65) { - this.anInt4396 = arg0.method2163(); + this.anInt4396 = arg0.g2(); } else if (arg1 == 66) { - this.anInt4404 = arg0.method2163(); + this.anInt4404 = arg0.g2(); } else if (arg1 == 67) { - this.anInt4399 = arg0.method2163(); + this.anInt4399 = arg0.g2(); } else if (arg1 == 69) { - this.anInt4433 = arg0.method2229(); + this.anInt4433 = arg0.g1(); } else if (arg1 == 70) { - this.anInt4408 = arg0.method2213(); + this.anInt4408 = arg0.g2s(); } else if (arg1 == 71) { - this.anInt4411 = arg0.method2213(); + this.anInt4411 = arg0.g2s(); } else if (arg1 == 72) { - this.anInt4434 = arg0.method2213(); + this.anInt4434 = arg0.g2s(); } else if (arg1 == 73) { this.aBoolean206 = true; } else if (arg1 == 74) { this.aBoolean210 = true; } else if (arg1 == 75) { - this.anInt4438 = arg0.method2229(); + this.anInt4438 = arg0.g1(); } else if (arg1 == 77 || arg1 == 92) { local18 = -1; - this.anInt4425 = arg0.method2163(); + this.anInt4425 = arg0.g2(); if (this.anInt4425 == 65535) { this.anInt4425 = -1; } - this.anInt4431 = arg0.method2163(); + this.anInt4431 = arg0.g2(); if (this.anInt4431 == 65535) { this.anInt4431 = -1; } if (arg1 == 92) { - local18 = arg0.method2163(); + local18 = arg0.g2(); if (local18 == 65535) { local18 = -1; } } - local38 = arg0.method2229(); + local38 = arg0.g1(); this.anIntArray380 = new int[local38 + 2]; for (@Pc(790) int local790 = 0; local790 <= local38; local790++) { - this.anIntArray380[local790] = arg0.method2163(); + this.anIntArray380[local790] = arg0.g2(); if (this.anIntArray380[local790] == 65535) { this.anIntArray380[local790] = -1; } } this.anIntArray380[local38 + 1] = local18; } else if (arg1 == 78) { - this.anInt4412 = arg0.method2163(); - this.anInt4402 = arg0.method2229(); + this.anInt4412 = arg0.g2(); + this.anInt4402 = arg0.g1(); } else if (arg1 == 79) { - this.anInt4419 = arg0.method2163(); - this.anInt4414 = arg0.method2163(); - this.anInt4402 = arg0.method2229(); - local18 = arg0.method2229(); + this.anInt4419 = arg0.g2(); + this.anInt4414 = arg0.g2(); + this.anInt4402 = arg0.g1(); + local18 = arg0.g1(); this.anIntArray381 = new int[local18]; for (local38 = 0; local38 < local18; local38++) { - this.anIntArray381[local38] = arg0.method2163(); + this.anIntArray381[local38] = arg0.g2(); } } else if (arg1 == 81) { this.aByte15 = 2; - this.aShort26 = (short) (arg0.method2229() * 256); + this.aShort26 = (short) (arg0.g1() * 256); } else if (arg1 == 82) { this.aBoolean216 = true; } else if (arg1 == 88) { @@ -561,7 +561,7 @@ public final class LocType { this.aBoolean208 = true; } else if (arg1 == 93) { this.aByte15 = 3; - this.aShort26 = (short) arg0.method2163(); + this.aShort26 = (short) arg0.g2(); } else if (arg1 == 94) { this.aByte15 = 4; } else if (arg1 == 95) { @@ -573,29 +573,29 @@ public final class LocType { } else if (arg1 == 98) { this.aBoolean214 = true; } else if (arg1 == 99) { - this.anInt4406 = arg0.method2229(); - this.anInt4416 = arg0.method2163(); + this.anInt4406 = arg0.g1(); + this.anInt4416 = arg0.g2(); } else if (arg1 == 100) { - this.anInt4420 = arg0.method2229(); - this.anInt4423 = arg0.method2163(); + this.anInt4420 = arg0.g1(); + this.anInt4423 = arg0.g2(); } else if (arg1 == 101) { - this.anInt4395 = arg0.method2229(); + this.anInt4395 = arg0.g1(); } else if (arg1 == 102) { - this.anInt4415 = arg0.method2163(); + this.anInt4415 = arg0.g2(); } else if (arg1 == 249) { - local18 = arg0.method2229(); + local18 = arg0.g1(); if (this.aClass133_19 == null) { local38 = Static165.method3164(local18); this.aClass133_19 = new HashTable(local38); } for (local38 = 0; local38 < local18; local38++) { - @Pc(576) boolean local576 = arg0.method2229() == 1; - @Pc(580) int local580 = arg0.method2220(); + @Pc(576) boolean local576 = arg0.g1() == 1; + @Pc(580) int local580 = arg0.g3(); @Pc(589) Node local589; if (local576) { - local589 = new StringNode(arg0.method2202()); + local589 = new StringNode(arg0.gjstr()); } else { - local589 = new IntNode(arg0.method2174()); + local589 = new IntNode(arg0.g4()); } this.aClass133_19.method3862(local589, (long) local580); } diff --git a/client/src/main/java/MidiDecoder.java b/client/src/main/java/MidiDecoder.java index 0bf31c3..8973303 100644 --- a/client/src/main/java/MidiDecoder.java +++ b/client/src/main/java/MidiDecoder.java @@ -62,15 +62,15 @@ public final class MidiDecoder { for (@Pc(8) int local8 = 0; local8 < local6; local8++) { this.anIntArray310[local8] = 0; this.anIntArray313[local8] = 0; - this.aClass3_Sub15_6.anInt2792 = this.anIntArray312[local8]; + this.aClass3_Sub15_6.offset = this.anIntArray312[local8]; this.method2632(local8); - this.anIntArray311[local8] = this.aClass3_Sub15_6.anInt2792; + this.anIntArray311[local8] = this.aClass3_Sub15_6.offset; } } @OriginalMember(owner = "client!ki", name = "c", descriptor = "()Z") public final boolean method2628() { - return this.aClass3_Sub15_6.aByteArray40 != null; + return this.aClass3_Sub15_6.data != null; } @OriginalMember(owner = "client!ki", name = "d", descriptor = "()I") @@ -85,12 +85,12 @@ public final class MidiDecoder { @OriginalMember(owner = "client!ki", name = "c", descriptor = "(I)V") public final void method2631(@OriginalArg(0) int arg0) { - this.aClass3_Sub15_6.anInt2792 = this.anIntArray311[arg0]; + this.aClass3_Sub15_6.offset = this.anIntArray311[arg0]; } @OriginalMember(owner = "client!ki", name = "d", descriptor = "(I)V") public final void method2632(@OriginalArg(0) int arg0) { - @Pc(4) int local4 = this.aClass3_Sub15_6.method2167(); + @Pc(4) int local4 = this.aClass3_Sub15_6.gVarInt(); this.anIntArray310[arg0] += local4; } @@ -101,76 +101,76 @@ public final class MidiDecoder { @Pc(78) byte local78 = Static135.aByteArray46[arg1 - 128]; local12 = arg1; if (local78 >= 1) { - local12 = arg1 | this.aClass3_Sub15_6.method2229() << 8; + local12 = arg1 | this.aClass3_Sub15_6.g1() << 8; } if (local78 >= 2) { - local12 |= this.aClass3_Sub15_6.method2229() << 16; + local12 |= this.aClass3_Sub15_6.g1() << 16; } return local12; } - @Pc(7) int local7 = this.aClass3_Sub15_6.method2229(); - local12 = this.aClass3_Sub15_6.method2167(); + @Pc(7) int local7 = this.aClass3_Sub15_6.g1(); + local12 = this.aClass3_Sub15_6.gVarInt(); if (local7 == 47) { - this.aClass3_Sub15_6.anInt2792 += local12; + this.aClass3_Sub15_6.offset += local12; return 1; } else if (local7 == 81) { - @Pc(32) int local32 = this.aClass3_Sub15_6.method2220(); + @Pc(32) int local32 = this.aClass3_Sub15_6.g3(); local12 -= 3; @Pc(38) int local38 = this.anIntArray310[arg0]; this.aLong117 += (long) local38 * (long) (this.anInt3304 - local32); this.anInt3304 = local32; - this.aClass3_Sub15_6.anInt2792 += local12; + this.aClass3_Sub15_6.offset += local12; return 2; } else { - this.aClass3_Sub15_6.anInt2792 += local12; + this.aClass3_Sub15_6.offset += local12; return 3; } } @OriginalMember(owner = "client!ki", name = "e", descriptor = "(I)I") private int method2634(@OriginalArg(0) int arg0) { - @Pc(7) byte local7 = this.aClass3_Sub15_6.aByteArray40[this.aClass3_Sub15_6.anInt2792]; + @Pc(7) byte local7 = this.aClass3_Sub15_6.data[this.aClass3_Sub15_6.offset]; @Pc(13) int local13; if (local7 < 0) { local13 = local7 & 0xFF; this.anIntArray313[arg0] = local13; - this.aClass3_Sub15_6.anInt2792++; + this.aClass3_Sub15_6.offset++; } else { local13 = this.anIntArray313[arg0]; } if (local13 != 240 && local13 != 247) { return this.method2633(arg0, local13); } - @Pc(42) int local42 = this.aClass3_Sub15_6.method2167(); + @Pc(42) int local42 = this.aClass3_Sub15_6.gVarInt(); if (local13 == 247 && local42 > 0) { - @Pc(57) int local57 = this.aClass3_Sub15_6.aByteArray40[this.aClass3_Sub15_6.anInt2792] & 0xFF; + @Pc(57) int local57 = this.aClass3_Sub15_6.data[this.aClass3_Sub15_6.offset] & 0xFF; if (local57 >= 241 && local57 <= 243 || local57 == 246 || local57 == 248 || local57 >= 250 && local57 <= 252 || local57 == 254) { - this.aClass3_Sub15_6.anInt2792++; + this.aClass3_Sub15_6.offset++; this.anIntArray313[arg0] = local57; return this.method2633(arg0, local57); } } - this.aClass3_Sub15_6.anInt2792 += local42; + this.aClass3_Sub15_6.offset += local42; return 0; } @OriginalMember(owner = "client!ki", name = "a", descriptor = "([B)V") public final void method2635(@OriginalArg(0) byte[] arg0) { - this.aClass3_Sub15_6.aByteArray40 = arg0; - this.aClass3_Sub15_6.anInt2792 = 10; - @Pc(12) int local12 = this.aClass3_Sub15_6.method2163(); - this.anInt3303 = this.aClass3_Sub15_6.method2163(); + this.aClass3_Sub15_6.data = arg0; + this.aClass3_Sub15_6.offset = 10; + @Pc(12) int local12 = this.aClass3_Sub15_6.g2(); + this.anInt3303 = this.aClass3_Sub15_6.g2(); this.anInt3304 = 500000; this.anIntArray312 = new int[local12]; @Pc(27) int local27 = 0; while (local27 < local12) { - @Pc(35) int local35 = this.aClass3_Sub15_6.method2174(); - @Pc(40) int local40 = this.aClass3_Sub15_6.method2174(); + @Pc(35) int local35 = this.aClass3_Sub15_6.g4(); + @Pc(40) int local40 = this.aClass3_Sub15_6.g4(); if (local35 == 1297379947) { - this.anIntArray312[local27] = this.aClass3_Sub15_6.anInt2792; + this.anIntArray312[local27] = this.aClass3_Sub15_6.offset; local27++; } - this.aClass3_Sub15_6.anInt2792 += local40; + this.aClass3_Sub15_6.offset += local40; } this.aLong117 = 0L; this.anIntArray311 = new int[local12]; @@ -183,7 +183,7 @@ public final class MidiDecoder { @OriginalMember(owner = "client!ki", name = "f", descriptor = "(I)V") public final void method2636(@OriginalArg(0) int arg0) { - this.anIntArray311[arg0] = this.aClass3_Sub15_6.anInt2792; + this.anIntArray311[arg0] = this.aClass3_Sub15_6.offset; } @OriginalMember(owner = "client!ki", name = "e", descriptor = "()I") @@ -202,7 +202,7 @@ public final class MidiDecoder { @OriginalMember(owner = "client!ki", name = "f", descriptor = "()V") public final void method2638() { - this.aClass3_Sub15_6.aByteArray40 = null; + this.aClass3_Sub15_6.data = null; this.anIntArray312 = null; this.anIntArray311 = null; this.anIntArray310 = null; @@ -211,6 +211,6 @@ public final class MidiDecoder { @OriginalMember(owner = "client!ki", name = "g", descriptor = "()V") public final void method2639() { - this.aClass3_Sub15_6.anInt2792 = -1; + this.aClass3_Sub15_6.offset = -1; } } diff --git a/client/src/main/java/MidiInstrument.java b/client/src/main/java/MidiInstrument.java index 13c3c09..a7abc44 100644 --- a/client/src/main/java/MidiInstrument.java +++ b/client/src/main/java/MidiInstrument.java @@ -35,39 +35,39 @@ public final class MidiInstrument extends Node { @Pc(29) int local29 = 0; this.aByteArray44 = new byte[128]; @Pc(38) Buffer local38 = new Buffer(arg0); - while (local38.aByteArray40[local29 + local38.anInt2792] != 0) { + while (local38.data[local29 + local38.offset] != 0) { local29++; } @Pc(55) byte[] local55 = new byte[local29]; @Pc(57) int local57; for (local57 = 0; local57 < local29; local57++) { - local55[local57] = local38.method2186(); + local55[local57] = local38.g1s(); } - local38.anInt2792++; + local38.offset++; local29++; - local57 = local38.anInt2792; - local38.anInt2792 += local29; + local57 = local38.offset; + local38.offset += local29; @Pc(91) int local91; - for (local91 = 0; local38.aByteArray40[local38.anInt2792 + local91] != 0; local91++) { + for (local91 = 0; local38.data[local38.offset + local91] != 0; local91++) { } @Pc(106) byte[] local106 = new byte[local91]; @Pc(108) int local108; for (local108 = 0; local108 < local91; local108++) { - local106[local108] = local38.method2186(); + local106[local108] = local38.g1s(); } - local38.anInt2792++; + local38.offset++; local91++; @Pc(133) int local133 = 0; - local108 = local38.anInt2792; - local38.anInt2792 += local91; - while (local38.aByteArray40[local133 + local38.anInt2792] != 0) { + local108 = local38.offset; + local38.offset += local91; + while (local38.data[local133 + local38.offset] != 0) { local133++; } @Pc(159) byte[] local159 = new byte[local133]; for (@Pc(161) int local161 = 0; local161 < local133; local161++) { - local159[local161] = local38.method2186(); + local159[local161] = local38.g1s(); } - local38.anInt2792++; + local38.offset++; local133++; @Pc(187) byte[] local187 = new byte[local133]; @Pc(194) int local194; @@ -79,7 +79,7 @@ public final class MidiInstrument extends Node { local187[1] = 1; @Pc(204) int local204 = 1; for (local206 = 2; local206 < local133; local206++) { - @Pc(217) int local217 = local38.method2229(); + @Pc(217) int local217 = local38.g1(); if (local217 == 0) { local204 = local194++; } else { @@ -94,39 +94,39 @@ public final class MidiInstrument extends Node { @Pc(242) Class162[] local242 = new Class162[local194]; for (local206 = 0; local206 < local242.length; local206++) { @Pc(256) Class162 local256 = local242[local206] = new Class162(); - @Pc(260) int local260 = local38.method2229(); + @Pc(260) int local260 = local38.g1(); if (local260 > 0) { local256.aByteArray80 = new byte[local260 * 2]; } - local260 = local38.method2229(); + local260 = local38.g1(); if (local260 > 0) { local256.aByteArray81 = new byte[local260 * 2 + 2]; local256.aByteArray81[1] = 64; } } - local206 = local38.method2229(); + local206 = local38.g1(); @Pc(311) byte[] local311 = local206 > 0 ? new byte[local206 * 2] : null; - local206 = local38.method2229(); + local206 = local38.g1(); @Pc(327) byte[] local327 = local206 > 0 ? new byte[local206 * 2] : null; @Pc(329) int local329; - for (local329 = 0; local38.aByteArray40[local329 + local38.anInt2792] != 0; local329++) { + for (local329 = 0; local38.data[local329 + local38.offset] != 0; local329++) { } @Pc(346) byte[] local346 = new byte[local329]; @Pc(348) int local348; for (local348 = 0; local348 < local329; local348++) { - local346[local348] = local38.method2186(); + local346[local348] = local38.g1s(); } - local38.anInt2792++; + local38.offset++; local329++; local348 = 0; @Pc(375) int local375; for (local375 = 0; local375 < 128; local375++) { - local348 += local38.method2229(); + local348 += local38.g1(); this.aShortArray36[local375] = (short) local348; } local348 = 0; for (local375 = 0; local375 < 128; local375++) { - local348 += local38.method2229(); + local348 += local38.g1(); this.aShortArray36[local375] = (short) (this.aShortArray36[local375] + (local348 << 8)); } local375 = 0; @@ -140,7 +140,7 @@ public final class MidiInstrument extends Node { } else { local375 = -1; } - local430 = local38.method2167(); + local430 = local38.gVarInt(); } this.aShortArray36[local432] = (short) (this.aShortArray36[local432] + ((local430 - 1 & 0x2) << 14)); this.anIntArray289[local432] = local430; @@ -153,7 +153,7 @@ public final class MidiInstrument extends Node { for (local496 = 0; local496 < 128; local496++) { if (this.anIntArray289[local496] != 0) { if (local375 == 0) { - local432 = local38.aByteArray40[local57++] - 1; + local432 = local38.data[local57++] - 1; if (local55.length > local428) { local375 = local55[local428++]; } else { @@ -170,7 +170,7 @@ public final class MidiInstrument extends Node { for (@Pc(550) int local550 = 0; local550 < 128; local550++) { if (this.anIntArray289[local550] != 0) { if (local375 == 0) { - local496 = local38.aByteArray40[local108++] + 16 << 2; + local496 = local38.data[local108++] + 16 << 2; if (local428 < local106.length) { local375 = local106[local428++]; } else { @@ -211,36 +211,36 @@ public final class MidiInstrument extends Node { local375 = -1; } if (this.anIntArray289[local664] > 0) { - local611 = local38.method2229() + 1; + local611 = local38.g1() + 1; } } local375--; this.aByteArray45[local664] = (byte) local611; } - this.anInt3078 = local38.method2229() + 1; + this.anInt3078 = local38.g1() + 1; @Pc(729) Class162 local729; @Pc(734) int local734; for (local664 = 0; local664 < local194; local664++) { local729 = local242[local664]; if (local729.aByteArray80 != null) { for (local734 = 1; local734 < local729.aByteArray80.length; local734 += 2) { - local729.aByteArray80[local734] = local38.method2186(); + local729.aByteArray80[local734] = local38.g1s(); } } if (local729.aByteArray81 != null) { for (local734 = 3; local734 < local729.aByteArray81.length - 2; local734 += 2) { - local729.aByteArray81[local734] = local38.method2186(); + local729.aByteArray81[local734] = local38.g1s(); } } } if (local311 != null) { for (local664 = 1; local664 < local311.length; local664 += 2) { - local311[local664] = local38.method2186(); + local311[local664] = local38.g1s(); } } if (local327 != null) { for (local664 = 1; local664 < local327.length; local664 += 2) { - local327[local664] = local38.method2186(); + local327[local664] = local38.g1s(); } } for (local664 = 0; local664 < local194; local664++) { @@ -248,7 +248,7 @@ public final class MidiInstrument extends Node { if (local729.aByteArray81 != null) { local348 = 0; for (local734 = 2; local734 < local729.aByteArray81.length; local734 += 2) { - local348 -= -local38.method2229() - 1; + local348 -= -local38.g1() - 1; local729.aByteArray81[local734] = (byte) local348; } } @@ -258,7 +258,7 @@ public final class MidiInstrument extends Node { if (local729.aByteArray80 != null) { local348 = 0; for (local734 = 2; local734 < local729.aByteArray80.length; local734 += 2) { - local348 = local348 + local38.method2229() + 1; + local348 = local348 + local38.g1() + 1; local729.aByteArray80[local734] = (byte) local348; } } @@ -270,10 +270,10 @@ public final class MidiInstrument extends Node { @Pc(1066) int local1066; @Pc(954) byte local954; if (local311 != null) { - local348 = local38.method2229(); + local348 = local38.g1(); local311[0] = (byte) local348; for (local664 = 2; local664 < local311.length; local664 += 2) { - local348 = local348 + local38.method2229() + 1; + local348 = local348 + local38.g1() + 1; local311[local664] = (byte) local348; } local954 = local311[0]; @@ -300,10 +300,10 @@ public final class MidiInstrument extends Node { } } if (local327 != null) { - local348 = local38.method2229(); + local348 = local38.g1(); local327[0] = (byte) local348; for (local664 = 2; local664 < local327.length; local664 += 2) { - local348 = local348 + local38.method2229() + 1; + local348 = local348 + local38.g1() + 1; local327[local664] = (byte) local348; } local954 = local327[0]; @@ -352,33 +352,33 @@ public final class MidiInstrument extends Node { } } for (local664 = 0; local664 < local194; local664++) { - local242[local664].anInt5815 = local38.method2229(); + local242[local664].anInt5815 = local38.g1(); } for (local664 = 0; local664 < local194; local664++) { local729 = local242[local664]; if (local729.aByteArray80 != null) { - local729.anInt5810 = local38.method2229(); + local729.anInt5810 = local38.g1(); } if (local729.aByteArray81 != null) { - local729.anInt5813 = local38.method2229(); + local729.anInt5813 = local38.g1(); } if (local729.anInt5815 > 0) { - local729.anInt5807 = local38.method2229(); + local729.anInt5807 = local38.g1(); } } for (local664 = 0; local664 < local194; local664++) { - local242[local664].anInt5814 = local38.method2229(); + local242[local664].anInt5814 = local38.g1(); } for (local664 = 0; local664 < local194; local664++) { local729 = local242[local664]; if (local729.anInt5814 > 0) { - local729.anInt5809 = local38.method2229(); + local729.anInt5809 = local38.g1(); } } for (local664 = 0; local664 < local194; local664++) { local729 = local242[local664]; if (local729.anInt5809 > 0) { - local729.anInt5811 = local38.method2229(); + local729.anInt5811 = local38.g1(); } } } diff --git a/client/src/main/java/NpcType.java b/client/src/main/java/NpcType.java index 59e89b8..3f3c705 100644 --- a/client/src/main/java/NpcType.java +++ b/client/src/main/java/NpcType.java @@ -487,7 +487,7 @@ public final class NpcType { @OriginalMember(owner = "client!me", name = "a", descriptor = "(Lclient!wa;I)V") public final void method2939(@OriginalArg(0) Buffer arg0) { while (true) { - @Pc(9) int local9 = arg0.method2229(); + @Pc(9) int local9 = arg0.g1(); if (local9 == 0) { return; } @@ -558,91 +558,91 @@ public final class NpcType { @Pc(12) int local12; @Pc(18) int local18; if (arg0 == 1) { - local12 = arg1.method2229(); + local12 = arg1.g1(); this.anIntArray356 = new int[local12]; for (local18 = 0; local18 < local12; local18++) { - this.anIntArray356[local18] = arg1.method2163(); + this.anIntArray356[local18] = arg1.g2(); if (this.anIntArray356[local18] == 65535) { this.anIntArray356[local18] = -1; } } } else if (arg0 == 2) { - this.aClass100_738 = arg1.method2202(); + this.aClass100_738 = arg1.gjstr(); } else if (arg0 == 12) { - this.anInt3713 = arg1.method2229(); + this.anInt3713 = arg1.g1(); } else if (arg0 >= 30 && arg0 < 35) { - this.aClass100Array116[arg0 - 30] = arg1.method2202(); + this.aClass100Array116[arg0 - 30] = arg1.gjstr(); if (this.aClass100Array116[arg0 - 30].method3111(Static10.aClass100_64)) { this.aClass100Array116[arg0 - 30] = null; } } else if (arg0 == 40) { - local12 = arg1.method2229(); + local12 = arg1.g1(); this.aShortArray39 = new short[local12]; this.aShortArray38 = new short[local12]; for (local18 = 0; local18 < local12; local18++) { - this.aShortArray38[local18] = (short) arg1.method2163(); - this.aShortArray39[local18] = (short) arg1.method2163(); + this.aShortArray38[local18] = (short) arg1.g2(); + this.aShortArray39[local18] = (short) arg1.g2(); } } else if (arg0 == 41) { - local12 = arg1.method2229(); + local12 = arg1.g1(); this.aShortArray37 = new short[local12]; this.aShortArray40 = new short[local12]; for (local18 = 0; local18 < local12; local18++) { - this.aShortArray40[local18] = (short) arg1.method2163(); - this.aShortArray37[local18] = (short) arg1.method2163(); + this.aShortArray40[local18] = (short) arg1.g2(); + this.aShortArray37[local18] = (short) arg1.g2(); } } else if (arg0 == 42) { - local12 = arg1.method2229(); + local12 = arg1.g1(); this.aByteArray51 = new byte[local12]; for (local18 = 0; local18 < local12; local18++) { - this.aByteArray51[local18] = arg1.method2186(); + this.aByteArray51[local18] = arg1.g1s(); } } else if (arg0 == 60) { - local12 = arg1.method2229(); + local12 = arg1.g1(); this.anIntArray354 = new int[local12]; for (local18 = 0; local18 < local12; local18++) { - this.anIntArray354[local18] = arg1.method2163(); + this.anIntArray354[local18] = arg1.g2(); } } else if (arg0 == 93) { this.aBoolean184 = false; } else if (arg0 == 95) { - this.anInt3726 = arg1.method2163(); + this.anInt3726 = arg1.g2(); } else if (arg0 == 97) { - this.anInt3729 = arg1.method2163(); + this.anInt3729 = arg1.g2(); } else if (arg0 == 98) { - this.anInt3731 = arg1.method2163(); + this.anInt3731 = arg1.g2(); } else if (arg0 == 99) { this.aBoolean182 = true; } else if (arg0 == 100) { - this.anInt3715 = arg1.method2186(); + this.anInt3715 = arg1.g1s(); } else if (arg0 == 101) { - this.anInt3738 = arg1.method2186() * 5; + this.anInt3738 = arg1.g1s() * 5; } else if (arg0 == 102) { - this.anInt3732 = arg1.method2163(); + this.anInt3732 = arg1.g2(); } else if (arg0 == 103) { - this.anInt3733 = arg1.method2163(); + this.anInt3733 = arg1.g2(); } else { @Pc(297) int local297; if (arg0 == 106 || arg0 == 118) { - this.anInt3723 = arg1.method2163(); + this.anInt3723 = arg1.g2(); local12 = -1; if (this.anInt3723 == 65535) { this.anInt3723 = -1; } - this.anInt3749 = arg1.method2163(); + this.anInt3749 = arg1.g2(); if (this.anInt3749 == 65535) { this.anInt3749 = -1; } if (arg0 == 118) { - local12 = arg1.method2163(); + local12 = arg1.g2(); if (local12 == 65535) { local12 = -1; } } - local18 = arg1.method2229(); + local18 = arg1.g1(); this.anIntArray357 = new int[local18 + 2]; for (local297 = 0; local297 <= local18; local297++) { - this.anIntArray357[local297] = arg1.method2163(); + this.anIntArray357[local297] = arg1.g2(); if (this.anIntArray357[local297] == 65535) { this.anIntArray357[local297] = -1; } @@ -655,78 +655,78 @@ public final class NpcType { } else if (arg0 == 111) { this.aBoolean180 = false; } else if (arg0 == 113) { - this.aShort24 = (short) arg1.method2163(); - this.aShort23 = (short) arg1.method2163(); + this.aShort24 = (short) arg1.g2(); + this.aShort23 = (short) arg1.g2(); } else if (arg0 == 114) { - this.aByte13 = arg1.method2186(); - this.aByte12 = arg1.method2186(); + this.aByte13 = arg1.g1s(); + this.aByte12 = arg1.g1s(); } else if (arg0 == 115) { - arg1.method2229(); - arg1.method2229(); + arg1.g1(); + arg1.g1(); } else if (arg0 == 119) { - this.aByte10 = arg1.method2186(); + this.aByte10 = arg1.g1s(); } else if (arg0 == 121) { this.anIntArrayArray29 = new int[this.anIntArray356.length][]; - local12 = arg1.method2229(); + local12 = arg1.g1(); for (local18 = 0; local18 < local12; local18++) { - local297 = arg1.method2229(); + local297 = arg1.g1(); @Pc(439) int[] local439 = this.anIntArrayArray29[local297] = new int[3]; - local439[0] = arg1.method2186(); - local439[1] = arg1.method2186(); - local439[2] = arg1.method2186(); + local439[0] = arg1.g1s(); + local439[1] = arg1.g1s(); + local439[2] = arg1.g1s(); } } else if (arg0 == 122) { - this.anInt3736 = arg1.method2163(); + this.anInt3736 = arg1.g2(); } else if (arg0 == 123) { - this.anInt3730 = arg1.method2163(); + this.anInt3730 = arg1.g2(); } else if (arg0 == 125) { - this.aByte11 = arg1.method2186(); + this.aByte11 = arg1.g1s(); } else if (arg0 == 126) { - this.anInt3739 = arg1.method2163(); + this.anInt3739 = arg1.g2(); } else if (arg0 == 127) { - this.anInt3737 = arg1.method2163(); + this.anInt3737 = arg1.g2(); } else if (arg0 == 128) { - arg1.method2229(); + arg1.g1(); } else if (arg0 == 134) { - this.anInt3728 = arg1.method2163(); + this.anInt3728 = arg1.g2(); if (this.anInt3728 == 65535) { this.anInt3728 = -1; } - this.anInt3745 = arg1.method2163(); + this.anInt3745 = arg1.g2(); if (this.anInt3745 == 65535) { this.anInt3745 = -1; } - this.anInt3747 = arg1.method2163(); + this.anInt3747 = arg1.g2(); if (this.anInt3747 == 65535) { this.anInt3747 = -1; } - this.anInt3734 = arg1.method2163(); + this.anInt3734 = arg1.g2(); if (this.anInt3734 == 65535) { this.anInt3734 = -1; } - this.anInt3746 = arg1.method2229(); + this.anInt3746 = arg1.g1(); } else if (arg0 == 135) { - this.anInt3750 = arg1.method2229(); - this.anInt3719 = arg1.method2163(); + this.anInt3750 = arg1.g1(); + this.anInt3719 = arg1.g2(); } else if (arg0 == 136) { - this.anInt3743 = arg1.method2229(); - this.anInt3735 = arg1.method2163(); + this.anInt3743 = arg1.g1(); + this.anInt3735 = arg1.g2(); } else if (arg0 == 137) { - this.anInt3752 = arg1.method2163(); + this.anInt3752 = arg1.g2(); } else if (arg0 == 249) { - local12 = arg1.method2229(); + local12 = arg1.g1(); if (this.aClass133_15 == null) { local18 = Static165.method3164(local12); this.aClass133_15 = new HashTable(local18); } for (local18 = 0; local18 < local12; local18++) { - @Pc(592) boolean local592 = arg1.method2229() == 1; - @Pc(596) int local596 = arg1.method2220(); + @Pc(592) boolean local592 = arg1.g1() == 1; + @Pc(596) int local596 = arg1.g3(); @Pc(605) Node local605; if (local592) { - local605 = new StringNode(arg1.method2202()); + local605 = new StringNode(arg1.gjstr()); } else { - local605 = new IntNode(arg1.method2174()); + local605 = new IntNode(arg1.g4()); } this.aClass133_15.method3862(local605, (long) local596); } diff --git a/client/src/main/java/ObjType.java b/client/src/main/java/ObjType.java index 0ff8b2b..581907e 100644 --- a/client/src/main/java/ObjType.java +++ b/client/src/main/java/ObjType.java @@ -356,7 +356,7 @@ public final class ObjType { @OriginalMember(owner = "client!h", name = "a", descriptor = "(ILclient!wa;)V") public final void method1827(@OriginalArg(1) Buffer arg0) { while (true) { - @Pc(5) int local5 = arg0.method2229(); + @Pc(5) int local5 = arg0.g1(); if (local5 == 0) { return; } @@ -367,150 +367,150 @@ public final class ObjType { @OriginalMember(owner = "client!h", name = "a", descriptor = "(BLclient!wa;I)V") private void method1828(@OriginalArg(1) Buffer arg0, @OriginalArg(2) int arg1) { if (arg1 == 1) { - this.anInt2320 = arg0.method2163(); + this.anInt2320 = arg0.g2(); } else if (arg1 == 2) { - this.aClass100_495 = arg0.method2202(); + this.aClass100_495 = arg0.gjstr(); } else if (arg1 == 4) { - this.anInt2375 = arg0.method2163(); + this.anInt2375 = arg0.g2(); } else if (arg1 == 5) { - this.anInt2353 = arg0.method2163(); + this.anInt2353 = arg0.g2(); } else if (arg1 == 6) { - this.anInt2369 = arg0.method2163(); + this.anInt2369 = arg0.g2(); } else if (arg1 == 7) { - this.anInt2359 = arg0.method2163(); + this.anInt2359 = arg0.g2(); if (this.anInt2359 > 32767) { this.anInt2359 -= 65536; } } else if (arg1 == 8) { - this.anInt2319 = arg0.method2163(); + this.anInt2319 = arg0.g2(); if (this.anInt2319 > 32767) { this.anInt2319 -= 65536; } } else if (arg1 == 11) { this.anInt2336 = 1; } else if (arg1 == 12) { - this.anInt2325 = arg0.method2174(); + this.anInt2325 = arg0.g4(); } else if (arg1 == 16) { this.aBoolean131 = true; } else if (arg1 == 23) { - this.anInt2360 = arg0.method2163(); + this.anInt2360 = arg0.g2(); } else if (arg1 == 24) { - this.anInt2341 = arg0.method2163(); + this.anInt2341 = arg0.g2(); } else if (arg1 == 25) { - this.anInt2331 = arg0.method2163(); + this.anInt2331 = arg0.g2(); } else if (arg1 == 26) { - this.anInt2361 = arg0.method2163(); + this.anInt2361 = arg0.g2(); } else if (arg1 >= 30 && arg1 < 35) { - this.aClass100Array72[arg1 - 30] = arg0.method2202(); + this.aClass100Array72[arg1 - 30] = arg0.gjstr(); if (this.aClass100Array72[arg1 - 30].method3111(Static10.aClass100_64)) { this.aClass100Array72[arg1 - 30] = null; } } else if (arg1 >= 35 && arg1 < 40) { - this.aClass100Array71[arg1 - 35] = arg0.method2202(); + this.aClass100Array71[arg1 - 35] = arg0.gjstr(); } else { @Pc(169) int local169; @Pc(179) int local179; if (arg1 == 40) { - local169 = arg0.method2229(); + local169 = arg0.g1(); this.aShortArray33 = new short[local169]; this.aShortArray34 = new short[local169]; for (local179 = 0; local179 < local169; local179++) { - this.aShortArray34[local179] = (short) arg0.method2163(); - this.aShortArray33[local179] = (short) arg0.method2163(); + this.aShortArray34[local179] = (short) arg0.g2(); + this.aShortArray33[local179] = (short) arg0.g2(); } } else if (arg1 == 41) { - local169 = arg0.method2229(); + local169 = arg0.g1(); this.aShortArray31 = new short[local169]; this.aShortArray32 = new short[local169]; for (local179 = 0; local179 < local169; local179++) { - this.aShortArray32[local179] = (short) arg0.method2163(); - this.aShortArray31[local179] = (short) arg0.method2163(); + this.aShortArray32[local179] = (short) arg0.g2(); + this.aShortArray31[local179] = (short) arg0.g2(); } } else if (arg1 == 42) { - local169 = arg0.method2229(); + local169 = arg0.g1(); this.aByteArray36 = new byte[local169]; for (local179 = 0; local179 < local169; local179++) { - this.aByteArray36[local179] = arg0.method2186(); + this.aByteArray36[local179] = arg0.g1s(); } } else if (arg1 == 65) { this.aBoolean132 = true; } else if (arg1 == 78) { - this.anInt2340 = arg0.method2163(); + this.anInt2340 = arg0.g2(); } else if (arg1 == 79) { - this.anInt2344 = arg0.method2163(); + this.anInt2344 = arg0.g2(); } else if (arg1 == 90) { - this.anInt2372 = arg0.method2163(); + this.anInt2372 = arg0.g2(); } else if (arg1 == 91) { - this.anInt2342 = arg0.method2163(); + this.anInt2342 = arg0.g2(); } else if (arg1 == 92) { - this.anInt2364 = arg0.method2163(); + this.anInt2364 = arg0.g2(); } else if (arg1 == 93) { - this.anInt2318 = arg0.method2163(); + this.anInt2318 = arg0.g2(); } else if (arg1 == 95) { - this.anInt2339 = arg0.method2163(); + this.anInt2339 = arg0.g2(); } else if (arg1 == 96) { - this.anInt2370 = arg0.method2229(); + this.anInt2370 = arg0.g1(); } else if (arg1 == 97) { - this.anInt2356 = arg0.method2163(); + this.anInt2356 = arg0.g2(); } else if (arg1 == 98) { - this.anInt2358 = arg0.method2163(); + this.anInt2358 = arg0.g2(); } else if (arg1 >= 100 && arg1 < 110) { if (this.anIntArray214 == null) { this.anIntArray214 = new int[10]; this.anIntArray212 = new int[10]; } - this.anIntArray214[arg1 - 100] = arg0.method2163(); - this.anIntArray212[arg1 - 100] = arg0.method2163(); + this.anIntArray214[arg1 - 100] = arg0.g2(); + this.anIntArray212[arg1 - 100] = arg0.g2(); } else if (arg1 == 110) { - this.anInt2373 = arg0.method2163(); + this.anInt2373 = arg0.g2(); } else if (arg1 == 111) { - this.anInt2350 = arg0.method2163(); + this.anInt2350 = arg0.g2(); } else if (arg1 == 112) { - this.anInt2368 = arg0.method2163(); + this.anInt2368 = arg0.g2(); } else if (arg1 == 113) { - this.anInt2352 = arg0.method2186(); + this.anInt2352 = arg0.g1s(); } else if (arg1 == 114) { - this.anInt2357 = arg0.method2186() * 5; + this.anInt2357 = arg0.g1s() * 5; } else if (arg1 == 115) { - this.anInt2351 = arg0.method2229(); + this.anInt2351 = arg0.g1(); } else if (arg1 == 121) { - this.anInt2363 = arg0.method2163(); + this.anInt2363 = arg0.g2(); } else if (arg1 == 122) { - this.anInt2334 = arg0.method2163(); + this.anInt2334 = arg0.g2(); } else if (arg1 == 125) { - this.anInt2330 = arg0.method2186(); - this.anInt2347 = arg0.method2186(); - this.anInt2343 = arg0.method2186(); + this.anInt2330 = arg0.g1s(); + this.anInt2347 = arg0.g1s(); + this.anInt2343 = arg0.g1s(); } else if (arg1 == 126) { - this.anInt2346 = arg0.method2186(); - this.anInt2371 = arg0.method2186(); - this.anInt2315 = arg0.method2186(); + this.anInt2346 = arg0.g1s(); + this.anInt2371 = arg0.g1s(); + this.anInt2315 = arg0.g1s(); } else if (arg1 == 127) { - this.anInt2338 = arg0.method2229(); - this.anInt2327 = arg0.method2163(); + this.anInt2338 = arg0.g1(); + this.anInt2327 = arg0.g2(); } else if (arg1 == 128) { - this.anInt2355 = arg0.method2229(); - this.anInt2321 = arg0.method2163(); + this.anInt2355 = arg0.g1(); + this.anInt2321 = arg0.g2(); } else if (arg1 == 129) { - arg0.method2229(); - arg0.method2163(); + arg0.g1(); + arg0.g2(); } else if (arg1 == 130) { - arg0.method2229(); - arg0.method2163(); + arg0.g1(); + arg0.g2(); } else if (arg1 == 249) { - local169 = arg0.method2229(); + local169 = arg0.g1(); if (this.aClass133_6 == null) { local179 = Static165.method3164(local169); this.aClass133_6 = new HashTable(local179); } for (local179 = 0; local179 < local169; local179++) { - @Pc(510) boolean local510 = arg0.method2229() == 1; - @Pc(514) int local514 = arg0.method2220(); + @Pc(510) boolean local510 = arg0.g1() == 1; + @Pc(514) int local514 = arg0.g3(); @Pc(523) Node local523; if (local510) { - local523 = new StringNode(arg0.method2202()); + local523 = new StringNode(arg0.gjstr()); } else { - local523 = new IntNode(arg0.method2174()); + local523 = new IntNode(arg0.g4()); } this.aClass133_6.method3862(local523, (long) local514); } diff --git a/client/src/main/java/Packet.java b/client/src/main/java/Packet.java index a7f7e69..de3881e 100644 --- a/client/src/main/java/Packet.java +++ b/client/src/main/java/Packet.java @@ -19,13 +19,13 @@ public final class Packet extends Buffer { @OriginalMember(owner = "client!i", name = "q", descriptor = "(B)V") public final void method2233() { - this.anInt2846 = this.anInt2792 * 8; + this.anInt2846 = this.offset * 8; } @OriginalMember(owner = "client!i", name = "a", descriptor = "(BI[BI)V") public final void method2237(@OriginalArg(2) byte[] arg0, @OriginalArg(3) int arg1) { for (@Pc(17) int local17 = 0; local17 < arg1; local17++) { - arg0[local17] = (byte) (this.aByteArray40[this.anInt2792++] - this.aClass71_1.method2295()); + arg0[local17] = (byte) (this.data[this.offset++] - this.aClass71_1.method2295()); } } @@ -36,14 +36,14 @@ public final class Packet extends Buffer { @Pc(16) int local16 = 0; this.anInt2846 += arg0; while (local14 < arg0) { - local16 += (Static18.anIntArray57[local14] & this.aByteArray40[local6++]) << arg0 - local14; + local16 += (Static18.anIntArray57[local14] & this.data[local6++]) << arg0 - local14; arg0 -= local14; local14 = 8; } if (local14 == arg0) { - local16 += this.aByteArray40[local6] & Static18.anIntArray57[local14]; + local16 += this.data[local6] & Static18.anIntArray57[local14]; } else { - local16 += this.aByteArray40[local6] >> local14 - arg0 & Static18.anIntArray57[arg0]; + local16 += this.data[local6] >> local14 - arg0 & Static18.anIntArray57[arg0]; } return local16; } @@ -60,16 +60,16 @@ public final class Packet extends Buffer { @OriginalMember(owner = "client!i", name = "r", descriptor = "(II)V") public final void method2242(@OriginalArg(1) int arg0) { - this.aByteArray40[this.anInt2792++] = (byte) (arg0 + this.aClass71_1.method2295()); + this.data[this.offset++] = (byte) (arg0 + this.aClass71_1.method2295()); } @OriginalMember(owner = "client!i", name = "s", descriptor = "(I)I") public final int method2243() { - return this.aByteArray40[this.anInt2792++] - this.aClass71_1.method2295() & 0xFF; + return this.data[this.offset++] - this.aClass71_1.method2295() & 0xFF; } @OriginalMember(owner = "client!i", name = "h", descriptor = "(Z)V") public final void method2244() { - this.anInt2792 = (this.anInt2846 + 7) / 8; + this.offset = (this.anInt2846 + 7) / 8; } } diff --git a/client/src/main/java/Player.java b/client/src/main/java/Player.java index 4f5c0bc..fdc20e7 100644 --- a/client/src/main/java/Player.java +++ b/client/src/main/java/Player.java @@ -68,8 +68,8 @@ public final class Player extends PathingEntity { @OriginalMember(owner = "client!e", name = "a", descriptor = "(ILclient!wa;)V") public final void method1262(@OriginalArg(1) Buffer arg0) { - arg0.anInt2792 = 0; - @Pc(20) int local20 = arg0.method2229(); + arg0.offset = 0; + @Pc(20) int local20 = arg0.g1(); @Pc(22) int local22 = -1; @Pc(26) int local26 = local20 & 0x1; @Pc(37) boolean local37 = (local20 & 0x4) != 0; @@ -79,23 +79,23 @@ public final class Player extends PathingEntity { this.anInt1651 = local20 >> 6 & 0x3; this.anInt3412 += (this.method2693() - local41) * 64; this.anInt3421 += (this.method2693() - local41) * 64; - this.anInt1669 = arg0.method2186(); - this.anInt1649 = arg0.method2186(); + this.anInt1669 = arg0.g1s(); + this.anInt1649 = arg0.g1s(); this.anInt1650 = 0; @Pc(111) int local111; @Pc(127) int local127; @Pc(134) int local134; @Pc(175) int local175; for (@Pc(102) int local102 = 0; local102 < 12; local102++) { - local111 = arg0.method2229(); + local111 = arg0.g1(); if (local111 == 0) { local44[local102] = 0; } else { - local127 = arg0.method2229(); + local127 = arg0.g1(); local134 = (local111 << 8) + local127; if (local102 == 0 && local134 == 65535) { - local22 = arg0.method2163(); - this.anInt1650 = arg0.method2229(); + local22 = arg0.g2(); + this.anInt1650 = arg0.g1(); break; } if (local134 >= 32768) { @@ -112,30 +112,30 @@ public final class Player extends PathingEntity { } @Pc(197) int[] local197 = new int[5]; for (local111 = 0; local111 < 5; local111++) { - local127 = arg0.method2229(); + local127 = arg0.g1(); if (local127 < 0 || local127 >= Static33.aShortArrayArray2[local111].length) { local127 = 0; } local197[local111] = local127; } - this.anInt3365 = arg0.method2163(); - @Pc(236) long local236 = arg0.method2182(); + this.anInt3365 = arg0.g2(); + @Pc(236) long local236 = arg0.g8(); this.aClass100_364 = Static79.method1702(local236).method3125(); - this.anInt1652 = arg0.method2229(); + this.anInt1652 = arg0.g1(); if (local37) { - this.anInt1671 = arg0.method2163(); + this.anInt1671 = arg0.g2(); this.anInt1656 = this.anInt1652; this.anInt1667 = -1; } else { this.anInt1671 = 0; - this.anInt1656 = arg0.method2229(); - this.anInt1667 = arg0.method2229(); + this.anInt1656 = arg0.g1(); + this.anInt1667 = arg0.g1(); if (this.anInt1667 == 255) { this.anInt1667 = -1; } } local134 = this.anInt1664; - this.anInt1664 = arg0.method2229(); + this.anInt1664 = arg0.g1(); if (this.anInt1664 == 0) { Static271.method4597(this); } else { @@ -143,10 +143,10 @@ public final class Player extends PathingEntity { @Pc(312) int local312 = this.anInt1654; @Pc(315) int local315 = this.anInt1670; local175 = this.anInt1648; - this.anInt1648 = arg0.method2163(); - this.anInt1658 = arg0.method2163(); - this.anInt1654 = arg0.method2163(); - this.anInt1670 = arg0.method2163(); + this.anInt1648 = arg0.g2(); + this.anInt1658 = arg0.g2(); + this.anInt1654 = arg0.g2(); + this.anInt1670 = arg0.g2(); if (this.anInt1664 != local134 || this.anInt1648 != local175 || this.anInt1658 != local309 || local312 != this.anInt1654 || this.anInt1670 != local315) { Static214.method4359(this); } diff --git a/client/src/main/java/RawModel.java b/client/src/main/java/RawModel.java index fa068ca..e8b68bd 100644 --- a/client/src/main/java/RawModel.java +++ b/client/src/main/java/RawModel.java @@ -834,32 +834,32 @@ public final class RawModel extends Entity { @Pc(24) Buffer local24 = new Buffer(arg0); @Pc(29) Buffer local29 = new Buffer(arg0); @Pc(34) Buffer local34 = new Buffer(arg0); - local4.anInt2792 = arg0.length - 23; - @Pc(44) int local44 = local4.method2163(); - @Pc(48) int local48 = local4.method2163(); - @Pc(52) int local52 = local4.method2229(); - @Pc(56) int local56 = local4.method2229(); + local4.offset = arg0.length - 23; + @Pc(44) int local44 = local4.g2(); + @Pc(48) int local48 = local4.g2(); + @Pc(52) int local52 = local4.g1(); + @Pc(56) int local56 = local4.g1(); @Pc(65) boolean local65 = (local56 & 0x1) == 1; @Pc(74) boolean local74 = (local56 & 0x2) == 2; - @Pc(78) int local78 = local4.method2229(); - @Pc(82) int local82 = local4.method2229(); - @Pc(86) int local86 = local4.method2229(); - @Pc(90) int local90 = local4.method2229(); - @Pc(94) int local94 = local4.method2229(); - @Pc(98) int local98 = local4.method2163(); - @Pc(102) int local102 = local4.method2163(); - @Pc(106) int local106 = local4.method2163(); - @Pc(110) int local110 = local4.method2163(); - @Pc(114) int local114 = local4.method2163(); + @Pc(78) int local78 = local4.g1(); + @Pc(82) int local82 = local4.g1(); + @Pc(86) int local86 = local4.g1(); + @Pc(90) int local90 = local4.g1(); + @Pc(94) int local94 = local4.g1(); + @Pc(98) int local98 = local4.g2(); + @Pc(102) int local102 = local4.g2(); + @Pc(106) int local106 = local4.g2(); + @Pc(110) int local110 = local4.g2(); + @Pc(114) int local114 = local4.g2(); @Pc(116) int local116 = 0; @Pc(118) int local118 = 0; @Pc(120) int local120 = 0; @Pc(131) int local131; if (local52 > 0) { this.aByteArray29 = new byte[local52]; - local4.anInt2792 = 0; + local4.offset = 0; for (local131 = 0; local131 < local52; local131++) { - @Pc(143) byte local143 = this.aByteArray29[local131] = local4.method2186(); + @Pc(143) byte local143 = this.aByteArray29[local131] = local4.g1s(); if (local143 == 0) { local116++; } @@ -972,11 +972,11 @@ public final class RawModel extends Entity { this.aByteArray33 = new byte[local120]; } } - local4.anInt2792 = local52; - local9.anInt2792 = local250; - local14.anInt2792 = local256; - local19.anInt2792 = local262; - local24.anInt2792 = local201; + local4.offset = local52; + local9.offset = local250; + local14.offset = local256; + local19.offset = local262; + local24.offset = local201; @Pc(473) int local473 = 0; @Pc(475) int local475 = 0; @Pc(477) int local477 = 0; @@ -986,18 +986,18 @@ public final class RawModel extends Entity { @Pc(498) int local498; @Pc(508) int local508; for (local479 = 0; local479 < local44; local479++) { - local486 = local4.method2229(); + local486 = local4.g1(); local488 = 0; if ((local486 & 0x1) != 0) { - local488 = local9.method2223(); + local488 = local9.gSmart1or2s(); } local498 = 0; if ((local486 & 0x2) != 0) { - local498 = local14.method2223(); + local498 = local14.gSmart1or2s(); } local508 = 0; if ((local486 & 0x4) != 0) { - local508 = local19.method2223(); + local508 = local19.gSmart1or2s(); } this.anIntArray202[local479] = local473 + local488; this.anIntArray201[local479] = local475 + local498; @@ -1006,54 +1006,54 @@ public final class RawModel extends Entity { local475 = this.anIntArray201[local479]; local477 = this.anIntArray203[local479]; if (local94 == 1) { - this.anIntArray193[local479] = local24.method2229(); + this.anIntArray193[local479] = local24.g1(); } } - local4.anInt2792 = local242; - local9.anInt2792 = local169; - local14.anInt2792 = local183; - local19.anInt2792 = local210; - local24.anInt2792 = local192; - local29.anInt2792 = local225; - local34.anInt2792 = local236; + local4.offset = local242; + local9.offset = local169; + local14.offset = local183; + local19.offset = local210; + local24.offset = local192; + local29.offset = local225; + local34.offset = local236; for (local479 = 0; local479 < local48; local479++) { - this.aShortArray24[local479] = (short) local4.method2163(); + this.aShortArray24[local479] = (short) local4.g2(); if (local65) { - this.aByteArray30[local479] = local9.method2186(); + this.aByteArray30[local479] = local9.g1s(); } if (local78 == 255) { - this.aByteArray35[local479] = local14.method2186(); + this.aByteArray35[local479] = local14.g1s(); } if (local82 == 1) { - this.aByteArray26[local479] = local19.method2186(); + this.aByteArray26[local479] = local19.g1s(); } if (local86 == 1) { - this.anIntArray192[local479] = local24.method2229(); + this.anIntArray192[local479] = local24.g1(); } if (local90 == 1) { - this.aShortArray23[local479] = (short) (local29.method2163() - 1); + this.aShortArray23[local479] = (short) (local29.g2() - 1); } if (this.aByteArray31 != null) { if (this.aShortArray23[local479] == -1) { this.aByteArray31[local479] = -1; } else { - this.aByteArray31[local479] = (byte) (local34.method2229() - 1); + this.aByteArray31[local479] = (byte) (local34.g1() - 1); } } } - local4.anInt2792 = local219; - local9.anInt2792 = local177; + local4.offset = local219; + local9.offset = local177; local479 = 0; local486 = 0; local488 = 0; local498 = 0; @Pc(700) int local700; for (local508 = 0; local508 < local48; local508++) { - local700 = local9.method2229(); + local700 = local9.g1(); if (local700 == 1) { - local479 = local4.method2223() + local498; - local486 = local4.method2223() + local479; - local488 = local4.method2223() + local486; + local479 = local4.gSmart1or2s() + local498; + local486 = local4.gSmart1or2s() + local479; + local488 = local4.gSmart1or2s() + local486; local498 = local488; this.anIntArray197[local508] = local479; this.anIntArray200[local508] = local486; @@ -1061,7 +1061,7 @@ public final class RawModel extends Entity { } if (local700 == 2) { local486 = local488; - local488 = local4.method2223() + local498; + local488 = local4.gSmart1or2s() + local498; local498 = local488; this.anIntArray197[local508] = local479; this.anIntArray200[local508] = local486; @@ -1069,7 +1069,7 @@ public final class RawModel extends Entity { } if (local700 == 3) { local479 = local488; - local488 = local4.method2223() + local498; + local488 = local4.gSmart1or2s() + local498; local498 = local488; this.anIntArray197[local508] = local479; this.anIntArray200[local508] = local486; @@ -1079,73 +1079,73 @@ public final class RawModel extends Entity { @Pc(803) int local803 = local479; local479 = local486; local486 = local803; - local488 = local4.method2223() + local498; + local488 = local4.gSmart1or2s() + local498; local498 = local488; this.anIntArray197[local508] = local479; this.anIntArray200[local508] = local803; this.anIntArray196[local508] = local488; } } - local4.anInt2792 = local268; - local9.anInt2792 = local276; - local14.anInt2792 = local284; - local19.anInt2792 = local292; - local24.anInt2792 = local298; - local29.anInt2792 = local304; + local4.offset = local268; + local9.offset = local276; + local14.offset = local284; + local19.offset = local292; + local24.offset = local298; + local29.offset = local304; for (local508 = 0; local508 < local52; local508++) { local700 = this.aByteArray29[local508] & 0xFF; if (local700 == 0) { - this.aShortArray26[local508] = (short) local4.method2163(); - this.aShortArray20[local508] = (short) local4.method2163(); - this.aShortArray28[local508] = (short) local4.method2163(); + this.aShortArray26[local508] = (short) local4.g2(); + this.aShortArray20[local508] = (short) local4.g2(); + this.aShortArray28[local508] = (short) local4.g2(); } if (local700 == 1) { - this.aShortArray26[local508] = (short) local9.method2163(); - this.aShortArray20[local508] = (short) local9.method2163(); - this.aShortArray28[local508] = (short) local9.method2163(); - this.aShortArray27[local508] = (short) local14.method2163(); - this.aShortArray25[local508] = (short) local14.method2163(); - this.aShortArray21[local508] = (short) local14.method2163(); - this.aByteArray27[local508] = local19.method2186(); - this.aByteArray32[local508] = local24.method2186(); - this.aByteArray34[local508] = local29.method2186(); + this.aShortArray26[local508] = (short) local9.g2(); + this.aShortArray20[local508] = (short) local9.g2(); + this.aShortArray28[local508] = (short) local9.g2(); + this.aShortArray27[local508] = (short) local14.g2(); + this.aShortArray25[local508] = (short) local14.g2(); + this.aShortArray21[local508] = (short) local14.g2(); + this.aByteArray27[local508] = local19.g1s(); + this.aByteArray32[local508] = local24.g1s(); + this.aByteArray34[local508] = local29.g1s(); } if (local700 == 2) { - this.aShortArray26[local508] = (short) local9.method2163(); - this.aShortArray20[local508] = (short) local9.method2163(); - this.aShortArray28[local508] = (short) local9.method2163(); - this.aShortArray27[local508] = (short) local14.method2163(); - this.aShortArray25[local508] = (short) local14.method2163(); - this.aShortArray21[local508] = (short) local14.method2163(); - this.aByteArray27[local508] = local19.method2186(); - this.aByteArray32[local508] = local24.method2186(); - this.aByteArray34[local508] = local29.method2186(); - this.aByteArray28[local508] = local29.method2186(); - this.aByteArray33[local508] = local29.method2186(); + this.aShortArray26[local508] = (short) local9.g2(); + this.aShortArray20[local508] = (short) local9.g2(); + this.aShortArray28[local508] = (short) local9.g2(); + this.aShortArray27[local508] = (short) local14.g2(); + this.aShortArray25[local508] = (short) local14.g2(); + this.aShortArray21[local508] = (short) local14.g2(); + this.aByteArray27[local508] = local19.g1s(); + this.aByteArray32[local508] = local24.g1s(); + this.aByteArray34[local508] = local29.g1s(); + this.aByteArray28[local508] = local29.g1s(); + this.aByteArray33[local508] = local29.g1s(); } if (local700 == 3) { - this.aShortArray26[local508] = (short) local9.method2163(); - this.aShortArray20[local508] = (short) local9.method2163(); - this.aShortArray28[local508] = (short) local9.method2163(); - this.aShortArray27[local508] = (short) local14.method2163(); - this.aShortArray25[local508] = (short) local14.method2163(); - this.aShortArray21[local508] = (short) local14.method2163(); - this.aByteArray27[local508] = local19.method2186(); - this.aByteArray32[local508] = local24.method2186(); - this.aByteArray34[local508] = local29.method2186(); + this.aShortArray26[local508] = (short) local9.g2(); + this.aShortArray20[local508] = (short) local9.g2(); + this.aShortArray28[local508] = (short) local9.g2(); + this.aShortArray27[local508] = (short) local14.g2(); + this.aShortArray25[local508] = (short) local14.g2(); + this.aShortArray21[local508] = (short) local14.g2(); + this.aByteArray27[local508] = local19.g1s(); + this.aByteArray32[local508] = local24.g1s(); + this.aByteArray34[local508] = local29.g1s(); } } if (!local74) { return; } - local4.anInt2792 = local131; - local508 = local4.method2229(); + local4.offset = local131; + local508 = local4.g1(); if (local508 > 0) { - local4.anInt2792 += local508 * 4; + local4.offset += local508 * 4; } - local700 = local4.method2229(); + local700 = local4.g1(); if (local700 > 0) { - local4.anInt2792 += local700 * 4; + local4.offset += local700 * 4; } } @@ -1466,19 +1466,19 @@ public final class RawModel extends Entity { @Pc(18) Buffer local18 = new Buffer(arg0); @Pc(23) Buffer local23 = new Buffer(arg0); @Pc(28) Buffer local28 = new Buffer(arg0); - local8.anInt2792 = arg0.length - 18; - @Pc(38) int local38 = local8.method2163(); - @Pc(42) int local42 = local8.method2163(); - @Pc(46) int local46 = local8.method2229(); - @Pc(50) int local50 = local8.method2229(); - @Pc(54) int local54 = local8.method2229(); - @Pc(58) int local58 = local8.method2229(); - @Pc(62) int local62 = local8.method2229(); - @Pc(66) int local66 = local8.method2229(); - @Pc(70) int local70 = local8.method2163(); - @Pc(74) int local74 = local8.method2163(); - @Pc(78) int local78 = local8.method2163(); - @Pc(82) int local82 = local8.method2163(); + local8.offset = arg0.length - 18; + @Pc(38) int local38 = local8.g2(); + @Pc(42) int local42 = local8.g2(); + @Pc(46) int local46 = local8.g1(); + @Pc(50) int local50 = local8.g1(); + @Pc(54) int local54 = local8.g1(); + @Pc(58) int local58 = local8.g1(); + @Pc(62) int local62 = local8.g1(); + @Pc(66) int local66 = local8.g1(); + @Pc(70) int local70 = local8.g2(); + @Pc(74) int local74 = local8.g2(); + @Pc(78) int local78 = local8.g2(); + @Pc(82) int local82 = local8.g2(); @Pc(90) int local90 = local38; @Pc(92) int local92 = local90; local90 += local42; @@ -1547,11 +1547,11 @@ public final class RawModel extends Entity { this.anIntArray192 = new int[local42]; } this.aShortArray24 = new short[local42]; - local8.anInt2792 = 0; - local13.anInt2792 = local165; - local18.anInt2792 = local171; - local23.anInt2792 = local90; - local28.anInt2792 = local125; + local8.offset = 0; + local13.offset = local165; + local18.offset = local171; + local23.offset = local90; + local28.offset = local125; @Pc(301) int local301 = 0; @Pc(303) int local303 = 0; @Pc(305) int local305 = 0; @@ -1561,18 +1561,18 @@ public final class RawModel extends Entity { @Pc(326) int local326; @Pc(336) int local336; for (local307 = 0; local307 < local38; local307++) { - local314 = local8.method2229(); + local314 = local8.g1(); local316 = 0; if ((local314 & 0x1) != 0) { - local316 = local13.method2223(); + local316 = local13.gSmart1or2s(); } local326 = 0; if ((local314 & 0x2) != 0) { - local326 = local18.method2223(); + local326 = local18.gSmart1or2s(); } local336 = 0; if ((local314 & 0x4) != 0) { - local336 = local23.method2223(); + local336 = local23.gSmart1or2s(); } this.anIntArray202[local307] = local301 + local316; this.anIntArray201[local307] = local303 + local326; @@ -1581,18 +1581,18 @@ public final class RawModel extends Entity { local303 = this.anIntArray201[local307]; local305 = this.anIntArray203[local307]; if (local66 == 1) { - this.anIntArray193[local307] = local28.method2229(); + this.anIntArray193[local307] = local28.g1(); } } - local8.anInt2792 = local149; - local13.anInt2792 = local116; - local18.anInt2792 = local98; - local23.anInt2792 = local134; - local28.anInt2792 = local107; + local8.offset = local149; + local13.offset = local116; + local18.offset = local98; + local23.offset = local134; + local28.offset = local107; for (local307 = 0; local307 < local42; local307++) { - this.aShortArray24[local307] = (short) local8.method2163(); + this.aShortArray24[local307] = (short) local8.g2(); if (local50 == 1) { - local314 = local13.method2229(); + local314 = local13.g1(); if ((local314 & 0x1) == 1) { this.aByteArray30[local307] = 1; local1 = true; @@ -1612,17 +1612,17 @@ public final class RawModel extends Entity { } } if (local54 == 255) { - this.aByteArray35[local307] = local18.method2186(); + this.aByteArray35[local307] = local18.g1s(); } if (local58 == 1) { - this.aByteArray26[local307] = local23.method2186(); + this.aByteArray26[local307] = local23.g1s(); } if (local62 == 1) { - this.anIntArray192[local307] = local28.method2229(); + this.anIntArray192[local307] = local28.g1(); } } - local8.anInt2792 = local143; - local13.anInt2792 = local92; + local8.offset = local143; + local13.offset = local92; local307 = 0; local314 = 0; local316 = 0; @@ -1630,11 +1630,11 @@ public final class RawModel extends Entity { @Pc(545) int local545; @Pc(648) int local648; for (local336 = 0; local336 < local42; local336++) { - local545 = local13.method2229(); + local545 = local13.g1(); if (local545 == 1) { - local307 = local8.method2223() + local326; - local314 = local8.method2223() + local307; - local316 = local8.method2223() + local314; + local307 = local8.gSmart1or2s() + local326; + local314 = local8.gSmart1or2s() + local307; + local316 = local8.gSmart1or2s() + local314; local326 = local316; this.anIntArray197[local336] = local307; this.anIntArray200[local336] = local314; @@ -1642,7 +1642,7 @@ public final class RawModel extends Entity { } if (local545 == 2) { local314 = local316; - local316 = local8.method2223() + local326; + local316 = local8.gSmart1or2s() + local326; local326 = local316; this.anIntArray197[local336] = local307; this.anIntArray200[local336] = local314; @@ -1650,7 +1650,7 @@ public final class RawModel extends Entity { } if (local545 == 3) { local307 = local316; - local316 = local8.method2223() + local326; + local316 = local8.gSmart1or2s() + local326; local326 = local316; this.anIntArray197[local336] = local307; this.anIntArray200[local336] = local314; @@ -1660,19 +1660,19 @@ public final class RawModel extends Entity { local648 = local307; local307 = local314; local314 = local648; - local316 = local8.method2223() + local326; + local316 = local8.gSmart1or2s() + local326; local326 = local316; this.anIntArray197[local336] = local307; this.anIntArray200[local336] = local648; this.anIntArray196[local336] = local316; } } - local8.anInt2792 = local157; + local8.offset = local157; for (local336 = 0; local336 < local46; local336++) { this.aByteArray29[local336] = 0; - this.aShortArray26[local336] = (short) local8.method2163(); - this.aShortArray20[local336] = (short) local8.method2163(); - this.aShortArray28[local336] = (short) local8.method2163(); + this.aShortArray26[local336] = (short) local8.g2(); + this.aShortArray20[local336] = (short) local8.g2(); + this.aShortArray28[local336] = (short) local8.g2(); } if (this.aByteArray31 != null) { @Pc(721) boolean local721 = false; diff --git a/client/src/main/java/SeqType.java b/client/src/main/java/SeqType.java index 561e224..9ee8cbc 100644 --- a/client/src/main/java/SeqType.java +++ b/client/src/main/java/SeqType.java @@ -63,7 +63,7 @@ public final class SeqType { @OriginalMember(owner = "client!tk", name = "a", descriptor = "(Lclient!wa;B)V") public final void method4213(@OriginalArg(0) Buffer arg0) { while (true) { - @Pc(19) int local19 = arg0.method2229(); + @Pc(19) int local19 = arg0.g1(); if (local19 == 0) { return; } @@ -289,61 +289,61 @@ public final class SeqType { @Pc(8) int local8; @Pc(14) int local14; if (arg0 == 1) { - local8 = arg1.method2163(); + local8 = arg1.g2(); this.anIntArray474 = new int[local8]; for (local14 = 0; local14 < local8; local14++) { - this.anIntArray474[local14] = arg1.method2163(); + this.anIntArray474[local14] = arg1.g2(); } this.anIntArray473 = new int[local8]; for (local14 = 0; local14 < local8; local14++) { - this.anIntArray473[local14] = arg1.method2163(); + this.anIntArray473[local14] = arg1.g2(); } for (local14 = 0; local14 < local8; local14++) { - this.anIntArray473[local14] += arg1.method2163() << 16; + this.anIntArray473[local14] += arg1.g2() << 16; } } else if (arg0 == 2) { - this.anInt5362 = arg1.method2163(); + this.anInt5362 = arg1.g2(); } else if (arg0 == 3) { this.aBooleanArray123 = new boolean[256]; - local8 = arg1.method2229(); + local8 = arg1.g1(); for (local14 = 0; local14 < local8; local14++) { - this.aBooleanArray123[arg1.method2229()] = true; + this.aBooleanArray123[arg1.g1()] = true; } } else if (arg0 == 4) { this.aBoolean279 = true; } else if (arg0 == 5) { - this.anInt5355 = arg1.method2229(); + this.anInt5355 = arg1.g1(); } else if (arg0 == 6) { - this.anInt5353 = arg1.method2163(); + this.anInt5353 = arg1.g2(); } else if (arg0 == 7) { - this.anInt5348 = arg1.method2163(); + this.anInt5348 = arg1.g2(); } else if (arg0 == 8) { - this.anInt5357 = arg1.method2229(); + this.anInt5357 = arg1.g1(); } else if (arg0 == 9) { - this.anInt5363 = arg1.method2229(); + this.anInt5363 = arg1.g1(); } else if (arg0 == 10) { - this.anInt5349 = arg1.method2229(); + this.anInt5349 = arg1.g1(); } else if (arg0 == 11) { - this.anInt5347 = arg1.method2229(); + this.anInt5347 = arg1.g1(); } else if (arg0 == 12) { - local8 = arg1.method2229(); + local8 = arg1.g1(); this.anIntArray475 = new int[local8]; for (local14 = 0; local14 < local8; local14++) { - this.anIntArray475[local14] = arg1.method2163(); + this.anIntArray475[local14] = arg1.g2(); } for (local14 = 0; local14 < local8; local14++) { - this.anIntArray475[local14] += arg1.method2163() << 16; + this.anIntArray475[local14] += arg1.g2() << 16; } } else if (arg0 == 13) { - local8 = arg1.method2163(); + local8 = arg1.g2(); this.anIntArrayArray38 = new int[local8][]; for (local14 = 0; local14 < local8; local14++) { - @Pc(163) int local163 = arg1.method2229(); + @Pc(163) int local163 = arg1.g1(); if (local163 > 0) { this.anIntArrayArray38[local14] = new int[local163]; - this.anIntArrayArray38[local14][0] = arg1.method2220(); + this.anIntArrayArray38[local14][0] = arg1.g3(); for (@Pc(182) int local182 = 1; local182 < local163; local182++) { - this.anIntArrayArray38[local14][local182] = arg1.method2163(); + this.anIntArrayArray38[local14][local182] = arg1.g2(); } } } diff --git a/client/src/main/java/Song.java b/client/src/main/java/Song.java index e93f390..8971a62 100644 --- a/client/src/main/java/Song.java +++ b/client/src/main/java/Song.java @@ -14,11 +14,11 @@ public final class Song extends Node { @OriginalMember(owner = "client!rf", name = "", descriptor = "(Lclient!wa;)V") public Song(@OriginalArg(0) Buffer arg0) { - arg0.anInt2792 = arg0.aByteArray40.length - 3; - @Pc(12) int local12 = arg0.method2229(); - @Pc(16) int local16 = arg0.method2163(); + arg0.offset = arg0.data.length - 3; + @Pc(12) int local12 = arg0.g1(); + @Pc(16) int local16 = arg0.g2(); @Pc(22) int local22 = local12 * 10 + 14; - arg0.anInt2792 = 0; + arg0.offset = 0; @Pc(27) int local27 = 0; @Pc(29) int local29 = 0; @Pc(31) int local31 = 0; @@ -33,7 +33,7 @@ public final class Song extends Node { for (local43 = 0; local43 < local12; local43++) { local48 = -1; while (true) { - local52 = arg0.method2229(); + local52 = arg0.g1(); if (local52 != local48) { local22++; } @@ -65,13 +65,13 @@ public final class Song extends Node { local22 += local27 * 5; local22 += (local31 + local33 + local29 + local35 + local39) * 2; local22 += local37 + local41; - local43 = arg0.anInt2792; + local43 = arg0.offset; local48 = local12 + local27 + local29 + local31 + local33 + local35 + local37 + local39 + local41; for (local52 = 0; local52 < local48; local52++) { - arg0.method2167(); + arg0.gVarInt(); } - local22 += arg0.anInt2792 - local43; - local52 = arg0.anInt2792; + local22 += arg0.offset - local43; + local52 = arg0.offset; @Pc(179) int local179 = 0; @Pc(181) int local181 = 0; @Pc(183) int local183 = 0; @@ -87,7 +87,7 @@ public final class Song extends Node { @Pc(203) int local203 = 0; @Pc(205) int local205; for (local205 = 0; local205 < local29; local205++) { - local203 = local203 + arg0.method2229() & 0x7F; + local203 = local203 + arg0.g1() & 0x7F; if (local203 == 0 || local203 == 32) { local41++; } else if (local203 == 1) { @@ -117,56 +117,56 @@ public final class Song extends Node { } } local205 = 0; - @Pc(298) int local298 = arg0.anInt2792; - arg0.anInt2792 += local199; - @Pc(307) int local307 = arg0.anInt2792; - arg0.anInt2792 += local39; - @Pc(316) int local316 = arg0.anInt2792; - arg0.anInt2792 += local37; - @Pc(325) int local325 = arg0.anInt2792; - arg0.anInt2792 += local35; - @Pc(334) int local334 = arg0.anInt2792; - arg0.anInt2792 += local179; - @Pc(343) int local343 = arg0.anInt2792; - arg0.anInt2792 += local183; - @Pc(352) int local352 = arg0.anInt2792; - arg0.anInt2792 += local187; - @Pc(361) int local361 = arg0.anInt2792; - arg0.anInt2792 += local31 + local33 + local39; - @Pc(374) int local374 = arg0.anInt2792; - arg0.anInt2792 += local31; - @Pc(383) int local383 = arg0.anInt2792; - arg0.anInt2792 += local201; - @Pc(392) int local392 = arg0.anInt2792; - arg0.anInt2792 += local33; - @Pc(401) int local401 = arg0.anInt2792; - arg0.anInt2792 += local181; - @Pc(410) int local410 = arg0.anInt2792; - arg0.anInt2792 += local185; - @Pc(419) int local419 = arg0.anInt2792; - arg0.anInt2792 += local189; - @Pc(428) int local428 = arg0.anInt2792; - arg0.anInt2792 += local41; - @Pc(437) int local437 = arg0.anInt2792; - arg0.anInt2792 += local35; - @Pc(446) int local446 = arg0.anInt2792; - arg0.anInt2792 += local191; - @Pc(455) int local455 = arg0.anInt2792; - arg0.anInt2792 += local193; - @Pc(464) int local464 = arg0.anInt2792; - arg0.anInt2792 += local195; - @Pc(473) int local473 = arg0.anInt2792; - arg0.anInt2792 += local197; - @Pc(482) int local482 = arg0.anInt2792; - arg0.anInt2792 += local27 * 3; + @Pc(298) int local298 = arg0.offset; + arg0.offset += local199; + @Pc(307) int local307 = arg0.offset; + arg0.offset += local39; + @Pc(316) int local316 = arg0.offset; + arg0.offset += local37; + @Pc(325) int local325 = arg0.offset; + arg0.offset += local35; + @Pc(334) int local334 = arg0.offset; + arg0.offset += local179; + @Pc(343) int local343 = arg0.offset; + arg0.offset += local183; + @Pc(352) int local352 = arg0.offset; + arg0.offset += local187; + @Pc(361) int local361 = arg0.offset; + arg0.offset += local31 + local33 + local39; + @Pc(374) int local374 = arg0.offset; + arg0.offset += local31; + @Pc(383) int local383 = arg0.offset; + arg0.offset += local201; + @Pc(392) int local392 = arg0.offset; + arg0.offset += local33; + @Pc(401) int local401 = arg0.offset; + arg0.offset += local181; + @Pc(410) int local410 = arg0.offset; + arg0.offset += local185; + @Pc(419) int local419 = arg0.offset; + arg0.offset += local189; + @Pc(428) int local428 = arg0.offset; + arg0.offset += local41; + @Pc(437) int local437 = arg0.offset; + arg0.offset += local35; + @Pc(446) int local446 = arg0.offset; + arg0.offset += local191; + @Pc(455) int local455 = arg0.offset; + arg0.offset += local193; + @Pc(464) int local464 = arg0.offset; + arg0.offset += local195; + @Pc(473) int local473 = arg0.offset; + arg0.offset += local197; + @Pc(482) int local482 = arg0.offset; + arg0.offset += local27 * 3; this.aByteArray65 = new byte[local22]; @Pc(500) Buffer local500 = new Buffer(this.aByteArray65); - local500.method2164(1297377380); - local500.method2164(6); - local500.method2230(local12 > 1 ? 1 : 0); - local500.method2230(local12); - local500.method2230(local16); - arg0.anInt2792 = local43; + local500.p4(1297377380); + local500.p4(6); + local500.p2(local12 > 1 ? 1 : 0); + local500.p2(local12); + local500.p2(local16); + arg0.offset = local43; @Pc(530) int local530 = 0; @Pc(532) int local532 = 0; @Pc(534) int local534 = 0; @@ -177,117 +177,117 @@ public final class Song extends Node { @Pc(545) int[] local545 = new int[128]; local203 = 0; label221: for (@Pc(549) int local549 = 0; local549 < local12; local549++) { - local500.method2164(1297379947); - local500.anInt2792 += 4; - @Pc(565) int local565 = local500.anInt2792; + local500.p4(1297379947); + local500.offset += 4; + @Pc(565) int local565 = local500.offset; @Pc(567) int local567 = -1; while (true) { while (true) { - @Pc(571) int local571 = arg0.method2167(); - local500.method2197(local571); - @Pc(583) int local583 = arg0.aByteArray40[local205++] & 0xFF; + @Pc(571) int local571 = arg0.gVarInt(); + local500.pVarInt(local571); + @Pc(583) int local583 = arg0.data[local205++] & 0xFF; @Pc(590) boolean local590 = local583 != local567; local567 = local583 & 0xF; if (local583 == 7) { if (local590) { - local500.method2178(255); + local500.p1(255); } - local500.method2178(47); - local500.method2178(0); - local500.method2168(local500.anInt2792 - local565); + local500.p1(47); + local500.p1(0); + local500.p4len(local500.offset - local565); continue label221; } if (local583 == 23) { if (local590) { - local500.method2178(255); + local500.p1(255); } - local500.method2178(81); - local500.method2178(3); - local500.method2178(arg0.aByteArray40[local482++]); - local500.method2178(arg0.aByteArray40[local482++]); - local500.method2178(arg0.aByteArray40[local482++]); + local500.p1(81); + local500.p1(3); + local500.p1(arg0.data[local482++]); + local500.p1(arg0.data[local482++]); + local500.p1(arg0.data[local482++]); } else { local530 ^= local583 >> 4; if (local567 == 0) { if (local590) { - local500.method2178(local530 + 144); + local500.p1(local530 + 144); } - local532 += arg0.aByteArray40[local361++]; - local534 += arg0.aByteArray40[local374++]; - local500.method2178(local532 & 0x7F); - local500.method2178(local534 & 0x7F); + local532 += arg0.data[local361++]; + local534 += arg0.data[local374++]; + local500.p1(local532 & 0x7F); + local500.p1(local534 & 0x7F); } else if (local567 == 1) { if (local590) { - local500.method2178(local530 + 128); + local500.p1(local530 + 128); } - local532 += arg0.aByteArray40[local361++]; - local536 += arg0.aByteArray40[local392++]; - local500.method2178(local532 & 0x7F); - local500.method2178(local536 & 0x7F); + local532 += arg0.data[local361++]; + local536 += arg0.data[local392++]; + local500.p1(local532 & 0x7F); + local500.p1(local536 & 0x7F); } else if (local567 == 2) { if (local590) { - local500.method2178(local530 + 176); + local500.p1(local530 + 176); } - local203 = local203 + arg0.aByteArray40[local52++] & 0x7F; - local500.method2178(local203); + local203 = local203 + arg0.data[local52++] & 0x7F; + local500.p1(local203); @Pc(775) byte local775; if (local203 == 0 || local203 == 32) { - local775 = arg0.aByteArray40[local428++]; + local775 = arg0.data[local428++]; } else if (local203 == 1) { - local775 = arg0.aByteArray40[local334++]; + local775 = arg0.data[local334++]; } else if (local203 == 33) { - local775 = arg0.aByteArray40[local401++]; + local775 = arg0.data[local401++]; } else if (local203 == 7) { - local775 = arg0.aByteArray40[local343++]; + local775 = arg0.data[local343++]; } else if (local203 == 39) { - local775 = arg0.aByteArray40[local410++]; + local775 = arg0.data[local410++]; } else if (local203 == 10) { - local775 = arg0.aByteArray40[local352++]; + local775 = arg0.data[local352++]; } else if (local203 == 42) { - local775 = arg0.aByteArray40[local419++]; + local775 = arg0.data[local419++]; } else if (local203 == 99) { - local775 = arg0.aByteArray40[local446++]; + local775 = arg0.data[local446++]; } else if (local203 == 98) { - local775 = arg0.aByteArray40[local455++]; + local775 = arg0.data[local455++]; } else if (local203 == 101) { - local775 = arg0.aByteArray40[local464++]; + local775 = arg0.data[local464++]; } else if (local203 == 100) { - local775 = arg0.aByteArray40[local473++]; + local775 = arg0.data[local473++]; } else if (local203 == 64 || local203 == 65 || local203 == 120 || local203 == 121 || local203 == 123) { - local775 = arg0.aByteArray40[local298++]; + local775 = arg0.data[local298++]; } else { - local775 = arg0.aByteArray40[local383++]; + local775 = arg0.data[local383++]; } @Pc(910) int local910 = local775 + local545[local203]; local545[local203] = local910; - local500.method2178(local910 & 0x7F); + local500.p1(local910 & 0x7F); } else if (local567 == 3) { if (local590) { - local500.method2178(local530 + 224); + local500.p1(local530 + 224); } - local538 += arg0.aByteArray40[local437++]; - local538 += arg0.aByteArray40[local325++] << 7; - local500.method2178(local538 & 0x7F); - local500.method2178(local538 >> 7 & 0x7F); + local538 += arg0.data[local437++]; + local538 += arg0.data[local325++] << 7; + local500.p1(local538 & 0x7F); + local500.p1(local538 >> 7 & 0x7F); } else if (local567 == 4) { if (local590) { - local500.method2178(local530 + 208); + local500.p1(local530 + 208); } - local540 += arg0.aByteArray40[local316++]; - local500.method2178(local540 & 0x7F); + local540 += arg0.data[local316++]; + local500.p1(local540 & 0x7F); } else if (local567 == 5) { if (local590) { - local500.method2178(local530 + 160); + local500.p1(local530 + 160); } - local532 += arg0.aByteArray40[local361++]; - local542 += arg0.aByteArray40[local307++]; - local500.method2178(local532 & 0x7F); - local500.method2178(local542 & 0x7F); + local532 += arg0.data[local361++]; + local542 += arg0.data[local307++]; + local500.p1(local532 & 0x7F); + local500.p1(local542 & 0x7F); } else if (local567 == 6) { if (local590) { - local500.method2178(local530 + 192); + local500.p1(local530 + 192); } - local500.method2178(arg0.aByteArray40[local428++]); + local500.p1(arg0.data[local428++]); } else { throw new RuntimeException(); } diff --git a/client/src/main/java/SpotAnimType.java b/client/src/main/java/SpotAnimType.java index d3f4233..07ca214 100644 --- a/client/src/main/java/SpotAnimType.java +++ b/client/src/main/java/SpotAnimType.java @@ -48,7 +48,7 @@ public final class SpotAnimType { @OriginalMember(owner = "client!eg", name = "a", descriptor = "(Lclient!wa;B)V") public final void method1316(@OriginalArg(0) Buffer arg0) { while (true) { - @Pc(17) int local17 = arg0.method2229(); + @Pc(17) int local17 = arg0.g1(); if (local17 == 0) { return; } @@ -59,39 +59,39 @@ public final class SpotAnimType { @OriginalMember(owner = "client!eg", name = "a", descriptor = "(Lclient!wa;II)V") private void method1318(@OriginalArg(0) Buffer arg0, @OriginalArg(1) int arg1) { if (arg1 == 1) { - this.anInt1753 = arg0.method2163(); + this.anInt1753 = arg0.g2(); } else if (arg1 == 2) { - this.anInt1754 = arg0.method2163(); + this.anInt1754 = arg0.g2(); } else if (arg1 == 4) { - this.anInt1745 = arg0.method2163(); + this.anInt1745 = arg0.g2(); } else if (arg1 == 5) { - this.anInt1752 = arg0.method2163(); + this.anInt1752 = arg0.g2(); } else if (arg1 == 6) { - this.anInt1755 = arg0.method2163(); + this.anInt1755 = arg0.g2(); } else if (arg1 == 7) { - this.anInt1749 = arg0.method2229(); + this.anInt1749 = arg0.g1(); } else if (arg1 == 8) { - this.anInt1748 = arg0.method2229(); + this.anInt1748 = arg0.g1(); } else if (arg1 == 9) { this.aBoolean100 = true; } else { @Pc(78) int local78; @Pc(88) int local88; if (arg1 == 40) { - local78 = arg0.method2229(); + local78 = arg0.g1(); this.aShortArray15 = new short[local78]; this.aShortArray18 = new short[local78]; for (local88 = 0; local88 < local78; local88++) { - this.aShortArray15[local88] = (short) arg0.method2163(); - this.aShortArray18[local88] = (short) arg0.method2163(); + this.aShortArray15[local88] = (short) arg0.g2(); + this.aShortArray18[local88] = (short) arg0.g2(); } } else if (arg1 == 41) { - local78 = arg0.method2229(); + local78 = arg0.g1(); this.aShortArray16 = new short[local78]; this.aShortArray17 = new short[local78]; for (local88 = 0; local88 < local78; local88++) { - this.aShortArray16[local88] = (short) arg0.method2163(); - this.aShortArray17[local88] = (short) arg0.method2163(); + this.aShortArray16[local88] = (short) arg0.g2(); + this.aShortArray17[local88] = (short) arg0.g2(); } } } diff --git a/client/src/main/java/Static10.java b/client/src/main/java/Static10.java index 6d44b1b..ae100a9 100644 --- a/client/src/main/java/Static10.java +++ b/client/src/main/java/Static10.java @@ -21,7 +21,7 @@ public final class Static10 { public static final JagString aClass100_65 = Static28.method790("Lade Schrifts-=tze )2 "); @OriginalMember(owner = "client!an", name = "a", descriptor = "([BIII)Lclient!na;") - public static JagString method346(@OriginalArg(0) byte[] arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2) { + public static JagString decodeString(@OriginalArg(0) byte[] arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2) { @Pc(7) JagString local7 = new JagString(); local7.aByteArray52 = new byte[arg1]; local7.anInt4030 = 0; @@ -90,7 +90,7 @@ public final class Static10 { } catch (@Pc(19) Exception local19) { @Pc(61) String local61 = "T2 - " + Static164.anInt3985 + "," + Static5.anInt45 + "," + Static49.anInt1462 + " - " + Static223.anInt5028 + "," + (Static225.anInt5068 + Static173.aClass8_Sub4_Sub1_2.anIntArray318[0]) + "," + (Static173.aClass8_Sub4_Sub1_2.anIntArray317[0] + Static142.anInt3483) + " - "; for (@Pc(63) int local63 = 0; local63 < Static223.anInt5028 && local63 < 50; local63++) { - local61 = local61 + Static57.aClass3_Sub15_Sub1_3.aByteArray40[local63] + ","; + local61 = local61 + Static57.aClass3_Sub15_Sub1_3.data[local63] + ","; } Static89.method1839(local61, local19); Static278.method4653(); diff --git a/client/src/main/java/Static103.java b/client/src/main/java/Static103.java index a0b1123..51a362c 100644 --- a/client/src/main/java/Static103.java +++ b/client/src/main/java/Static103.java @@ -44,24 +44,24 @@ public final class Static103 { Static122.anInt3047 = Static7.anInt985; Static25.anInt826 = Static60.anInt1893; Static6.aClass3_Sub15_Sub1_1.method2242(71); - Static6.aClass3_Sub15_Sub1_1.method2191(local36); + Static6.aClass3_Sub15_Sub1_1.p2leadd(local36); } } if (local23 == 46) { Static233.method4003(local31, local19, local15); Static6.aClass3_Sub15_Sub1_1.method2242(247); - Static6.aClass3_Sub15_Sub1_1.method2222(Static142.anInt3483 + local19); - Static6.aClass3_Sub15_Sub1_1.method2191(local15 + Static225.anInt5068); - Static6.aClass3_Sub15_Sub1_1.method2230(Integer.MAX_VALUE & (int) (local31 >>> 32)); + Static6.aClass3_Sub15_Sub1_1.p2le(Static142.anInt3483 + local19); + Static6.aClass3_Sub15_Sub1_1.p2leadd(local15 + Static225.anInt5068); + Static6.aClass3_Sub15_Sub1_1.p2(Integer.MAX_VALUE & (int) (local31 >>> 32)); } if (local23 == 40) { Static6.aClass3_Sub15_Sub1_1.method2242(27); - Static6.aClass3_Sub15_Sub1_1.method2230(Static185.anInt4370); - Static6.aClass3_Sub15_Sub1_1.method2211(local19); - Static6.aClass3_Sub15_Sub1_1.method2222(local15); - Static6.aClass3_Sub15_Sub1_1.method2211(Static224.anInt5062); - Static6.aClass3_Sub15_Sub1_1.method2191(Static274.anInt4997); - Static6.aClass3_Sub15_Sub1_1.method2191(local36); + Static6.aClass3_Sub15_Sub1_1.p2(Static185.anInt4370); + Static6.aClass3_Sub15_Sub1_1.p4le2(local19); + Static6.aClass3_Sub15_Sub1_1.p2le(local15); + Static6.aClass3_Sub15_Sub1_1.p4le2(Static224.anInt5062); + Static6.aClass3_Sub15_Sub1_1.p2leadd(Static274.anInt4997); + Static6.aClass3_Sub15_Sub1_1.p2leadd(local36); Static72.anInt2043 = 0; Static257.aClass13_7 = Static5.method32(local19); Static250.anInt5444 = local15; @@ -76,7 +76,7 @@ public final class Static103 { Static17.anInt577 = 0; Static25.anInt826 = Static60.anInt1893; Static6.aClass3_Sub15_Sub1_1.method2242(30); - Static6.aClass3_Sub15_Sub1_1.method2230(local36); + Static6.aClass3_Sub15_Sub1_1.p2(local36); } } if (local23 == 17) { @@ -88,7 +88,7 @@ public final class Static103 { Static70.anInt2013 = 2; Static25.anInt826 = Static60.anInt1893; Static6.aClass3_Sub15_Sub1_1.method2242(78); - Static6.aClass3_Sub15_Sub1_1.method2222(local36); + Static6.aClass3_Sub15_Sub1_1.p2le(local36); } } if (local23 == 44) { @@ -100,14 +100,14 @@ public final class Static103 { Static25.anInt826 = Static60.anInt1893; Static17.anInt577 = 0; Static6.aClass3_Sub15_Sub1_1.method2242(133); - Static6.aClass3_Sub15_Sub1_1.method2222(local36); + Static6.aClass3_Sub15_Sub1_1.p2le(local36); } } if (local23 == 58) { Static6.aClass3_Sub15_Sub1_1.method2242(135); - Static6.aClass3_Sub15_Sub1_1.method2209(local36); - Static6.aClass3_Sub15_Sub1_1.method2209(local15); - Static6.aClass3_Sub15_Sub1_1.method2185(local19); + Static6.aClass3_Sub15_Sub1_1.p2add(local36); + Static6.aClass3_Sub15_Sub1_1.p2add(local15); + Static6.aClass3_Sub15_Sub1_1.p4me(local19); Static72.anInt2043 = 0; Static257.aClass13_7 = Static5.method32(local19); Static250.anInt5444 = local15; @@ -115,9 +115,9 @@ public final class Static103 { if (local23 == 42) { Static233.method4003(local31, local19, local15); Static6.aClass3_Sub15_Sub1_1.method2242(254); - Static6.aClass3_Sub15_Sub1_1.method2222(local15 + Static225.anInt5068); - Static6.aClass3_Sub15_Sub1_1.method2209((int) (local31 >>> 32) & Integer.MAX_VALUE); - Static6.aClass3_Sub15_Sub1_1.method2230(local19 + Static142.anInt3483); + Static6.aClass3_Sub15_Sub1_1.p2le(local15 + Static225.anInt5068); + Static6.aClass3_Sub15_Sub1_1.p2add((int) (local31 >>> 32) & Integer.MAX_VALUE); + Static6.aClass3_Sub15_Sub1_1.p2(local19 + Static142.anInt3483); } if (local23 == 28) { Static153.method2909(); @@ -131,9 +131,9 @@ public final class Static103 { Static17.anInt577 = 0; Static25.anInt826 = Static60.anInt1893; Static6.aClass3_Sub15_Sub1_1.method2242(239); - Static6.aClass3_Sub15_Sub1_1.method2211(Static98.anInt2512); - Static6.aClass3_Sub15_Sub1_1.method2209(Static15.anInt506); - Static6.aClass3_Sub15_Sub1_1.method2191(local36); + Static6.aClass3_Sub15_Sub1_1.p4le2(Static98.anInt2512); + Static6.aClass3_Sub15_Sub1_1.p2add(Static15.anInt506); + Static6.aClass3_Sub15_Sub1_1.p2leadd(local36); } } @Pc(560) boolean local560; @@ -151,16 +151,16 @@ public final class Static103 { Static70.anInt2013 = 2; Static25.anInt826 = Static60.anInt1893; Static6.aClass3_Sub15_Sub1_1.method2242(66); - Static6.aClass3_Sub15_Sub1_1.method2222(Static225.anInt5068 + local15); - Static6.aClass3_Sub15_Sub1_1.method2230(local36); - Static6.aClass3_Sub15_Sub1_1.method2191(local19 + Static142.anInt3483); + Static6.aClass3_Sub15_Sub1_1.p2le(Static225.anInt5068 + local15); + Static6.aClass3_Sub15_Sub1_1.p2(local36); + Static6.aClass3_Sub15_Sub1_1.p2leadd(local19 + Static142.anInt3483); } if (local23 == 1001) { Static233.method4003(local31, local19, local15); Static6.aClass3_Sub15_Sub1_1.method2242(170); - Static6.aClass3_Sub15_Sub1_1.method2191(Integer.MAX_VALUE & (int) (local31 >>> 32)); - Static6.aClass3_Sub15_Sub1_1.method2191(local15 + Static225.anInt5068); - Static6.aClass3_Sub15_Sub1_1.method2191(local19 + Static142.anInt3483); + Static6.aClass3_Sub15_Sub1_1.p2leadd(Integer.MAX_VALUE & (int) (local31 >>> 32)); + Static6.aClass3_Sub15_Sub1_1.p2leadd(local15 + Static225.anInt5068); + Static6.aClass3_Sub15_Sub1_1.p2leadd(local19 + Static142.anInt3483); } if (local23 == 1002) { Static70.anInt2013 = 2; @@ -168,14 +168,14 @@ public final class Static103 { Static25.anInt826 = Static60.anInt1893; Static17.anInt577 = 0; Static6.aClass3_Sub15_Sub1_1.method2242(92); - Static6.aClass3_Sub15_Sub1_1.method2191(local36); + Static6.aClass3_Sub15_Sub1_1.p2leadd(local36); } @Pc(693) Component local693; if (local23 == 1006) { local693 = Static5.method32(local19); if (local693 == null || local693.anIntArray50[local15] < 100000) { Static6.aClass3_Sub15_Sub1_1.method2242(92); - Static6.aClass3_Sub15_Sub1_1.method2191(local36); + Static6.aClass3_Sub15_Sub1_1.p2leadd(local36); } else { method2231(Static186.aClass100_827, 0, Static34.method882(new JagString[] { Static123.method2423(local693.anIntArray50[local15]), Static249.aClass100_1039, Static71.method1439(local36).aClass100_495 })); } @@ -190,17 +190,17 @@ public final class Static103 { if (Static191.anInt4502 > 0 && Static187.aBooleanArray101[82] && Static187.aBooleanArray101[81]) { Static61.method1454(Static225.anInt5068 + local15, Static142.anInt3483 + local19, Static55.anInt1735); } else if (Static102.method2075(Static173.aClass8_Sub4_Sub1_2.anIntArray317[0], 0, 0, true, 0, local15, 0, 0, 1, local19, Static173.aClass8_Sub4_Sub1_2.anIntArray318[0])) { - Static6.aClass3_Sub15_Sub1_1.method2178(Static1.anInt5); - Static6.aClass3_Sub15_Sub1_1.method2178(Static107.anInt2878); - Static6.aClass3_Sub15_Sub1_1.method2230(Static57.anInt1747); - Static6.aClass3_Sub15_Sub1_1.method2178(57); - Static6.aClass3_Sub15_Sub1_1.method2178(Static59.anInt1814); - Static6.aClass3_Sub15_Sub1_1.method2178(Static273.anInt4130); - Static6.aClass3_Sub15_Sub1_1.method2178(89); - Static6.aClass3_Sub15_Sub1_1.method2230(Static173.aClass8_Sub4_Sub1_2.anInt3412); - Static6.aClass3_Sub15_Sub1_1.method2230(Static173.aClass8_Sub4_Sub1_2.anInt3421); - Static6.aClass3_Sub15_Sub1_1.method2178(Static221.anInt4364); - Static6.aClass3_Sub15_Sub1_1.method2178(63); + Static6.aClass3_Sub15_Sub1_1.p1(Static1.anInt5); + Static6.aClass3_Sub15_Sub1_1.p1(Static107.anInt2878); + Static6.aClass3_Sub15_Sub1_1.p2(Static57.anInt1747); + Static6.aClass3_Sub15_Sub1_1.p1(57); + Static6.aClass3_Sub15_Sub1_1.p1(Static59.anInt1814); + Static6.aClass3_Sub15_Sub1_1.p1(Static273.anInt4130); + Static6.aClass3_Sub15_Sub1_1.p1(89); + Static6.aClass3_Sub15_Sub1_1.p2(Static173.aClass8_Sub4_Sub1_2.anInt3412); + Static6.aClass3_Sub15_Sub1_1.p2(Static173.aClass8_Sub4_Sub1_2.anInt3421); + Static6.aClass3_Sub15_Sub1_1.p1(Static221.anInt4364); + Static6.aClass3_Sub15_Sub1_1.p1(63); } } } @@ -217,26 +217,26 @@ public final class Static103 { } if (local884 != null) { Static6.aClass3_Sub15_Sub1_1.method2242(72); - Static6.aClass3_Sub15_Sub1_1.method2230(local884.anInt3741); + Static6.aClass3_Sub15_Sub1_1.p2(local884.anInt3741); } } } if (local23 == 47) { Static6.aClass3_Sub15_Sub1_1.method2242(156); - Static6.aClass3_Sub15_Sub1_1.method2191(local15); - Static6.aClass3_Sub15_Sub1_1.method2209(local36); - Static6.aClass3_Sub15_Sub1_1.method2211(local19); + Static6.aClass3_Sub15_Sub1_1.p2leadd(local15); + Static6.aClass3_Sub15_Sub1_1.p2add(local36); + Static6.aClass3_Sub15_Sub1_1.p4le2(local19); Static72.anInt2043 = 0; Static257.aClass13_7 = Static5.method32(local19); Static250.anInt5444 = local15; } if (local23 == 3) { Static6.aClass3_Sub15_Sub1_1.method2242(253); - Static6.aClass3_Sub15_Sub1_1.method2211(Static98.anInt2512); - Static6.aClass3_Sub15_Sub1_1.method2191(local15); - Static6.aClass3_Sub15_Sub1_1.method2211(local19); - Static6.aClass3_Sub15_Sub1_1.method2209(local36); - Static6.aClass3_Sub15_Sub1_1.method2222(Static15.anInt506); + Static6.aClass3_Sub15_Sub1_1.p4le2(Static98.anInt2512); + Static6.aClass3_Sub15_Sub1_1.p2leadd(local15); + Static6.aClass3_Sub15_Sub1_1.p4le2(local19); + Static6.aClass3_Sub15_Sub1_1.p2add(local36); + Static6.aClass3_Sub15_Sub1_1.p2le(Static15.anInt506); Static72.anInt2043 = 0; Static257.aClass13_7 = Static5.method32(local19); Static250.anInt5444 = local15; @@ -250,7 +250,7 @@ public final class Static103 { Static122.anInt3047 = Static7.anInt985; Static17.anInt577 = 0; Static6.aClass3_Sub15_Sub1_1.method2242(4); - Static6.aClass3_Sub15_Sub1_1.method2222(local36); + Static6.aClass3_Sub15_Sub1_1.p2le(local36); } } if (local23 == 41 && Static39.aClass13_10 == null) { @@ -261,27 +261,27 @@ public final class Static103 { if (local23 == 49) { Static233.method4003(local31, local19, local15); Static6.aClass3_Sub15_Sub1_1.method2242(84); - Static6.aClass3_Sub15_Sub1_1.method2191(Integer.MAX_VALUE & (int) (local31 >>> 32)); - Static6.aClass3_Sub15_Sub1_1.method2191(Static142.anInt3483 + local19); - Static6.aClass3_Sub15_Sub1_1.method2222(local15 + Static225.anInt5068); + Static6.aClass3_Sub15_Sub1_1.p2leadd(Integer.MAX_VALUE & (int) (local31 >>> 32)); + Static6.aClass3_Sub15_Sub1_1.p2leadd(Static142.anInt3483 + local19); + Static6.aClass3_Sub15_Sub1_1.p2le(local15 + Static225.anInt5068); } if (local23 == 23) { Static6.aClass3_Sub15_Sub1_1.method2242(206); - Static6.aClass3_Sub15_Sub1_1.method2209(local36); - Static6.aClass3_Sub15_Sub1_1.method2222(local15); - Static6.aClass3_Sub15_Sub1_1.method2211(local19); + Static6.aClass3_Sub15_Sub1_1.p2add(local36); + Static6.aClass3_Sub15_Sub1_1.p2le(local15); + Static6.aClass3_Sub15_Sub1_1.p4le2(local19); Static72.anInt2043 = 0; Static257.aClass13_7 = Static5.method32(local19); Static250.anInt5444 = local15; } if (local23 == 14 && Static233.method4003(local31, local19, local15)) { Static6.aClass3_Sub15_Sub1_1.method2242(134); - Static6.aClass3_Sub15_Sub1_1.method2209(Static225.anInt5068 + local15); - Static6.aClass3_Sub15_Sub1_1.method2230(Static274.anInt4997); - Static6.aClass3_Sub15_Sub1_1.method2222(local19 + Static142.anInt3483); - Static6.aClass3_Sub15_Sub1_1.method2230(Static185.anInt4370); - Static6.aClass3_Sub15_Sub1_1.method2185(Static224.anInt5062); - Static6.aClass3_Sub15_Sub1_1.method2209((int) (local31 >>> 32) & Integer.MAX_VALUE); + Static6.aClass3_Sub15_Sub1_1.p2add(Static225.anInt5068 + local15); + Static6.aClass3_Sub15_Sub1_1.p2(Static274.anInt4997); + Static6.aClass3_Sub15_Sub1_1.p2le(local19 + Static142.anInt3483); + Static6.aClass3_Sub15_Sub1_1.p2(Static185.anInt4370); + Static6.aClass3_Sub15_Sub1_1.p4me(Static224.anInt5062); + Static6.aClass3_Sub15_Sub1_1.p2add((int) (local31 >>> 32) & Integer.MAX_VALUE); } if (local23 == 37) { local43 = Static159.aClass8_Sub4_Sub1Array1[local36]; @@ -292,7 +292,7 @@ public final class Static103 { Static25.anInt826 = Static60.anInt1893; Static122.anInt3047 = Static7.anInt985; Static6.aClass3_Sub15_Sub1_1.method2242(114); - Static6.aClass3_Sub15_Sub1_1.method2191(local36); + Static6.aClass3_Sub15_Sub1_1.p2leadd(local36); } } if (local23 == 9 || local23 == 1003) { @@ -300,9 +300,9 @@ public final class Static103 { } if (local23 == 5) { Static6.aClass3_Sub15_Sub1_1.method2242(55); - Static6.aClass3_Sub15_Sub1_1.method2222(local36); - Static6.aClass3_Sub15_Sub1_1.method2209(local15); - Static6.aClass3_Sub15_Sub1_1.method2201(local19); + Static6.aClass3_Sub15_Sub1_1.p2le(local36); + Static6.aClass3_Sub15_Sub1_1.p2add(local15); + Static6.aClass3_Sub15_Sub1_1.p4rme(local19); Static72.anInt2043 = 0; Static257.aClass13_7 = Static5.method32(local19); Static250.anInt5444 = local15; @@ -321,9 +321,9 @@ public final class Static103 { Static17.anInt577 = 0; Static25.anInt826 = Static60.anInt1893; Static6.aClass3_Sub15_Sub1_1.method2242(228); - Static6.aClass3_Sub15_Sub1_1.method2230(local36); - Static6.aClass3_Sub15_Sub1_1.method2222(Static225.anInt5068 + local15); - Static6.aClass3_Sub15_Sub1_1.method2191(Static142.anInt3483 + local19); + Static6.aClass3_Sub15_Sub1_1.p2(local36); + Static6.aClass3_Sub15_Sub1_1.p2le(Static225.anInt5068 + local15); + Static6.aClass3_Sub15_Sub1_1.p2leadd(Static142.anInt3483 + local19); } if (local23 == 4) { local192 = Static175.aClass8_Sub4_Sub2Array1[local36]; @@ -334,7 +334,7 @@ public final class Static103 { Static25.anInt826 = Static60.anInt1893; Static122.anInt3047 = Static7.anInt985; Static6.aClass3_Sub15_Sub1_1.method2242(148); - Static6.aClass3_Sub15_Sub1_1.method2209(local36); + Static6.aClass3_Sub15_Sub1_1.p2add(local36); } } if (local23 == 32) { @@ -365,14 +365,14 @@ public final class Static103 { Static70.anInt2013 = 2; Static122.anInt3047 = Static7.anInt985; Static6.aClass3_Sub15_Sub1_1.method2242(180); - Static6.aClass3_Sub15_Sub1_1.method2191(local36); + Static6.aClass3_Sub15_Sub1_1.p2leadd(local36); } } if (local23 == 35) { Static6.aClass3_Sub15_Sub1_1.method2242(161); - Static6.aClass3_Sub15_Sub1_1.method2211(local19); - Static6.aClass3_Sub15_Sub1_1.method2191(local36); - Static6.aClass3_Sub15_Sub1_1.method2191(local15); + Static6.aClass3_Sub15_Sub1_1.p4le2(local19); + Static6.aClass3_Sub15_Sub1_1.p2leadd(local36); + Static6.aClass3_Sub15_Sub1_1.p2leadd(local15); Static72.anInt2043 = 0; Static257.aClass13_7 = Static5.method32(local19); Static250.anInt5444 = local15; @@ -386,9 +386,9 @@ public final class Static103 { Static122.anInt3047 = Static7.anInt985; Static25.anInt826 = Static60.anInt1893; Static6.aClass3_Sub15_Sub1_1.method2242(195); - Static6.aClass3_Sub15_Sub1_1.method2209(Static15.anInt506); - Static6.aClass3_Sub15_Sub1_1.method2211(Static98.anInt2512); - Static6.aClass3_Sub15_Sub1_1.method2191(local36); + Static6.aClass3_Sub15_Sub1_1.p2add(Static15.anInt506); + Static6.aClass3_Sub15_Sub1_1.p4le2(Static98.anInt2512); + Static6.aClass3_Sub15_Sub1_1.p2leadd(local36); } } if (local23 == 34) { @@ -405,15 +405,15 @@ public final class Static103 { Static25.anInt826 = Static60.anInt1893; Static17.anInt577 = 0; Static6.aClass3_Sub15_Sub1_1.method2242(109); - Static6.aClass3_Sub15_Sub1_1.method2222(local19 + Static142.anInt3483); - Static6.aClass3_Sub15_Sub1_1.method2230(local15 + Static225.anInt5068); - Static6.aClass3_Sub15_Sub1_1.method2191(local36); + Static6.aClass3_Sub15_Sub1_1.p2le(local19 + Static142.anInt3483); + Static6.aClass3_Sub15_Sub1_1.p2(local15 + Static225.anInt5068); + Static6.aClass3_Sub15_Sub1_1.p2leadd(local36); } if (local23 == 25) { Static6.aClass3_Sub15_Sub1_1.method2242(81); - Static6.aClass3_Sub15_Sub1_1.method2209(local15); - Static6.aClass3_Sub15_Sub1_1.method2230(local36); - Static6.aClass3_Sub15_Sub1_1.method2201(local19); + Static6.aClass3_Sub15_Sub1_1.p2add(local15); + Static6.aClass3_Sub15_Sub1_1.p2(local36); + Static6.aClass3_Sub15_Sub1_1.p4rme(local19); Static72.anInt2043 = 0; Static257.aClass13_7 = Static5.method32(local19); Static250.anInt5444 = local15; @@ -427,13 +427,13 @@ public final class Static103 { Static122.anInt3047 = Static7.anInt985; Static17.anInt577 = 0; Static6.aClass3_Sub15_Sub1_1.method2242(218); - Static6.aClass3_Sub15_Sub1_1.method2222(local36); + Static6.aClass3_Sub15_Sub1_1.p2le(local36); } } @Pc(1955) int local1955; if (local23 == 51) { Static6.aClass3_Sub15_Sub1_1.method2242(10); - Static6.aClass3_Sub15_Sub1_1.method2164(local19); + Static6.aClass3_Sub15_Sub1_1.p4(local19); local693 = Static5.method32(local19); if (local693.anIntArrayArray4 != null && local693.anIntArrayArray4[0][0] == 5) { local1955 = local693.anIntArrayArray4[0][1]; @@ -452,15 +452,15 @@ public final class Static103 { Static25.anInt826 = Static60.anInt1893; Static122.anInt3047 = Static7.anInt985; Static6.aClass3_Sub15_Sub1_1.method2242(115); - Static6.aClass3_Sub15_Sub1_1.method2185(Static224.anInt5062); - Static6.aClass3_Sub15_Sub1_1.method2222(Static185.anInt4370); - Static6.aClass3_Sub15_Sub1_1.method2222(local36); - Static6.aClass3_Sub15_Sub1_1.method2191(Static274.anInt4997); + Static6.aClass3_Sub15_Sub1_1.p4me(Static224.anInt5062); + Static6.aClass3_Sub15_Sub1_1.p2le(Static185.anInt4370); + Static6.aClass3_Sub15_Sub1_1.p2le(local36); + Static6.aClass3_Sub15_Sub1_1.p2leadd(Static274.anInt4997); } } if (local23 == 59) { Static6.aClass3_Sub15_Sub1_1.method2242(10); - Static6.aClass3_Sub15_Sub1_1.method2164(local19); + Static6.aClass3_Sub15_Sub1_1.p4(local19); local693 = Static5.method32(local19); if (local693.anIntArrayArray4 != null && local693.anIntArrayArray4[0][0] == 5) { local1955 = local693.anIntArrayArray4[0][1]; @@ -478,12 +478,12 @@ public final class Static103 { Static25.anInt826 = Static60.anInt1893; Static70.anInt2013 = 2; Static6.aClass3_Sub15_Sub1_1.method2242(101); - Static6.aClass3_Sub15_Sub1_1.method2191(local15 + Static225.anInt5068); - Static6.aClass3_Sub15_Sub1_1.method2222(Static185.anInt4370); - Static6.aClass3_Sub15_Sub1_1.method2222(Static274.anInt4997); - Static6.aClass3_Sub15_Sub1_1.method2222(local36); - Static6.aClass3_Sub15_Sub1_1.method2191(Static142.anInt3483 + local19); - Static6.aClass3_Sub15_Sub1_1.method2185(Static224.anInt5062); + Static6.aClass3_Sub15_Sub1_1.p2leadd(local15 + Static225.anInt5068); + Static6.aClass3_Sub15_Sub1_1.p2le(Static185.anInt4370); + Static6.aClass3_Sub15_Sub1_1.p2le(Static274.anInt4997); + Static6.aClass3_Sub15_Sub1_1.p2le(local36); + Static6.aClass3_Sub15_Sub1_1.p2leadd(Static142.anInt3483 + local19); + Static6.aClass3_Sub15_Sub1_1.p4me(Static224.anInt5062); } if (local23 == 1004) { Static17.anInt577 = 0; @@ -491,7 +491,7 @@ public final class Static103 { Static70.anInt2013 = 2; Static25.anInt826 = Static60.anInt1893; Static6.aClass3_Sub15_Sub1_1.method2242(94); - Static6.aClass3_Sub15_Sub1_1.method2191(local36); + Static6.aClass3_Sub15_Sub1_1.p2leadd(local36); } if (local23 == 11) { if (local36 == 0) { @@ -499,10 +499,10 @@ public final class Static103 { Static113.method3556(Static55.anInt1735, local15, local19); } else if (local36 == 1) { Static6.aClass3_Sub15_Sub1_1.method2242(131); - Static6.aClass3_Sub15_Sub1_1.method2185(Static98.anInt2512); - Static6.aClass3_Sub15_Sub1_1.method2209(Static225.anInt5068 + local15); - Static6.aClass3_Sub15_Sub1_1.method2191(Static15.anInt506); - Static6.aClass3_Sub15_Sub1_1.method2209(local19 + Static142.anInt3483); + Static6.aClass3_Sub15_Sub1_1.p4me(Static98.anInt2512); + Static6.aClass3_Sub15_Sub1_1.p2add(Static225.anInt5068 + local15); + Static6.aClass3_Sub15_Sub1_1.p2leadd(Static15.anInt506); + Static6.aClass3_Sub15_Sub1_1.p2add(local19 + Static142.anInt3483); } } if (local23 == 8) { @@ -513,7 +513,7 @@ public final class Static103 { } if (local2287) { Static6.aClass3_Sub15_Sub1_1.method2242(10); - Static6.aClass3_Sub15_Sub1_1.method2164(local19); + Static6.aClass3_Sub15_Sub1_1.p4(local19); } } if (local23 == 1) { @@ -525,17 +525,17 @@ public final class Static103 { Static70.anInt2013 = 2; Static122.anInt3047 = Static7.anInt985; Static6.aClass3_Sub15_Sub1_1.method2242(248); - Static6.aClass3_Sub15_Sub1_1.method2191(local36); - Static6.aClass3_Sub15_Sub1_1.method2230(Static274.anInt4997); - Static6.aClass3_Sub15_Sub1_1.method2230(Static185.anInt4370); - Static6.aClass3_Sub15_Sub1_1.method2185(Static224.anInt5062); + Static6.aClass3_Sub15_Sub1_1.p2leadd(local36); + Static6.aClass3_Sub15_Sub1_1.p2(Static274.anInt4997); + Static6.aClass3_Sub15_Sub1_1.p2(Static185.anInt4370); + Static6.aClass3_Sub15_Sub1_1.p4me(Static224.anInt5062); } } if (local23 == 7) { Static6.aClass3_Sub15_Sub1_1.method2242(85); - Static6.aClass3_Sub15_Sub1_1.method2201(local19); - Static6.aClass3_Sub15_Sub1_1.method2230(local15); - Static6.aClass3_Sub15_Sub1_1.method2209(local36); + Static6.aClass3_Sub15_Sub1_1.p4rme(local19); + Static6.aClass3_Sub15_Sub1_1.p2(local15); + Static6.aClass3_Sub15_Sub1_1.p2add(local36); Static72.anInt2043 = 0; Static257.aClass13_7 = Static5.method32(local19); Static250.anInt5444 = local15; @@ -554,23 +554,23 @@ public final class Static103 { Static122.anInt3047 = Static7.anInt985; Static17.anInt577 = 0; Static6.aClass3_Sub15_Sub1_1.method2242(48); - Static6.aClass3_Sub15_Sub1_1.method2209(local15 + Static225.anInt5068); - Static6.aClass3_Sub15_Sub1_1.method2191(local36); - Static6.aClass3_Sub15_Sub1_1.method2222(Static142.anInt3483 + local19); + Static6.aClass3_Sub15_Sub1_1.p2add(local15 + Static225.anInt5068); + Static6.aClass3_Sub15_Sub1_1.p2leadd(local36); + Static6.aClass3_Sub15_Sub1_1.p2le(Static142.anInt3483 + local19); } if (local23 == 38 && Static233.method4003(local31, local19, local15)) { Static6.aClass3_Sub15_Sub1_1.method2242(233); - Static6.aClass3_Sub15_Sub1_1.method2191(local19 + Static142.anInt3483); - Static6.aClass3_Sub15_Sub1_1.method2209(Static225.anInt5068 + local15); - Static6.aClass3_Sub15_Sub1_1.method2191(Static15.anInt506); - Static6.aClass3_Sub15_Sub1_1.method2201(Static98.anInt2512); - Static6.aClass3_Sub15_Sub1_1.method2209((int) (local31 >>> 32) & Integer.MAX_VALUE); + Static6.aClass3_Sub15_Sub1_1.p2leadd(local19 + Static142.anInt3483); + Static6.aClass3_Sub15_Sub1_1.p2add(Static225.anInt5068 + local15); + Static6.aClass3_Sub15_Sub1_1.p2leadd(Static15.anInt506); + Static6.aClass3_Sub15_Sub1_1.p4rme(Static98.anInt2512); + Static6.aClass3_Sub15_Sub1_1.p2add((int) (local31 >>> 32) & Integer.MAX_VALUE); } if (local23 == 13) { Static6.aClass3_Sub15_Sub1_1.method2242(6); - Static6.aClass3_Sub15_Sub1_1.method2164(local19); - Static6.aClass3_Sub15_Sub1_1.method2209(local15); - Static6.aClass3_Sub15_Sub1_1.method2222(local36); + Static6.aClass3_Sub15_Sub1_1.p4(local19); + Static6.aClass3_Sub15_Sub1_1.p2add(local15); + Static6.aClass3_Sub15_Sub1_1.p2le(local36); Static72.anInt2043 = 0; Static257.aClass13_7 = Static5.method32(local19); Static250.anInt5444 = local15; @@ -584,7 +584,7 @@ public final class Static103 { Static122.anInt3047 = Static7.anInt985; Static17.anInt577 = 0; Static6.aClass3_Sub15_Sub1_1.method2242(175); - Static6.aClass3_Sub15_Sub1_1.method2209(local36); + Static6.aClass3_Sub15_Sub1_1.p2add(local36); } } if (local23 == 22) { @@ -604,15 +604,15 @@ public final class Static103 { if (local23 == 50) { Static233.method4003(local31, local19, local15); Static6.aClass3_Sub15_Sub1_1.method2242(194); - Static6.aClass3_Sub15_Sub1_1.method2191(local19 + Static142.anInt3483); - Static6.aClass3_Sub15_Sub1_1.method2222(Static225.anInt5068 + local15); - Static6.aClass3_Sub15_Sub1_1.method2230((int) (local31 >>> 32) & Integer.MAX_VALUE); + Static6.aClass3_Sub15_Sub1_1.p2leadd(local19 + Static142.anInt3483); + Static6.aClass3_Sub15_Sub1_1.p2le(Static225.anInt5068 + local15); + Static6.aClass3_Sub15_Sub1_1.p2((int) (local31 >>> 32) & Integer.MAX_VALUE); } if (local23 == 48) { Static6.aClass3_Sub15_Sub1_1.method2242(154); - Static6.aClass3_Sub15_Sub1_1.method2222(local15); - Static6.aClass3_Sub15_Sub1_1.method2201(local19); - Static6.aClass3_Sub15_Sub1_1.method2191(local36); + Static6.aClass3_Sub15_Sub1_1.p2le(local15); + Static6.aClass3_Sub15_Sub1_1.p4rme(local19); + Static6.aClass3_Sub15_Sub1_1.p2leadd(local36); Static72.anInt2043 = 0; Static257.aClass13_7 = Static5.method32(local19); Static250.anInt5444 = local15; @@ -626,14 +626,14 @@ public final class Static103 { Static25.anInt826 = Static60.anInt1893; Static70.anInt2013 = 2; Static6.aClass3_Sub15_Sub1_1.method2242(68); - Static6.aClass3_Sub15_Sub1_1.method2191(local36); + Static6.aClass3_Sub15_Sub1_1.p2leadd(local36); } } if (local23 == 43) { Static6.aClass3_Sub15_Sub1_1.method2242(153); - Static6.aClass3_Sub15_Sub1_1.method2211(local19); - Static6.aClass3_Sub15_Sub1_1.method2222(local15); - Static6.aClass3_Sub15_Sub1_1.method2222(local36); + Static6.aClass3_Sub15_Sub1_1.p4le2(local19); + Static6.aClass3_Sub15_Sub1_1.p2le(local15); + Static6.aClass3_Sub15_Sub1_1.p2le(local36); Static72.anInt2043 = 0; Static257.aClass13_7 = Static5.method32(local19); Static250.anInt5444 = local15; @@ -648,18 +648,18 @@ public final class Static103 { Static70.anInt2013 = 2; Static17.anInt577 = 0; Static6.aClass3_Sub15_Sub1_1.method2242(73); - Static6.aClass3_Sub15_Sub1_1.method2201(Static98.anInt2512); - Static6.aClass3_Sub15_Sub1_1.method2230(Static142.anInt3483 + local19); - Static6.aClass3_Sub15_Sub1_1.method2191(local36); - Static6.aClass3_Sub15_Sub1_1.method2191(local15 + Static225.anInt5068); - Static6.aClass3_Sub15_Sub1_1.method2222(Static15.anInt506); + Static6.aClass3_Sub15_Sub1_1.p4rme(Static98.anInt2512); + Static6.aClass3_Sub15_Sub1_1.p2(Static142.anInt3483 + local19); + Static6.aClass3_Sub15_Sub1_1.p2leadd(local36); + Static6.aClass3_Sub15_Sub1_1.p2leadd(local15 + Static225.anInt5068); + Static6.aClass3_Sub15_Sub1_1.p2le(Static15.anInt506); } if (local23 == 12) { Static6.aClass3_Sub15_Sub1_1.method2242(82); - Static6.aClass3_Sub15_Sub1_1.method2230(Static15.anInt506); - Static6.aClass3_Sub15_Sub1_1.method2201(local19); - Static6.aClass3_Sub15_Sub1_1.method2164(Static98.anInt2512); - Static6.aClass3_Sub15_Sub1_1.method2191(local15); + Static6.aClass3_Sub15_Sub1_1.p2(Static15.anInt506); + Static6.aClass3_Sub15_Sub1_1.p4rme(local19); + Static6.aClass3_Sub15_Sub1_1.p4(Static98.anInt2512); + Static6.aClass3_Sub15_Sub1_1.p2leadd(local15); } if (local23 == 36) { if (local36 == 0) { @@ -669,8 +669,8 @@ public final class Static103 { Static61.method1454(local15 + Static225.anInt5068, Static142.anInt3483 - -local19, Static55.anInt1735); } else { Static6.aClass3_Sub15_Sub1_1.method2242(179); - Static6.aClass3_Sub15_Sub1_1.method2230(local19 + Static142.anInt3483); - Static6.aClass3_Sub15_Sub1_1.method2230(local15 + Static225.anInt5068); + Static6.aClass3_Sub15_Sub1_1.p2(local19 + Static142.anInt3483); + Static6.aClass3_Sub15_Sub1_1.p2(local15 + Static225.anInt5068); } } if (local23 == 6) { @@ -682,7 +682,7 @@ public final class Static103 { Static70.anInt2013 = 2; Static122.anInt3047 = Static7.anInt985; Static6.aClass3_Sub15_Sub1_1.method2242(106); - Static6.aClass3_Sub15_Sub1_1.method2230(local36); + Static6.aClass3_Sub15_Sub1_1.p2(local36); } } if (local23 == 20) { @@ -699,9 +699,9 @@ public final class Static103 { Static122.anInt3047 = Static7.anInt985; Static70.anInt2013 = 2; Static6.aClass3_Sub15_Sub1_1.method2242(33); - Static6.aClass3_Sub15_Sub1_1.method2230(local36); - Static6.aClass3_Sub15_Sub1_1.method2230(Static225.anInt5068 + local15); - Static6.aClass3_Sub15_Sub1_1.method2222(Static142.anInt3483 + local19); + Static6.aClass3_Sub15_Sub1_1.p2(local36); + Static6.aClass3_Sub15_Sub1_1.p2(Static225.anInt5068 + local15); + Static6.aClass3_Sub15_Sub1_1.p2le(Static142.anInt3483 + local19); } if (local23 == 16) { local192 = Static175.aClass8_Sub4_Sub2Array1[local36]; @@ -712,7 +712,7 @@ public final class Static103 { Static25.anInt826 = Static60.anInt1893; Static70.anInt2013 = 2; Static6.aClass3_Sub15_Sub1_1.method2242(3); - Static6.aClass3_Sub15_Sub1_1.method2191(local36); + Static6.aClass3_Sub15_Sub1_1.p2leadd(local36); } } if (Static260.anInt5014 != 0) { diff --git a/client/src/main/java/Static124.java b/client/src/main/java/Static124.java index 0fc3123..a9ec919 100644 --- a/client/src/main/java/Static124.java +++ b/client/src/main/java/Static124.java @@ -48,14 +48,14 @@ public final class Static124 { @Pc(10) Buffer local10 = new Buffer(arg2); @Pc(12) int local12 = -1; while (true) { - @Pc(16) int local16 = local10.method2199(); + @Pc(16) int local16 = local10.gVarSmart(); if (local16 == 0) { return; } local12 += local16; @Pc(27) int local27 = 0; while (true) { - @Pc(31) int local31 = local10.method2204(); + @Pc(31) int local31 = local10.gSmart1or2(); if (local31 == 0) { break; } @@ -63,7 +63,7 @@ public final class Static124 { @Pc(46) int local46 = local27 & 0x3F; @Pc(50) int local50 = local27 >> 12; @Pc(56) int local56 = local27 >> 6 & 0x3F; - @Pc(60) int local60 = local10.method2229(); + @Pc(60) int local60 = local10.g1(); @Pc(64) int local64 = local60 >> 2; @Pc(68) int local68 = local60 & 0x3; @Pc(72) int local72 = arg0 + local56; diff --git a/client/src/main/java/Static125.java b/client/src/main/java/Static125.java index 1e88ae9..8abbb63 100644 --- a/client/src/main/java/Static125.java +++ b/client/src/main/java/Static125.java @@ -31,12 +31,12 @@ public final class Static125 { @OriginalMember(owner = "client!jl", name = "a", descriptor = "(IIIII)V") public static void method2448(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) { - Static6.aClass3_Sub15_Sub1_1.anInt2792 = 0; - Static6.aClass3_Sub15_Sub1_1.method2178(147); - Static6.aClass3_Sub15_Sub1_1.method2178(arg2); - Static6.aClass3_Sub15_Sub1_1.method2178(arg3); - Static6.aClass3_Sub15_Sub1_1.method2230(arg0); - Static6.aClass3_Sub15_Sub1_1.method2230(arg1); + Static6.aClass3_Sub15_Sub1_1.offset = 0; + Static6.aClass3_Sub15_Sub1_1.p1(147); + Static6.aClass3_Sub15_Sub1_1.p1(arg2); + Static6.aClass3_Sub15_Sub1_1.p1(arg3); + Static6.aClass3_Sub15_Sub1_1.p2(arg0); + Static6.aClass3_Sub15_Sub1_1.p2(arg1); Static226.anInt5079 = 0; Static57.anInt1758 = 0; Static179.anInt4261 = 1; diff --git a/client/src/main/java/Static127.java b/client/src/main/java/Static127.java index cf213a6..1c51fce 100644 --- a/client/src/main/java/Static127.java +++ b/client/src/main/java/Static127.java @@ -219,7 +219,7 @@ public final class Static127 { try { if (Static232.aClass212_5.anObject6 != null) { @Pc(265) byte[] local265 = ((String) Static232.aClass212_5.anObject6).getBytes("ISO-8859-1"); - local246 = Static10.method346(local265, local265.length, 0); + local246 = Static10.decodeString(local265, local265.length, 0); } } catch (@Pc(274) UnsupportedEncodingException local274) { } @@ -368,7 +368,7 @@ public final class Static127 { } } Static6.aClass3_Sub15_Sub1_1.method2242(44); - Static6.aClass3_Sub15_Sub1_1.method2178(arg0.method3120() - 1); - Static6.aClass3_Sub15_Sub1_1.method2171(arg0.method3136(2)); + Static6.aClass3_Sub15_Sub1_1.p1(arg0.length() - 1); + Static6.aClass3_Sub15_Sub1_1.pjstr(arg0.method3136(2)); } } diff --git a/client/src/main/java/Static134.java b/client/src/main/java/Static134.java index 3906c4d..10db679 100644 --- a/client/src/main/java/Static134.java +++ b/client/src/main/java/Static134.java @@ -40,6 +40,6 @@ public final class Static134 { @OriginalMember(owner = "client!kh", name = "b", descriptor = "(I)V") public static void method2623() { Static6.aClass3_Sub15_Sub1_1.method2242(104); - Static6.aClass3_Sub15_Sub1_1.method2166(0L); + Static6.aClass3_Sub15_Sub1_1.p8(0L); } } diff --git a/client/src/main/java/Static136.java b/client/src/main/java/Static136.java index 6b6146a..510f502 100644 --- a/client/src/main/java/Static136.java +++ b/client/src/main/java/Static136.java @@ -42,10 +42,10 @@ public final class Static136 { @OriginalMember(owner = "client!kk", name = "b", descriptor = "(Lclient!wa;I)V") public static void method2654(@OriginalArg(0) Buffer arg0) { - if (arg0.aByteArray40.length - arg0.anInt2792 < 1) { + if (arg0.data.length - arg0.offset < 1) { return; } - @Pc(21) int local21 = arg0.method2229(); + @Pc(21) int local21 = arg0.g1(); if (local21 < 0 || local21 > 11) { return; } @@ -75,84 +75,84 @@ public final class Static136 { } else { local34 = 19; } - if (arg0.aByteArray40.length - arg0.anInt2792 < local34) { + if (arg0.data.length - arg0.offset < local34) { return; } - Static113.anInt4609 = arg0.method2229(); + Static113.anInt4609 = arg0.g1(); if (Static113.anInt4609 < 1) { Static113.anInt4609 = 1; } else if (Static113.anInt4609 > 4) { Static113.anInt4609 = 4; } - Static53.method1293(arg0.method2229() == 1); - Static80.aBoolean231 = arg0.method2229() == 1; - Static250.aBoolean283 = arg0.method2229() == 1; - Static53.aBoolean99 = arg0.method2229() == 1; - Static15.aBoolean33 = arg0.method2229() == 1; - Static11.aBoolean15 = arg0.method2229() == 1; - Static159.aBoolean189 = arg0.method2229() == 1; - Static209.aBoolean240 = arg0.method2229() == 1; - Static139.anInt3451 = arg0.method2229(); + Static53.method1293(arg0.g1() == 1); + Static80.aBoolean231 = arg0.g1() == 1; + Static250.aBoolean283 = arg0.g1() == 1; + Static53.aBoolean99 = arg0.g1() == 1; + Static15.aBoolean33 = arg0.g1() == 1; + Static11.aBoolean15 = arg0.g1() == 1; + Static159.aBoolean189 = arg0.g1() == 1; + Static209.aBoolean240 = arg0.g1() == 1; + Static139.anInt3451 = arg0.g1(); if (Static139.anInt3451 > 2) { Static139.anInt3451 = 2; } if (local21 < 2) { - Static178.aBoolean202 = arg0.method2229() == 1; - arg0.method2229(); + Static178.aBoolean202 = arg0.g1() == 1; + arg0.g1(); } else { - Static178.aBoolean202 = arg0.method2229() == 1; + Static178.aBoolean202 = arg0.g1() == 1; } - Static220.aBoolean244 = arg0.method2229() == 1; - Static71.aBoolean107 = arg0.method2229() == 1; - Static102.anInt2679 = arg0.method2229(); + Static220.aBoolean244 = arg0.g1() == 1; + Static71.aBoolean107 = arg0.g1() == 1; + Static102.anInt2679 = arg0.g1(); if (Static102.anInt2679 > 2) { Static102.anInt2679 = 2; } Static186.anInt4392 = Static102.anInt2679; - Static99.aBoolean143 = arg0.method2229() == 1; - Static125.anInt3104 = arg0.method2229(); + Static99.aBoolean143 = arg0.g1() == 1; + Static125.anInt3104 = arg0.g1(); if (Static125.anInt3104 > 127) { Static125.anInt3104 = 127; } - Static12.anInt391 = arg0.method2229(); - Static30.anInt978 = arg0.method2229(); + Static12.anInt391 = arg0.g1(); + Static30.anInt978 = arg0.g1(); if (Static30.anInt978 > 127) { Static30.anInt978 = 127; } if (local21 >= 1) { - Static114.anInt5831 = arg0.method2163(); - Static22.anInt729 = arg0.method2163(); + Static114.anInt5831 = arg0.g2(); + Static22.anInt729 = arg0.g2(); } if (local21 >= 3 && local21 < 6) { - arg0.method2229(); + arg0.g1(); } if (local21 >= 4) { - @Pc(386) int local386 = arg0.method2229(); + @Pc(386) int local386 = arg0.g1(); if (Static238.anInt5316 < 96) { local386 = 0; } Static76.method1645(local386); } if (local21 >= 5) { - Static164.anInt3988 = arg0.method2174(); + Static164.anInt3988 = arg0.g4(); } if (local21 >= 6) { - Static214.anInt5581 = arg0.method2229(); + Static214.anInt5581 = arg0.g1(); } if (local21 >= 7) { - Static164.aBoolean191 = arg0.method2229() == 1; + Static164.aBoolean191 = arg0.g1() == 1; } if (local21 >= 8) { - Static33.aBoolean63 = arg0.method2229() == 1; + Static33.aBoolean63 = arg0.g1() == 1; } if (local21 >= 9) { - Static141.anInt3474 = arg0.method2229(); + Static141.anInt3474 = arg0.g1(); } if (local21 >= 10) { - Static127.aBoolean159 = arg0.method2229() != 0; + Static127.aBoolean159 = arg0.g1() != 0; } if (local21 >= 11) { - Static64.aBoolean111 = arg0.method2229() != 0; + Static64.aBoolean111 = arg0.g1() != 0; } } diff --git a/client/src/main/java/Static137.java b/client/src/main/java/Static137.java index db1c601..72d7eb8 100644 --- a/client/src/main/java/Static137.java +++ b/client/src/main/java/Static137.java @@ -15,7 +15,7 @@ public final class Static137 { @OriginalMember(owner = "client!kl", name = "a", descriptor = "(Lclient!wa;B)Lclient!kc;") public static TextureOp29SubOp2 method2664(@OriginalArg(0) Buffer arg0) { - return new TextureOp29SubOp2(arg0.method2213(), arg0.method2213(), arg0.method2213(), arg0.method2213(), arg0.method2220(), arg0.method2220(), arg0.method2229()); + return new TextureOp29SubOp2(arg0.g2s(), arg0.g2s(), arg0.g2s(), arg0.g2s(), arg0.g3(), arg0.g3(), arg0.g1()); } @OriginalMember(owner = "client!kl", name = "b", descriptor = "(II)Z") diff --git a/client/src/main/java/Static140.java b/client/src/main/java/Static140.java index 1658813..38dbe92 100644 --- a/client/src/main/java/Static140.java +++ b/client/src/main/java/Static140.java @@ -37,7 +37,7 @@ public final class Static140 { } } } - arg0.method2179(local15, 24); + arg0.pBytes(local15, 24); } @OriginalMember(owner = "client!la", name = "a", descriptor = "(ILclient!e;)I") @@ -85,7 +85,7 @@ public final class Static140 { Static193.aClass100Array134[Static35.anInt1093++] = Static79.method1702(arg0); Static185.anInt4369 = Static119.anInt3028; Static6.aClass3_Sub15_Sub1_1.method2242(34); - Static6.aClass3_Sub15_Sub1_1.method2166(arg0); + Static6.aClass3_Sub15_Sub1_1.p8(arg0); } @OriginalMember(owner = "client!la", name = "a", descriptor = "(Lsignlink!ll;Ljava/lang/Object;I)V") @@ -126,11 +126,11 @@ public final class Static140 { @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])); - local35.aClass100Array153[local37] = local56.method2202(); - local35.aByteArray69[local37] = local56.method2186(); - local35.aShortArray73[local37] = (short) local56.method2163(); - local35.aShortArray72[local37] = (short) local56.method2163(); - local35.anIntArray444[local37] = local56.method2174(); + local35.aClass100Array153[local37] = local56.gjstr(); + local35.aByteArray69[local37] = local56.g1s(); + local35.aShortArray73[local37] = (short) local56.g2(); + local35.aShortArray72[local37] = (short) local56.g2(); + local35.anIntArray444[local37] = local56.g4(); } return local35; } diff --git a/client/src/main/java/Static146.java b/client/src/main/java/Static146.java index d650e32..b0c07ff 100644 --- a/client/src/main/java/Static146.java +++ b/client/src/main/java/Static146.java @@ -24,11 +24,11 @@ public final class Static146 { @OriginalMember(owner = "client!lg", name = "a", descriptor = "(ZLclient!wa;Lclient!na;)I") public static int method2748(@OriginalArg(1) Buffer arg0, @OriginalArg(2) JagString arg1) { - @Pc(6) int local6 = arg0.anInt2792; + @Pc(6) int local6 = arg0.offset; @Pc(14) byte[] local14 = arg1.method3148(); - arg0.method2194(local14.length); - arg0.anInt2792 += Static62.aClass44_1.method1550(local14.length, arg0.aByteArray40, local14, 0, arg0.anInt2792); - return arg0.anInt2792 - local6; + arg0.pSmart1or2(local14.length); + arg0.offset += Static62.aClass44_1.method1550(local14.length, arg0.data, local14, 0, arg0.offset); + return arg0.offset - local6; } @OriginalMember(owner = "client!lg", name = "a", descriptor = "(Lclient!ve;BII)[Lclient!ok;") diff --git a/client/src/main/java/Static156.java b/client/src/main/java/Static156.java index 9fc94b0..2f26ffa 100644 --- a/client/src/main/java/Static156.java +++ b/client/src/main/java/Static156.java @@ -126,7 +126,7 @@ public final class Static156 { public static void method2956(@OriginalArg(0) long arg0) { if ((long) 0 != arg0) { Static6.aClass3_Sub15_Sub1_1.method2242(104); - Static6.aClass3_Sub15_Sub1_1.method2166(arg0); + Static6.aClass3_Sub15_Sub1_1.p8(arg0); } } @@ -192,6 +192,6 @@ public final class Static156 { @OriginalMember(owner = "client!mf", name = "a", descriptor = "(BLclient!wa;)Lclient!ta;") public static TextureOp29SubOp4 method2960(@OriginalArg(1) Buffer arg0) { - return new TextureOp29SubOp4(arg0.method2213(), arg0.method2213(), arg0.method2213(), arg0.method2213(), arg0.method2220(), arg0.method2220(), arg0.method2229()); + return new TextureOp29SubOp4(arg0.g2s(), arg0.g2s(), arg0.g2s(), arg0.g2s(), arg0.g3(), arg0.g3(), arg0.g1()); } } diff --git a/client/src/main/java/Static158.java b/client/src/main/java/Static158.java index 1bf308a..aebe049 100644 --- a/client/src/main/java/Static158.java +++ b/client/src/main/java/Static158.java @@ -59,7 +59,7 @@ public final class Static158 { } Static124.aClass95_2 = new BufferedSocket((Socket) Static72.aClass212_3.anObject6, Static71.aClass213_3); Static72.aClass212_3 = null; - Static124.aClass95_2.method2830(Static6.aClass3_Sub15_Sub1_1.aByteArray40, Static6.aClass3_Sub15_Sub1_1.anInt2792); + Static124.aClass95_2.method2830(Static6.aClass3_Sub15_Sub1_1.data, Static6.aClass3_Sub15_Sub1_1.offset); if (Static11.aClass62_1 != null) { Static11.aClass62_1.method3571(); } @@ -93,10 +93,10 @@ public final class Static158 { if (Static124.aClass95_2.method2831() < Static229.aClass100Array156.length * 8) { return; } - Static57.aClass3_Sub15_Sub1_3.anInt2792 = 0; - Static124.aClass95_2.method2827(0, Static229.aClass100Array156.length * 8, Static57.aClass3_Sub15_Sub1_3.aByteArray40); + Static57.aClass3_Sub15_Sub1_3.offset = 0; + Static124.aClass95_2.method2827(0, Static229.aClass100Array156.length * 8, Static57.aClass3_Sub15_Sub1_3.data); for (local120 = 0; local120 < Static229.aClass100Array156.length; local120++) { - Static229.aClass100Array156[local120] = Static79.method1702(Static57.aClass3_Sub15_Sub1_3.method2182()); + Static229.aClass100Array156[local120] = Static79.method1702(Static57.aClass3_Sub15_Sub1_3.g8()); } Static223.anInt5034 = 21; Static179.anInt4261 = 0; @@ -148,15 +148,15 @@ public final class Static158 { } @Pc(67) int local67 = 0; @Pc(74) Buffer local74 = new Buffer(Static191.aByteArrayArray15[local16]); - while (local74.anInt2792 < Static191.aByteArrayArray15[local16].length && local67 < 511) { + while (local74.offset < Static191.aByteArrayArray15[local16].length && local67 < 511) { @Pc(97) int local97 = local67++ << 6 | local25; - @Pc(103) int local103 = local74.method2163(); + @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.anInt5068; @Pc(129) int local129 = local103 & 0x3F; @Pc(142) int local142 = local129 + (Static238.anIntArray470[local16] & 0xFF) * 64 - Static142.anInt3483; - @Pc(148) NpcType local148 = Static214.method4363(local74.method2163()); + @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]; diff --git a/client/src/main/java/Static162.java b/client/src/main/java/Static162.java index 81bf9b9..0300f94 100644 --- a/client/src/main/java/Static162.java +++ b/client/src/main/java/Static162.java @@ -24,16 +24,16 @@ public final class Static162 { @OriginalMember(owner = "client!ml", name = "a", descriptor = "(B[B)[B") public static byte[] method3092(@OriginalArg(1) byte[] arg0) { @Pc(17) Buffer local17 = new Buffer(arg0); - @Pc(21) int local21 = local17.method2229(); - @Pc(25) int local25 = local17.method2174(); + @Pc(21) int local21 = local17.g1(); + @Pc(25) int local25 = local17.g4(); if (local25 < 0 || Static133.anInt5233 != 0 && Static133.anInt5233 < local25) { throw new RuntimeException(); } else if (local21 == 0) { @Pc(53) byte[] local53 = new byte[local25]; - local17.method2190(local25, local53); + local17.gBytes(local25, local53); return local53; } else { - @Pc(65) int local65 = local17.method2174(); + @Pc(65) int local65 = local17.g4(); if (local65 < 0 || Static133.anInt5233 != 0 && Static133.anInt5233 < local65) { throw new RuntimeException(); } diff --git a/client/src/main/java/Static166.java b/client/src/main/java/Static166.java index c090d87..b943105 100644 --- a/client/src/main/java/Static166.java +++ b/client/src/main/java/Static166.java @@ -28,17 +28,17 @@ public final class Static166 { @OriginalMember(owner = "client!nc", name = "a", descriptor = "(BLclient!wa;)V") public static void method3166(@OriginalArg(1) Buffer arg0) { label123: while (true) { - if (arg0.aByteArray40.length > arg0.anInt2792) { + if (arg0.data.length > arg0.offset) { @Pc(17) boolean local17 = false; @Pc(19) int local19 = 0; @Pc(21) int local21 = 0; - if (arg0.method2229() == 1) { - local19 = arg0.method2229(); + if (arg0.g1() == 1) { + local19 = arg0.g1(); local17 = true; - local21 = arg0.method2229(); + local21 = arg0.g1(); } - @Pc(42) int local42 = arg0.method2229(); - @Pc(46) int local46 = arg0.method2229(); + @Pc(42) int local42 = arg0.g1(); + @Pc(46) int local46 = arg0.g1(); @Pc(53) int local53 = local42 * 64 - Static158.anInt3846; @Pc(65) int local65 = Static2.anInt13 + Static181.anInt4296 - local46 * 64 - 1; @Pc(84) int local84; @@ -53,25 +53,25 @@ public final class Static166 { } for (@Pc(155) int local155 = 0; local155 < 64; local155++) { if (!local17 || local19 * 8 <= local150 && local150 < local19 * 8 + 8 && local155 >= local21 * 8 && local155 < local21 * 8 + 8) { - @Pc(202) int local202 = arg0.method2229(); + @Pc(202) int local202 = arg0.g1(); if (local202 != 0) { @Pc(214) int local214; if ((local202 & 0x1) == 1) { - local214 = arg0.method2229(); + local214 = arg0.g1(); if (Static70.aByteArrayArrayArray7[local84][local95] == null) { Static70.aByteArrayArrayArray7[local84][local95] = new byte[4096]; } Static70.aByteArrayArrayArray7[local84][local95][local150 + (63 - local155 << 6)] = (byte) local214; } if ((local202 & 0x2) == 2) { - local214 = arg0.method2220(); + local214 = arg0.g3(); if (Static58.anIntArrayArrayArray5[local84][local95] == null) { Static58.anIntArrayArrayArray5[local84][local95] = new int[4096]; } Static58.anIntArrayArrayArray5[local84][local95][(63 - local155 << 6) + local150] = local214; } if ((local202 & 0x4) == 4) { - local214 = arg0.method2220(); + local214 = arg0.g3(); if (Static83.anIntArrayArrayArray3[local84][local95] == null) { Static83.anIntArrayArrayArray3[local84][local95] = new int[4096]; } @@ -101,16 +101,16 @@ public final class Static166 { if (local84 >= (local17 ? 64 : 4096)) { continue label123; } - local95 = arg0.method2229(); + local95 = arg0.g1(); if (local95 != 0) { if ((local95 & 0x1) == 1) { - arg0.anInt2792++; + arg0.offset++; } if ((local95 & 0x2) == 2) { - arg0.anInt2792 += 2; + arg0.offset += 2; } if ((local95 & 0x4) == 4) { - arg0.anInt2792 += 3; + arg0.offset += 3; } } local84++; diff --git a/client/src/main/java/Static169.java b/client/src/main/java/Static169.java index 4323b64..490935c 100644 --- a/client/src/main/java/Static169.java +++ b/client/src/main/java/Static169.java @@ -80,7 +80,7 @@ public final class Static169 { } @OriginalMember(owner = "client!nf", name = "a", descriptor = "(II[BB)I") - public static int method3178(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) byte[] arg2) { + public static int crc32(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) byte[] arg2) { @Pc(5) int local5 = -1; for (@Pc(15) int local15 = arg0; local15 < arg1; local15++) { local5 = local5 >>> 8 ^ HuffmanCodec.anIntArray175[(local5 ^ arg2[local15]) & 0xFF]; diff --git a/client/src/main/java/Static170.java b/client/src/main/java/Static170.java index 1751146..08cbcef 100644 --- a/client/src/main/java/Static170.java +++ b/client/src/main/java/Static170.java @@ -55,11 +55,11 @@ public final class Static170 { @OriginalMember(owner = "client!nh", name = "a", descriptor = "(I[B)Z") public static boolean method2572(@OriginalArg(1) byte[] arg0) { @Pc(13) Buffer local13 = new Buffer(arg0); - @Pc(17) int local17 = local13.method2229(); + @Pc(17) int local17 = local13.g1(); if (local17 != 1) { return false; } - @Pc(33) boolean local33 = local13.method2229() == 1; + @Pc(33) boolean local33 = local13.g1() == 1; if (local33) { Static97.method1962(local13); } diff --git a/client/src/main/java/Static171.java b/client/src/main/java/Static171.java index 922d2b6..920a11a 100644 --- a/client/src/main/java/Static171.java +++ b/client/src/main/java/Static171.java @@ -25,7 +25,7 @@ public final class Static171 { @OriginalMember(owner = "client!ni", name = "a", descriptor = "(ILclient!na;)I") public static int method3218(@OriginalArg(1) JagString arg0) { - if (Static203.aClass134_1 == null || arg0.method3120() == 0) { + if (Static203.aClass134_1 == null || arg0.length() == 0) { return -1; } for (@Pc(20) int local20 = 0; local20 < Static203.aClass134_1.anInt5074; local20++) { @@ -55,7 +55,7 @@ public final class Static171 { @OriginalMember(owner = "client!ni", name = "a", descriptor = "(ILclient!na;I)V") public static void method3221(@OriginalArg(1) JagString arg0, @OriginalArg(2) int arg1) { Static6.aClass3_Sub15_Sub1_1.method2242(188); - Static6.aClass3_Sub15_Sub1_1.method2216(arg1); - Static6.aClass3_Sub15_Sub1_1.method2166(arg0.method3158()); + Static6.aClass3_Sub15_Sub1_1.p1a(arg1); + Static6.aClass3_Sub15_Sub1_1.p8(arg0.method3158()); } } diff --git a/client/src/main/java/Static178.java b/client/src/main/java/Static178.java index 81f6254..52c00bd 100644 --- a/client/src/main/java/Static178.java +++ b/client/src/main/java/Static178.java @@ -43,7 +43,7 @@ public final class Static178 { } if (local24 < Static199.aClass3_Sub22Array1.length && Static199.aClass3_Sub22Array1[local24] != null) { Static6.aClass3_Sub15_Sub1_1.method2242(162); - Static6.aClass3_Sub15_Sub1_1.method2166(Static199.aClass3_Sub22Array1[local24].aLong192); + Static6.aClass3_Sub15_Sub1_1.p8(Static199.aClass3_Sub22Array1[local24].aLong192); } } diff --git a/client/src/main/java/Static182.java b/client/src/main/java/Static182.java index ac4b6c5..e3b7c1a 100644 --- a/client/src/main/java/Static182.java +++ b/client/src/main/java/Static182.java @@ -93,7 +93,7 @@ public final class Static182 { } local137 = local95; } - if (local59.method3120() > 0) { + if (local59.length() > 0) { local59.method3113(local28); } return Static34.method882(new JagString[] { local9, local137.method3124(), local59.method3124() }); diff --git a/client/src/main/java/Static193.java b/client/src/main/java/Static193.java index 1a2485b..63277c9 100644 --- a/client/src/main/java/Static193.java +++ b/client/src/main/java/Static193.java @@ -47,7 +47,7 @@ public final class Static193 { } Static185.anInt4369 = Static119.anInt3028; Static6.aClass3_Sub15_Sub1_1.method2242(57); - Static6.aClass3_Sub15_Sub1_1.method2166(arg0); + Static6.aClass3_Sub15_Sub1_1.p8(arg0); break; } } @@ -288,25 +288,25 @@ public final class Static193 { @Pc(27) int local27 = Static84.anIntArray209[arg0]; if (arg1 == 0) { Static6.aClass3_Sub15_Sub1_1.method2242(215); - Static6.aClass3_Sub15_Sub1_1.method2178(local13 + local13 + 3); + Static6.aClass3_Sub15_Sub1_1.p1(local13 + local13 + 3); } if (arg1 == 1) { Static6.aClass3_Sub15_Sub1_1.method2242(39); - Static6.aClass3_Sub15_Sub1_1.method2178(local13 + local13 + 3 + 14); + Static6.aClass3_Sub15_Sub1_1.p1(local13 + local13 + 3 + 14); } if (arg1 == 2) { Static6.aClass3_Sub15_Sub1_1.method2242(77); - Static6.aClass3_Sub15_Sub1_1.method2178(local13 + local13 + 3); + Static6.aClass3_Sub15_Sub1_1.p1(local13 + local13 + 3); } - Static6.aClass3_Sub15_Sub1_1.method2216(Static187.aBooleanArray101[82] ? 1 : 0); - Static6.aClass3_Sub15_Sub1_1.method2230(Static225.anInt5068 + local23); - Static6.aClass3_Sub15_Sub1_1.method2209(Static142.anInt3483 + local27); + Static6.aClass3_Sub15_Sub1_1.p1a(Static187.aBooleanArray101[82] ? 1 : 0); + Static6.aClass3_Sub15_Sub1_1.p2(Static225.anInt5068 + local23); + Static6.aClass3_Sub15_Sub1_1.p2add(Static142.anInt3483 + local27); Static84.anInt2255 = Static84.anIntArray209[0]; Static115.anInt2939 = Static259.anIntArray514[0]; for (@Pc(126) int local126 = 1; local126 < local13; local126++) { arg0--; - Static6.aClass3_Sub15_Sub1_1.method2216(Static259.anIntArray514[arg0] - local23); - Static6.aClass3_Sub15_Sub1_1.method2169(Static84.anIntArray209[arg0] - local27); + Static6.aClass3_Sub15_Sub1_1.p1a(Static259.anIntArray514[arg0] - local23); + Static6.aClass3_Sub15_Sub1_1.p1sub(Static84.anIntArray209[arg0] - local27); } } } diff --git a/client/src/main/java/Static2.java b/client/src/main/java/Static2.java index 73df507..70b3b25 100644 --- a/client/src/main/java/Static2.java +++ b/client/src/main/java/Static2.java @@ -260,8 +260,8 @@ public final class Static2 { @OriginalMember(owner = "client!aa", name = "a", descriptor = "(IZI)V") public static void method10(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) { Static6.aClass3_Sub15_Sub1_1.method2242(132); - Static6.aClass3_Sub15_Sub1_1.method2201(arg1); - Static6.aClass3_Sub15_Sub1_1.method2222(arg0); + Static6.aClass3_Sub15_Sub1_1.p4rme(arg1); + Static6.aClass3_Sub15_Sub1_1.p2le(arg0); } @OriginalMember(owner = "client!aa", name = "a", descriptor = "(BLclient!be;)V") diff --git a/client/src/main/java/Static202.java b/client/src/main/java/Static202.java index 743911b..05e5118 100644 --- a/client/src/main/java/Static202.java +++ b/client/src/main/java/Static202.java @@ -31,8 +31,8 @@ public final class Static202 { @OriginalMember(owner = "client!qg", name = "a", descriptor = "(Lsignlink!ll;Lclient!wa;IB)V") public static void method3654(@OriginalArg(0) SignLink arg0, @OriginalArg(1) Buffer arg1, @OriginalArg(2) int arg2) { @Pc(17) ReflectionCheck local17 = new ReflectionCheck(); - local17.anInt1725 = arg1.method2229(); - local17.anInt1732 = arg1.method2174(); + local17.anInt1725 = arg1.g1(); + local17.anInt1732 = arg1.g4(); local17.aClass212Array1 = new PrivilegedRequest[local17.anInt1725]; local17.anIntArray138 = new int[local17.anInt1725]; local17.aByteArrayArrayArray6 = new byte[local17.anInt1725][][]; @@ -41,35 +41,35 @@ public final class Static202 { local17.anIntArray137 = new int[local17.anInt1725]; for (@Pc(59) int local59 = 0; local59 < local17.anInt1725; local59++) { try { - @Pc(71) int local71 = arg1.method2229(); + @Pc(71) int local71 = arg1.g1(); @Pc(93) String local93; @Pc(104) String local104; @Pc(95) int local95; if (local71 == 0 || local71 == 1 || local71 == 2) { - local93 = new String(arg1.method2202().method3148()); + local93 = new String(arg1.gjstr().method3148()); local95 = 0; - local104 = new String(arg1.method2202().method3148()); + local104 = new String(arg1.gjstr().method3148()); if (local71 == 1) { - local95 = arg1.method2174(); + local95 = arg1.g4(); } local17.anIntArray139[local59] = local71; local17.anIntArray137[local59] = local95; local17.aClass212Array2[local59] = arg0.method5126(local104, Static6.method85(local93)); } else if (local71 == 3 || local71 == 4) { - local93 = new String(arg1.method2202().method3148()); - local104 = new String(arg1.method2202().method3148()); - local95 = arg1.method2229(); + local93 = new String(arg1.gjstr().method3148()); + local104 = new String(arg1.gjstr().method3148()); + local95 = arg1.g1(); @Pc(171) String[] local171 = new String[local95]; for (@Pc(173) int local173 = 0; local173 < local95; local173++) { - local171[local173] = new String(arg1.method2202().method3148()); + local171[local173] = new String(arg1.gjstr().method3148()); } @Pc(193) byte[][] local193 = new byte[local95][]; @Pc(210) int local210; if (local71 == 3) { for (@Pc(199) int local199 = 0; local199 < local95; local199++) { - local210 = arg1.method2174(); + local210 = arg1.g4(); local193[local199] = new byte[local210]; - arg1.method2190(local210, local193[local199]); + arg1.gBytes(local210, local193[local199]); } } local17.anIntArray139[local59] = local71; diff --git a/client/src/main/java/Static203.java b/client/src/main/java/Static203.java index 702f902..063ebb9 100644 --- a/client/src/main/java/Static203.java +++ b/client/src/main/java/Static203.java @@ -80,7 +80,7 @@ public final class Static203 { if (local16.anInt5925 == 1) { local11 = (FileOnDisk) local16.anObject6; @Pc(39) Buffer local39 = Static48.method1196(); - local11.method5134(local39.aByteArray40, local39.anInt2792, 0); + local11.method5134(local39.data, local39.offset, 0); } } catch (@Pc(49) Exception local49) { } diff --git a/client/src/main/java/Static205.java b/client/src/main/java/Static205.java index bbe538b..46fd8c0 100644 --- a/client/src/main/java/Static205.java +++ b/client/src/main/java/Static205.java @@ -16,7 +16,7 @@ public final class Static205 { public static JagString method3677(@OriginalArg(0) Component arg0, @OriginalArg(2) int arg1) { if (!Static36.method940(arg0).method503(arg1) && arg0.anObjectArray29 == null) { return null; - } else if (arg0.aClass100Array18 == null || arg0.aClass100Array18.length <= arg1 || arg0.aClass100Array18[arg1] == null || arg0.aClass100Array18[arg1].method3144().method3120() == 0) { + } else if (arg0.aClass100Array18 == null || arg0.aClass100Array18.length <= arg1 || arg0.aClass100Array18[arg1] == null || arg0.aClass100Array18[arg1].method3144().length() == 0) { return Static121.aBoolean154 ? Static34.method882(new JagString[] { Static207.aClass100_903, Static123.method2423(arg1) }) : null; } else { return arg0.aClass100Array18[arg1]; diff --git a/client/src/main/java/Static206.java b/client/src/main/java/Static206.java index 93f2431..801ffb1 100644 --- a/client/src/main/java/Static206.java +++ b/client/src/main/java/Static206.java @@ -46,13 +46,13 @@ public final class Static206 { @OriginalMember(owner = "client!qk", name = "a", descriptor = "(BLclient!wa;)Lclient!j;") public static TextureOp method3680(@OriginalArg(1) Buffer arg0) { - arg0.method2229(); - @Pc(13) int local13 = arg0.method2229(); + arg0.g1(); + @Pc(13) int local13 = arg0.g1(); @Pc(17) TextureOp local17 = Static223.method3860(local13); - local17.anInt5840 = arg0.method2229(); - @Pc(26) int local26 = arg0.method2229(); + local17.anInt5840 = arg0.g1(); + @Pc(26) int local26 = arg0.g1(); for (@Pc(34) int local34 = 0; local34 < local26; local34++) { - @Pc(41) int local41 = arg0.method2229(); + @Pc(41) int local41 = arg0.g1(); local17.method4629(local41, arg0); } local17.method4630(); diff --git a/client/src/main/java/Static207.java b/client/src/main/java/Static207.java index db4ee42..b550786 100644 --- a/client/src/main/java/Static207.java +++ b/client/src/main/java/Static207.java @@ -112,15 +112,15 @@ public final class Static207 { return -1; } Static124.aClass95_2 = new BufferedSocket((Socket) Static72.aClass212_3.anObject6, Static71.aClass213_3); - Static6.aClass3_Sub15_Sub1_1.anInt2792 = 0; + Static6.aClass3_Sub15_Sub1_1.offset = 0; Static72.aClass212_3 = null; local82 = 0; if (Static61.aBoolean109) { local82 = Static80.anInt4702; } - Static6.aClass3_Sub15_Sub1_1.method2178(255); - Static6.aClass3_Sub15_Sub1_1.method2164(local82); - Static124.aClass95_2.method2830(Static6.aClass3_Sub15_Sub1_1.aByteArray40, Static6.aClass3_Sub15_Sub1_1.anInt2792); + Static6.aClass3_Sub15_Sub1_1.p1(255); + Static6.aClass3_Sub15_Sub1_1.p4(local82); + Static124.aClass95_2.method2830(Static6.aClass3_Sub15_Sub1_1.data, Static6.aClass3_Sub15_Sub1_1.offset); if (Static11.aClass62_1 != null) { Static11.aClass62_1.method3571(); } diff --git a/client/src/main/java/Static21.java b/client/src/main/java/Static21.java index 0674c17..d4b8917 100644 --- a/client/src/main/java/Static21.java +++ b/client/src/main/java/Static21.java @@ -32,6 +32,6 @@ public final class Static21 { @OriginalMember(owner = "client!bk", name = "a", descriptor = "(BLclient!wa;)Lclient!re;") public static TextureOp29SubOp3 method620(@OriginalArg(1) Buffer arg0) { - return new TextureOp29SubOp3(arg0.method2213(), arg0.method2213(), arg0.method2213(), arg0.method2213(), arg0.method2213(), arg0.method2213(), arg0.method2213(), arg0.method2213(), arg0.method2220(), arg0.method2229()); + return new TextureOp29SubOp3(arg0.g2s(), arg0.g2s(), arg0.g2s(), arg0.g2s(), arg0.g2s(), arg0.g2s(), arg0.g2s(), arg0.g2s(), arg0.g3(), arg0.g1()); } } diff --git a/client/src/main/java/Static210.java b/client/src/main/java/Static210.java index 33d42a4..da6c3a4 100644 --- a/client/src/main/java/Static210.java +++ b/client/src/main/java/Static210.java @@ -29,10 +29,10 @@ public final class Static210 { @OriginalMember(owner = "client!rb", name = "a", descriptor = "(Lclient!wa;Z)Lclient!bn;") public static Map method3713(@OriginalArg(0) Buffer arg0) { - @Pc(35) Map local35 = new Map(arg0.method2202(), arg0.method2202(), arg0.method2163(), arg0.method2163(), arg0.method2174(), arg0.method2229() == 1, arg0.method2229()); - @Pc(39) int local39 = arg0.method2229(); + @Pc(35) Map local35 = new Map(arg0.gjstr(), arg0.gjstr(), arg0.g2(), arg0.g2(), arg0.g4(), arg0.g1() == 1, arg0.g1()); + @Pc(39) int local39 = arg0.g1(); for (@Pc(41) int local41 = 0; local41 < local39; local41++) { - local35.aClass69_23.method2282(new Class3_Sub24(arg0.method2163(), arg0.method2163(), arg0.method2163(), arg0.method2163())); + local35.aClass69_23.method2282(new Class3_Sub24(arg0.g2(), arg0.g2(), arg0.g2(), arg0.g2())); } local35.method665(); return local35; diff --git a/client/src/main/java/Static216.java b/client/src/main/java/Static216.java index d5eb1eb..65c993b 100644 --- a/client/src/main/java/Static216.java +++ b/client/src/main/java/Static216.java @@ -54,11 +54,11 @@ public final class Static216 { Static124.aClass95_2 = new BufferedSocket((Socket) Static72.aClass212_3.anObject6, Static71.aClass213_3); Static72.aClass212_3 = null; @Pc(106) long local106 = Static101.aLong98 = Static186.aClass100_829.method3158(); - Static6.aClass3_Sub15_Sub1_1.anInt2792 = 0; - Static6.aClass3_Sub15_Sub1_1.method2178(14); + Static6.aClass3_Sub15_Sub1_1.offset = 0; + Static6.aClass3_Sub15_Sub1_1.p1(14); @Pc(120) int local120 = (int) (local106 >> 16 & 0x1FL); - Static6.aClass3_Sub15_Sub1_1.method2178(local120); - Static124.aClass95_2.method2830(Static6.aClass3_Sub15_Sub1_1.aByteArray40, 2); + Static6.aClass3_Sub15_Sub1_1.p1(local120); + Static124.aClass95_2.method2830(Static6.aClass3_Sub15_Sub1_1.data, 2); if (Static11.aClass62_1 != null) { Static11.aClass62_1.method3571(); } @@ -85,74 +85,74 @@ public final class Static216 { if (Static124.aClass95_2.method2831() < 8) { return; } - Static124.aClass95_2.method2827(0, 8, Static57.aClass3_Sub15_Sub1_3.aByteArray40); - Static57.aClass3_Sub15_Sub1_3.anInt2792 = 0; - Static193.aLong147 = Static57.aClass3_Sub15_Sub1_3.method2182(); + Static124.aClass95_2.method2827(0, 8, Static57.aClass3_Sub15_Sub1_3.data); + Static57.aClass3_Sub15_Sub1_3.offset = 0; + Static193.aLong147 = Static57.aClass3_Sub15_Sub1_3.g8(); @Pc(210) int[] local210 = new int[4]; - Static6.aClass3_Sub15_Sub1_1.anInt2792 = 0; + Static6.aClass3_Sub15_Sub1_1.offset = 0; local210[2] = (int) (Static193.aLong147 >> 32); local210[3] = (int) Static193.aLong147; local210[1] = (int) (Math.random() * 9.9999999E7D); local210[0] = (int) (Math.random() * 9.9999999E7D); - Static6.aClass3_Sub15_Sub1_1.method2178(10); - Static6.aClass3_Sub15_Sub1_1.method2164(local210[0]); - Static6.aClass3_Sub15_Sub1_1.method2164(local210[1]); - Static6.aClass3_Sub15_Sub1_1.method2164(local210[2]); - Static6.aClass3_Sub15_Sub1_1.method2164(local210[3]); - Static6.aClass3_Sub15_Sub1_1.method2166(Static186.aClass100_829.method3158()); - Static6.aClass3_Sub15_Sub1_1.method2171(Static186.aClass100_828); - Static6.aClass3_Sub15_Sub1_1.method2226(Static86.aBigInteger1, Static256.aBigInteger2); - Static17.aClass3_Sub15_Sub1_2.anInt2792 = 0; + Static6.aClass3_Sub15_Sub1_1.p1(10); + Static6.aClass3_Sub15_Sub1_1.p4(local210[0]); + Static6.aClass3_Sub15_Sub1_1.p4(local210[1]); + Static6.aClass3_Sub15_Sub1_1.p4(local210[2]); + Static6.aClass3_Sub15_Sub1_1.p4(local210[3]); + Static6.aClass3_Sub15_Sub1_1.p8(Static186.aClass100_829.method3158()); + Static6.aClass3_Sub15_Sub1_1.pjstr(Static186.aClass100_828); + Static6.aClass3_Sub15_Sub1_1.encryptRsa(Static86.aBigInteger1, Static256.aBigInteger2); + Static17.aClass3_Sub15_Sub1_2.offset = 0; if (Static244.anInt5370 == 40) { - Static17.aClass3_Sub15_Sub1_2.method2178(18); + Static17.aClass3_Sub15_Sub1_2.p1(18); } else { - Static17.aClass3_Sub15_Sub1_2.method2178(16); + Static17.aClass3_Sub15_Sub1_2.p1(16); } - Static17.aClass3_Sub15_Sub1_2.method2230(Static6.aClass3_Sub15_Sub1_1.anInt2792 + Static229.method3937(Static47.aClass100_991) + 159); - Static17.aClass3_Sub15_Sub1_2.method2164(530); - Static17.aClass3_Sub15_Sub1_2.method2178(Static5.anInt39); - Static17.aClass3_Sub15_Sub1_2.method2178(Static249.aBoolean282 ? 1 : 0); - Static17.aClass3_Sub15_Sub1_2.method2178(1); - Static17.aClass3_Sub15_Sub1_2.method2178(Static144.method2736()); - Static17.aClass3_Sub15_Sub1_2.method2230(Static48.anInt1448); - Static17.aClass3_Sub15_Sub1_2.method2230(Static254.anInt5554); - Static17.aClass3_Sub15_Sub1_2.method2178(Static186.anInt4392); + Static17.aClass3_Sub15_Sub1_2.p2(Static6.aClass3_Sub15_Sub1_1.offset + Static229.method3937(Static47.aClass100_991) + 159); + Static17.aClass3_Sub15_Sub1_2.p4(530); + Static17.aClass3_Sub15_Sub1_2.p1(Static5.anInt39); + Static17.aClass3_Sub15_Sub1_2.p1(Static249.aBoolean282 ? 1 : 0); + Static17.aClass3_Sub15_Sub1_2.p1(1); + Static17.aClass3_Sub15_Sub1_2.p1(Static144.method2736()); + Static17.aClass3_Sub15_Sub1_2.p2(Static48.anInt1448); + Static17.aClass3_Sub15_Sub1_2.p2(Static254.anInt5554); + Static17.aClass3_Sub15_Sub1_2.p1(Static186.anInt4392); Static140.method2705(Static17.aClass3_Sub15_Sub1_2); - Static17.aClass3_Sub15_Sub1_2.method2171(Static47.aClass100_991); - Static17.aClass3_Sub15_Sub1_2.method2164(Static204.anInt4760); - Static17.aClass3_Sub15_Sub1_2.method2164(Static145.method2746()); + Static17.aClass3_Sub15_Sub1_2.pjstr(Static47.aClass100_991); + Static17.aClass3_Sub15_Sub1_2.p4(Static204.anInt4760); + Static17.aClass3_Sub15_Sub1_2.p4(Static145.method2746()); Static18.aBoolean39 = true; - Static17.aClass3_Sub15_Sub1_2.method2230(Static189.anInt4443); - Static17.aClass3_Sub15_Sub1_2.method2164(Static213.aClass153_88.method4480()); - Static17.aClass3_Sub15_Sub1_2.method2164(Static249.aClass153_100.method4480()); - Static17.aClass3_Sub15_Sub1_2.method2164(Static274.aClass153_90.method4480()); - Static17.aClass3_Sub15_Sub1_2.method2164(Static41.aClass153_25.method4480()); - Static17.aClass3_Sub15_Sub1_2.method2164(Static248.aClass153_75.method4480()); - Static17.aClass3_Sub15_Sub1_2.method2164(Static26.aClass153_16.method4480()); - Static17.aClass3_Sub15_Sub1_2.method2164(Static130.aClass153_47.method4480()); - Static17.aClass3_Sub15_Sub1_2.method2164(Static267.aClass153_109.method4480()); - Static17.aClass3_Sub15_Sub1_2.method2164(Static209.aClass153_86.method4480()); - Static17.aClass3_Sub15_Sub1_2.method2164(Static195.aClass153_80.method4480()); - Static17.aClass3_Sub15_Sub1_2.method2164(Static184.aClass153_78.method4480()); - Static17.aClass3_Sub15_Sub1_2.method2164(Static214.aClass153_106.method4480()); - Static17.aClass3_Sub15_Sub1_2.method2164(Static16.aClass153_9.method4480()); - Static17.aClass3_Sub15_Sub1_2.method2164(Static261.aClass153_107.method4480()); - Static17.aClass3_Sub15_Sub1_2.method2164(Static137.aClass153_49.method4480()); - Static17.aClass3_Sub15_Sub1_2.method2164(Static138.aClass153_51.method4480()); - Static17.aClass3_Sub15_Sub1_2.method2164(Static280.aClass153_110.method4480()); - Static17.aClass3_Sub15_Sub1_2.method2164(Static138.aClass153_50.method4480()); - Static17.aClass3_Sub15_Sub1_2.method2164(Static172.aClass153_71.method4480()); - Static17.aClass3_Sub15_Sub1_2.method2164(Static171.aClass153_68.method4480()); - Static17.aClass3_Sub15_Sub1_2.method2164(Static253.aClass153_104.method4480()); - Static17.aClass3_Sub15_Sub1_2.method2164(Static122.aClass153_46.method4480()); - Static17.aClass3_Sub15_Sub1_2.method2164(Static156.aClass153_59.method4480()); - Static17.aClass3_Sub15_Sub1_2.method2164(Static227.aClass153_94.method4480()); - Static17.aClass3_Sub15_Sub1_2.method2164(Static254.aClass153_105.method4480()); - Static17.aClass3_Sub15_Sub1_2.method2164(Static28.aClass153_18.method4480()); - Static17.aClass3_Sub15_Sub1_2.method2164(Static167.aClass153_63.method4480()); - Static17.aClass3_Sub15_Sub1_2.method2164(Static226.aClass153_93.method4480()); - Static17.aClass3_Sub15_Sub1_2.method2179(Static6.aClass3_Sub15_Sub1_1.aByteArray40, Static6.aClass3_Sub15_Sub1_1.anInt2792); - Static124.aClass95_2.method2830(Static17.aClass3_Sub15_Sub1_2.aByteArray40, Static17.aClass3_Sub15_Sub1_2.anInt2792); + Static17.aClass3_Sub15_Sub1_2.p2(Static189.anInt4443); + Static17.aClass3_Sub15_Sub1_2.p4(Static213.aClass153_88.method4480()); + Static17.aClass3_Sub15_Sub1_2.p4(Static249.aClass153_100.method4480()); + Static17.aClass3_Sub15_Sub1_2.p4(Static274.aClass153_90.method4480()); + Static17.aClass3_Sub15_Sub1_2.p4(Static41.aClass153_25.method4480()); + Static17.aClass3_Sub15_Sub1_2.p4(Static248.aClass153_75.method4480()); + Static17.aClass3_Sub15_Sub1_2.p4(Static26.aClass153_16.method4480()); + Static17.aClass3_Sub15_Sub1_2.p4(Static130.aClass153_47.method4480()); + Static17.aClass3_Sub15_Sub1_2.p4(Static267.aClass153_109.method4480()); + Static17.aClass3_Sub15_Sub1_2.p4(Static209.aClass153_86.method4480()); + Static17.aClass3_Sub15_Sub1_2.p4(Static195.aClass153_80.method4480()); + Static17.aClass3_Sub15_Sub1_2.p4(Static184.aClass153_78.method4480()); + Static17.aClass3_Sub15_Sub1_2.p4(Static214.aClass153_106.method4480()); + Static17.aClass3_Sub15_Sub1_2.p4(Static16.aClass153_9.method4480()); + Static17.aClass3_Sub15_Sub1_2.p4(Static261.aClass153_107.method4480()); + Static17.aClass3_Sub15_Sub1_2.p4(Static137.aClass153_49.method4480()); + Static17.aClass3_Sub15_Sub1_2.p4(Static138.aClass153_51.method4480()); + Static17.aClass3_Sub15_Sub1_2.p4(Static280.aClass153_110.method4480()); + Static17.aClass3_Sub15_Sub1_2.p4(Static138.aClass153_50.method4480()); + Static17.aClass3_Sub15_Sub1_2.p4(Static172.aClass153_71.method4480()); + Static17.aClass3_Sub15_Sub1_2.p4(Static171.aClass153_68.method4480()); + Static17.aClass3_Sub15_Sub1_2.p4(Static253.aClass153_104.method4480()); + Static17.aClass3_Sub15_Sub1_2.p4(Static122.aClass153_46.method4480()); + Static17.aClass3_Sub15_Sub1_2.p4(Static156.aClass153_59.method4480()); + Static17.aClass3_Sub15_Sub1_2.p4(Static227.aClass153_94.method4480()); + Static17.aClass3_Sub15_Sub1_2.p4(Static254.aClass153_105.method4480()); + Static17.aClass3_Sub15_Sub1_2.p4(Static28.aClass153_18.method4480()); + Static17.aClass3_Sub15_Sub1_2.p4(Static167.aClass153_63.method4480()); + Static17.aClass3_Sub15_Sub1_2.p4(Static226.aClass153_93.method4480()); + Static17.aClass3_Sub15_Sub1_2.pBytes(Static6.aClass3_Sub15_Sub1_1.data, Static6.aClass3_Sub15_Sub1_1.offset); + Static124.aClass95_2.method2830(Static17.aClass3_Sub15_Sub1_2.data, Static17.aClass3_Sub15_Sub1_2.offset); Static6.aClass3_Sub15_Sub1_1.method2240(local210); for (@Pc(583) int local583 = 0; local583 < 4; local583++) { local210[local583] += 50; @@ -195,9 +195,9 @@ public final class Static216 { } } if (Static184.anInt4348 == 6) { - Static6.aClass3_Sub15_Sub1_1.anInt2792 = 0; + Static6.aClass3_Sub15_Sub1_1.offset = 0; Static6.aClass3_Sub15_Sub1_1.method2242(17); - Static124.aClass95_2.method2830(Static6.aClass3_Sub15_Sub1_1.aByteArray40, Static6.aClass3_Sub15_Sub1_1.anInt2792); + Static124.aClass95_2.method2830(Static6.aClass3_Sub15_Sub1_1.data, Static6.aClass3_Sub15_Sub1_1.offset); Static184.anInt4348 = 4; return; } @@ -227,18 +227,18 @@ public final class Static216 { if (Static124.aClass95_2.method2831() < 14) { return; } - Static124.aClass95_2.method2827(0, 14, Static57.aClass3_Sub15_Sub1_3.aByteArray40); - Static57.aClass3_Sub15_Sub1_3.anInt2792 = 0; - Static191.anInt4502 = Static57.aClass3_Sub15_Sub1_3.method2229(); - Static249.anInt5431 = Static57.aClass3_Sub15_Sub1_3.method2229(); - Static124.aBoolean157 = Static57.aClass3_Sub15_Sub1_3.method2229() == 1; - Static207.aBoolean236 = Static57.aClass3_Sub15_Sub1_3.method2229() == 1; - Static25.aBoolean57 = Static57.aClass3_Sub15_Sub1_3.method2229() == 1; - Static86.aBoolean129 = Static57.aClass3_Sub15_Sub1_3.method2229() == 1; - Static245.aBoolean281 = Static57.aClass3_Sub15_Sub1_3.method2229() == 1; - Static16.anInt549 = Static57.aClass3_Sub15_Sub1_3.method2163(); - Static202.aBoolean233 = Static57.aClass3_Sub15_Sub1_3.method2229() == 1; - Static2.aBoolean1 = Static57.aClass3_Sub15_Sub1_3.method2229() == 1; + Static124.aClass95_2.method2827(0, 14, Static57.aClass3_Sub15_Sub1_3.data); + Static57.aClass3_Sub15_Sub1_3.offset = 0; + Static191.anInt4502 = Static57.aClass3_Sub15_Sub1_3.g1(); + Static249.anInt5431 = Static57.aClass3_Sub15_Sub1_3.g1(); + Static124.aBoolean157 = Static57.aClass3_Sub15_Sub1_3.g1() == 1; + Static207.aBoolean236 = Static57.aClass3_Sub15_Sub1_3.g1() == 1; + Static25.aBoolean57 = Static57.aClass3_Sub15_Sub1_3.g1() == 1; + Static86.aBoolean129 = Static57.aClass3_Sub15_Sub1_3.g1() == 1; + Static245.aBoolean281 = Static57.aClass3_Sub15_Sub1_3.g1() == 1; + Static16.anInt549 = Static57.aClass3_Sub15_Sub1_3.g2(); + Static202.aBoolean233 = Static57.aClass3_Sub15_Sub1_3.g1() == 1; + Static2.aBoolean1 = Static57.aClass3_Sub15_Sub1_3.g1() == 1; Static189.method3438(Static2.aBoolean1); Static9.method186(Static2.aBoolean1); if (!Static249.aBoolean282) { @@ -255,15 +255,15 @@ public final class Static216 { } } Static164.anInt3985 = Static57.aClass3_Sub15_Sub1_3.method2243(); - Static223.anInt5028 = Static57.aClass3_Sub15_Sub1_3.method2163(); + Static223.anInt5028 = Static57.aClass3_Sub15_Sub1_3.g2(); Static184.anInt4348 = 9; } if (Static184.anInt4348 == 9) { if (Static124.aClass95_2.method2831() < Static223.anInt5028) { return; } - Static57.aClass3_Sub15_Sub1_3.anInt2792 = 0; - Static124.aClass95_2.method2827(0, Static223.anInt5028, Static57.aClass3_Sub15_Sub1_3.aByteArray40); + Static57.aClass3_Sub15_Sub1_3.offset = 0; + Static124.aClass95_2.method2827(0, Static223.anInt5028, Static57.aClass3_Sub15_Sub1_3.data); Static266.anInt5336 = 2; Static184.anInt4348 = 0; Static243.method4221(); diff --git a/client/src/main/java/Static217.java b/client/src/main/java/Static217.java index 62a66e7..bc26174 100644 --- a/client/src/main/java/Static217.java +++ b/client/src/main/java/Static217.java @@ -138,14 +138,14 @@ public final class Static217 { @Pc(7) int local7 = -1; @Pc(12) Buffer local12 = new Buffer(arg2); while (true) { - @Pc(20) int local20 = local12.method2199(); + @Pc(20) int local20 = local12.gVarSmart(); if (local20 == 0) { return; } local7 += local20; @Pc(31) int local31 = 0; while (true) { - @Pc(35) int local35 = local12.method2204(); + @Pc(35) int local35 = local12.gSmart1or2(); if (local35 == 0) { break; } @@ -153,7 +153,7 @@ public final class Static217 { @Pc(50) int local50 = local31 & 0x3F; @Pc(56) int local56 = local31 >> 6 & 0x3F; @Pc(60) int local60 = local31 >> 12; - @Pc(64) int local64 = local12.method2229(); + @Pc(64) int local64 = local12.g1(); @Pc(68) int local68 = local64 >> 2; @Pc(72) int local72 = local64 & 0x3; if (arg3 == local60 && local56 >= arg8 && local56 < arg8 + 8 && arg9 <= local50 && arg9 + 8 > local50) { diff --git a/client/src/main/java/Static218.java b/client/src/main/java/Static218.java index 2f474b0..f3b9052 100644 --- a/client/src/main/java/Static218.java +++ b/client/src/main/java/Static218.java @@ -117,7 +117,7 @@ public final class Static218 { @OriginalMember(owner = "client!rk", name = "c", descriptor = "(Lclient!na;)Lclient!na;") public static JagString method2862(@OriginalArg(0) JagString arg0) { - @Pc(3) int local3 = arg0.method3120(); + @Pc(3) int local3 = arg0.length(); @Pc(5) int local5 = 0; @Pc(15) int local15; for (@Pc(7) int local7 = 0; local7 < local3; local7++) { diff --git a/client/src/main/java/Static225.java b/client/src/main/java/Static225.java index aa71adb..40550f2 100644 --- a/client/src/main/java/Static225.java +++ b/client/src/main/java/Static225.java @@ -105,18 +105,18 @@ public final class Static225 { Static266.anInt5336 = -3; Static219.anInt4937 = 1; @Pc(43) Buffer local43 = new Buffer(128); - local43.method2178(10); - local43.method2230((int) (Math.random() * 99999.0D)); - local43.method2230(530); - local43.method2166(Static186.aClass100_829.method3158()); - local43.method2164((int) (Math.random() * 9.9999999E7D)); - local43.method2171(Static186.aClass100_828); - local43.method2164((int) (Math.random() * 9.9999999E7D)); - local43.method2226(Static86.aBigInteger1, Static256.aBigInteger2); - Static6.aClass3_Sub15_Sub1_1.anInt2792 = 0; - Static6.aClass3_Sub15_Sub1_1.method2178(210); - Static6.aClass3_Sub15_Sub1_1.method2178(local43.anInt2792); - Static6.aClass3_Sub15_Sub1_1.method2179(local43.aByteArray40, local43.anInt2792); + local43.p1(10); + local43.p2((int) (Math.random() * 99999.0D)); + local43.p2(530); + local43.p8(Static186.aClass100_829.method3158()); + local43.p4((int) (Math.random() * 9.9999999E7D)); + local43.pjstr(Static186.aClass100_828); + local43.p4((int) (Math.random() * 9.9999999E7D)); + local43.encryptRsa(Static86.aBigInteger1, Static256.aBigInteger2); + Static6.aClass3_Sub15_Sub1_1.offset = 0; + Static6.aClass3_Sub15_Sub1_1.p1(210); + Static6.aClass3_Sub15_Sub1_1.p1(local43.offset); + Static6.aClass3_Sub15_Sub1_1.pBytes(local43.data, local43.offset); } else { Static49.method1208(); } diff --git a/client/src/main/java/Static228.java b/client/src/main/java/Static228.java index 74438e7..f5a6379 100644 --- a/client/src/main/java/Static228.java +++ b/client/src/main/java/Static228.java @@ -32,7 +32,7 @@ public final class Static228 { public static final long[] aLongArray8 = new long[32]; @OriginalMember(owner = "client!sh", name = "a", descriptor = "(II)[B") - public static synchronized byte[] method3907(@OriginalArg(1) int arg0) { + public static synchronized byte[] allocate(@OriginalArg(1) int arg0) { @Pc(22) byte[] local22; if (arg0 == 100 && Static115.anInt2937 > 0) { local22 = Static277.aByteArrayArray16[--Static115.anInt2937]; diff --git a/client/src/main/java/Static229.java b/client/src/main/java/Static229.java index 1008c6b..2065834 100644 --- a/client/src/main/java/Static229.java +++ b/client/src/main/java/Static229.java @@ -52,7 +52,7 @@ public final class Static229 { @OriginalMember(owner = "client!si", name = "a", descriptor = "(BLclient!na;)I") public static int method3937(@OriginalArg(1) JagString arg0) { - return arg0.method3120() + 1; + return arg0.length() + 1; } @OriginalMember(owner = "client!si", name = "b", descriptor = "(IIB)V") diff --git a/client/src/main/java/Static230.java b/client/src/main/java/Static230.java index 8667a09..cd2a362 100644 --- a/client/src/main/java/Static230.java +++ b/client/src/main/java/Static230.java @@ -163,7 +163,7 @@ public final class Static230 { @Pc(17) JagString local17 = Static272.aClass100_989.method3153(Static71.aClass213_3.anApplet2); @Pc(23) JagString local23 = Static246.aClass100_1029.method3153(Static71.aClass213_3.anApplet2); @Pc(48) JagString local48 = Static34.method882(new JagString[] { local17, Static142.aClass100_667, arg0, Static276.aClass100_1095, local23 }); - if (arg0.method3120() == 0) { + if (arg0.length() == 0) { local48 = Static34.method882(new JagString[] { local48, Static245.aClass100_1018 }); } else { local48 = Static34.method882(new JagString[] { local48, Static263.aClass100_1082, Static33.method873(MonotonicClock.method5096() + 94608000000L), Static64.aClass100_431, Static154.method2929(94608000L) }); diff --git a/client/src/main/java/Static231.java b/client/src/main/java/Static231.java index 078272f..2bb960a 100644 --- a/client/src/main/java/Static231.java +++ b/client/src/main/java/Static231.java @@ -37,17 +37,17 @@ public final class Static231 { @OriginalMember(owner = "client!sk", name = "a", descriptor = "(ILclient!wa;)V") public static void method3980(@OriginalArg(1) Buffer arg0) { label83: while (true) { - if (arg0.anInt2792 < arg0.aByteArray40.length) { + if (arg0.offset < arg0.data.length) { @Pc(23) int local23 = 0; @Pc(25) boolean local25 = false; @Pc(27) int local27 = 0; - if (arg0.method2229() == 1) { + if (arg0.g1() == 1) { local25 = true; - local23 = arg0.method2229(); - local27 = arg0.method2229(); + local23 = arg0.g1(); + local27 = arg0.g1(); } - @Pc(46) int local46 = arg0.method2229(); - @Pc(50) int local50 = arg0.method2229(); + @Pc(46) int local46 = arg0.g1(); + @Pc(50) int local50 = arg0.g1(); @Pc(57) int local57 = local46 * 64 - Static158.anInt3846; @Pc(68) int local68 = Static181.anInt4296 + Static2.anInt13 - local50 * 64 - 1; @Pc(146) byte local146; @@ -62,13 +62,13 @@ public final class Static231 { } for (@Pc(107) int local107 = 0; local107 < 64; local107++) { if (!local25 || local23 * 8 <= local102 && local23 * 8 + 8 > local102 && local107 >= local27 * 8 && local27 * 8 + 8 > local107) { - local146 = arg0.method2186(); + local146 = arg0.g1s(); if (local146 != 0) { if (Static229.aByteArrayArrayArray12[local96][local100] == null) { Static229.aByteArrayArrayArray12[local96][local100] = new byte[4096]; } Static229.aByteArrayArrayArray12[local96][local100][(63 - local107 << 6) + local102] = local146; - @Pc(182) byte local182 = arg0.method2186(); + @Pc(182) byte local182 = arg0.g1s(); if (Static125.aByteArrayArrayArray10[local96][local100] == null) { Static125.aByteArrayArrayArray10[local96][local100] = new byte[4096]; } @@ -84,9 +84,9 @@ public final class Static231 { if (local96 >= (local25 ? 64 : 4096)) { continue label83; } - local146 = arg0.method2186(); + local146 = arg0.g1s(); if (local146 != 0) { - arg0.anInt2792++; + arg0.offset++; } local96++; } diff --git a/client/src/main/java/Static233.java b/client/src/main/java/Static233.java index 7b4825e..54c9d5d 100644 --- a/client/src/main/java/Static233.java +++ b/client/src/main/java/Static233.java @@ -187,9 +187,9 @@ public final class Static233 { return; } arg0.method2242(163); - arg0.method2178(0); - local25 = arg0.anInt2792; - arg0.method2164(local18.anInt1732); + arg0.p1(0); + local25 = arg0.offset; + arg0.p4(local18.anInt1732); for (@Pc(121) int local121 = 0; local121 < local18.anInt1725; local121++) { if (local18.anIntArray138[local121] == 0) { try { @@ -199,17 +199,17 @@ public final class Static233 { if (local151 == 0) { local168 = (Field) local18.aClass212Array2[local121].anObject6; local195 = local168.getInt(null); - arg0.method2178(0); - arg0.method2164(local195); + arg0.p1(0); + arg0.p4(local195); } else if (local151 == 1) { local168 = (Field) local18.aClass212Array2[local121].anObject6; local168.setInt(null, local18.anIntArray137[local121]); - arg0.method2178(0); + arg0.p1(0); } else if (local151 == 2) { local168 = (Field) local18.aClass212Array2[local121].anObject6; local195 = local168.getModifiers(); - arg0.method2178(0); - arg0.method2164(local195); + arg0.p1(0); + arg0.p4(local195); } @Pc(234) Method local234; if (local151 == 3) { @@ -222,53 +222,53 @@ public final class Static233 { } @Pc(272) Object local272 = local234.invoke(null, local243); if (local272 == null) { - arg0.method2178(0); + arg0.p1(0); } else if (local272 instanceof Number) { - arg0.method2178(1); - arg0.method2166(((Number) local272).longValue()); + arg0.p1(1); + arg0.p8(((Number) local272).longValue()); } else if (local272 instanceof JagString) { - arg0.method2178(2); - arg0.method2171((JagString) local272); + arg0.p1(2); + arg0.pjstr((JagString) local272); } else { - arg0.method2178(4); + arg0.p1(4); } } else if (local151 == 4) { local234 = (Method) local18.aClass212Array1[local121].anObject6; local195 = local234.getModifiers(); - arg0.method2178(0); - arg0.method2164(local195); + arg0.p1(0); + arg0.p4(local195); } } catch (@Pc(338) ClassNotFoundException local338) { - arg0.method2178(-10); + arg0.p1(-10); } catch (@Pc(344) InvalidClassException local344) { - arg0.method2178(-11); + arg0.p1(-11); } catch (@Pc(350) StreamCorruptedException local350) { - arg0.method2178(-12); + arg0.p1(-12); } catch (@Pc(356) OptionalDataException local356) { - arg0.method2178(-13); + arg0.p1(-13); } catch (@Pc(362) IllegalAccessException local362) { - arg0.method2178(-14); + arg0.p1(-14); } catch (@Pc(368) IllegalArgumentException local368) { - arg0.method2178(-15); + arg0.p1(-15); } catch (@Pc(374) InvocationTargetException local374) { - arg0.method2178(-16); + arg0.p1(-16); } catch (@Pc(380) SecurityException local380) { - arg0.method2178(-17); + arg0.p1(-17); } catch (@Pc(386) IOException local386) { - arg0.method2178(-18); + arg0.p1(-18); } catch (@Pc(392) NullPointerException local392) { - arg0.method2178(-19); + arg0.p1(-19); } catch (@Pc(398) Exception local398) { - arg0.method2178(-20); + arg0.p1(-20); } catch (@Pc(404) Throwable local404) { - arg0.method2178(-21); + arg0.p1(-21); } } else { - arg0.method2178(local18.anIntArray138[local121]); + arg0.p1(local18.anIntArray138[local121]); } } - arg0.method2219(local25); - arg0.method2195(arg0.anInt2792 - local25); + arg0.pCrc32(local25); + arg0.p1len(arg0.offset - local25); local18.method4658(); } } diff --git a/client/src/main/java/Static234.java b/client/src/main/java/Static234.java index 36b96f3..166af96 100644 --- a/client/src/main/java/Static234.java +++ b/client/src/main/java/Static234.java @@ -30,44 +30,44 @@ public final class Static234 { for (@Pc(3) int local3 = 0; local3 < Static116.anInt2951; local3++) { @Pc(10) int local10 = Static44.anIntArray106[local3]; @Pc(14) Npc local14 = Static175.aClass8_Sub4_Sub2Array1[local10]; - @Pc(18) int local18 = Static57.aClass3_Sub15_Sub1_3.method2229(); + @Pc(18) int local18 = Static57.aClass3_Sub15_Sub1_3.g1(); if ((local18 & 0x8) != 0) { - local18 += Static57.aClass3_Sub15_Sub1_3.method2229() << 8; + local18 += Static57.aClass3_Sub15_Sub1_3.g1() << 8; } @Pc(43) int local43; @Pc(47) int local47; if ((local18 & 0x40) != 0) { - local43 = Static57.aClass3_Sub15_Sub1_3.method2229(); - local47 = Static57.aClass3_Sub15_Sub1_3.method2212(); + 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.anInt3372 = Static57.aClass3_Sub15_Sub1_3.method2180(); + local14.anInt3372 = Static57.aClass3_Sub15_Sub1_3.g1ssub(); } if ((local18 & 0x2) != 0) { - local43 = Static57.aClass3_Sub15_Sub1_3.method2212(); - local47 = Static57.aClass3_Sub15_Sub1_3.method2180(); + local43 = Static57.aClass3_Sub15_Sub1_3.p1neg(); + local47 = Static57.aClass3_Sub15_Sub1_3.g1ssub(); local14.method2686(local47, Static83.anInt372, local43); } if ((local18 & 0x10) != 0) { - local43 = Static57.aClass3_Sub15_Sub1_3.method2163(); - local47 = Static57.aClass3_Sub15_Sub1_3.method2229(); + local43 = Static57.aClass3_Sub15_Sub1_3.g2(); + local47 = Static57.aClass3_Sub15_Sub1_3.g1(); if (local43 == 65535) { local43 = -1; } Static223.method3855(local47, local43, local14); } if ((local18 & 0x4) != 0) { - local14.anInt3370 = Static57.aClass3_Sub15_Sub1_3.method2184(); + local14.anInt3370 = Static57.aClass3_Sub15_Sub1_3.g2sub(); if (local14.anInt3370 == 65535) { local14.anInt3370 = -1; } } if ((local18 & 0x80) != 0) { - local43 = Static57.aClass3_Sub15_Sub1_3.method2184(); + local43 = Static57.aClass3_Sub15_Sub1_3.g2sub(); if (local43 == 65535) { local43 = -1; } - local47 = Static57.aClass3_Sub15_Sub1_3.method2208(); + local47 = Static57.aClass3_Sub15_Sub1_3.g4me(); @Pc(147) boolean local147 = true; if (local43 != -1 && local14.anInt3432 != -1 && Static36.method941(Static34.method877(local43).anInt1754).anInt5355 < Static36.method941(Static34.method877(local14.anInt3432).anInt1754).anInt5355) { local147 = false; @@ -97,7 +97,7 @@ public final class Static234 { if (local14.aClass96_1.method2935()) { Static91.method1877(local14); } - local14.method2698(Static214.method4363(Static57.aClass3_Sub15_Sub1_3.method2192())); + local14.method2698(Static214.method4363(Static57.aClass3_Sub15_Sub1_3.g2le())); local14.method2692(local14.aClass96_1.anInt3713); local14.anInt3365 = local14.aClass96_1.anInt3737; if (local14.aClass96_1.method2935()) { @@ -105,28 +105,28 @@ public final class Static234 { } } if ((local18 & 0x20) != 0) { - local14.aClass100_640 = Static57.aClass3_Sub15_Sub1_3.method2202(); + local14.aClass100_640 = Static57.aClass3_Sub15_Sub1_3.gjstr(); local14.anInt3408 = 100; } if ((local18 & 0x100) != 0) { - local43 = Static57.aClass3_Sub15_Sub1_3.method2212(); + local43 = Static57.aClass3_Sub15_Sub1_3.p1neg(); @Pc(331) int[] local331 = new int[local43]; @Pc(334) int[] local334 = new int[local43]; @Pc(337) int[] local337 = new int[local43]; for (@Pc(339) int local339 = 0; local339 < local43; local339++) { - @Pc(350) int local350 = Static57.aClass3_Sub15_Sub1_3.method2192(); + @Pc(350) int local350 = Static57.aClass3_Sub15_Sub1_3.g2le(); if (local350 == 65535) { local350 = -1; } local331[local339] = local350; - local334[local339] = Static57.aClass3_Sub15_Sub1_3.method2180(); - local337[local339] = Static57.aClass3_Sub15_Sub1_3.method2163(); + local334[local339] = Static57.aClass3_Sub15_Sub1_3.g1ssub(); + local337[local339] = Static57.aClass3_Sub15_Sub1_3.g2(); } Static159.method3037(local337, local14, local334, local331); } if ((local18 & 0x200) != 0) { - local14.anInt3382 = Static57.aClass3_Sub15_Sub1_3.method2184(); - local14.anInt3363 = Static57.aClass3_Sub15_Sub1_3.method2163(); + local14.anInt3382 = Static57.aClass3_Sub15_Sub1_3.g2sub(); + local14.anInt3363 = Static57.aClass3_Sub15_Sub1_3.g2(); } } } diff --git a/client/src/main/java/Static239.java b/client/src/main/java/Static239.java index 93c7129..60467b6 100644 --- a/client/src/main/java/Static239.java +++ b/client/src/main/java/Static239.java @@ -133,7 +133,7 @@ public final class Static239 { } catch (@Pc(5) UnsupportedEncodingException local5) { local3 = arg0.getBytes(); } - return Static10.method346(local3, local3.length, 0); + return Static10.decodeString(local3, local3.length, 0); } @OriginalMember(owner = "client!tf", name = "a", descriptor = "(IIII)V") @@ -441,7 +441,7 @@ public final class Static239 { @Pc(193) JagString[] local193 = local176.method3145().method3147(32); for (@Pc(195) int local195 = 0; local195 < local193.length; local195++) { @Pc(203) JagString local203 = local193[local195]; - if (local203.method3120() >= 4 && local203.method3137(4, 0).method3123()) { + if (local203.length() >= 4 && local203.method3137(4, 0).method3123()) { local184 = local203.method3137(4, 0).method3132(); break; } diff --git a/client/src/main/java/Static243.java b/client/src/main/java/Static243.java index 99cf6b7..b33cc22 100644 --- a/client/src/main/java/Static243.java +++ b/client/src/main/java/Static243.java @@ -52,10 +52,10 @@ public final class Static243 { Static164.anInt3985 = -1; Static267.anInt5775 = 0; Static60.anInt1894 = 0; - Static6.aClass3_Sub15_Sub1_1.anInt2792 = 0; + Static6.aClass3_Sub15_Sub1_1.offset = 0; Static230.anInt5152 = -1; Static201.anInt1862 = 0; - Static57.aClass3_Sub15_Sub1_3.anInt2792 = 0; + Static57.aClass3_Sub15_Sub1_3.offset = 0; @Pc(3506) int local3506; for (local3506 = 0; local3506 < Static143.aClass102Array1.length; local3506++) { Static143.aClass102Array1[local3506] = null; diff --git a/client/src/main/java/Static245.java b/client/src/main/java/Static245.java index 7ab2039..68567ee 100644 --- a/client/src/main/java/Static245.java +++ b/client/src/main/java/Static245.java @@ -73,9 +73,9 @@ public final class Static245 { for (@Pc(7) int local7 = 0; local7 < Static116.anInt2951; local7++) { @Pc(31) int local31 = Static44.anIntArray106[local7]; @Pc(35) Player local35 = Static159.aClass8_Sub4_Sub1Array1[local31]; - @Pc(39) int local39 = Static57.aClass3_Sub15_Sub1_3.method2229(); + @Pc(39) int local39 = Static57.aClass3_Sub15_Sub1_3.g1(); if ((local39 & 0x10) != 0) { - local39 += Static57.aClass3_Sub15_Sub1_3.method2229() << 8; + local39 += Static57.aClass3_Sub15_Sub1_3.g1() << 8; } Static84.method1768(local39, local31, local35); } @@ -118,14 +118,14 @@ public final class Static245 { @Pc(255) int local255; @Pc(266) int local266; @Pc(316) int local316; - while (local96.aByteArray40.length > local96.anInt2792) { - local103 = local96.method2229(); + while (local96.data.length > local96.offset) { + local103 = local96.g1(); if (local103 != 129) { - local96.anInt2792--; + local96.offset--; break; } for (local108 = 0; local108 < 4; local108++) { - @Pc(223) byte local223 = local96.method2186(); + @Pc(223) byte local223 = local96.g1s(); @Pc(237) int local237; if (local223 == 0) { if (local108 <= arg6) { @@ -164,7 +164,7 @@ public final class Static245 { } else if (local223 == 1) { for (local232 = 0; local232 < 64; local232 += 4) { for (local237 = 0; local237 < 64; local237 += 4) { - @Pc(246) byte local246 = local96.method2186(); + @Pc(246) byte local246 = local96.g1s(); if (local108 <= arg6) { for (local255 = local232; local255 < local232 + 4; local255++) { for (local266 = local237; local266 < local237 + 4; local266++) { @@ -189,13 +189,13 @@ public final class Static245 { @Pc(472) Environment local472 = null; label207: while (true) { label200: do { - while (local96.aByteArray40.length > local96.anInt2792) { - local108 = local96.method2229(); + while (local96.data.length > local96.offset) { + local108 = local96.g1(); if (local108 != 0) { if (local108 != 1) { throw new IllegalStateException(); } - local497 = local96.method2229(); + local497 = local96.g1(); continue label200; } local472 = new Environment(local96); @@ -209,7 +209,7 @@ public final class Static245 { for (local232 = 0; local232 < local497; local232++) { @Pc(517) Light local517 = new Light(local96); if (local517.anInt2243 == 31) { - @Pc(529) LightType local529 = Static140.method2709(local96.method2163()); + @Pc(529) LightType local529 = Static140.method2709(local96.g2()); local517.method1762(local529.anInt2865, local529.anInt2873, local529.anInt2867, local529.anInt2872); } local417 = local517.anInt2240 >> 7; diff --git a/client/src/main/java/Static254.java b/client/src/main/java/Static254.java index ac15df6..947f2a2 100644 --- a/client/src/main/java/Static254.java +++ b/client/src/main/java/Static254.java @@ -218,13 +218,13 @@ public final class Static254 { @OriginalMember(owner = "client!uj", name = "a", descriptor = "(Lclient!wa;II)Lclient!na;") public static JagString method4350(@OriginalArg(0) Buffer arg0) { try { - @Pc(7) int local7 = arg0.method2204(); + @Pc(7) int local7 = arg0.gSmart1or2(); if (local7 > 32767) { local7 = 32767; } @Pc(15) byte[] local15 = new byte[local7]; - arg0.anInt2792 += Static62.aClass44_1.method1552(0, local7, local15, arg0.aByteArray40, arg0.anInt2792); - return Static10.method346(local15, local7, 0); + arg0.offset += Static62.aClass44_1.method1552(0, local7, local15, arg0.data, arg0.offset); + return Static10.decodeString(local15, local7, 0); } catch (@Pc(47) Exception local47) { return Static267.aClass100_1087; } diff --git a/client/src/main/java/Static263.java b/client/src/main/java/Static263.java index 14626b5..d9d2c8f 100644 --- a/client/src/main/java/Static263.java +++ b/client/src/main/java/Static263.java @@ -59,53 +59,53 @@ public final class Static263 { } if (arg2 == 1) { Static6.aClass3_Sub15_Sub1_1.method2242(155); - Static6.aClass3_Sub15_Sub1_1.method2164(arg3); - Static6.aClass3_Sub15_Sub1_1.method2230(arg1); + Static6.aClass3_Sub15_Sub1_1.p4(arg3); + Static6.aClass3_Sub15_Sub1_1.p2(arg1); } if (arg2 == 2) { Static6.aClass3_Sub15_Sub1_1.method2242(196); - Static6.aClass3_Sub15_Sub1_1.method2164(arg3); - Static6.aClass3_Sub15_Sub1_1.method2230(arg1); + Static6.aClass3_Sub15_Sub1_1.p4(arg3); + Static6.aClass3_Sub15_Sub1_1.p2(arg1); } if (arg2 == 3) { Static6.aClass3_Sub15_Sub1_1.method2242(124); - Static6.aClass3_Sub15_Sub1_1.method2164(arg3); - Static6.aClass3_Sub15_Sub1_1.method2230(arg1); + Static6.aClass3_Sub15_Sub1_1.p4(arg3); + Static6.aClass3_Sub15_Sub1_1.p2(arg1); } if (arg2 == 4) { Static6.aClass3_Sub15_Sub1_1.method2242(199); - Static6.aClass3_Sub15_Sub1_1.method2164(arg3); - Static6.aClass3_Sub15_Sub1_1.method2230(arg1); + Static6.aClass3_Sub15_Sub1_1.p4(arg3); + Static6.aClass3_Sub15_Sub1_1.p2(arg1); } if (arg2 == 5) { Static6.aClass3_Sub15_Sub1_1.method2242(234); - Static6.aClass3_Sub15_Sub1_1.method2164(arg3); - Static6.aClass3_Sub15_Sub1_1.method2230(arg1); + Static6.aClass3_Sub15_Sub1_1.p4(arg3); + Static6.aClass3_Sub15_Sub1_1.p2(arg1); } if (arg2 == 6) { Static6.aClass3_Sub15_Sub1_1.method2242(168); - Static6.aClass3_Sub15_Sub1_1.method2164(arg3); - Static6.aClass3_Sub15_Sub1_1.method2230(arg1); + Static6.aClass3_Sub15_Sub1_1.p4(arg3); + Static6.aClass3_Sub15_Sub1_1.p2(arg1); } if (arg2 == 7) { Static6.aClass3_Sub15_Sub1_1.method2242(166); - Static6.aClass3_Sub15_Sub1_1.method2164(arg3); - Static6.aClass3_Sub15_Sub1_1.method2230(arg1); + Static6.aClass3_Sub15_Sub1_1.p4(arg3); + Static6.aClass3_Sub15_Sub1_1.p2(arg1); } if (arg2 == 8) { Static6.aClass3_Sub15_Sub1_1.method2242(64); - Static6.aClass3_Sub15_Sub1_1.method2164(arg3); - Static6.aClass3_Sub15_Sub1_1.method2230(arg1); + Static6.aClass3_Sub15_Sub1_1.p4(arg3); + Static6.aClass3_Sub15_Sub1_1.p2(arg1); } if (arg2 == 9) { Static6.aClass3_Sub15_Sub1_1.method2242(53); - Static6.aClass3_Sub15_Sub1_1.method2164(arg3); - Static6.aClass3_Sub15_Sub1_1.method2230(arg1); + Static6.aClass3_Sub15_Sub1_1.p4(arg3); + Static6.aClass3_Sub15_Sub1_1.p2(arg1); } if (arg2 == 10) { Static6.aClass3_Sub15_Sub1_1.method2242(9); - Static6.aClass3_Sub15_Sub1_1.method2164(arg3); - Static6.aClass3_Sub15_Sub1_1.method2230(arg1); + Static6.aClass3_Sub15_Sub1_1.p4(arg3); + Static6.aClass3_Sub15_Sub1_1.p2(arg1); } } diff --git a/client/src/main/java/Static264.java b/client/src/main/java/Static264.java index 5b8b113..37133a4 100644 --- a/client/src/main/java/Static264.java +++ b/client/src/main/java/Static264.java @@ -28,7 +28,7 @@ public final class Static264 { @OriginalMember(owner = "client!vh", name = "a", descriptor = "(ILclient!wa;)Lclient!bd;") public static Class12 method3568(@OriginalArg(1) Buffer arg0) { @Pc(3) Class12 local3 = new Class12(); - local3.anInt439 = arg0.method2163(); + local3.anInt439 = arg0.g2(); local3.aClass3_Sub2_Sub6_1 = Static230.method3953(local3.anInt439); return local3; } diff --git a/client/src/main/java/Static269.java b/client/src/main/java/Static269.java index 26fb715..1b88adc 100644 --- a/client/src/main/java/Static269.java +++ b/client/src/main/java/Static269.java @@ -76,14 +76,14 @@ public final class Static269 { @Pc(188) int local188; @Pc(190) int local190; @Pc(194) int local194; - while (local95.anInt2792 < local95.aByteArray40.length) { - local21 = local95.method2229(); + while (local95.offset < local95.data.length) { + local21 = local95.g1(); if (local21 != 129) { - local95.anInt2792--; + local95.offset--; break; } for (local117 = 0; local117 < 4; local117++) { - @Pc(168) byte local168 = local95.method2186(); + @Pc(168) byte local168 = local95.g1s(); if (local168 == 0) { local243 = arg4; if (arg4 < 0) { @@ -119,7 +119,7 @@ public final class Static269 { } else if (local168 == 1) { for (local243 = 0; local243 < 64; local243 += 4) { for (local188 = 0; local188 < 64; local188 += 4) { - @Pc(305) byte local305 = local95.method2186(); + @Pc(305) byte local305 = local95.g1s(); for (local194 = local243 + arg4; local194 < arg4 + local243 + 4; local194++) { for (@Pc(320) int local320 = arg3 + local188; local320 < arg3 + local188 + 4; local320++) { if (local194 >= 0 && local194 < 104 && local320 >= 0 && local320 < 104) { @@ -170,13 +170,13 @@ public final class Static269 { @Pc(490) Environment local490 = null; label270: while (true) { label263: do { - while (local95.anInt2792 < local95.aByteArray40.length) { - local117 = local95.method2229(); + while (local95.offset < local95.data.length) { + local117 = local95.g1(); if (local117 != 0) { if (local117 != 1) { throw new IllegalStateException(); } - local515 = local95.method2229(); + local515 = local95.g1(); continue label263; } local490 = new Environment(local95); @@ -198,7 +198,7 @@ public final class Static269 { for (local243 = 0; local243 < local515; local243++) { @Pc(529) Light local529 = new Light(local95); if (local529.anInt2243 == 31) { - @Pc(541) LightType local541 = Static140.method2709(local95.method2163()); + @Pc(541) LightType local541 = Static140.method2709(local95.g2()); local529.method1762(local541.anInt2865, local541.anInt2873, local541.anInt2867, local541.anInt2872); } local529.anInt2245 += arg3 << 7; @@ -337,6 +337,6 @@ public final class Static269 { @OriginalMember(owner = "client!wa", name = "a", descriptor = "(IZ)Lclient!na;") public static JagString method2228(@OriginalArg(0) int arg0) { - return Static233.aClass100Array160[arg0].method3120() > 0 ? Static34.method882(new JagString[] { Static254.aClass100Array168[arg0], Static206.aClass100_901, Static233.aClass100Array160[arg0] }) : Static254.aClass100Array168[arg0]; + return Static233.aClass100Array160[arg0].length() > 0 ? Static34.method882(new JagString[] { Static254.aClass100Array168[arg0], Static206.aClass100_901, Static233.aClass100Array160[arg0] }) : Static254.aClass100Array168[arg0]; } } diff --git a/client/src/main/java/Static271.java b/client/src/main/java/Static271.java index 091cd91..355e767 100644 --- a/client/src/main/java/Static271.java +++ b/client/src/main/java/Static271.java @@ -34,11 +34,11 @@ public final class Static271 { if (Static121.aClass38_3 != null) { try { Static121.aClass38_3.method1459(0L); - Static121.aClass38_3.method1458(arg0.aByteArray40, arg0.anInt2792, 24); + Static121.aClass38_3.method1458(arg0.data, arg0.offset, 24); } catch (@Pc(16) Exception local16) { } } - arg0.anInt2792 += 24; + arg0.offset += 24; } @OriginalMember(owner = "client!wc", name = "a", descriptor = "(ZI)V") diff --git a/client/src/main/java/Static276.java b/client/src/main/java/Static276.java index 2351dda..8a2c337 100644 --- a/client/src/main/java/Static276.java +++ b/client/src/main/java/Static276.java @@ -58,19 +58,19 @@ public final class Static276 { Static102.method2075(Static173.aClass8_Sub4_Sub1_2.anIntArray317[0], 0, 1, false, 0, local28.anIntArray318[0], 1, 0, 2, local28.anIntArray317[0], Static173.aClass8_Sub4_Sub1_2.anIntArray318[0]); if (arg0 == 1) { Static6.aClass3_Sub15_Sub1_1.method2242(68); - Static6.aClass3_Sub15_Sub1_1.method2191(Static105.anIntArray256[local15]); + Static6.aClass3_Sub15_Sub1_1.p2leadd(Static105.anIntArray256[local15]); } else if (arg0 == 4) { Static6.aClass3_Sub15_Sub1_1.method2242(180); - Static6.aClass3_Sub15_Sub1_1.method2191(Static105.anIntArray256[local15]); + Static6.aClass3_Sub15_Sub1_1.p2leadd(Static105.anIntArray256[local15]); } else if (arg0 == 5) { Static6.aClass3_Sub15_Sub1_1.method2242(4); - Static6.aClass3_Sub15_Sub1_1.method2222(Static105.anIntArray256[local15]); + Static6.aClass3_Sub15_Sub1_1.p2le(Static105.anIntArray256[local15]); } else if (arg0 == 6) { Static6.aClass3_Sub15_Sub1_1.method2242(133); - Static6.aClass3_Sub15_Sub1_1.method2222(Static105.anIntArray256[local15]); + Static6.aClass3_Sub15_Sub1_1.p2le(Static105.anIntArray256[local15]); } else if (arg0 == 7) { Static6.aClass3_Sub15_Sub1_1.method2242(114); - Static6.aClass3_Sub15_Sub1_1.method2191(Static105.anIntArray256[local15]); + Static6.aClass3_Sub15_Sub1_1.p2leadd(Static105.anIntArray256[local15]); } break; } diff --git a/client/src/main/java/Static278.java b/client/src/main/java/Static278.java index d5ac109..029acc6 100644 --- a/client/src/main/java/Static278.java +++ b/client/src/main/java/Static278.java @@ -121,16 +121,16 @@ public final class Static278 { @Pc(32) int local32; if (arg5 < 0 || arg5 >= 104 || arg4 < 0 || arg4 >= 104) { while (true) { - local32 = arg3.method2229(); + local32 = arg3.g1(); if (local32 == 0) { break; } if (local32 == 1) { - arg3.method2229(); + arg3.g1(); break; } if (local32 <= 49) { - arg3.method2229(); + arg3.g1(); } } return; @@ -139,7 +139,7 @@ public final class Static278 { Static12.aByteArrayArrayArray2[arg7][arg5][arg4] = 0; } while (true) { - local32 = arg3.method2229(); + local32 = arg3.g1(); if (local32 == 0) { if (arg2) { Static83.anIntArrayArrayArray4[0][arg5][arg4] = Static107.anIntArrayArrayArray10[0][arg5][arg4]; @@ -151,7 +151,7 @@ public final class Static278 { break; } if (local32 == 1) { - @Pc(111) int local111 = arg3.method2229(); + @Pc(111) int local111 = arg3.g1(); if (arg2) { Static83.anIntArrayArrayArray4[0][arg5][arg4] = Static107.anIntArrayArrayArray10[0][arg5][arg4] + local111 * 8; } else { @@ -167,7 +167,7 @@ public final class Static278 { break; } if (local32 <= 49) { - Static240.aByteArrayArrayArray14[arg7][arg5][arg4] = arg3.method2186(); + Static240.aByteArrayArrayArray14[arg7][arg5][arg4] = arg3.g1s(); Static163.aByteArrayArrayArray11[arg7][arg5][arg4] = (byte) ((local32 - 2) / 4); Static4.aByteArrayArrayArray1[arg7][arg5][arg4] = (byte) (local32 + arg6 - 2 & 0x3); } else if (local32 > 81) { diff --git a/client/src/main/java/Static31.java b/client/src/main/java/Static31.java index ce2f6d2..190e4d4 100644 --- a/client/src/main/java/Static31.java +++ b/client/src/main/java/Static31.java @@ -81,7 +81,7 @@ public final class Static31 { } Static124.aClass95_2 = new BufferedSocket((Socket) Static72.aClass212_3.anObject6, Static71.aClass213_3); Static72.aClass212_3 = null; - Static124.aClass95_2.method2830(Static6.aClass3_Sub15_Sub1_1.aByteArray40, Static6.aClass3_Sub15_Sub1_1.anInt2792); + Static124.aClass95_2.method2830(Static6.aClass3_Sub15_Sub1_1.data, Static6.aClass3_Sub15_Sub1_1.offset); if (Static11.aClass62_1 != null) { Static11.aClass62_1.method3571(); } diff --git a/client/src/main/java/Static33.java b/client/src/main/java/Static33.java index 24f1cbc..9e0da06 100644 --- a/client/src/main/java/Static33.java +++ b/client/src/main/java/Static33.java @@ -64,17 +64,17 @@ public final class Static33 { @Pc(33) int local33; @Pc(102) int local102; @Pc(114) int local114; - while (arg0.anInt2792 < arg0.aByteArray40.length) { + while (arg0.offset < arg0.data.length) { @Pc(31) int local31 = 0; local33 = 0; @Pc(35) boolean local35 = false; - if (arg0.method2229() == 1) { - local33 = arg0.method2229(); - local31 = arg0.method2229(); + if (arg0.g1() == 1) { + local33 = arg0.g1(); + local31 = arg0.g1(); local35 = true; } - @Pc(57) int local57 = arg0.method2229(); - @Pc(61) int local61 = arg0.method2229(); + @Pc(57) int local57 = arg0.g1(); + @Pc(61) int local61 = arg0.g1(); @Pc(68) int local68 = local57 * 64 - Static158.anInt3846; @Pc(78) int local78 = Static181.anInt4296 + Static2.anInt13 - local61 * 64 - 1; if (local68 >= 0 && local78 - 63 >= 0 && Static48.anInt1449 > local68 + 63 && Static181.anInt4296 > local78) { @@ -82,14 +82,14 @@ public final class Static33 { @Pc(112) byte[] local112 = local23[local68 + local102]; for (local114 = 0; local114 < 64; local114++) { if (!local35 || local102 >= local33 * 8 && local33 * 8 + 8 > local102 && local114 >= local31 * 8 && local114 < local31 * 8 + 8) { - local112[local78 - local114] = arg0.method2186(); + local112[local78 - local114] = arg0.g1s(); } } } } else if (local35) { - arg0.anInt2792 += 64; + arg0.offset += 64; } else { - arg0.anInt2792 += 4096; + arg0.offset += 4096; } } @Pc(175) int local175 = Static48.anInt1449; diff --git a/client/src/main/java/Static38.java b/client/src/main/java/Static38.java index 902cba6..369780f 100644 --- a/client/src/main/java/Static38.java +++ b/client/src/main/java/Static38.java @@ -89,7 +89,7 @@ public final class Static38 { for (@Pc(231) int local231 = 0; local231 < local211; local231++) { @Pc(242) JagString local242 = Static45.aClass100Array53[local231]; if (local211 - 1 > local231) { - local242.method3133(local242.method3120() - 4); + local242.method3133(local242.length() - 4); } local84.method1508(local242, local59, local80, local82); local80 += local84.method1503(); diff --git a/client/src/main/java/Static4.java b/client/src/main/java/Static4.java index a019723..ba9ed3d 100644 --- a/client/src/main/java/Static4.java +++ b/client/src/main/java/Static4.java @@ -76,8 +76,8 @@ public final class Static4 { } if (Static164.anInt3985 == -1) { local14--; - Static124.aClass95_2.method2827(0, 1, Static57.aClass3_Sub15_Sub1_3.aByteArray40); - Static57.aClass3_Sub15_Sub1_3.anInt2792 = 0; + Static124.aClass95_2.method2827(0, 1, Static57.aClass3_Sub15_Sub1_3.data); + Static57.aClass3_Sub15_Sub1_3.offset = 0; Static164.anInt3985 = Static57.aClass3_Sub15_Sub1_3.method2243(); Static223.anInt5028 = Static234.anIntArray456[Static164.anInt3985]; } @@ -85,32 +85,32 @@ public final class Static4 { if (local14 <= 0) { return false; } - Static124.aClass95_2.method2827(0, 1, Static57.aClass3_Sub15_Sub1_3.aByteArray40); + Static124.aClass95_2.method2827(0, 1, Static57.aClass3_Sub15_Sub1_3.data); local14--; - Static223.anInt5028 = Static57.aClass3_Sub15_Sub1_3.aByteArray40[0] & 0xFF; + Static223.anInt5028 = Static57.aClass3_Sub15_Sub1_3.data[0] & 0xFF; } if (Static223.anInt5028 == -2) { if (local14 <= 1) { return false; } local14 -= 2; - Static124.aClass95_2.method2827(0, 2, Static57.aClass3_Sub15_Sub1_3.aByteArray40); - Static57.aClass3_Sub15_Sub1_3.anInt2792 = 0; - Static223.anInt5028 = Static57.aClass3_Sub15_Sub1_3.method2163(); + Static124.aClass95_2.method2827(0, 2, Static57.aClass3_Sub15_Sub1_3.data); + Static57.aClass3_Sub15_Sub1_3.offset = 0; + Static223.anInt5028 = Static57.aClass3_Sub15_Sub1_3.g2(); } if (Static223.anInt5028 > local14) { return false; } - Static57.aClass3_Sub15_Sub1_3.anInt2792 = 0; - Static124.aClass95_2.method2827(0, Static223.anInt5028, Static57.aClass3_Sub15_Sub1_3.aByteArray40); + Static57.aClass3_Sub15_Sub1_3.offset = 0; + Static124.aClass95_2.method2827(0, Static223.anInt5028, Static57.aClass3_Sub15_Sub1_3.data); Static49.anInt1462 = Static5.anInt45; Static5.anInt45 = Static230.anInt5152; Static230.anInt5152 = Static164.anInt3985; Static201.anInt1862 = 0; @Pc(133) int local133; if (Static164.anInt3985 == 60) { - local133 = Static57.aClass3_Sub15_Sub1_3.method2184(); - @Pc(137) byte local137 = Static57.aClass3_Sub15_Sub1_3.method2189(); + local133 = Static57.aClass3_Sub15_Sub1_3.g2sub(); + @Pc(137) byte local137 = Static57.aClass3_Sub15_Sub1_3.g1neg(); Static170.method2575(local137, local133); Static164.anInt3985 = -1; return true; @@ -118,17 +118,17 @@ public final class Static4 { @Pc(171) int local171; @Pc(156) JagString local156; if (Static164.anInt3985 == 115) { - local133 = Static57.aClass3_Sub15_Sub1_3.method2163(); - local156 = Static57.aClass3_Sub15_Sub1_3.method2202(); - @Pc(163) Object[] local163 = new Object[local156.method3120() + 1]; - for (local171 = local156.method3120() - 1; local171 >= 0; local171--) { + local133 = Static57.aClass3_Sub15_Sub1_3.g2(); + local156 = Static57.aClass3_Sub15_Sub1_3.gjstr(); + @Pc(163) Object[] local163 = new Object[local156.length() + 1]; + for (local171 = local156.length() - 1; local171 >= 0; local171--) { if (local156.method3149(local171) == 115) { - local163[local171 + 1] = Static57.aClass3_Sub15_Sub1_3.method2202(); + local163[local171 + 1] = Static57.aClass3_Sub15_Sub1_3.gjstr(); } else { - local163[local171 + 1] = Integer.valueOf(Static57.aClass3_Sub15_Sub1_3.method2174()); + local163[local171 + 1] = Integer.valueOf(Static57.aClass3_Sub15_Sub1_3.g4()); } } - local163[0] = Integer.valueOf(Static57.aClass3_Sub15_Sub1_3.method2174()); + local163[0] = Integer.valueOf(Static57.aClass3_Sub15_Sub1_3.g4()); if (Static248.method3288(local133)) { @Pc(226) HookRequest local226 = new HookRequest(); local226.anObjectArray31 = local163; @@ -142,7 +142,7 @@ public final class Static4 { @Pc(277) int local277; @Pc(506) JagString local506; if (Static164.anInt3985 == 70) { - @Pc(245) JagString local245 = Static57.aClass3_Sub15_Sub1_3.method2202(); + @Pc(245) JagString local245 = Static57.aClass3_Sub15_Sub1_3.gjstr(); if (local245.method3130(Static196.aClass100_863)) { local156 = local245.method3137(local245.method3131(Static264.aClass100_875), 0); local275 = local156.method3158(); @@ -167,7 +167,7 @@ public final class Static4 { } } if (!local262 && Static11.anInt384 == 0) { - local506 = local245.method3137(local245.method3120() - 9, local245.method3131(Static264.aClass100_875) + 1); + local506 = local245.method3137(local245.length() - 9, local245.method3131(Static264.aClass100_875) + 1); Static103.method2231(local156, 8, local506); } } else if (local245.method3130(Static191.aClass100_845)) { @@ -246,7 +246,7 @@ public final class Static4 { } } if (!local262 && Static11.anInt384 == 0) { - local506 = local245.method3137(local245.method3120() - 9, local245.method3131(Static264.aClass100_875) + 1); + local506 = local245.method3137(local245.length() - 9, local245.method3131(Static264.aClass100_875) + 1); Static103.method2231(local156, 21, local506); } } else { @@ -258,19 +258,19 @@ public final class Static4 { @Pc(786) int local786; @Pc(790) JagString local790; if (Static164.anInt3985 == 123) { - local133 = Static57.aClass3_Sub15_Sub1_3.method2192(); - local786 = Static57.aClass3_Sub15_Sub1_3.method2184(); - local790 = Static57.aClass3_Sub15_Sub1_3.method2202(); + local133 = Static57.aClass3_Sub15_Sub1_3.g2le(); + local786 = Static57.aClass3_Sub15_Sub1_3.g2sub(); + local790 = Static57.aClass3_Sub15_Sub1_3.gjstr(); if (Static248.method3288(local786)) { Static193.method3498(local790, local133); } Static164.anInt3985 = -1; return true; } else if (Static164.anInt3985 == 230) { - Static180.anInt4264 = Static57.aClass3_Sub15_Sub1_3.method2177(); - Static115.anInt2940 = Static57.aClass3_Sub15_Sub1_3.method2180(); - while (Static223.anInt5028 > Static57.aClass3_Sub15_Sub1_3.anInt2792) { - Static164.anInt3985 = Static57.aClass3_Sub15_Sub1_3.method2229(); + Static180.anInt4264 = Static57.aClass3_Sub15_Sub1_3.g1add(); + Static115.anInt2940 = Static57.aClass3_Sub15_Sub1_3.g1ssub(); + while (Static223.anInt5028 > Static57.aClass3_Sub15_Sub1_3.offset) { + Static164.anInt3985 = Static57.aClass3_Sub15_Sub1_3.g1(); Static75.method1634(); } Static164.anInt3985 = -1; @@ -282,9 +282,9 @@ public final class Static4 { } else { @Pc(864) int local864; if (Static164.anInt3985 == 220) { - local133 = Static57.aClass3_Sub15_Sub1_3.method2224(); - local786 = Static57.aClass3_Sub15_Sub1_3.method2192(); - local864 = Static57.aClass3_Sub15_Sub1_3.method2163(); + local133 = Static57.aClass3_Sub15_Sub1_3.p4rme(); + local786 = Static57.aClass3_Sub15_Sub1_3.g2le(); + local864 = Static57.aClass3_Sub15_Sub1_3.g2(); if (Static248.method3288(local864)) { Static229.method3938(local786, local133); } @@ -297,14 +297,14 @@ public final class Static4 { @Pc(899) long local899; @Pc(904) long local904; if (Static164.anInt3985 == 81) { - local884 = Static57.aClass3_Sub15_Sub1_3.method2182(); - Static57.aClass3_Sub15_Sub1_3.method2186(); - local275 = Static57.aClass3_Sub15_Sub1_3.method2182(); - local899 = Static57.aClass3_Sub15_Sub1_3.method2163(); - local904 = Static57.aClass3_Sub15_Sub1_3.method2220(); - local908 = Static57.aClass3_Sub15_Sub1_3.method2229(); + local884 = Static57.aClass3_Sub15_Sub1_3.g8(); + Static57.aClass3_Sub15_Sub1_3.g1s(); + local275 = Static57.aClass3_Sub15_Sub1_3.g8(); + local899 = Static57.aClass3_Sub15_Sub1_3.g2(); + local904 = Static57.aClass3_Sub15_Sub1_3.g3(); + local908 = Static57.aClass3_Sub15_Sub1_3.g1(); @Pc(910) boolean local910 = false; - local916 = Static57.aClass3_Sub15_Sub1_3.method2163(); + local916 = Static57.aClass3_Sub15_Sub1_3.g2(); @Pc(922) long local922 = (local899 << 32) + local904; @Pc(924) int local924 = 0; label1320: while (true) { @@ -346,7 +346,7 @@ public final class Static4 { @Pc(1245) boolean local1245; if (Static164.anInt3985 == 55) { Static278.anInt5867 = Static119.anInt3028; - local884 = Static57.aClass3_Sub15_Sub1_3.method2182(); + local884 = Static57.aClass3_Sub15_Sub1_3.g8(); if (local884 == 0L) { Static270.aClass100_1094 = null; Static164.anInt3985 = -1; @@ -355,11 +355,11 @@ public final class Static4 { Static214.anInt5577 = 0; return true; } - local275 = Static57.aClass3_Sub15_Sub1_3.method2182(); + local275 = Static57.aClass3_Sub15_Sub1_3.g8(); Static15.aClass100_87 = Static79.method1702(local275); Static270.aClass100_1094 = Static79.method1702(local884); - Static50.aByte6 = Static57.aClass3_Sub15_Sub1_3.method2186(); - local1146 = Static57.aClass3_Sub15_Sub1_3.method2229(); + Static50.aByte6 = Static57.aClass3_Sub15_Sub1_3.g1s(); + local1146 = Static57.aClass3_Sub15_Sub1_3.g1(); if (local1146 == 255) { Static164.anInt3985 = -1; return true; @@ -368,11 +368,11 @@ public final class Static4 { @Pc(1158) Class3_Sub22[] local1158 = new Class3_Sub22[100]; for (local1160 = 0; local1160 < Static214.anInt5577; local1160++) { local1158[local1160] = new Class3_Sub22(); - local1158[local1160].aLong192 = Static57.aClass3_Sub15_Sub1_3.method2182(); + local1158[local1160].aLong192 = Static57.aClass3_Sub15_Sub1_3.g8(); local1158[local1160].aClass100_636 = Static79.method1702(local1158[local1160].aLong192); - local1158[local1160].anInt3340 = Static57.aClass3_Sub15_Sub1_3.method2163(); - local1158[local1160].aByte9 = Static57.aClass3_Sub15_Sub1_3.method2186(); - local1158[local1160].aClass100_635 = Static57.aClass3_Sub15_Sub1_3.method2202(); + local1158[local1160].anInt3340 = Static57.aClass3_Sub15_Sub1_3.g2(); + local1158[local1160].aByte9 = Static57.aClass3_Sub15_Sub1_3.g1s(); + local1158[local1160].aClass100_635 = Static57.aClass3_Sub15_Sub1_3.gjstr(); if (Static101.aLong98 == local1158[local1160].aLong192) { Static160.aByte14 = local1158[local1160].aByte9; } @@ -397,7 +397,7 @@ public final class Static4 { Static164.anInt3985 = -1; return true; } else if (Static164.anInt3985 == 164) { - local133 = Static57.aClass3_Sub15_Sub1_3.method2206(); + local133 = Static57.aClass3_Sub15_Sub1_3.g4rme(); Static232.aClass212_5 = Static71.aClass213_3.method5128(local133); Static164.anInt3985 = -1; return true; @@ -406,30 +406,30 @@ public final class Static4 { Static164.anInt3985 = -1; return true; } else if (Static164.anInt3985 == 48) { - local133 = Static57.aClass3_Sub15_Sub1_3.method2163(); - local156 = Static57.aClass3_Sub15_Sub1_3.method2202(); - local864 = Static57.aClass3_Sub15_Sub1_3.method2207(); + local133 = Static57.aClass3_Sub15_Sub1_3.g2(); + local156 = Static57.aClass3_Sub15_Sub1_3.gjstr(); + local864 = Static57.aClass3_Sub15_Sub1_3.g2leadd(); if (Static248.method3288(local133)) { Static193.method3498(local156, local864); } Static164.anInt3985 = -1; return true; } else if (Static164.anInt3985 == 232) { - Static59.anInt1812 = Static57.aClass3_Sub15_Sub1_3.method2229(); - Static49.anInt1459 = Static57.aClass3_Sub15_Sub1_3.method2229(); - Static84.anInt2256 = Static57.aClass3_Sub15_Sub1_3.method2229(); + Static59.anInt1812 = Static57.aClass3_Sub15_Sub1_3.g1(); + Static49.anInt1459 = Static57.aClass3_Sub15_Sub1_3.g1(); + Static84.anInt2256 = Static57.aClass3_Sub15_Sub1_3.g1(); Static164.anInt3985 = -1; return true; } else { @Pc(1409) JagString local1409; if (Static164.anInt3985 == 44) { - local133 = Static57.aClass3_Sub15_Sub1_3.method2207(); + local133 = Static57.aClass3_Sub15_Sub1_3.g2leadd(); if (local133 == 65535) { local133 = -1; } - local786 = Static57.aClass3_Sub15_Sub1_3.method2229(); - local864 = Static57.aClass3_Sub15_Sub1_3.method2229(); - local1409 = Static57.aClass3_Sub15_Sub1_3.method2202(); + local786 = Static57.aClass3_Sub15_Sub1_3.g1(); + local864 = Static57.aClass3_Sub15_Sub1_3.g1(); + local1409 = Static57.aClass3_Sub15_Sub1_3.gjstr(); if (local864 >= 1 && local864 <= 8) { if (local1409.method3111(Static92.aClass100_510)) { local1409 = null; @@ -441,24 +441,24 @@ public final class Static4 { Static164.anInt3985 = -1; return true; } else if (Static164.anInt3985 == 226) { - local133 = Static57.aClass3_Sub15_Sub1_3.method2174(); - local786 = Static57.aClass3_Sub15_Sub1_3.method2184(); + local133 = Static57.aClass3_Sub15_Sub1_3.g4(); + local786 = Static57.aClass3_Sub15_Sub1_3.g2sub(); Static170.method2575(local133, local786); Static164.anInt3985 = -1; return true; } else if (Static164.anInt3985 == 21) { - local133 = Static57.aClass3_Sub15_Sub1_3.method2212(); - local786 = Static57.aClass3_Sub15_Sub1_3.method2163(); - local864 = Static57.aClass3_Sub15_Sub1_3.method2208(); + local133 = Static57.aClass3_Sub15_Sub1_3.p1neg(); + local786 = Static57.aClass3_Sub15_Sub1_3.g2(); + local864 = Static57.aClass3_Sub15_Sub1_3.g4me(); if (Static248.method3288(local786)) { Static153.method2905(local864, local133); } Static164.anInt3985 = -1; return true; } else if (Static164.anInt3985 == 145) { - local133 = Static57.aClass3_Sub15_Sub1_3.method2207(); - local786 = Static57.aClass3_Sub15_Sub1_3.method2177(); - local864 = Static57.aClass3_Sub15_Sub1_3.method2207(); + local133 = Static57.aClass3_Sub15_Sub1_3.g2leadd(); + local786 = Static57.aClass3_Sub15_Sub1_3.g1add(); + local864 = Static57.aClass3_Sub15_Sub1_3.g2leadd(); if (Static248.method3288(local864)) { if (local786 == 2) { Static5.method34(); @@ -474,17 +474,17 @@ public final class Static4 { Static164.anInt3985 = -1; return true; } else if (Static164.anInt3985 == 69) { - local133 = Static57.aClass3_Sub15_Sub1_3.method2207(); - local786 = Static57.aClass3_Sub15_Sub1_3.method2174(); - local864 = Static57.aClass3_Sub15_Sub1_3.method2184(); + local133 = Static57.aClass3_Sub15_Sub1_3.g2leadd(); + local786 = Static57.aClass3_Sub15_Sub1_3.g4(); + local864 = Static57.aClass3_Sub15_Sub1_3.g2sub(); if (Static248.method3288(local133)) { Static132.method2606(local864, local786); } Static164.anInt3985 = -1; return true; } else if (Static164.anInt3985 == 141) { - local884 = Static57.aClass3_Sub15_Sub1_3.method2182(); - local864 = Static57.aClass3_Sub15_Sub1_3.method2163(); + local884 = Static57.aClass3_Sub15_Sub1_3.g8(); + local864 = Static57.aClass3_Sub15_Sub1_3.g2(); local1409 = Static230.method3953(local864).method770(Static57.aClass3_Sub15_Sub1_3); Static154.method2928(local864, 19, local1409, null, Static79.method1702(local884).method3125()); Static164.anInt3985 = -1; @@ -500,21 +500,21 @@ public final class Static4 { Static164.anInt3985 = -1; return true; } else if (Static164.anInt3985 == 125) { - local133 = Static57.aClass3_Sub15_Sub1_3.method2163(); - local786 = Static57.aClass3_Sub15_Sub1_3.method2229(); - local864 = Static57.aClass3_Sub15_Sub1_3.method2229(); - local171 = Static57.aClass3_Sub15_Sub1_3.method2163(); - local1146 = Static57.aClass3_Sub15_Sub1_3.method2229(); - local277 = Static57.aClass3_Sub15_Sub1_3.method2229(); + local133 = Static57.aClass3_Sub15_Sub1_3.g2(); + local786 = Static57.aClass3_Sub15_Sub1_3.g1(); + local864 = Static57.aClass3_Sub15_Sub1_3.g1(); + local171 = Static57.aClass3_Sub15_Sub1_3.g2(); + local1146 = Static57.aClass3_Sub15_Sub1_3.g1(); + local277 = Static57.aClass3_Sub15_Sub1_3.g1(); if (Static248.method3288(local133)) { Static260.method3849(local171, local864, local1146, local786, local277); } Static164.anInt3985 = -1; return true; } else if (Static164.anInt3985 == 36) { - local133 = Static57.aClass3_Sub15_Sub1_3.method2224(); - local786 = Static57.aClass3_Sub15_Sub1_3.method2217(); - local864 = Static57.aClass3_Sub15_Sub1_3.method2184(); + local133 = Static57.aClass3_Sub15_Sub1_3.p4rme(); + local786 = Static57.aClass3_Sub15_Sub1_3.g2les(); + local864 = Static57.aClass3_Sub15_Sub1_3.g2sub(); if (Static248.method3288(local864)) { Static225.method3893(local133, local786); } @@ -524,14 +524,14 @@ public final class Static4 { @Pc(1814) ServerActiveProperties local1814; @Pc(1804) ServerActiveProperties local1804; if (Static164.anInt3985 == 9) { - local133 = Static57.aClass3_Sub15_Sub1_3.method2207(); - local786 = Static57.aClass3_Sub15_Sub1_3.method2208(); - local864 = Static57.aClass3_Sub15_Sub1_3.method2184(); - local171 = Static57.aClass3_Sub15_Sub1_3.method2192(); + local133 = Static57.aClass3_Sub15_Sub1_3.g2leadd(); + local786 = Static57.aClass3_Sub15_Sub1_3.g4me(); + local864 = Static57.aClass3_Sub15_Sub1_3.g2sub(); + local171 = Static57.aClass3_Sub15_Sub1_3.g2le(); if (local171 == 65535) { local171 = -1; } - local1146 = Static57.aClass3_Sub15_Sub1_3.method2184(); + local1146 = Static57.aClass3_Sub15_Sub1_3.g2sub(); if (local1146 == 65535) { local1146 = -1; } @@ -555,10 +555,10 @@ public final class Static4 { } @Pc(1986) int local1986; if (Static164.anInt3985 == 56) { - local133 = Static57.aClass3_Sub15_Sub1_3.method2163(); - local786 = Static57.aClass3_Sub15_Sub1_3.method2192(); - local864 = Static57.aClass3_Sub15_Sub1_3.method2206(); - local171 = Static57.aClass3_Sub15_Sub1_3.method2207(); + local133 = Static57.aClass3_Sub15_Sub1_3.g2(); + local786 = Static57.aClass3_Sub15_Sub1_3.g2le(); + local864 = Static57.aClass3_Sub15_Sub1_3.g4rme(); + local171 = Static57.aClass3_Sub15_Sub1_3.g2leadd(); if (local864 >> 30 == 0) { @Pc(1994) SeqType local1994; if (local864 >> 29 != 0) { @@ -648,10 +648,10 @@ public final class Static4 { Static164.anInt3985 = -1; return true; } else if (Static164.anInt3985 == 207) { - local133 = Static57.aClass3_Sub15_Sub1_3.method2224(); - local786 = Static57.aClass3_Sub15_Sub1_3.method2184(); - local864 = Static57.aClass3_Sub15_Sub1_3.method2163(); - local171 = Static57.aClass3_Sub15_Sub1_3.method2184(); + local133 = Static57.aClass3_Sub15_Sub1_3.p4rme(); + local786 = Static57.aClass3_Sub15_Sub1_3.g2sub(); + local864 = Static57.aClass3_Sub15_Sub1_3.g2(); + local171 = Static57.aClass3_Sub15_Sub1_3.g2sub(); if (Static248.method3288(local786)) { Static190.method3444(local171 + (local864 << 16), local133); } @@ -659,9 +659,9 @@ public final class Static4 { return true; } else if (Static164.anInt3985 == 38) { Static103.method2245(); - local133 = Static57.aClass3_Sub15_Sub1_3.method2177(); - local786 = Static57.aClass3_Sub15_Sub1_3.method2206(); - local864 = Static57.aClass3_Sub15_Sub1_3.method2229(); + local133 = Static57.aClass3_Sub15_Sub1_3.g1add(); + local786 = Static57.aClass3_Sub15_Sub1_3.g4rme(); + local864 = Static57.aClass3_Sub15_Sub1_3.g1(); Static227.anIntArray446[local864] = local786; Static99.anIntArray240[local864] = local133; Static141.anIntArray326[local864] = 1; @@ -678,8 +678,8 @@ public final class Static4 { Static164.anInt3985 = -1; return true; } else if (Static164.anInt3985 == 149) { - local133 = Static57.aClass3_Sub15_Sub1_3.method2163(); - local786 = Static57.aClass3_Sub15_Sub1_3.method2174(); + local133 = Static57.aClass3_Sub15_Sub1_3.g2(); + local786 = Static57.aClass3_Sub15_Sub1_3.g4(); if (Static248.method3288(local133)) { @Pc(2441) Class3_Sub31 local2441 = (Class3_Sub31) Static119.aClass133_9.method3863((long) local786); if (local2441 != null) { @@ -693,9 +693,9 @@ public final class Static4 { Static164.anInt3985 = -1; return true; } else if (Static164.anInt3985 == 187) { - local133 = Static57.aClass3_Sub15_Sub1_3.method2192(); - local786 = Static57.aClass3_Sub15_Sub1_3.method2163(); - local864 = Static57.aClass3_Sub15_Sub1_3.method2163(); + local133 = Static57.aClass3_Sub15_Sub1_3.g2le(); + local786 = Static57.aClass3_Sub15_Sub1_3.g2(); + local864 = Static57.aClass3_Sub15_Sub1_3.g2(); if (Static248.method3288(local786)) { Static57.anInt1747 = local133; Static72.anInt2031 = local864; @@ -708,19 +708,19 @@ public final class Static4 { Static164.anInt3985 = -1; return true; } else if (Static164.anInt3985 == 132) { - local133 = Static57.aClass3_Sub15_Sub1_3.method2163(); - local786 = Static57.aClass3_Sub15_Sub1_3.method2184(); - local864 = Static57.aClass3_Sub15_Sub1_3.method2207(); - local171 = Static57.aClass3_Sub15_Sub1_3.method2207(); - local1146 = Static57.aClass3_Sub15_Sub1_3.method2174(); + local133 = Static57.aClass3_Sub15_Sub1_3.g2(); + local786 = Static57.aClass3_Sub15_Sub1_3.g2sub(); + local864 = Static57.aClass3_Sub15_Sub1_3.g2leadd(); + local171 = Static57.aClass3_Sub15_Sub1_3.g2leadd(); + local1146 = Static57.aClass3_Sub15_Sub1_3.g4(); if (Static248.method3288(local786)) { Static261.method4505(local864, local1146, local171, local133); } Static164.anInt3985 = -1; return true; } else if (Static164.anInt3985 == 112) { - Static115.anInt2940 = Static57.aClass3_Sub15_Sub1_3.method2229(); - Static180.anInt4264 = Static57.aClass3_Sub15_Sub1_3.method2212(); + Static115.anInt2940 = Static57.aClass3_Sub15_Sub1_3.g1(); + Static180.anInt4264 = Static57.aClass3_Sub15_Sub1_3.p1neg(); for (local133 = Static115.anInt2940; local133 < Static115.anInt2940 + 8; local133++) { for (local786 = Static180.anInt4264; local786 < Static180.anInt4264 + 8; local786++) { if (Static159.aClass69ArrayArrayArray1[Static55.anInt1735][local133][local786] != null) { @@ -737,7 +737,7 @@ public final class Static4 { Static164.anInt3985 = -1; return true; } else if (Static164.anInt3985 == 144) { - local133 = Static57.aClass3_Sub15_Sub1_3.method2224(); + local133 = Static57.aClass3_Sub15_Sub1_3.p4rme(); @Pc(2666) Component local2666 = Static5.method32(local133); for (local864 = 0; local864 < local2666.anIntArray40.length; local864++) { local2666.anIntArray40[local864] = -1; @@ -747,9 +747,9 @@ public final class Static4 { Static164.anInt3985 = -1; return true; } else if (Static164.anInt3985 == 130) { - local133 = Static57.aClass3_Sub15_Sub1_3.method2208(); - local786 = Static57.aClass3_Sub15_Sub1_3.method2207(); - local864 = Static57.aClass3_Sub15_Sub1_3.method2184(); + local133 = Static57.aClass3_Sub15_Sub1_3.g4me(); + local786 = Static57.aClass3_Sub15_Sub1_3.g2leadd(); + local864 = Static57.aClass3_Sub15_Sub1_3.g2sub(); if (local864 == 65535) { local864 = -1; } @@ -759,13 +759,13 @@ public final class Static4 { Static164.anInt3985 = -1; return true; } else if (Static164.anInt3985 == 192) { - Static270.anInt5795 = Static57.aClass3_Sub15_Sub1_3.method2229(); + Static270.anInt5795 = Static57.aClass3_Sub15_Sub1_3.g1(); Static164.anInt3985 = -1; return true; } else if (Static164.anInt3985 == 13) { - local133 = Static57.aClass3_Sub15_Sub1_3.method2180(); - local786 = Static57.aClass3_Sub15_Sub1_3.method2177(); - local864 = Static57.aClass3_Sub15_Sub1_3.method2229(); + local133 = Static57.aClass3_Sub15_Sub1_3.g1ssub(); + local786 = Static57.aClass3_Sub15_Sub1_3.g1add(); + local864 = Static57.aClass3_Sub15_Sub1_3.g1(); Static55.anInt1735 = local786 >> 1; Static173.aClass8_Sub4_Sub1_2.method1265(local133, (local786 & 0x1) == 1, local864); Static164.anInt3985 = -1; @@ -775,9 +775,9 @@ public final class Static4 { @Pc(3038) JagString local3038; @Pc(3020) JagString local3020; if (Static164.anInt3985 == 62) { - local884 = Static57.aClass3_Sub15_Sub1_3.method2182(); - local864 = Static57.aClass3_Sub15_Sub1_3.method2163(); - local171 = Static57.aClass3_Sub15_Sub1_3.method2229(); + local884 = Static57.aClass3_Sub15_Sub1_3.g8(); + local864 = Static57.aClass3_Sub15_Sub1_3.g2(); + local171 = Static57.aClass3_Sub15_Sub1_3.g1(); local262 = true; if (local884 < 0L) { local884 &= Long.MAX_VALUE; @@ -785,7 +785,7 @@ public final class Static4 { } local506 = Static186.aClass100_827; if (local864 > 0) { - local506 = Static57.aClass3_Sub15_Sub1_3.method2202(); + local506 = Static57.aClass3_Sub15_Sub1_3.gjstr(); } @Pc(2834) JagString local2834 = Static79.method1702(local884).method3125(); for (local1986 = 0; local1986 < Static9.anInt178; local1986++) { @@ -853,7 +853,7 @@ public final class Static4 { if (Static223.anInt5028 == 0) { Static195.aClass100_859 = Static105.aClass100_560; } else { - Static195.aClass100_859 = Static57.aClass3_Sub15_Sub1_3.method2202(); + Static195.aClass100_859 = Static57.aClass3_Sub15_Sub1_3.gjstr(); } Static164.anInt3985 = -1; return true; @@ -868,23 +868,23 @@ public final class Static4 { Static164.anInt3985 = -1; return true; } else if (Static164.anInt3985 == 154) { - local133 = Static57.aClass3_Sub15_Sub1_3.method2163(); - local786 = Static57.aClass3_Sub15_Sub1_3.method2229(); - local864 = Static57.aClass3_Sub15_Sub1_3.method2229(); - local171 = Static57.aClass3_Sub15_Sub1_3.method2163(); - local1146 = Static57.aClass3_Sub15_Sub1_3.method2229(); - local277 = Static57.aClass3_Sub15_Sub1_3.method2229(); + local133 = Static57.aClass3_Sub15_Sub1_3.g2(); + local786 = Static57.aClass3_Sub15_Sub1_3.g1(); + local864 = Static57.aClass3_Sub15_Sub1_3.g1(); + local171 = Static57.aClass3_Sub15_Sub1_3.g2(); + local1146 = Static57.aClass3_Sub15_Sub1_3.g1(); + local277 = Static57.aClass3_Sub15_Sub1_3.g1(); if (Static248.method3288(local133)) { Static141.method2722(true, local1146, local171, local277, local864, local786); } Static164.anInt3985 = -1; return true; } else if (Static164.anInt3985 == 247) { - local884 = Static57.aClass3_Sub15_Sub1_3.method2182(); - local275 = Static57.aClass3_Sub15_Sub1_3.method2163(); - local899 = Static57.aClass3_Sub15_Sub1_3.method2220(); - local1160 = Static57.aClass3_Sub15_Sub1_3.method2229(); - local1986 = Static57.aClass3_Sub15_Sub1_3.method2163(); + local884 = Static57.aClass3_Sub15_Sub1_3.g8(); + local275 = Static57.aClass3_Sub15_Sub1_3.g2(); + local899 = Static57.aClass3_Sub15_Sub1_3.g3(); + local1160 = Static57.aClass3_Sub15_Sub1_3.g1(); + local1986 = Static57.aClass3_Sub15_Sub1_3.g2(); @Pc(3263) boolean local3263 = false; @Pc(3270) long local3270 = (local275 << 32) + local899; @Pc(3272) int local3272 = 0; @@ -924,9 +924,9 @@ public final class Static4 { } else { @Pc(3456) Class3_Sub31 local3456; if (Static164.anInt3985 == 176) { - local133 = Static57.aClass3_Sub15_Sub1_3.method2206(); - local786 = Static57.aClass3_Sub15_Sub1_3.method2184(); - local864 = Static57.aClass3_Sub15_Sub1_3.method2206(); + local133 = Static57.aClass3_Sub15_Sub1_3.g4rme(); + local786 = Static57.aClass3_Sub15_Sub1_3.g2sub(); + local864 = Static57.aClass3_Sub15_Sub1_3.g4rme(); if (Static248.method3288(local786)) { @Pc(3449) Class3_Sub31 local3449 = (Class3_Sub31) Static119.aClass133_9.method3863((long) local133); local3456 = (Class3_Sub31) Static119.aClass133_9.method3863((long) local864); @@ -953,12 +953,12 @@ public final class Static4 { Static164.anInt3985 = -1; return true; } else if (Static164.anInt3985 == 27) { - local133 = Static57.aClass3_Sub15_Sub1_3.method2163(); - local786 = Static57.aClass3_Sub15_Sub1_3.method2229(); - local864 = Static57.aClass3_Sub15_Sub1_3.method2229(); - local171 = Static57.aClass3_Sub15_Sub1_3.method2229(); - local1146 = Static57.aClass3_Sub15_Sub1_3.method2229(); - local277 = Static57.aClass3_Sub15_Sub1_3.method2163(); + local133 = Static57.aClass3_Sub15_Sub1_3.g2(); + local786 = Static57.aClass3_Sub15_Sub1_3.g1(); + local864 = Static57.aClass3_Sub15_Sub1_3.g1(); + local171 = Static57.aClass3_Sub15_Sub1_3.g1(); + local1146 = Static57.aClass3_Sub15_Sub1_3.g1(); + local277 = Static57.aClass3_Sub15_Sub1_3.g2(); if (Static248.method3288(local133)) { Static176.aBooleanArray95[local786] = true; Static222.anIntArray437[local786] = local864; @@ -969,16 +969,16 @@ public final class Static4 { Static164.anInt3985 = -1; return true; } else if (Static164.anInt3985 == 2) { - local133 = Static57.aClass3_Sub15_Sub1_3.method2206(); - local786 = Static57.aClass3_Sub15_Sub1_3.method2184(); - local864 = Static57.aClass3_Sub15_Sub1_3.method2207(); + local133 = Static57.aClass3_Sub15_Sub1_3.g4rme(); + local786 = Static57.aClass3_Sub15_Sub1_3.g2sub(); + local864 = Static57.aClass3_Sub15_Sub1_3.g2leadd(); if (Static248.method3288(local786)) { Static136.method2649(local864, local133); } Static164.anInt3985 = -1; return true; } else if (Static164.anInt3985 == 85) { - Static60.anInt1894 = Static57.aClass3_Sub15_Sub1_3.method2163() * 30; + Static60.anInt1894 = Static57.aClass3_Sub15_Sub1_3.g2() * 30; Static164.anInt3985 = -1; Static209.anInt4808 = Static119.anInt3028; return true; @@ -987,9 +987,9 @@ public final class Static4 { Static164.anInt3985 = -1; return true; } else if (Static164.anInt3985 == 65) { - local133 = Static57.aClass3_Sub15_Sub1_3.method2192(); - local786 = Static57.aClass3_Sub15_Sub1_3.method2212(); - local864 = Static57.aClass3_Sub15_Sub1_3.method2207(); + local133 = Static57.aClass3_Sub15_Sub1_3.g2le(); + local786 = Static57.aClass3_Sub15_Sub1_3.p1neg(); + local864 = Static57.aClass3_Sub15_Sub1_3.g2leadd(); if (Static248.method3288(local133)) { Static132.method2606(local864, local786); } @@ -997,7 +997,7 @@ public final class Static4 { return true; } else if (Static164.anInt3985 == 234) { Static103.method2245(); - Static12.anInt400 = Static57.aClass3_Sub15_Sub1_3.method2229(); + Static12.anInt400 = Static57.aClass3_Sub15_Sub1_3.g1(); Static209.anInt4808 = Static119.anInt3028; Static164.anInt3985 = -1; return true; @@ -1008,15 +1008,15 @@ public final class Static4 { Static164.anInt3985 = -1; return true; } else if (Static164.anInt3985 == 191) { - local133 = Static57.aClass3_Sub15_Sub1_3.method2192(); + local133 = Static57.aClass3_Sub15_Sub1_3.g2le(); Static13.method472(local133); Static27.anIntArray70[Static111.anInt2901++ & 0x1F] = local133 & 0x7FFF; Static164.anInt3985 = -1; return true; } else if (Static164.anInt3985 == 102) { - local133 = Static57.aClass3_Sub15_Sub1_3.method2192(); - local786 = Static57.aClass3_Sub15_Sub1_3.method2180(); - local864 = Static57.aClass3_Sub15_Sub1_3.method2163(); + local133 = Static57.aClass3_Sub15_Sub1_3.g2le(); + local786 = Static57.aClass3_Sub15_Sub1_3.g1ssub(); + local864 = Static57.aClass3_Sub15_Sub1_3.g2(); @Pc(3766) Npc local3766 = Static175.aClass8_Sub4_Sub2Array1[local133]; if (local3766 != null) { Static223.method3855(local786, local864, local3766); @@ -1025,12 +1025,12 @@ public final class Static4 { return true; } else if (Static164.anInt3985 == 159) { Static103.method2245(); - Static251.anInt5456 = Static57.aClass3_Sub15_Sub1_3.method2213(); + Static251.anInt5456 = Static57.aClass3_Sub15_Sub1_3.g2s(); Static209.anInt4808 = Static119.anInt3028; Static164.anInt3985 = -1; return true; } else if (Static164.anInt3985 == 71) { - local884 = Static57.aClass3_Sub15_Sub1_3.method2182(); + local884 = Static57.aClass3_Sub15_Sub1_3.g8(); local790 = Static218.method2862(Static65.method1497(Static57.aClass3_Sub15_Sub1_3).method3116()); Static103.method2231(Static79.method1702(local884).method3125(), 6, local790); Static164.anInt3985 = -1; @@ -1041,7 +1041,7 @@ public final class Static4 { } @Pc(3848) byte[] local3848 = new byte[Static223.anInt5028]; Static57.aClass3_Sub15_Sub1_3.method2237(local3848, Static223.anInt5028); - local156 = Static10.method346(local3848, Static223.anInt5028, 0); + local156 = Static10.decodeString(local3848, Static223.anInt5028, 0); if (Static39.aFrame1 == null && (SignLink.anInt5928 == 3 || !SignLink.aString15.startsWith("win") || Static178.aBoolean203)) { Static169.method3175(local156, true); } else { @@ -1052,27 +1052,27 @@ public final class Static4 { Static164.anInt3985 = -1; return true; } else if (Static164.anInt3985 == 111) { - local133 = Static57.aClass3_Sub15_Sub1_3.method2184(); - local786 = Static57.aClass3_Sub15_Sub1_3.method2224(); - local864 = Static57.aClass3_Sub15_Sub1_3.method2207(); - local171 = Static57.aClass3_Sub15_Sub1_3.method2192(); - local1146 = Static57.aClass3_Sub15_Sub1_3.method2207(); + local133 = Static57.aClass3_Sub15_Sub1_3.g2sub(); + local786 = Static57.aClass3_Sub15_Sub1_3.p4rme(); + local864 = Static57.aClass3_Sub15_Sub1_3.g2leadd(); + local171 = Static57.aClass3_Sub15_Sub1_3.g2le(); + local1146 = Static57.aClass3_Sub15_Sub1_3.g2leadd(); if (Static248.method3288(local133)) { Static132.method2607(local864, 7, local786, local171 << 16 | local1146); } Static164.anInt3985 = -1; return true; } else if (Static164.anInt3985 == 37) { - local133 = Static57.aClass3_Sub15_Sub1_3.method2177(); - local786 = Static57.aClass3_Sub15_Sub1_3.method2192(); + local133 = Static57.aClass3_Sub15_Sub1_3.g1add(); + local786 = Static57.aClass3_Sub15_Sub1_3.g2le(); Static272.method3995(local133, local786); Static164.anInt3985 = -1; return true; } else if (Static164.anInt3985 == 155) { - local133 = Static57.aClass3_Sub15_Sub1_3.method2229(); - local786 = Static57.aClass3_Sub15_Sub1_3.method2224(); - local864 = Static57.aClass3_Sub15_Sub1_3.method2184(); - local171 = Static57.aClass3_Sub15_Sub1_3.method2163(); + local133 = Static57.aClass3_Sub15_Sub1_3.g1(); + local786 = Static57.aClass3_Sub15_Sub1_3.p4rme(); + local864 = Static57.aClass3_Sub15_Sub1_3.g2sub(); + local171 = Static57.aClass3_Sub15_Sub1_3.g2(); if (Static248.method3288(local864)) { local3456 = (Class3_Sub31) Static119.aClass133_9.method3863((long) local786); if (local3456 != null) { @@ -1096,15 +1096,15 @@ public final class Static4 { Static164.anInt3985 = -1; return true; } else if (Static164.anInt3985 == 217) { - local133 = Static57.aClass3_Sub15_Sub1_3.method2229(); + local133 = Static57.aClass3_Sub15_Sub1_3.g1(); @Pc(4084) Class102 local4084 = new Class102(); local786 = local133 >> 6; local4084.anInt4058 = local133 & 0x3F; - local4084.anInt4048 = Static57.aClass3_Sub15_Sub1_3.method2229(); + local4084.anInt4048 = Static57.aClass3_Sub15_Sub1_3.g1(); if (local4084.anInt4048 >= 0 && local4084.anInt4048 < Static276.aClass3_Sub2_Sub1Array11.length) { if (local4084.anInt4058 == 1 || local4084.anInt4058 == 10) { - local4084.anInt4057 = Static57.aClass3_Sub15_Sub1_3.method2163(); - Static57.aClass3_Sub15_Sub1_3.anInt2792 += 3; + local4084.anInt4057 = Static57.aClass3_Sub15_Sub1_3.g2(); + Static57.aClass3_Sub15_Sub1_3.offset += 3; } else if (local4084.anInt4058 >= 2 && local4084.anInt4058 <= 6) { if (local4084.anInt4058 == 2) { local4084.anInt4045 = 64; @@ -1127,11 +1127,11 @@ public final class Static4 { local4084.anInt4047 = 128; } local4084.anInt4058 = 2; - local4084.anInt4053 = Static57.aClass3_Sub15_Sub1_3.method2163(); - local4084.anInt4046 = Static57.aClass3_Sub15_Sub1_3.method2163(); - local4084.anInt4050 = Static57.aClass3_Sub15_Sub1_3.method2229(); + local4084.anInt4053 = Static57.aClass3_Sub15_Sub1_3.g2(); + local4084.anInt4046 = Static57.aClass3_Sub15_Sub1_3.g2(); + local4084.anInt4050 = Static57.aClass3_Sub15_Sub1_3.g1(); } - local4084.anInt4052 = Static57.aClass3_Sub15_Sub1_3.method2163(); + local4084.anInt4052 = Static57.aClass3_Sub15_Sub1_3.g2(); if (local4084.anInt4052 == 65535) { local4084.anInt4052 = -1; } @@ -1142,7 +1142,7 @@ public final class Static4 { } else if (Static164.anInt3985 == 126) { Static35.anInt1093 = Static223.anInt5028 / 8; for (local133 = 0; local133 < Static35.anInt1093; local133++) { - Static190.aLongArray6[local133] = Static57.aClass3_Sub15_Sub1_3.method2182(); + Static190.aLongArray6[local133] = Static57.aClass3_Sub15_Sub1_3.g8(); Static193.aClass100Array134[local133] = Static79.method1702(Static190.aLongArray6[local133]); } Static185.anInt4369 = Static119.anInt3028; @@ -1153,22 +1153,22 @@ public final class Static4 { Static164.anInt3985 = -1; return true; } else if (Static164.anInt3985 == 119) { - local133 = Static57.aClass3_Sub15_Sub1_3.method2184(); - local786 = Static57.aClass3_Sub15_Sub1_3.method2208(); - local864 = Static57.aClass3_Sub15_Sub1_3.method2213(); - local171 = Static57.aClass3_Sub15_Sub1_3.method2173(); + local133 = Static57.aClass3_Sub15_Sub1_3.g2sub(); + local786 = Static57.aClass3_Sub15_Sub1_3.g4me(); + local864 = Static57.aClass3_Sub15_Sub1_3.g2s(); + local171 = Static57.aClass3_Sub15_Sub1_3.g2sadd(); if (Static248.method3288(local133)) { Static280.method4666(local864, local786, local171); } Static164.anInt3985 = -1; return true; } else if (Static164.anInt3985 == 235) { - local133 = Static57.aClass3_Sub15_Sub1_3.method2180(); + local133 = Static57.aClass3_Sub15_Sub1_3.g1ssub(); local786 = local133 >> 2; local864 = local133 & 0x3; local171 = Static133.anIntArray453[local786]; - local1146 = Static57.aClass3_Sub15_Sub1_3.method2163(); - local277 = Static57.aClass3_Sub15_Sub1_3.method2174(); + local1146 = Static57.aClass3_Sub15_Sub1_3.g2(); + local277 = Static57.aClass3_Sub15_Sub1_3.g4(); if (local1146 == 65535) { local1146 = -1; } @@ -1181,10 +1181,10 @@ public final class Static4 { Static164.anInt3985 = -1; return true; } else if (Static164.anInt3985 == 0) { - local884 = Static57.aClass3_Sub15_Sub1_3.method2182(); - local275 = Static57.aClass3_Sub15_Sub1_3.method2163(); - local899 = Static57.aClass3_Sub15_Sub1_3.method2220(); - local1160 = Static57.aClass3_Sub15_Sub1_3.method2229(); + local884 = Static57.aClass3_Sub15_Sub1_3.g8(); + local275 = Static57.aClass3_Sub15_Sub1_3.g2(); + local899 = Static57.aClass3_Sub15_Sub1_3.g3(); + local1160 = Static57.aClass3_Sub15_Sub1_3.g1(); @Pc(4425) boolean local4425 = false; @Pc(4431) long local4431 = local899 + (local275 << 32); local3002 = 0; @@ -1225,13 +1225,13 @@ public final class Static4 { Static164.anInt3985 = -1; return true; } else if (Static164.anInt3985 == 54) { - local884 = Static57.aClass3_Sub15_Sub1_3.method2182(); - Static57.aClass3_Sub15_Sub1_3.method2186(); - local275 = Static57.aClass3_Sub15_Sub1_3.method2182(); - local899 = Static57.aClass3_Sub15_Sub1_3.method2163(); - local904 = Static57.aClass3_Sub15_Sub1_3.method2220(); + local884 = Static57.aClass3_Sub15_Sub1_3.g8(); + Static57.aClass3_Sub15_Sub1_3.g1s(); + local275 = Static57.aClass3_Sub15_Sub1_3.g8(); + local899 = Static57.aClass3_Sub15_Sub1_3.g2(); + local904 = Static57.aClass3_Sub15_Sub1_3.g3(); @Pc(4626) long local4626 = (local899 << 32) + local904; - local908 = Static57.aClass3_Sub15_Sub1_3.method2229(); + local908 = Static57.aClass3_Sub15_Sub1_3.g1(); @Pc(4632) boolean local4632 = false; @Pc(4634) int local4634 = 0; label1575: while (true) { @@ -1275,18 +1275,18 @@ public final class Static4 { Static164.anInt3985 = -1; return true; } else if (Static164.anInt3985 == 172) { - local133 = Static57.aClass3_Sub15_Sub1_3.method2163(); - local786 = Static57.aClass3_Sub15_Sub1_3.method2229(); + local133 = Static57.aClass3_Sub15_Sub1_3.g2(); + local786 = Static57.aClass3_Sub15_Sub1_3.g1(); if (local133 == 65535) { local133 = -1; } - local864 = Static57.aClass3_Sub15_Sub1_3.method2163(); + local864 = Static57.aClass3_Sub15_Sub1_3.g2(); Static26.method744(local786, local133, local864); Static164.anInt3985 = -1; return true; } else if (Static164.anInt3985 == 66) { - local133 = Static57.aClass3_Sub15_Sub1_3.method2207(); - local786 = Static57.aClass3_Sub15_Sub1_3.method2206(); + local133 = Static57.aClass3_Sub15_Sub1_3.g2leadd(); + local786 = Static57.aClass3_Sub15_Sub1_3.g4rme(); if (Static248.method3288(local133)) { local864 = 0; if (Static173.aClass8_Sub4_Sub1_2.aClass59_1 != null) { @@ -1297,25 +1297,25 @@ public final class Static4 { Static164.anInt3985 = -1; return true; } else if (Static164.anInt3985 == 171) { - local133 = Static57.aClass3_Sub15_Sub1_3.method2224(); - local156 = Static57.aClass3_Sub15_Sub1_3.method2202(); - local864 = Static57.aClass3_Sub15_Sub1_3.method2184(); + local133 = Static57.aClass3_Sub15_Sub1_3.p4rme(); + local156 = Static57.aClass3_Sub15_Sub1_3.gjstr(); + local864 = Static57.aClass3_Sub15_Sub1_3.g2sub(); if (Static248.method3288(local864)) { Static80.method3617(local156, local133); } Static164.anInt3985 = -1; return true; } else if (Static164.anInt3985 == 84) { - local133 = Static57.aClass3_Sub15_Sub1_3.method2208(); - local786 = Static57.aClass3_Sub15_Sub1_3.method2207(); + local133 = Static57.aClass3_Sub15_Sub1_3.g4me(); + local786 = Static57.aClass3_Sub15_Sub1_3.g2leadd(); Static272.method3995(local133, local786); Static164.anInt3985 = -1; return true; } else { @Pc(4956) Component local4956; if (Static164.anInt3985 == 22) { - local133 = Static57.aClass3_Sub15_Sub1_3.method2174(); - local786 = Static57.aClass3_Sub15_Sub1_3.method2163(); + local133 = Static57.aClass3_Sub15_Sub1_3.g4(); + local786 = Static57.aClass3_Sub15_Sub1_3.g2(); if (local133 < -70000) { local786 += 32768; } @@ -1324,14 +1324,14 @@ public final class Static4 { } else { local4956 = Static5.method32(local133); } - while (Static57.aClass3_Sub15_Sub1_3.anInt2792 < Static223.anInt5028) { - local171 = Static57.aClass3_Sub15_Sub1_3.method2204(); - local1146 = Static57.aClass3_Sub15_Sub1_3.method2163(); + while (Static57.aClass3_Sub15_Sub1_3.offset < Static223.anInt5028) { + local171 = Static57.aClass3_Sub15_Sub1_3.gSmart1or2(); + local1146 = Static57.aClass3_Sub15_Sub1_3.g2(); local277 = 0; if (local1146 != 0) { - local277 = Static57.aClass3_Sub15_Sub1_3.method2229(); + local277 = Static57.aClass3_Sub15_Sub1_3.g1(); if (local277 == 255) { - local277 = Static57.aClass3_Sub15_Sub1_3.method2174(); + local277 = Static57.aClass3_Sub15_Sub1_3.g4(); } } if (local4956 != null && local171 >= 0 && local4956.anIntArray40.length > local171) { @@ -1348,7 +1348,7 @@ public final class Static4 { Static164.anInt3985 = -1; return true; } else if (Static164.anInt3985 == 24) { - local133 = Static57.aClass3_Sub15_Sub1_3.method2163(); + local133 = Static57.aClass3_Sub15_Sub1_3.g2(); if (Static248.method3288(local133)) { Static35.method902(); } @@ -1359,23 +1359,23 @@ public final class Static4 { Static164.anInt3985 = -1; return false; } else if (Static164.anInt3985 == 116) { - local133 = Static57.aClass3_Sub15_Sub1_3.method2229(); - if (Static57.aClass3_Sub15_Sub1_3.method2229() == 0) { + local133 = Static57.aClass3_Sub15_Sub1_3.g1(); + if (Static57.aClass3_Sub15_Sub1_3.g1() == 0) { Static229.aClass136Array1[local133] = new StockMarketOffer(); } else { - Static57.aClass3_Sub15_Sub1_3.anInt2792--; + Static57.aClass3_Sub15_Sub1_3.offset--; Static229.aClass136Array1[local133] = new StockMarketOffer(Static57.aClass3_Sub15_Sub1_3); } Static164.anInt3985 = -1; Static207.anInt4778 = Static119.anInt3028; return true; } else if (Static164.anInt3985 == 73) { - local133 = Static57.aClass3_Sub15_Sub1_3.method2184(); - local786 = Static57.aClass3_Sub15_Sub1_3.method2208(); + local133 = Static57.aClass3_Sub15_Sub1_3.g2sub(); + local786 = Static57.aClass3_Sub15_Sub1_3.g4me(); if (local133 == 65535) { local133 = -1; } - local864 = Static57.aClass3_Sub15_Sub1_3.method2192(); + local864 = Static57.aClass3_Sub15_Sub1_3.g2le(); if (Static248.method3288(local864)) { Static132.method2607(-1, 2, local786, local133); } @@ -1386,14 +1386,14 @@ public final class Static4 { Static164.anInt3985 = -1; return true; } else if (Static164.anInt3985 == 165) { - local133 = Static57.aClass3_Sub15_Sub1_3.method2192(); - local786 = Static57.aClass3_Sub15_Sub1_3.method2192(); + local133 = Static57.aClass3_Sub15_Sub1_3.g2le(); + local786 = Static57.aClass3_Sub15_Sub1_3.g2le(); if (local786 == 65535) { local786 = -1; } - local864 = Static57.aClass3_Sub15_Sub1_3.method2174(); - local171 = Static57.aClass3_Sub15_Sub1_3.method2184(); - local1146 = Static57.aClass3_Sub15_Sub1_3.method2206(); + local864 = Static57.aClass3_Sub15_Sub1_3.g4(); + local171 = Static57.aClass3_Sub15_Sub1_3.g2sub(); + local1146 = Static57.aClass3_Sub15_Sub1_3.g4rme(); if (local171 == 65535) { local171 = -1; } @@ -1415,14 +1415,14 @@ public final class Static4 { Static164.anInt3985 = -1; return true; } else if (Static164.anInt3985 == 197) { - Static166.anInt4054 = Static57.aClass3_Sub15_Sub1_3.method2229(); + Static166.anInt4054 = Static57.aClass3_Sub15_Sub1_3.g1(); Static185.anInt4369 = Static119.anInt3028; Static164.anInt3985 = -1; return true; } else if (Static164.anInt3985 == 196) { - local884 = Static57.aClass3_Sub15_Sub1_3.method2182(); - local864 = Static57.aClass3_Sub15_Sub1_3.method2163(); - @Pc(5325) byte local5325 = Static57.aClass3_Sub15_Sub1_3.method2186(); + local884 = Static57.aClass3_Sub15_Sub1_3.g8(); + local864 = Static57.aClass3_Sub15_Sub1_3.g2(); + @Pc(5325) byte local5325 = Static57.aClass3_Sub15_Sub1_3.g1s(); local262 = false; if ((Long.MIN_VALUE & local884) != 0L) { local262 = true; @@ -1444,7 +1444,7 @@ public final class Static4 { Static199.aClass3_Sub22Array1[Static214.anInt5577] = null; } } else { - local506 = Static57.aClass3_Sub15_Sub1_3.method2202(); + local506 = Static57.aClass3_Sub15_Sub1_3.gjstr(); @Pc(5347) Class3_Sub22 local5347 = new Class3_Sub22(); local5347.aLong192 = local884; local5347.aClass100_636 = Static79.method1702(local5347.aLong192); @@ -1488,13 +1488,13 @@ public final class Static4 { Static278.anInt5867 = Static119.anInt3028; return true; } else if (Static164.anInt3985 == 50) { - local133 = Static57.aClass3_Sub15_Sub1_3.method2174(); - local786 = Static57.aClass3_Sub15_Sub1_3.method2224(); - local864 = Static57.aClass3_Sub15_Sub1_3.method2207(); + local133 = Static57.aClass3_Sub15_Sub1_3.g4(); + local786 = Static57.aClass3_Sub15_Sub1_3.p4rme(); + local864 = Static57.aClass3_Sub15_Sub1_3.g2leadd(); if (local864 == 65535) { local864 = -1; } - local171 = Static57.aClass3_Sub15_Sub1_3.method2192(); + local171 = Static57.aClass3_Sub15_Sub1_3.g2le(); if (Static248.method3288(local171)) { @Pc(5603) Component local5603 = Static5.method32(local786); @Pc(5615) ObjType local5615; @@ -1520,8 +1520,8 @@ public final class Static4 { Static164.anInt3985 = -1; return true; } else if (Static164.anInt3985 == 105) { - local133 = Static57.aClass3_Sub15_Sub1_3.method2174(); - local786 = Static57.aClass3_Sub15_Sub1_3.method2163(); + local133 = Static57.aClass3_Sub15_Sub1_3.g4(); + local786 = Static57.aClass3_Sub15_Sub1_3.g2(); if (local133 < -70000) { local786 += 32768; } @@ -1537,13 +1537,13 @@ public final class Static4 { } } Static14.method475(local786); - local171 = Static57.aClass3_Sub15_Sub1_3.method2163(); + local171 = Static57.aClass3_Sub15_Sub1_3.g2(); for (local1146 = 0; local1146 < local171; local1146++) { - local277 = Static57.aClass3_Sub15_Sub1_3.method2180(); + local277 = Static57.aClass3_Sub15_Sub1_3.g1ssub(); if (local277 == 255) { - local277 = Static57.aClass3_Sub15_Sub1_3.method2174(); + local277 = Static57.aClass3_Sub15_Sub1_3.g4(); } - local1160 = Static57.aClass3_Sub15_Sub1_3.method2163(); + local1160 = Static57.aClass3_Sub15_Sub1_3.g2(); if (local4956 != null && local1146 < local4956.anIntArray40.length) { local4956.anIntArray40[local1146] = local1160; local4956.anIntArray50[local1146] = local277; @@ -1558,16 +1558,16 @@ public final class Static4 { Static164.anInt3985 = -1; return true; } else if (Static164.anInt3985 == 142) { - Static230.method3954(Static57.aClass3_Sub15_Sub1_3.method2202()); + Static230.method3954(Static57.aClass3_Sub15_Sub1_3.gjstr()); Static164.anInt3985 = -1; return true; } else if (Static164.anInt3985 == 26) { - Static115.anInt2940 = Static57.aClass3_Sub15_Sub1_3.method2212(); - Static180.anInt4264 = Static57.aClass3_Sub15_Sub1_3.method2229(); + Static115.anInt2940 = Static57.aClass3_Sub15_Sub1_3.p1neg(); + Static180.anInt4264 = Static57.aClass3_Sub15_Sub1_3.g1(); Static164.anInt3985 = -1; return true; } else if (Static164.anInt3985 == 4) { - local133 = Static57.aClass3_Sub15_Sub1_3.method2207(); + local133 = Static57.aClass3_Sub15_Sub1_3.g2leadd(); if (local133 == 65535) { local133 = -1; } @@ -1575,8 +1575,8 @@ public final class Static4 { Static164.anInt3985 = -1; return true; } else if (Static164.anInt3985 == 208) { - local133 = Static57.aClass3_Sub15_Sub1_3.method2181(); - local786 = Static57.aClass3_Sub15_Sub1_3.method2192(); + local133 = Static57.aClass3_Sub15_Sub1_3.g3le(); + local786 = Static57.aClass3_Sub15_Sub1_3.g2le(); if (local786 == 65535) { local786 = -1; } @@ -1647,10 +1647,10 @@ public final class Static4 { } if (Static56.aClass13_12 != null && Static36.method938(Static105.aClass13_14) != null) { Static6.aClass3_Sub15_Sub1_1.method2242(79); - Static6.aClass3_Sub15_Sub1_1.method2185(Static105.aClass13_14.anInt507); - Static6.aClass3_Sub15_Sub1_1.method2222(Static56.aClass13_12.anInt457); - Static6.aClass3_Sub15_Sub1_1.method2164(Static56.aClass13_12.anInt507); - Static6.aClass3_Sub15_Sub1_1.method2222(Static105.aClass13_14.anInt457); + Static6.aClass3_Sub15_Sub1_1.p4me(Static105.aClass13_14.anInt507); + Static6.aClass3_Sub15_Sub1_1.p2le(Static56.aClass13_12.anInt457); + Static6.aClass3_Sub15_Sub1_1.p4(Static56.aClass13_12.anInt507); + Static6.aClass3_Sub15_Sub1_1.p2le(Static105.aClass13_14.anInt457); } } else if ((Static116.anInt2952 == 1 || Static277.method4640(Static231.anInt5204 - 1)) && Static231.anInt5204 > 2) { Static226.method3901(); diff --git a/client/src/main/java/Static40.java b/client/src/main/java/Static40.java index 5bde473..799198c 100644 --- a/client/src/main/java/Static40.java +++ b/client/src/main/java/Static40.java @@ -121,25 +121,25 @@ public final class Static40 { @OriginalMember(owner = "client!da", name = "a", descriptor = "(IIIILclient!na;JI)V") public static void method1016(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) JagString arg3, @OriginalArg(5) long arg4, @OriginalArg(6) int arg5) { @Pc(8) Buffer local8 = new Buffer(128); - local8.method2178(10); - local8.method2230((int) (Math.random() * 99999.0D)); - local8.method2230(530); - local8.method2166(arg4); - local8.method2164((int) (Math.random() * 9.9999999E7D)); - local8.method2171(arg3); - local8.method2164((int) (Math.random() * 9.9999999E7D)); - local8.method2230(Static204.anInt4760); - local8.method2178(arg0); - local8.method2178(arg2); - local8.method2164((int) (Math.random() * 9.9999999E7D)); - local8.method2230(arg5); - local8.method2230(arg1); - local8.method2164((int) (Math.random() * 9.9999999E7D)); - local8.method2226(Static86.aBigInteger1, Static256.aBigInteger2); - Static6.aClass3_Sub15_Sub1_1.anInt2792 = 0; - Static6.aClass3_Sub15_Sub1_1.method2178(36); - Static6.aClass3_Sub15_Sub1_1.method2178(local8.anInt2792); - Static6.aClass3_Sub15_Sub1_1.method2179(local8.aByteArray40, local8.anInt2792); + local8.p1(10); + local8.p2((int) (Math.random() * 99999.0D)); + local8.p2(530); + local8.p8(arg4); + local8.p4((int) (Math.random() * 9.9999999E7D)); + local8.pjstr(arg3); + local8.p4((int) (Math.random() * 9.9999999E7D)); + local8.p2(Static204.anInt4760); + local8.p1(arg0); + local8.p1(arg2); + local8.p4((int) (Math.random() * 9.9999999E7D)); + local8.p2(arg5); + local8.p2(arg1); + local8.p4((int) (Math.random() * 9.9999999E7D)); + local8.encryptRsa(Static86.aBigInteger1, Static256.aBigInteger2); + Static6.aClass3_Sub15_Sub1_1.offset = 0; + Static6.aClass3_Sub15_Sub1_1.p1(36); + Static6.aClass3_Sub15_Sub1_1.p1(local8.offset); + Static6.aClass3_Sub15_Sub1_1.pBytes(local8.data, local8.offset); Static223.anInt5034 = -3; Static179.anInt4261 = 1; Static226.anInt5079 = 0; diff --git a/client/src/main/java/Static44.java b/client/src/main/java/Static44.java index eb4ea86..948c9e9 100644 --- a/client/src/main/java/Static44.java +++ b/client/src/main/java/Static44.java @@ -21,7 +21,7 @@ public final class Static44 { @OriginalMember(owner = "client!dh", name = "a", descriptor = "(Z)V") public static void method1146() { - Static6.aClass3_Sub15_Sub1_1.anInt2792 = 0; + Static6.aClass3_Sub15_Sub1_1.offset = 0; Static5.anInt45 = -1; Static60.aBoolean108 = false; Static223.anInt5028 = 0; @@ -31,7 +31,7 @@ public final class Static44 { Static270.anInt5795 = 0; Static60.anInt1894 = 0; Static49.anInt1462 = -1; - Static57.aClass3_Sub15_Sub1_3.anInt2792 = 0; + Static57.aClass3_Sub15_Sub1_3.offset = 0; Static201.anInt1862 = 0; Static164.anInt3985 = -1; @Pc(35) int local35; diff --git a/client/src/main/java/Static47.java b/client/src/main/java/Static47.java index 07eb560..443e551 100644 --- a/client/src/main/java/Static47.java +++ b/client/src/main/java/Static47.java @@ -32,17 +32,17 @@ public final class Static47 { @OriginalMember(owner = "client!dk", name = "a", descriptor = "(Lclient!wa;Z)V") public static void method3998(@OriginalArg(0) Buffer arg0) { label87: while (true) { - if (arg0.anInt2792 < arg0.aByteArray40.length) { + if (arg0.offset < arg0.data.length) { @Pc(22) int local22 = 0; @Pc(24) boolean local24 = false; @Pc(26) int local26 = 0; - if (arg0.method2229() == 1) { + if (arg0.g1() == 1) { local24 = true; - local22 = arg0.method2229(); - local26 = arg0.method2229(); + local22 = arg0.g1(); + local26 = arg0.g1(); } - @Pc(46) int local46 = arg0.method2229(); - @Pc(50) int local50 = arg0.method2229(); + @Pc(46) int local46 = arg0.g1(); + @Pc(50) int local50 = arg0.g1(); @Pc(62) int local62 = Static2.anInt13 + Static181.anInt4296 - local50 * 64 - 1; @Pc(69) int local69 = local46 * 64 - Static158.anInt3846; @Pc(147) byte local147; @@ -57,13 +57,13 @@ public final class Static47 { } for (@Pc(104) int local104 = 0; local104 < 64; local104++) { if (!local24 || local97 >= local22 * 8 && local97 < local22 * 8 + 8 && local104 >= local26 * 8 && local104 < local26 * 8 + 8) { - local147 = arg0.method2186(); + local147 = arg0.g1s(); if (local147 != 0) { if (Static34.aByteArrayArrayArray3[local91][local95] == null) { Static34.aByteArrayArrayArray3[local91][local95] = new byte[4096]; } Static34.aByteArrayArrayArray3[local91][local95][local97 + (63 - local104 << 6)] = local147; - @Pc(186) byte local186 = arg0.method2186(); + @Pc(186) byte local186 = arg0.g1s(); if (Static90.aByteArrayArrayArray8[local91][local95] == null) { Static90.aByteArrayArrayArray8[local91][local95] = new byte[4096]; } @@ -79,9 +79,9 @@ public final class Static47 { if ((local24 ? 64 : 4096) <= local91) { continue label87; } - local147 = arg0.method2186(); + local147 = arg0.g1s(); if (local147 != 0) { - arg0.anInt2792++; + arg0.offset++; } local91++; } diff --git a/client/src/main/java/Static48.java b/client/src/main/java/Static48.java index 2bab774..0bdf6fd 100644 --- a/client/src/main/java/Static48.java +++ b/client/src/main/java/Static48.java @@ -34,35 +34,35 @@ public final class Static48 { @OriginalMember(owner = "client!dl", name = "a", descriptor = "(B)Lclient!wa;") public static Buffer method1196() { @Pc(4) Buffer local4 = new Buffer(34); - local4.method2178(11); - local4.method2178(Static113.anInt4609); - local4.method2178(Static162.aBoolean190 ? 1 : 0); - local4.method2178(Static80.aBoolean231 ? 1 : 0); - local4.method2178(Static250.aBoolean283 ? 1 : 0); - local4.method2178(Static53.aBoolean99 ? 1 : 0); - local4.method2178(Static15.aBoolean33 ? 1 : 0); - local4.method2178(Static11.aBoolean15 ? 1 : 0); - local4.method2178(Static159.aBoolean189 ? 1 : 0); - local4.method2178(Static209.aBoolean240 ? 1 : 0); - local4.method2178(Static139.anInt3451); - local4.method2178(Static178.aBoolean202 ? 1 : 0); - local4.method2178(Static220.aBoolean244 ? 1 : 0); - local4.method2178(Static71.aBoolean107 ? 1 : 0); - local4.method2178(Static102.anInt2679); - local4.method2178(Static99.aBoolean143 ? 1 : 0); - local4.method2178(Static125.anInt3104); - local4.method2178(Static12.anInt391); - local4.method2178(Static30.anInt978); - local4.method2230(Static114.anInt5831); - local4.method2230(Static22.anInt729); - local4.method2178(Static76.method1644()); - local4.method2164(Static164.anInt3988); - local4.method2178(Static214.anInt5581); - local4.method2178(Static164.aBoolean191 ? 1 : 0); - local4.method2178(Static33.aBoolean63 ? 1 : 0); - local4.method2178(Static141.anInt3474); - local4.method2178(Static127.aBoolean159 ? 1 : 0); - local4.method2178(Static64.aBoolean111 ? 1 : 0); + local4.p1(11); + local4.p1(Static113.anInt4609); + local4.p1(Static162.aBoolean190 ? 1 : 0); + local4.p1(Static80.aBoolean231 ? 1 : 0); + local4.p1(Static250.aBoolean283 ? 1 : 0); + local4.p1(Static53.aBoolean99 ? 1 : 0); + local4.p1(Static15.aBoolean33 ? 1 : 0); + local4.p1(Static11.aBoolean15 ? 1 : 0); + local4.p1(Static159.aBoolean189 ? 1 : 0); + local4.p1(Static209.aBoolean240 ? 1 : 0); + local4.p1(Static139.anInt3451); + local4.p1(Static178.aBoolean202 ? 1 : 0); + local4.p1(Static220.aBoolean244 ? 1 : 0); + local4.p1(Static71.aBoolean107 ? 1 : 0); + local4.p1(Static102.anInt2679); + local4.p1(Static99.aBoolean143 ? 1 : 0); + local4.p1(Static125.anInt3104); + local4.p1(Static12.anInt391); + local4.p1(Static30.anInt978); + local4.p2(Static114.anInt5831); + local4.p2(Static22.anInt729); + local4.p1(Static76.method1644()); + local4.p4(Static164.anInt3988); + local4.p1(Static214.anInt5581); + local4.p1(Static164.aBoolean191 ? 1 : 0); + local4.p1(Static33.aBoolean63 ? 1 : 0); + local4.p1(Static141.anInt3474); + local4.p1(Static127.aBoolean159 ? 1 : 0); + local4.p1(Static64.aBoolean111 ? 1 : 0); return local4; } diff --git a/client/src/main/java/Static49.java b/client/src/main/java/Static49.java index a90f3cd..1350f01 100644 --- a/client/src/main/java/Static49.java +++ b/client/src/main/java/Static49.java @@ -40,7 +40,7 @@ public final class Static49 { @Pc(17) int local17 = -1; @Pc(22) Buffer local22 = new Buffer(arg2); label70: while (true) { - @Pc(26) int local26 = local22.method2199(); + @Pc(26) int local26 = local22.gVarSmart(); if (local26 == 0) { return local15; } @@ -59,13 +59,13 @@ public final class Static49 { do { @Pc(45) int local45; while (local39) { - local45 = local22.method2204(); + local45 = local22.gSmart1or2(); if (local45 == 0) { continue label70; } - local22.method2229(); + local22.g1(); } - local45 = local22.method2204(); + local45 = local22.gSmart1or2(); if (local45 == 0) { continue label70; } @@ -74,7 +74,7 @@ public final class Static49 { @Pc(64) int local64 = local33 >> 6 & 0x3F; local68 = arg1 + local58; local72 = arg0 + local64; - local78 = local22.method2229() >> 2; + local78 = local22.g1() >> 2; } while (local72 <= 0); } while (local68 <= 0); } while (local72 >= 103); diff --git a/client/src/main/java/Static54.java b/client/src/main/java/Static54.java index 858590f..177524a 100644 --- a/client/src/main/java/Static54.java +++ b/client/src/main/java/Static54.java @@ -339,7 +339,7 @@ public final class Static54 { Static144.aBoolean173 = false; } else if (Static12.anInt391 != 0 && Static221.anInt4363 != -1 && !Static136.method2655()) { Static6.aClass3_Sub15_Sub1_1.method2242(137); - Static6.aClass3_Sub15_Sub1_1.method2164(Static221.anInt4363); + Static6.aClass3_Sub15_Sub1_1.p4(Static221.anInt4363); Static221.anInt4363 = -1; } } diff --git a/client/src/main/java/Static59.java b/client/src/main/java/Static59.java index 766aa0f..84387f6 100644 --- a/client/src/main/java/Static59.java +++ b/client/src/main/java/Static59.java @@ -47,10 +47,10 @@ public final class Static59 { @OriginalMember(owner = "client!ej", name = "i", descriptor = "(I)V") public static void method1373() { Static6.aClass3_Sub15_Sub1_1.method2242(243); - Static6.aClass3_Sub15_Sub1_1.method2178(Static144.method2736()); - Static6.aClass3_Sub15_Sub1_1.method2230(Static48.anInt1448); - Static6.aClass3_Sub15_Sub1_1.method2230(Static254.anInt5554); - Static6.aClass3_Sub15_Sub1_1.method2178(Static186.anInt4392); + Static6.aClass3_Sub15_Sub1_1.p1(Static144.method2736()); + Static6.aClass3_Sub15_Sub1_1.p2(Static48.anInt1448); + Static6.aClass3_Sub15_Sub1_1.p2(Static254.anInt5554); + Static6.aClass3_Sub15_Sub1_1.p1(Static186.anInt4392); } @OriginalMember(owner = "client!ej", name = "a", descriptor = "(Lclient!ve;ILclient!ve;Lclient!of;)V") diff --git a/client/src/main/java/Static64.java b/client/src/main/java/Static64.java index c9ca664..9c1e7fa 100644 --- a/client/src/main/java/Static64.java +++ b/client/src/main/java/Static64.java @@ -46,8 +46,8 @@ public final class Static64 { Static159.aClass8_Sub4_Sub1Array1[local30] = null; } } - if (Static223.anInt5028 != Static57.aClass3_Sub15_Sub1_3.anInt2792) { - throw new RuntimeException("gpp1 pos:" + Static57.aClass3_Sub15_Sub1_3.anInt2792 + " psize:" + Static223.anInt5028); + if (Static223.anInt5028 != Static57.aClass3_Sub15_Sub1_3.offset) { + throw new RuntimeException("gpp1 pos:" + Static57.aClass3_Sub15_Sub1_3.offset + " psize:" + Static223.anInt5028); } for (local23 = 0; local23 < Static267.anInt5774; local23++) { if (Static159.aClass8_Sub4_Sub1Array1[Static105.anIntArray256[local23]] == null) { @@ -92,6 +92,6 @@ public final class Static64 { Static9.anInt178++; Static185.anInt4369 = Static119.anInt3028; Static6.aClass3_Sub15_Sub1_1.method2242(120); - Static6.aClass3_Sub15_Sub1_1.method2166(arg0); + Static6.aClass3_Sub15_Sub1_1.p8(arg0); } } diff --git a/client/src/main/java/Static69.java b/client/src/main/java/Static69.java index 73181a3..70e26ae 100644 --- a/client/src/main/java/Static69.java +++ b/client/src/main/java/Static69.java @@ -58,7 +58,7 @@ public final class Static69 { } Static185.anInt4369 = Static119.anInt3028; Static6.aClass3_Sub15_Sub1_1.method2242(213); - Static6.aClass3_Sub15_Sub1_1.method2166(arg0); + Static6.aClass3_Sub15_Sub1_1.p8(arg0); break; } } @@ -181,8 +181,8 @@ public final class Static69 { @OriginalMember(owner = "client!fh", name = "a", descriptor = "(Lclient!wa;I)V") public static void method1546(@OriginalArg(0) Buffer arg0) { for (@Pc(7) int local7 = 0; local7 < Static106.anInt2871; local7++) { - @Pc(18) int local18 = arg0.method2204(); - @Pc(22) int local22 = arg0.method2163(); + @Pc(18) int local18 = arg0.gSmart1or2(); + @Pc(22) int local22 = arg0.g2(); if (local22 == 65535) { local22 = -1; } diff --git a/client/src/main/java/Static7.java b/client/src/main/java/Static7.java index be6e8ac..442e190 100644 --- a/client/src/main/java/Static7.java +++ b/client/src/main/java/Static7.java @@ -55,8 +55,8 @@ public final class Static7 { if (!Static224.aBoolean247 && Static124.aClass95_2 != null) { Static6.aClass3_Sub15_Sub1_1.method2242(93); try { - Static124.aClass95_2.method2830(Static6.aClass3_Sub15_Sub1_1.aByteArray40, Static6.aClass3_Sub15_Sub1_1.anInt2792); - Static6.aClass3_Sub15_Sub1_1.anInt2792 = 0; + Static124.aClass95_2.method2830(Static6.aClass3_Sub15_Sub1_1.data, Static6.aClass3_Sub15_Sub1_1.offset); + Static6.aClass3_Sub15_Sub1_1.offset = 0; } catch (@Pc(53) IOException local53) { Static224.aBoolean247 = true; } diff --git a/client/src/main/java/Static70.java b/client/src/main/java/Static70.java index 4815a20..5db35cf 100644 --- a/client/src/main/java/Static70.java +++ b/client/src/main/java/Static70.java @@ -31,13 +31,13 @@ public final class Static70 { @OriginalMember(owner = "client!fi", name = "a", descriptor = "(BI)Lclient!na;") public static JagString method1548(@OriginalArg(1) int arg0) { @Pc(9) JagString local9 = Static123.method2423(arg0); - for (@Pc(21) int local21 = local9.method3120() - 3; local21 > 0; local21 -= 3) { + for (@Pc(21) int local21 = local9.length() - 3; local21 > 0; local21 -= 3) { local9 = Static34.method882(new JagString[] { local9.method3137(local21, 0), Static159.aClass100_760, local9.method3136(local21) }); } - if (local9.method3120() > 9) { - return Static34.method882(new JagString[] { Static250.aClass100_1043, local9.method3137(local9.method3120() - 8, 0), Static69.aClass100_444, Static123.aClass100_593, local9, Static116.aClass100_583 }); - } else if (local9.method3120() > 6) { - return Static34.method882(new JagString[] { Static119.aClass100_589, local9.method3137(local9.method3120() - 4, 0), Static35.aClass100_220, Static123.aClass100_593, local9, Static116.aClass100_583 }); + if (local9.length() > 9) { + return Static34.method882(new JagString[] { Static250.aClass100_1043, local9.method3137(local9.length() - 8, 0), Static69.aClass100_444, Static123.aClass100_593, local9, Static116.aClass100_583 }); + } else if (local9.length() > 6) { + return Static34.method882(new JagString[] { Static119.aClass100_589, local9.method3137(local9.length() - 4, 0), Static35.aClass100_220, Static123.aClass100_593, local9, Static116.aClass100_583 }); } else { return Static34.method882(new JagString[] { Static278.aClass100_1101, local9, Static230.aClass100_978 }); } diff --git a/client/src/main/java/Static71.java b/client/src/main/java/Static71.java index 0c2e3d8..653b029 100644 --- a/client/src/main/java/Static71.java +++ b/client/src/main/java/Static71.java @@ -75,7 +75,7 @@ public final class Static71 { @OriginalMember(owner = "client!fk", name = "a", descriptor = "([BIZ)I") public static int method1442(@OriginalArg(0) byte[] arg0, @OriginalArg(1) int arg1) { - return Static169.method3178(0, arg1, arg0); + return Static169.crc32(0, arg1, arg0); } @OriginalMember(owner = "client!fk", name = "b", descriptor = "(IB)V") @@ -102,6 +102,6 @@ public final class Static71 { @OriginalMember(owner = "client!fk", name = "c", descriptor = "(I)V") public static void method1445() { Static6.aClass3_Sub15_Sub1_1.method2242(177); - Static6.aClass3_Sub15_Sub1_1.method2230(Static189.anInt4443); + Static6.aClass3_Sub15_Sub1_1.p2(Static189.anInt4443); } } diff --git a/client/src/main/java/Static75.java b/client/src/main/java/Static75.java index 87ef2ab..1143b01 100644 --- a/client/src/main/java/Static75.java +++ b/client/src/main/java/Static75.java @@ -23,18 +23,18 @@ public final class Static75 { @Pc(151) int local151; @Pc(169) int local169; if (!Static230.aBoolean250) { - local13 = Static57.aClass3_Sub15_Sub1_3.method2184(); - local20 = (Static223.anInt5028 - Static57.aClass3_Sub15_Sub1_3.anInt2792) / 16; + local13 = Static57.aClass3_Sub15_Sub1_3.g2sub(); + local20 = (Static223.anInt5028 - Static57.aClass3_Sub15_Sub1_3.offset) / 16; Static72.anIntArrayArray14 = 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.method2224(); + Static72.anIntArrayArray14[local26][local31] = Static57.aClass3_Sub15_Sub1_3.p4rme(); } } - local26 = Static57.aClass3_Sub15_Sub1_3.method2180(); - local31 = Static57.aClass3_Sub15_Sub1_3.method2163(); - local60 = Static57.aClass3_Sub15_Sub1_3.method2184(); - local64 = Static57.aClass3_Sub15_Sub1_3.method2184(); + 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; @@ -76,10 +76,10 @@ public final class Static75 { Static127.method2463(local26, local60, local31, local64, false, local13); return; } - local13 = Static57.aClass3_Sub15_Sub1_3.method2207(); - local20 = Static57.aClass3_Sub15_Sub1_3.method2207(); - local26 = Static57.aClass3_Sub15_Sub1_3.method2180(); - local31 = Static57.aClass3_Sub15_Sub1_3.method2207(); + local13 = Static57.aClass3_Sub15_Sub1_3.g2leadd(); + local20 = Static57.aClass3_Sub15_Sub1_3.g2leadd(); + local26 = Static57.aClass3_Sub15_Sub1_3.g1ssub(); + local31 = Static57.aClass3_Sub15_Sub1_3.g2leadd(); Static57.aClass3_Sub15_Sub1_3.method2233(); @Pc(391) int local391; for (local60 = 0; local60 < 4; local60++) { @@ -95,14 +95,14 @@ public final class Static75 { } } Static57.aClass3_Sub15_Sub1_3.method2244(); - local60 = (Static223.anInt5028 - Static57.aClass3_Sub15_Sub1_3.anInt2792) / 16; + local60 = (Static223.anInt5028 - Static57.aClass3_Sub15_Sub1_3.offset) / 16; Static72.anIntArrayArray14 = 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.method2224(); + Static72.anIntArrayArray14[local64][local391] = Static57.aClass3_Sub15_Sub1_3.p4rme(); } } - local64 = Static57.aClass3_Sub15_Sub1_3.method2163(); + local64 = Static57.aClass3_Sub15_Sub1_3.g2(); Static35.anIntArray82 = new int[local60]; Static172.anIntArray366 = new int[local60]; Static36.anIntArray84 = new int[local60]; @@ -189,22 +189,22 @@ public final class Static75 { @Pc(39) int local39; @Pc(45) int local45; if (Static164.anInt3985 == 195) { - local15 = Static57.aClass3_Sub15_Sub1_3.method2212(); + local15 = Static57.aClass3_Sub15_Sub1_3.p1neg(); local19 = local15 & 0x3; local23 = local15 >> 2; local27 = Static133.anIntArray453[local23]; - local31 = Static57.aClass3_Sub15_Sub1_3.method2229(); + local31 = Static57.aClass3_Sub15_Sub1_3.g1(); local39 = (local31 >> 4 & 0x7) + Static115.anInt2940; local45 = (local31 & 0x7) + Static180.anInt4264; if (local39 >= 0 && local45 >= 0 && local39 < 104 && local45 < 104) { Static29.method800(Static55.anInt1735, local45, local19, local39, -1, -1, local27, local23, 0); } } else if (Static164.anInt3985 == 33) { - local15 = Static57.aClass3_Sub15_Sub1_3.method2192(); - local23 = Static57.aClass3_Sub15_Sub1_3.method2229(); + local15 = Static57.aClass3_Sub15_Sub1_3.g2le(); + local23 = Static57.aClass3_Sub15_Sub1_3.g1(); local27 = (local23 & 0x7) + Static180.anInt4264; local19 = (local23 >> 4 & 0x7) + Static115.anInt2940; - local31 = Static57.aClass3_Sub15_Sub1_3.method2184(); + local31 = Static57.aClass3_Sub15_Sub1_3.g2sub(); if (local19 >= 0 && local27 >= 0 && local19 < 104 && local27 < 104) { @Pc(122) ObjStack local122 = new ObjStack(); local122.anInt5550 = local31; @@ -224,22 +224,22 @@ public final class Static75 { @Pc(236) int local236; @Pc(317) ProjAnim local317; if (Static164.anInt3985 == 121) { - local15 = Static57.aClass3_Sub15_Sub1_3.method2229(); + local15 = Static57.aClass3_Sub15_Sub1_3.g1(); local23 = Static115.anInt2940 * 2 + (local15 >> 4 & 0xF); local19 = (local15 & 0xF) + Static180.anInt4264 * 2; - local27 = local23 + Static57.aClass3_Sub15_Sub1_3.method2186(); - local31 = Static57.aClass3_Sub15_Sub1_3.method2186() + local19; - local39 = Static57.aClass3_Sub15_Sub1_3.method2213(); - local45 = Static57.aClass3_Sub15_Sub1_3.method2163(); - local218 = Static57.aClass3_Sub15_Sub1_3.method2229() * 4; - local224 = Static57.aClass3_Sub15_Sub1_3.method2229() * 4; - local228 = Static57.aClass3_Sub15_Sub1_3.method2163(); - local232 = Static57.aClass3_Sub15_Sub1_3.method2163(); - local236 = Static57.aClass3_Sub15_Sub1_3.method2229(); + local27 = local23 + Static57.aClass3_Sub15_Sub1_3.g1s(); + local31 = Static57.aClass3_Sub15_Sub1_3.g1s() + local19; + local39 = Static57.aClass3_Sub15_Sub1_3.g2s(); + local45 = Static57.aClass3_Sub15_Sub1_3.g2(); + local218 = Static57.aClass3_Sub15_Sub1_3.g1() * 4; + local224 = Static57.aClass3_Sub15_Sub1_3.g1() * 4; + local228 = Static57.aClass3_Sub15_Sub1_3.g2(); + local232 = Static57.aClass3_Sub15_Sub1_3.g2(); + local236 = Static57.aClass3_Sub15_Sub1_3.g1(); if (local236 == 255) { local236 = -1; } - local247 = Static57.aClass3_Sub15_Sub1_3.method2229(); + local247 = Static57.aClass3_Sub15_Sub1_3.g1(); if (local23 >= 0 && local19 >= 0 && local23 < 208 && local19 < 208 && local27 >= 0 && local31 >= 0 && local27 < 208 && local31 < 208 && local45 != 65535) { local31 *= 64; local27 = local27 * 64; @@ -250,12 +250,12 @@ public final class Static75 { Static217.aClass69_116.method2282(new ProjAnimNode(local317)); } } else if (Static164.anInt3985 == 17) { - local15 = Static57.aClass3_Sub15_Sub1_3.method2229(); + local15 = Static57.aClass3_Sub15_Sub1_3.g1(); local23 = Static115.anInt2940 + (local15 >> 4 & 0x7); local19 = Static180.anInt4264 + (local15 & 0x7); - local27 = Static57.aClass3_Sub15_Sub1_3.method2163(); - local31 = Static57.aClass3_Sub15_Sub1_3.method2229(); - local39 = Static57.aClass3_Sub15_Sub1_3.method2163(); + local27 = Static57.aClass3_Sub15_Sub1_3.g2(); + local31 = Static57.aClass3_Sub15_Sub1_3.g1(); + local39 = Static57.aClass3_Sub15_Sub1_3.g2(); if (local23 >= 0 && local19 >= 0 && local23 < 104 && local19 < 104) { local23 = local23 * 128 + 64; local19 = local19 * 128 + 64; @@ -263,26 +263,26 @@ public final class Static75 { Static99.aClass69_64.method2282(new SpotAnimNode(local427)); } } else if (Static164.anInt3985 == 179) { - local15 = Static57.aClass3_Sub15_Sub1_3.method2177(); + local15 = Static57.aClass3_Sub15_Sub1_3.g1add(); local23 = local15 >> 2; local19 = local15 & 0x3; local27 = Static133.anIntArray453[local23]; - local31 = Static57.aClass3_Sub15_Sub1_3.method2229(); + local31 = Static57.aClass3_Sub15_Sub1_3.g1(); local39 = Static115.anInt2940 + (local31 >> 4 & 0x7); local45 = (local31 & 0x7) + Static180.anInt4264; - local218 = Static57.aClass3_Sub15_Sub1_3.method2184(); + local218 = Static57.aClass3_Sub15_Sub1_3.g2sub(); if (local39 >= 0 && local45 >= 0 && local39 < 104 && local45 < 104) { Static29.method800(Static55.anInt1735, local45, local19, local39, -1, local218, local27, local23, 0); } } else if (Static164.anInt3985 == 20) { - local15 = Static57.aClass3_Sub15_Sub1_3.method2180(); + local15 = Static57.aClass3_Sub15_Sub1_3.g1ssub(); local23 = (local15 >> 4 & 0x7) + Static115.anInt2940; local19 = Static180.anInt4264 + (local15 & 0x7); - local27 = Static57.aClass3_Sub15_Sub1_3.method2180(); + local27 = Static57.aClass3_Sub15_Sub1_3.g1ssub(); local31 = local27 >> 2; local39 = local27 & 0x3; local45 = Static133.anIntArray453[local31]; - local218 = Static57.aClass3_Sub15_Sub1_3.method2192(); + local218 = Static57.aClass3_Sub15_Sub1_3.g2le(); if (local218 == 65535) { local218 = -1; } @@ -290,31 +290,31 @@ public final class Static75 { } else { @Pc(633) int local633; if (Static164.anInt3985 == 202) { - local15 = Static57.aClass3_Sub15_Sub1_3.method2229(); + local15 = Static57.aClass3_Sub15_Sub1_3.g1(); local23 = local15 >> 2; local19 = local15 & 0x3; - local27 = Static57.aClass3_Sub15_Sub1_3.method2229(); + local27 = Static57.aClass3_Sub15_Sub1_3.g1(); local31 = (local27 >> 4 & 0x7) + Static115.anInt2940; local39 = (local27 & 0x7) + Static180.anInt4264; - @Pc(605) byte local605 = Static57.aClass3_Sub15_Sub1_3.method2215(); - @Pc(609) byte local609 = Static57.aClass3_Sub15_Sub1_3.method2215(); - @Pc(613) byte local613 = Static57.aClass3_Sub15_Sub1_3.method2175(); - local228 = Static57.aClass3_Sub15_Sub1_3.method2184(); - local232 = Static57.aClass3_Sub15_Sub1_3.method2192(); - @Pc(625) byte local625 = Static57.aClass3_Sub15_Sub1_3.method2186(); - local247 = Static57.aClass3_Sub15_Sub1_3.method2163(); - local633 = Static57.aClass3_Sub15_Sub1_3.method2214(); + @Pc(605) byte local605 = Static57.aClass3_Sub15_Sub1_3.p1sub(); + @Pc(609) byte local609 = Static57.aClass3_Sub15_Sub1_3.p1sub(); + @Pc(613) byte local613 = Static57.aClass3_Sub15_Sub1_3.g1sub(); + local228 = Static57.aClass3_Sub15_Sub1_3.g2sub(); + local232 = Static57.aClass3_Sub15_Sub1_3.g2le(); + @Pc(625) byte local625 = Static57.aClass3_Sub15_Sub1_3.g1s(); + local247 = Static57.aClass3_Sub15_Sub1_3.g2(); + local633 = Static57.aClass3_Sub15_Sub1_3.g2lesadd(); if (!Static239.aBoolean269) { Static170.method2574(local625, local247, local633, local232, local39, local613, local19, local605, local31, local23, local609, local228); } } if (Static164.anInt3985 == 14) { - local15 = Static57.aClass3_Sub15_Sub1_3.method2229(); + local15 = Static57.aClass3_Sub15_Sub1_3.g1(); local19 = Static180.anInt4264 + (local15 & 0x7); local23 = (local15 >> 4 & 0x7) + Static115.anInt2940; - local27 = Static57.aClass3_Sub15_Sub1_3.method2163(); - local31 = Static57.aClass3_Sub15_Sub1_3.method2163(); - local39 = Static57.aClass3_Sub15_Sub1_3.method2163(); + local27 = Static57.aClass3_Sub15_Sub1_3.g2(); + local31 = Static57.aClass3_Sub15_Sub1_3.g2(); + local39 = Static57.aClass3_Sub15_Sub1_3.g2(); if (local23 >= 0 && local19 >= 0 && local23 < 104 && local19 < 104) { @Pc(710) LinkedList local710 = Static159.aClass69ArrayArrayArray1[Static55.anInt1735][local23][local19]; if (local710 != null) { @@ -329,12 +329,12 @@ public final class Static75 { } } } else if (Static164.anInt3985 == 135) { - local15 = Static57.aClass3_Sub15_Sub1_3.method2207(); - local23 = Static57.aClass3_Sub15_Sub1_3.method2212(); + local15 = Static57.aClass3_Sub15_Sub1_3.g2leadd(); + local23 = Static57.aClass3_Sub15_Sub1_3.p1neg(); local27 = Static180.anInt4264 + (local23 & 0x7); local19 = (local23 >> 4 & 0x7) + Static115.anInt2940; - local31 = Static57.aClass3_Sub15_Sub1_3.method2192(); - local39 = Static57.aClass3_Sub15_Sub1_3.method2192(); + local31 = Static57.aClass3_Sub15_Sub1_3.g2le(); + local39 = Static57.aClass3_Sub15_Sub1_3.g2le(); if (local19 >= 0 && local27 >= 0 && local19 < 104 && local27 < 104 && Static16.anInt549 != local15) { @Pc(812) ObjStack local812 = new ObjStack(); local812.anInt5550 = local31; @@ -346,19 +346,19 @@ public final class Static75 { Static220.method3797(local27, local19); } } else if (Static164.anInt3985 == 16) { - local15 = Static57.aClass3_Sub15_Sub1_3.method2229(); + local15 = Static57.aClass3_Sub15_Sub1_3.g1(); local23 = Static115.anInt2940 + (local15 >> 4 & 0x7); local19 = (local15 & 0x7) + Static180.anInt4264; - local27 = local23 + Static57.aClass3_Sub15_Sub1_3.method2186(); - local31 = Static57.aClass3_Sub15_Sub1_3.method2186() + local19; - local39 = Static57.aClass3_Sub15_Sub1_3.method2213(); - local45 = Static57.aClass3_Sub15_Sub1_3.method2163(); - local218 = Static57.aClass3_Sub15_Sub1_3.method2229() * 4; - local224 = Static57.aClass3_Sub15_Sub1_3.method2229() * 4; - local228 = Static57.aClass3_Sub15_Sub1_3.method2163(); - local232 = Static57.aClass3_Sub15_Sub1_3.method2163(); - local236 = Static57.aClass3_Sub15_Sub1_3.method2229(); - local247 = Static57.aClass3_Sub15_Sub1_3.method2229(); + local27 = local23 + Static57.aClass3_Sub15_Sub1_3.g1s(); + local31 = Static57.aClass3_Sub15_Sub1_3.g1s() + local19; + local39 = Static57.aClass3_Sub15_Sub1_3.g2s(); + local45 = Static57.aClass3_Sub15_Sub1_3.g2(); + local218 = Static57.aClass3_Sub15_Sub1_3.g1() * 4; + local224 = Static57.aClass3_Sub15_Sub1_3.g1() * 4; + local228 = Static57.aClass3_Sub15_Sub1_3.g2(); + local232 = Static57.aClass3_Sub15_Sub1_3.g2(); + local236 = Static57.aClass3_Sub15_Sub1_3.g1(); + local247 = Static57.aClass3_Sub15_Sub1_3.g1(); if (local236 == 255) { local236 = -1; } @@ -372,20 +372,20 @@ public final class Static75 { Static217.aClass69_116.method2282(new ProjAnimNode(local317)); } } else if (Static164.anInt3985 == 104) { - local15 = Static57.aClass3_Sub15_Sub1_3.method2229(); + local15 = Static57.aClass3_Sub15_Sub1_3.g1(); local19 = Static180.anInt4264 * 2 + (local15 & 0xF); local23 = Static115.anInt2940 * 2 + (local15 >> 4 & 0xF); - local27 = Static57.aClass3_Sub15_Sub1_3.method2186() + local23; - local31 = Static57.aClass3_Sub15_Sub1_3.method2186() + local19; - local39 = Static57.aClass3_Sub15_Sub1_3.method2213(); - local45 = Static57.aClass3_Sub15_Sub1_3.method2213(); - local218 = Static57.aClass3_Sub15_Sub1_3.method2163(); - local224 = Static57.aClass3_Sub15_Sub1_3.method2186(); - local228 = Static57.aClass3_Sub15_Sub1_3.method2229() * 4; - local232 = Static57.aClass3_Sub15_Sub1_3.method2163(); - local236 = Static57.aClass3_Sub15_Sub1_3.method2163(); - local247 = Static57.aClass3_Sub15_Sub1_3.method2229(); - local633 = Static57.aClass3_Sub15_Sub1_3.method2229(); + local27 = Static57.aClass3_Sub15_Sub1_3.g1s() + local23; + local31 = Static57.aClass3_Sub15_Sub1_3.g1s() + local19; + local39 = Static57.aClass3_Sub15_Sub1_3.g2s(); + local45 = Static57.aClass3_Sub15_Sub1_3.g2s(); + local218 = Static57.aClass3_Sub15_Sub1_3.g2(); + local224 = Static57.aClass3_Sub15_Sub1_3.g1s(); + local228 = Static57.aClass3_Sub15_Sub1_3.g1() * 4; + local232 = Static57.aClass3_Sub15_Sub1_3.g2(); + local236 = Static57.aClass3_Sub15_Sub1_3.g2(); + local247 = Static57.aClass3_Sub15_Sub1_3.g1(); + local633 = Static57.aClass3_Sub15_Sub1_3.g1(); if (local247 == 255) { local247 = -1; } @@ -434,16 +434,16 @@ public final class Static75 { Static217.aClass69_116.method2282(new ProjAnimNode(local1331)); } } else if (Static164.anInt3985 == 97) { - local15 = Static57.aClass3_Sub15_Sub1_3.method2229(); + local15 = Static57.aClass3_Sub15_Sub1_3.g1(); local23 = Static115.anInt2940 + (local15 >> 4 & 0x7); local19 = Static180.anInt4264 + (local15 & 0x7); - local27 = Static57.aClass3_Sub15_Sub1_3.method2163(); + local27 = Static57.aClass3_Sub15_Sub1_3.g2(); if (local27 == 65535) { local27 = -1; } - local31 = Static57.aClass3_Sub15_Sub1_3.method2229(); + local31 = Static57.aClass3_Sub15_Sub1_3.g1(); local39 = local31 >> 4 & 0xF; - local218 = Static57.aClass3_Sub15_Sub1_3.method2229(); + local218 = Static57.aClass3_Sub15_Sub1_3.g1(); local45 = local31 & 0x7; if (local23 >= 0 && local19 >= 0 && local23 < 104 && local19 < 104) { local224 = local39 + 1; @@ -457,10 +457,10 @@ public final class Static75 { } } } else if (Static164.anInt3985 == 240) { - local15 = Static57.aClass3_Sub15_Sub1_3.method2180(); + local15 = Static57.aClass3_Sub15_Sub1_3.g1ssub(); local19 = Static180.anInt4264 + (local15 & 0x7); local23 = (local15 >> 4 & 0x7) + Static115.anInt2940; - local27 = Static57.aClass3_Sub15_Sub1_3.method2163(); + local27 = Static57.aClass3_Sub15_Sub1_3.g2(); if (local23 >= 0 && local19 >= 0 && local23 < 104 && local19 < 104) { @Pc(1565) LinkedList local1565 = Static159.aClass69ArrayArrayArray1[Static55.anInt1735][local23][local19]; if (local1565 != null) { diff --git a/client/src/main/java/Static78.java b/client/src/main/java/Static78.java index 56e955e..da2b20e 100644 --- a/client/src/main/java/Static78.java +++ b/client/src/main/java/Static78.java @@ -35,9 +35,9 @@ public final class Static78 { @OriginalMember(owner = "client!gd", name = "a", descriptor = "(JI)V") public static void method1691(@OriginalArg(0) long arg0) { - Static6.aClass3_Sub15_Sub1_1.anInt2792 = 0; - Static6.aClass3_Sub15_Sub1_1.method2178(186); - Static6.aClass3_Sub15_Sub1_1.method2166(arg0); + Static6.aClass3_Sub15_Sub1_1.offset = 0; + Static6.aClass3_Sub15_Sub1_1.p1(186); + Static6.aClass3_Sub15_Sub1_1.p8(arg0); Static179.anInt4261 = 1; Static226.anInt5079 = 0; Static57.anInt1758 = 0; @@ -276,7 +276,7 @@ public final class Static78 { Static231.aBoolean252 = false; if (Static39.aFrame1 != null && Static124.aClass95_2 != null && Static244.anInt5370 == 25) { Static6.aClass3_Sub15_Sub1_1.method2242(20); - Static6.aClass3_Sub15_Sub1_1.method2164(1057001181); + Static6.aClass3_Sub15_Sub1_1.p4(1057001181); } if (!Static230.aBoolean250) { @Pc(815) int local815 = (Static52.anInt1695 + 6) / 8; diff --git a/client/src/main/java/Static81.java b/client/src/main/java/Static81.java index 9a660ff..d51bffe 100644 --- a/client/src/main/java/Static81.java +++ b/client/src/main/java/Static81.java @@ -133,9 +133,9 @@ public final class Static81 { } else if (Static150.anInt3585 != 0 || Static178.aClass74_1.anInt2990 >= 40) { Static6.aClass3_Sub15_Sub1_1.method2242(123); local79 = 0; - Static6.aClass3_Sub15_Sub1_1.method2178(0); - local86 = Static6.aClass3_Sub15_Sub1_1.anInt2792; - for (local88 = 0; Static178.aClass74_1.anInt2990 > local88 && Static6.aClass3_Sub15_Sub1_1.anInt2792 - local86 < 240; local88++) { + Static6.aClass3_Sub15_Sub1_1.p1(0); + local86 = Static6.aClass3_Sub15_Sub1_1.offset; + for (local88 = 0; Static178.aClass74_1.anInt2990 > local88 && Static6.aClass3_Sub15_Sub1_1.offset - local86 < 240; local88++) { local79++; local106 = Static178.aClass74_1.anIntArray279[local88]; local111 = Static178.aClass74_1.anIntArray280[local88]; @@ -163,28 +163,28 @@ public final class Static81 { if (Static204.anInt4762 < 8 && local182 >= -32 && local182 <= 31 && local189 >= -32 && local189 <= 31) { local189 += 32; local182 += 32; - Static6.aClass3_Sub15_Sub1_1.method2230(local189 + (Static204.anInt4762 << 12) + (local182 << 6)); + Static6.aClass3_Sub15_Sub1_1.p2(local189 + (Static204.anInt4762 << 12) + (local182 << 6)); Static204.anInt4762 = 0; } else if (Static204.anInt4762 < 32 && local182 >= -128 && local182 <= 127 && local189 >= -128 && local189 <= 127) { - Static6.aClass3_Sub15_Sub1_1.method2178(Static204.anInt4762 + 128); + Static6.aClass3_Sub15_Sub1_1.p1(Static204.anInt4762 + 128); local189 += 128; local182 += 128; - Static6.aClass3_Sub15_Sub1_1.method2230((local182 << 8) + local189); + Static6.aClass3_Sub15_Sub1_1.p2((local182 << 8) + local189); Static204.anInt4762 = 0; } else if (Static204.anInt4762 < 32) { - Static6.aClass3_Sub15_Sub1_1.method2178(Static204.anInt4762 + 192); + Static6.aClass3_Sub15_Sub1_1.p1(Static204.anInt4762 + 192); if (local142) { - Static6.aClass3_Sub15_Sub1_1.method2164(Integer.MIN_VALUE); + Static6.aClass3_Sub15_Sub1_1.p4(Integer.MIN_VALUE); } else { - Static6.aClass3_Sub15_Sub1_1.method2164(local111 | local106 << 16); + Static6.aClass3_Sub15_Sub1_1.p4(local111 | local106 << 16); } Static204.anInt4762 = 0; } else { - Static6.aClass3_Sub15_Sub1_1.method2230(Static204.anInt4762 + 57344); + Static6.aClass3_Sub15_Sub1_1.p2(Static204.anInt4762 + 57344); if (local142) { - Static6.aClass3_Sub15_Sub1_1.method2164(Integer.MIN_VALUE); + Static6.aClass3_Sub15_Sub1_1.p4(Integer.MIN_VALUE); } else { - Static6.aClass3_Sub15_Sub1_1.method2164(local111 | local106 << 16); + Static6.aClass3_Sub15_Sub1_1.p4(local111 | local106 << 16); } Static204.anInt4762 = 0; } @@ -192,7 +192,7 @@ public final class Static81 { Static204.anInt4762++; } } - Static6.aClass3_Sub15_Sub1_1.method2195(Static6.aClass3_Sub15_Sub1_1.anInt2792 - local86); + Static6.aClass3_Sub15_Sub1_1.p1len(Static6.aClass3_Sub15_Sub1_1.offset - local86); if (Static178.aClass74_1.anInt2990 > local79) { Static178.aClass74_1.anInt2990 -= local79; for (local88 = 0; local88 < Static178.aClass74_1.anInt2990; local88++) { @@ -228,8 +228,8 @@ public final class Static81 { local437 = 1; } Static6.aClass3_Sub15_Sub1_1.method2242(75); - Static6.aClass3_Sub15_Sub1_1.method2191(local437 << 15 | local111); - Static6.aClass3_Sub15_Sub1_1.method2185(local88 | local79 << 16); + Static6.aClass3_Sub15_Sub1_1.p2leadd(local437 << 15 | local111); + Static6.aClass3_Sub15_Sub1_1.p4me(local88 | local79 << 16); } if (Static16.anInt551 > 0) { Static16.anInt551--; @@ -249,22 +249,22 @@ public final class Static81 { Static16.anInt551 = 20; Static197.aBoolean228 = false; Static6.aClass3_Sub15_Sub1_1.method2242(21); - Static6.aClass3_Sub15_Sub1_1.method2209(Static72.anInt2031); - Static6.aClass3_Sub15_Sub1_1.method2222(Static57.anInt1747); + Static6.aClass3_Sub15_Sub1_1.p2add(Static72.anInt2031); + Static6.aClass3_Sub15_Sub1_1.p2le(Static57.anInt1747); } if (Static26.aBoolean59 && !Static67.aBoolean168) { Static67.aBoolean168 = true; Static6.aClass3_Sub15_Sub1_1.method2242(22); - Static6.aClass3_Sub15_Sub1_1.method2178(1); + Static6.aClass3_Sub15_Sub1_1.p1(1); } if (!Static26.aBoolean59 && Static67.aBoolean168) { Static67.aBoolean168 = false; Static6.aClass3_Sub15_Sub1_1.method2242(22); - Static6.aClass3_Sub15_Sub1_1.method2178(0); + Static6.aClass3_Sub15_Sub1_1.p1(0); } if (!Static18.aBoolean39) { Static6.aClass3_Sub15_Sub1_1.method2242(98); - Static6.aClass3_Sub15_Sub1_1.method2164(Static145.method2746()); + Static6.aClass3_Sub15_Sub1_1.p4(Static145.method2746()); Static18.aBoolean39 = true; } Static31.method846(); @@ -458,10 +458,10 @@ public final class Static81 { local1361.method487(Static18.anInt588, Static4.anInt36); } Static6.aClass3_Sub15_Sub1_1.method2242(231); - Static6.aClass3_Sub15_Sub1_1.method2230(Static4.anInt36); - Static6.aClass3_Sub15_Sub1_1.method2211(Static118.aClass13_15.anInt507); - Static6.aClass3_Sub15_Sub1_1.method2209(Static18.anInt588); - Static6.aClass3_Sub15_Sub1_1.method2169(local1363); + Static6.aClass3_Sub15_Sub1_1.p2(Static4.anInt36); + Static6.aClass3_Sub15_Sub1_1.p4le2(Static118.aClass13_15.anInt507); + Static6.aClass3_Sub15_Sub1_1.p2add(Static18.anInt588); + Static6.aClass3_Sub15_Sub1_1.p1sub(local1363); } } else if ((Static116.anInt2952 == 1 || Static277.method4640(Static231.anInt5204 - 1)) && Static231.anInt5204 > 2) { Static226.method3901(); @@ -530,10 +530,10 @@ public final class Static81 { } else if (Static125.anInt3096 == 2) { if (Static56.anInt1742 != -1) { Static6.aClass3_Sub15_Sub1_1.method2242(131); - Static6.aClass3_Sub15_Sub1_1.method2185(Static98.anInt2512); - Static6.aClass3_Sub15_Sub1_1.method2209(Static225.anInt5068 + Static56.anInt1742); - Static6.aClass3_Sub15_Sub1_1.method2191(Static15.anInt506); - Static6.aClass3_Sub15_Sub1_1.method2209(Static116.anInt2954 + Static142.anInt3483); + Static6.aClass3_Sub15_Sub1_1.p4me(Static98.anInt2512); + Static6.aClass3_Sub15_Sub1_1.p2add(Static225.anInt5068 + Static56.anInt1742); + Static6.aClass3_Sub15_Sub1_1.p2leadd(Static15.anInt506); + Static6.aClass3_Sub15_Sub1_1.p2add(Static116.anInt2954 + Static142.anInt3483); Static70.anInt2013 = 1; Static17.anInt577 = 0; Static25.anInt826 = Static60.anInt1893; @@ -543,8 +543,8 @@ public final class Static81 { } else if (Static187.anInt4422 == 2) { if (Static56.anInt1742 != -1) { Static6.aClass3_Sub15_Sub1_1.method2242(179); - Static6.aClass3_Sub15_Sub1_1.method2230(Static142.anInt3483 + Static116.anInt2954); - Static6.aClass3_Sub15_Sub1_1.method2230(Static56.anInt1742 + Static225.anInt5068); + Static6.aClass3_Sub15_Sub1_1.p2(Static142.anInt3483 + Static116.anInt2954); + Static6.aClass3_Sub15_Sub1_1.p2(Static56.anInt1742 + Static225.anInt5068); Static17.anInt577 = 0; Static70.anInt2013 = 1; Static122.anInt3047 = Static7.anInt985; @@ -677,10 +677,10 @@ public final class Static81 { Static34.aBoolean65 = false; } try { - if (Static124.aClass95_2 != null && Static6.aClass3_Sub15_Sub1_1.anInt2792 > 0) { - Static124.aClass95_2.method2830(Static6.aClass3_Sub15_Sub1_1.aByteArray40, Static6.aClass3_Sub15_Sub1_1.anInt2792); + if (Static124.aClass95_2 != null && Static6.aClass3_Sub15_Sub1_1.offset > 0) { + Static124.aClass95_2.method2830(Static6.aClass3_Sub15_Sub1_1.data, Static6.aClass3_Sub15_Sub1_1.offset); Static131.anInt3251 = 0; - Static6.aClass3_Sub15_Sub1_1.anInt2792 = 0; + Static6.aClass3_Sub15_Sub1_1.offset = 0; } } catch (@Pc(2266) IOException local2266) { Static175.method3279(); diff --git a/client/src/main/java/Static84.java b/client/src/main/java/Static84.java index bb3fe25..b90ceea 100644 --- a/client/src/main/java/Static84.java +++ b/client/src/main/java/Static84.java @@ -37,10 +37,10 @@ public final class Static84 { @Pc(17) int local17; @Pc(24) int local24; if ((arg0 & 0x80) != 0) { - local13 = Static57.aClass3_Sub15_Sub1_3.method2192(); - local17 = Static57.aClass3_Sub15_Sub1_3.method2229(); - @Pc(21) int local21 = Static57.aClass3_Sub15_Sub1_3.method2229(); - local24 = Static57.aClass3_Sub15_Sub1_3.anInt2792; + local13 = Static57.aClass3_Sub15_Sub1_3.g2le(); + local17 = Static57.aClass3_Sub15_Sub1_3.g1(); + @Pc(21) int local21 = Static57.aClass3_Sub15_Sub1_3.g1(); + local24 = Static57.aClass3_Sub15_Sub1_3.offset; @Pc(35) boolean local35 = (local13 & 0x8000) != 0; if (arg2.aClass100_364 != null && arg2.aClass59_1 != null) { @Pc(48) long local48 = arg2.aClass100_364.method3158(); @@ -58,9 +58,9 @@ public final class Static84 { } } if (!local50 && Static11.anInt384 == 0) { - Static270.aClass3_Sub15_9.anInt2792 = 0; - Static57.aClass3_Sub15_Sub1_3.method2200(local21, Static270.aClass3_Sub15_9.aByteArray40); - Static270.aClass3_Sub15_9.anInt2792 = 0; + Static270.aClass3_Sub15_9.offset = 0; + Static57.aClass3_Sub15_Sub1_3.gBytesRev(local21, Static270.aClass3_Sub15_9.data); + Static270.aClass3_Sub15_9.offset = 0; @Pc(106) int local106 = -1; @Pc(127) JagString local127; if (local35) { @@ -84,50 +84,50 @@ public final class Static84 { } } } - Static57.aClass3_Sub15_Sub1_3.anInt2792 = local24 + local21; + Static57.aClass3_Sub15_Sub1_3.offset = local24 + local21; } if ((arg0 & 0x1) != 0) { - local13 = Static57.aClass3_Sub15_Sub1_3.method2204(); - local17 = Static57.aClass3_Sub15_Sub1_3.method2177(); + 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.anInt3372 = Static57.aClass3_Sub15_Sub1_3.method2180(); + arg2.anInt3372 = Static57.aClass3_Sub15_Sub1_3.g1ssub(); } if ((arg0 & 0x8) != 0) { - local13 = Static57.aClass3_Sub15_Sub1_3.method2163(); + local13 = Static57.aClass3_Sub15_Sub1_3.g2(); if (local13 == 65535) { local13 = -1; } - local17 = Static57.aClass3_Sub15_Sub1_3.method2229(); + local17 = Static57.aClass3_Sub15_Sub1_3.g1(); Static186.method3415(local17, local13, arg2); } if ((arg0 & 0x4) != 0) { - local13 = Static57.aClass3_Sub15_Sub1_3.method2177(); + local13 = Static57.aClass3_Sub15_Sub1_3.g1add(); @Pc(309) byte[] local309 = new byte[local13]; @Pc(314) Buffer local314 = new Buffer(local309); - Static57.aClass3_Sub15_Sub1_3.method2190(local13, local309); + Static57.aClass3_Sub15_Sub1_3.gBytes(local13, local309); Static115.aClass3_Sub15Array1[arg1] = local314; arg2.method1262(local314); } if ((arg0 & 0x2) != 0) { - arg2.anInt3370 = Static57.aClass3_Sub15_Sub1_3.method2184(); + arg2.anInt3370 = Static57.aClass3_Sub15_Sub1_3.g2sub(); if (arg2.anInt3370 == 65535) { arg2.anInt3370 = -1; } } if ((arg0 & 0x400) != 0) { - arg2.anInt3380 = Static57.aClass3_Sub15_Sub1_3.method2212(); - arg2.anInt3428 = Static57.aClass3_Sub15_Sub1_3.method2229(); - arg2.anInt3416 = Static57.aClass3_Sub15_Sub1_3.method2177(); - arg2.anInt3392 = Static57.aClass3_Sub15_Sub1_3.method2229(); - arg2.anInt3395 = Static57.aClass3_Sub15_Sub1_3.method2192() + Static83.anInt372; - arg2.anInt3386 = Static57.aClass3_Sub15_Sub1_3.method2192() + Static83.anInt372; - arg2.anInt3431 = Static57.aClass3_Sub15_Sub1_3.method2212(); + arg2.anInt3380 = Static57.aClass3_Sub15_Sub1_3.p1neg(); + 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.anInt3431 = Static57.aClass3_Sub15_Sub1_3.p1neg(); arg2.anInt3409 = 1; arg2.anInt3405 = 0; } if ((arg0 & 0x20) != 0) { - arg2.aClass100_640 = Static57.aClass3_Sub15_Sub1_3.method2202(); + arg2.aClass100_640 = Static57.aClass3_Sub15_Sub1_3.gjstr(); if (arg2.aClass100_640.method3149(0) == 126) { arg2.aClass100_640 = arg2.aClass100_640.method3136(1); Static103.method2231(arg2.method1264(), 2, arg2.aClass100_640); @@ -139,32 +139,32 @@ public final class Static84 { arg2.anInt3408 = 150; } if ((arg0 & 0x200) != 0) { - local13 = Static57.aClass3_Sub15_Sub1_3.method2204(); - local17 = Static57.aClass3_Sub15_Sub1_3.method2180(); + local13 = Static57.aClass3_Sub15_Sub1_3.gSmart1or2(); + local17 = Static57.aClass3_Sub15_Sub1_3.g1ssub(); arg2.method2686(local17, Static83.anInt372, local13); } if ((arg0 & 0x800) != 0) { - local13 = Static57.aClass3_Sub15_Sub1_3.method2212(); + local13 = Static57.aClass3_Sub15_Sub1_3.p1neg(); @Pc(502) int[] local502 = new int[local13]; @Pc(505) int[] local505 = new int[local13]; @Pc(508) int[] local508 = new int[local13]; for (@Pc(510) int local510 = 0; local510 < local13; local510++) { - @Pc(521) int local521 = Static57.aClass3_Sub15_Sub1_3.method2192(); + @Pc(521) int local521 = Static57.aClass3_Sub15_Sub1_3.g2le(); if (local521 == 65535) { local521 = -1; } local502[local510] = local521; - local505[local510] = Static57.aClass3_Sub15_Sub1_3.method2177(); - local508[local510] = Static57.aClass3_Sub15_Sub1_3.method2163(); + local505[local510] = Static57.aClass3_Sub15_Sub1_3.g1add(); + local508[local510] = Static57.aClass3_Sub15_Sub1_3.g2(); } Static32.method865(local505, local502, arg2, local508); } if ((arg0 & 0x100) != 0) { - local13 = Static57.aClass3_Sub15_Sub1_3.method2192(); + local13 = Static57.aClass3_Sub15_Sub1_3.g2le(); if (local13 == 65535) { local13 = -1; } - local17 = Static57.aClass3_Sub15_Sub1_3.method2224(); + local17 = Static57.aClass3_Sub15_Sub1_3.p4rme(); @Pc(573) boolean local573 = true; if (local13 != -1 && arg2.anInt3432 != -1 && Static36.method941(Static34.method877(local13).anInt1754).anInt5355 < Static36.method941(Static34.method877(arg2.anInt3432).anInt1754).anInt5355) { local573 = false; @@ -191,16 +191,16 @@ public final class Static84 { } } if ((arg0 & 0x40) != 0) { - arg2.anInt3382 = Static57.aClass3_Sub15_Sub1_3.method2163(); - arg2.anInt3363 = Static57.aClass3_Sub15_Sub1_3.method2207(); + arg2.anInt3382 = Static57.aClass3_Sub15_Sub1_3.g2(); + arg2.anInt3363 = Static57.aClass3_Sub15_Sub1_3.g2leadd(); } } @OriginalMember(owner = "client!gk", name = "a", descriptor = "([BI)V") public static void method1770(@OriginalArg(0) byte[] arg0) { @Pc(4) Buffer local4 = new Buffer(arg0); - local4.anInt2792 = arg0.length - 2; - Static165.anInt4038 = local4.method2163(); + local4.offset = arg0.length - 2; + Static165.anInt4038 = local4.g2(); Static26.anIntArray66 = new int[Static165.anInt4038]; Static254.anIntArray488 = new int[Static165.anInt4038]; Static274.anIntArray440 = new int[Static165.anInt4038]; @@ -208,32 +208,32 @@ public final class Static84 { Static64.aByteArrayArray9 = new byte[Static165.anInt4038][]; Static269.anIntArray252 = new int[Static165.anInt4038]; Static7.aByteArrayArray5 = new byte[Static165.anInt4038][]; - local4.anInt2792 = arg0.length - Static165.anInt4038 * 8 - 7; - Static124.anInt3080 = local4.method2163(); - Static227.anInt5091 = local4.method2163(); - @Pc(66) int local66 = (local4.method2229() & 0xFF) + 1; + local4.offset = arg0.length - Static165.anInt4038 * 8 - 7; + Static124.anInt3080 = local4.g2(); + Static227.anInt5091 = local4.g2(); + @Pc(66) int local66 = (local4.g1() & 0xFF) + 1; @Pc(68) int local68; for (local68 = 0; local68 < Static165.anInt4038; local68++) { - Static274.anIntArray440[local68] = local4.method2163(); + Static274.anIntArray440[local68] = local4.g2(); } for (local68 = 0; local68 < Static165.anInt4038; local68++) { - Static269.anIntArray252[local68] = local4.method2163(); + Static269.anIntArray252[local68] = local4.g2(); } for (local68 = 0; local68 < Static165.anInt4038; local68++) { - Static254.anIntArray488[local68] = local4.method2163(); + Static254.anIntArray488[local68] = local4.g2(); } for (local68 = 0; local68 < Static165.anInt4038; local68++) { - Static26.anIntArray66[local68] = local4.method2163(); + Static26.anIntArray66[local68] = local4.g2(); } - local4.anInt2792 = arg0.length + 3 - Static165.anInt4038 * 8 - local66 * 3 - 7; + local4.offset = arg0.length + 3 - Static165.anInt4038 * 8 - local66 * 3 - 7; Static259.anIntArray513 = new int[local66]; for (local68 = 1; local68 < local66; local68++) { - Static259.anIntArray513[local68] = local4.method2220(); + Static259.anIntArray513[local68] = local4.g3(); if (Static259.anIntArray513[local68] == 0) { Static259.anIntArray513[local68] = 1; } } - local4.anInt2792 = 0; + local4.offset = 0; for (local68 = 0; local68 < Static165.anInt4038; local68++) { @Pc(195) int local195 = Static254.anIntArray488[local68]; @Pc(199) int local199 = Static26.anIntArray66[local68]; @@ -243,15 +243,15 @@ public final class Static84 { Static7.aByteArrayArray5[local68] = local206; @Pc(215) byte[] local215 = new byte[local203]; Static64.aByteArrayArray9[local68] = local215; - @Pc(223) int local223 = local4.method2229(); + @Pc(223) int local223 = local4.g1(); @Pc(232) int local232; if ((local223 & 0x1) == 0) { for (local232 = 0; local232 < local203; local232++) { - local206[local232] = local4.method2186(); + local206[local232] = local4.g1s(); } if ((local223 & 0x2) != 0) { for (local232 = 0; local232 < local203; local232++) { - @Pc(343) byte local343 = local215[local232] = local4.method2186(); + @Pc(343) byte local343 = local215[local232] = local4.g1s(); local208 |= local343 != -1; } } @@ -269,14 +269,14 @@ public final class Static84 { break label88; } for (local241 = 0; local241 < local199; local241++) { - @Pc(291) byte local291 = local215[local195 * local241 + local232] = local4.method2186(); + @Pc(291) byte local291 = local215[local195 * local241 + local232] = local4.g1s(); local208 |= local291 != -1; } local232++; } } for (local241 = 0; local241 < local199; local241++) { - local206[local232 + local241 * local195] = local4.method2186(); + local206[local232 + local241 * local195] = local4.g1s(); } local232++; } diff --git a/client/src/main/java/Static86.java b/client/src/main/java/Static86.java index 5233de5..7022e15 100644 --- a/client/src/main/java/Static86.java +++ b/client/src/main/java/Static86.java @@ -63,8 +63,8 @@ public final class Static86 { Static175.aClass8_Sub4_Sub2Array1[local30] = null; } } - if (Static223.anInt5028 != Static57.aClass3_Sub15_Sub1_3.anInt2792) { - throw new RuntimeException("gnp1 pos:" + Static57.aClass3_Sub15_Sub1_3.anInt2792 + " psize:" + Static223.anInt5028); + if (Static223.anInt5028 != Static57.aClass3_Sub15_Sub1_3.offset) { + throw new RuntimeException("gnp1 pos:" + Static57.aClass3_Sub15_Sub1_3.offset + " psize:" + Static223.anInt5028); } for (local19 = 0; local19 < Static272.anInt5214; local19++) { if (Static175.aClass8_Sub4_Sub2Array1[Static33.anIntArray79[local19]] == null) { diff --git a/client/src/main/java/Static87.java b/client/src/main/java/Static87.java index b425721..29beda9 100644 --- a/client/src/main/java/Static87.java +++ b/client/src/main/java/Static87.java @@ -540,7 +540,7 @@ public final class Static87 { if (Static180.aClass13_22 == local30 && local30.anInt475 != 0) { local276 = local30.anInt475; } - if (local30.aClass100_82.method3120() > 0) { + if (local30.aClass100_82.length() > 0) { local1934 = local30.aClass100_82; } } else { @@ -808,7 +808,7 @@ public final class Static87 { @Pc(3299) Font local3299 = Static215.aClass3_Sub2_Sub9_32; local3297 = Static127.method2465(local30, local3297); @Pc(3325) JagString local3325; - while (local3297.method3120() > 0) { + while (local3297.length() > 0) { local518 = local3297.method3131(Static269.aClass100_556); if (local518 == -1) { local3325 = local3297; @@ -846,7 +846,7 @@ public final class Static87 { local3297 = local30.aClass100_84; local545 = local556 + local3299.anInt3626 + 2; local3297 = Static127.method2465(local30, local3297); - while (local3297.method3120() > 0) { + while (local3297.length() > 0) { local563 = local3297.method3131(Static269.aClass100_556); if (local563 == -1) { local3325 = local3297; diff --git a/client/src/main/java/Static88.java b/client/src/main/java/Static88.java index 082ca9c..21263ce 100644 --- a/client/src/main/java/Static88.java +++ b/client/src/main/java/Static88.java @@ -1,4 +1,3 @@ -import java.awt.Component; import java.io.UnsupportedEncodingException; import java.util.Date; import org.openrs2.deob.annotation.OriginalArg; @@ -851,7 +850,7 @@ public final class Static88 { @Pc(12937) int[] local12937 = null; local26--; local2522 = Static3.aClass100Array176[local26]; - if (local2522.method3120() > 0 && local2522.method3149(local2522.method3120() - 1) == 89) { + if (local2522.length() > 0 && local2522.method3149(local2522.length() - 1) == 89) { local28--; local652 = Static254.anIntArray487[local28]; if (local652 > 0) { @@ -861,9 +860,9 @@ public final class Static88 { local12937[local652] = Static254.anIntArray487[local28]; } } - local2522 = local2522.method3137(local2522.method3120() - 1, 0); + local2522 = local2522.method3137(local2522.length() - 1, 0); } - @Pc(13000) Object[] local13000 = new Object[local2522.method3120() + 1]; + @Pc(13000) Object[] local13000 = new Object[local2522.length() + 1]; for (local4859 = local13000.length - 1; local4859 >= 1; local4859--) { if (local2522.method3149(local4859 - 1) == 115) { local26--; @@ -1259,22 +1258,22 @@ public final class Static88 { local803 = local609.method3132(); } Static6.aClass3_Sub15_Sub1_1.method2242(23); - Static6.aClass3_Sub15_Sub1_1.method2164(local803); + Static6.aClass3_Sub15_Sub1_1.p4(local803); continue; } if (local226 == 3105) { local26--; local609 = Static3.aClass100Array176[local26]; Static6.aClass3_Sub15_Sub1_1.method2242(244); - Static6.aClass3_Sub15_Sub1_1.method2166(local609.method3158()); + Static6.aClass3_Sub15_Sub1_1.p8(local609.method3158()); continue; } if (local226 == 3106) { local26--; local609 = Static3.aClass100Array176[local26]; Static6.aClass3_Sub15_Sub1_1.method2242(65); - Static6.aClass3_Sub15_Sub1_1.method2178(local609.method3120() + 1); - Static6.aClass3_Sub15_Sub1_1.method2171(local609); + Static6.aClass3_Sub15_Sub1_1.p1(local609.length() + 1); + Static6.aClass3_Sub15_Sub1_1.pjstr(local609); continue; } if (local226 == 3107) { @@ -1306,7 +1305,7 @@ public final class Static88 { local28--; local809 = Static254.anIntArray487[local28]; Static6.aClass3_Sub15_Sub1_1.method2242(111); - Static6.aClass3_Sub15_Sub1_1.method2230(local809); + Static6.aClass3_Sub15_Sub1_1.p2(local809); continue; } } else if (local226 < 3300) { @@ -2182,9 +2181,9 @@ public final class Static88 { Static49.anInt1459 = Static254.anIntArray487[local28 + 1]; Static84.anInt2256 = Static254.anIntArray487[local28 + 2]; Static6.aClass3_Sub15_Sub1_1.method2242(157); - Static6.aClass3_Sub15_Sub1_1.method2178(Static59.anInt1812); - Static6.aClass3_Sub15_Sub1_1.method2178(Static49.anInt1459); - Static6.aClass3_Sub15_Sub1_1.method2178(Static84.anInt2256); + Static6.aClass3_Sub15_Sub1_1.p1(Static59.anInt1812); + Static6.aClass3_Sub15_Sub1_1.p1(Static49.anInt1459); + Static6.aClass3_Sub15_Sub1_1.p1(Static84.anInt2256); continue; } if (local226 == 5002) { @@ -2194,9 +2193,9 @@ public final class Static88 { local803 = Static254.anIntArray487[local28]; local1052 = Static254.anIntArray487[local28 + 1]; Static6.aClass3_Sub15_Sub1_1.method2242(99); - Static6.aClass3_Sub15_Sub1_1.method2166(local609.method3158()); - Static6.aClass3_Sub15_Sub1_1.method2178(local803 - 1); - Static6.aClass3_Sub15_Sub1_1.method2178(local1052); + Static6.aClass3_Sub15_Sub1_1.p8(local609.method3158()); + Static6.aClass3_Sub15_Sub1_1.p1(local803 - 1); + Static6.aClass3_Sub15_Sub1_1.p1(local1052); continue; } if (local226 == 5003) { @@ -2237,121 +2236,121 @@ public final class Static88 { @Pc(5555) byte local5555 = 0; if (local2522.method3138(Static21.aClass100_126)) { local5555 = 0; - local609 = local609.method3136(Static21.aClass100_126.method3120()); + local609 = local609.method3136(Static21.aClass100_126.length()); } else if (local2522.method3138(Static141.aClass100_666)) { - local609 = local609.method3136(Static141.aClass100_666.method3120()); + local609 = local609.method3136(Static141.aClass100_666.length()); local5555 = 1; } else if (local2522.method3138(aClass100_496)) { - local609 = local609.method3136(aClass100_496.method3120()); + local609 = local609.method3136(aClass100_496.length()); local5555 = 2; } else if (local2522.method3138(Static36.aClass100_234)) { local5555 = 3; - local609 = local609.method3136(Static36.aClass100_234.method3120()); + local609 = local609.method3136(Static36.aClass100_234.length()); } else if (local2522.method3138(Static92.aClass100_512)) { - local609 = local609.method3136(Static92.aClass100_512.method3120()); + local609 = local609.method3136(Static92.aClass100_512.length()); local5555 = 4; } else if (local2522.method3138(Static16.aClass100_95)) { - local609 = local609.method3136(Static16.aClass100_95.method3120()); + local609 = local609.method3136(Static16.aClass100_95.length()); local5555 = 5; } else if (local2522.method3138(Static157.aClass100_750)) { local5555 = 6; - local609 = local609.method3136(Static157.aClass100_750.method3120()); + local609 = local609.method3136(Static157.aClass100_750.length()); } else if (local2522.method3138(Static245.aClass100_1019)) { local5555 = 7; - local609 = local609.method3136(Static245.aClass100_1019.method3120()); + local609 = local609.method3136(Static245.aClass100_1019.length()); } else if (local2522.method3138(Static138.aClass100_643)) { - local609 = local609.method3136(Static138.aClass100_643.method3120()); + local609 = local609.method3136(Static138.aClass100_643.length()); local5555 = 8; } else if (local2522.method3138(Static2.aClass100_3)) { local5555 = 9; - local609 = local609.method3136(Static2.aClass100_3.method3120()); + local609 = local609.method3136(Static2.aClass100_3.length()); } else if (local2522.method3138(Static262.aClass100_1078)) { local5555 = 10; - local609 = local609.method3136(Static262.aClass100_1078.method3120()); + local609 = local609.method3136(Static262.aClass100_1078.length()); } else if (local2522.method3138(Static7.aClass100_191)) { - local609 = local609.method3136(Static7.aClass100_191.method3120()); + local609 = local609.method3136(Static7.aClass100_191.length()); local5555 = 11; } else if (Static141.anInt3470 != 0) { if (local2522.method3138(Static21.aClass100_123)) { local5555 = 0; - local609 = local609.method3136(Static21.aClass100_123.method3120()); + local609 = local609.method3136(Static21.aClass100_123.length()); } else if (local2522.method3138(Static141.aClass100_663)) { - local609 = local609.method3136(Static141.aClass100_663.method3120()); + local609 = local609.method3136(Static141.aClass100_663.length()); local5555 = 1; } else if (local2522.method3138(aClass100_498)) { - local609 = local609.method3136(aClass100_498.method3120()); + local609 = local609.method3136(aClass100_498.length()); local5555 = 2; } else if (local2522.method3138(Static36.aClass100_233)) { - local609 = local609.method3136(Static36.aClass100_233.method3120()); + local609 = local609.method3136(Static36.aClass100_233.length()); local5555 = 3; } else if (local2522.method3138(Static92.aClass100_508)) { - local609 = local609.method3136(Static92.aClass100_508.method3120()); + local609 = local609.method3136(Static92.aClass100_508.length()); local5555 = 4; } else if (local2522.method3138(Static16.aClass100_94)) { local5555 = 5; - local609 = local609.method3136(Static16.aClass100_94.method3120()); + local609 = local609.method3136(Static16.aClass100_94.length()); } else if (local2522.method3138(Static157.aClass100_752)) { - local609 = local609.method3136(Static157.aClass100_752.method3120()); + local609 = local609.method3136(Static157.aClass100_752.length()); local5555 = 6; } else if (local2522.method3138(Static245.aClass100_1022)) { local5555 = 7; - local609 = local609.method3136(Static245.aClass100_1022.method3120()); + local609 = local609.method3136(Static245.aClass100_1022.length()); } else if (local2522.method3138(Static138.aClass100_648)) { local5555 = 8; - local609 = local609.method3136(Static138.aClass100_648.method3120()); + local609 = local609.method3136(Static138.aClass100_648.length()); } else if (local2522.method3138(Static2.aClass100_4)) { local5555 = 9; - local609 = local609.method3136(Static2.aClass100_4.method3120()); + local609 = local609.method3136(Static2.aClass100_4.length()); } else if (local2522.method3138(Static262.aClass100_1079)) { - local609 = local609.method3136(Static262.aClass100_1079.method3120()); + local609 = local609.method3136(Static262.aClass100_1079.length()); local5555 = 10; } else if (local2522.method3138(Static7.aClass100_190)) { - local609 = local609.method3136(Static7.aClass100_190.method3120()); + local609 = local609.method3136(Static7.aClass100_190.length()); local5555 = 11; } } @Pc(5943) byte local5943 = 0; local2522 = local609.method3114(); if (local2522.method3138(Static41.aClass100_270)) { - local609 = local609.method3136(Static41.aClass100_270.method3120()); + local609 = local609.method3136(Static41.aClass100_270.length()); local5943 = 1; } else if (local2522.method3138(Static191.aClass100_843)) { local5943 = 2; - local609 = local609.method3136(Static191.aClass100_843.method3120()); + local609 = local609.method3136(Static191.aClass100_843.length()); } else if (local2522.method3138(Static220.aClass100_932)) { - local609 = local609.method3136(Static220.aClass100_932.method3120()); + local609 = local609.method3136(Static220.aClass100_932.length()); local5943 = 3; } else if (local2522.method3138(Static56.aClass100_388)) { local5943 = 4; - local609 = local609.method3136(Static56.aClass100_388.method3120()); + local609 = local609.method3136(Static56.aClass100_388.length()); } else if (local2522.method3138(Static57.aClass100_389)) { local5943 = 5; - local609 = local609.method3136(Static57.aClass100_389.method3120()); + local609 = local609.method3136(Static57.aClass100_389.length()); } else if (Static141.anInt3470 != 0) { if (local2522.method3138(Static41.aClass100_272)) { - local609 = local609.method3136(Static41.aClass100_272.method3120()); + local609 = local609.method3136(Static41.aClass100_272.length()); local5943 = 1; } else if (local2522.method3138(Static191.aClass100_846)) { local5943 = 2; - local609 = local609.method3136(Static191.aClass100_846.method3120()); + local609 = local609.method3136(Static191.aClass100_846.length()); } else if (local2522.method3138(Static220.aClass100_931)) { local5943 = 3; - local609 = local609.method3136(Static220.aClass100_931.method3120()); + local609 = local609.method3136(Static220.aClass100_931.length()); } else if (local2522.method3138(Static56.aClass100_385)) { local5943 = 4; - local609 = local609.method3136(Static56.aClass100_385.method3120()); + local609 = local609.method3136(Static56.aClass100_385.length()); } else if (local2522.method3138(Static57.aClass100_391)) { - local609 = local609.method3136(Static57.aClass100_391.method3120()); + local609 = local609.method3136(Static57.aClass100_391.length()); local5943 = 5; } } Static6.aClass3_Sub15_Sub1_1.method2242(237); - Static6.aClass3_Sub15_Sub1_1.method2178(0); - local4859 = Static6.aClass3_Sub15_Sub1_1.anInt2792; - Static6.aClass3_Sub15_Sub1_1.method2178(local5555); - Static6.aClass3_Sub15_Sub1_1.method2178(local5943); + Static6.aClass3_Sub15_Sub1_1.p1(0); + local4859 = Static6.aClass3_Sub15_Sub1_1.offset; + Static6.aClass3_Sub15_Sub1_1.p1(local5555); + Static6.aClass3_Sub15_Sub1_1.p1(local5943); Static146.method2748(Static6.aClass3_Sub15_Sub1_1, local609); - Static6.aClass3_Sub15_Sub1_1.method2195(Static6.aClass3_Sub15_Sub1_1.anInt2792 - local4859); + Static6.aClass3_Sub15_Sub1_1.p1len(Static6.aClass3_Sub15_Sub1_1.offset - local4859); continue; } Static127.method2470(local609); @@ -2363,11 +2362,11 @@ public final class Static88 { local609 = Static3.aClass100Array176[local26]; if (Static191.anInt4502 != 0 || (!Static124.aBoolean157 || Static207.aBoolean236) && !Static86.aBoolean129) { Static6.aClass3_Sub15_Sub1_1.method2242(201); - Static6.aClass3_Sub15_Sub1_1.method2178(0); - local1052 = Static6.aClass3_Sub15_Sub1_1.anInt2792; - Static6.aClass3_Sub15_Sub1_1.method2166(local609.method3158()); + Static6.aClass3_Sub15_Sub1_1.p1(0); + local1052 = Static6.aClass3_Sub15_Sub1_1.offset; + Static6.aClass3_Sub15_Sub1_1.p8(local609.method3158()); Static146.method2748(Static6.aClass3_Sub15_Sub1_1, local2522); - Static6.aClass3_Sub15_Sub1_1.method2195(Static6.aClass3_Sub15_Sub1_1.anInt2792 - local1052); + Static6.aClass3_Sub15_Sub1_1.p1len(Static6.aClass3_Sub15_Sub1_1.offset - local1052); } continue; } @@ -2503,34 +2502,34 @@ public final class Static88 { } if (local226 == 5059) { Static6.aClass3_Sub15_Sub1_1.method2242(167); - Static6.aClass3_Sub15_Sub1_1.method2178(0); - local809 = Static6.aClass3_Sub15_Sub1_1.anInt2792; - Static6.aClass3_Sub15_Sub1_1.method2178(0); - Static6.aClass3_Sub15_Sub1_1.method2230(Static122.aClass12_1.anInt439); + Static6.aClass3_Sub15_Sub1_1.p1(0); + local809 = Static6.aClass3_Sub15_Sub1_1.offset; + Static6.aClass3_Sub15_Sub1_1.p1(0); + Static6.aClass3_Sub15_Sub1_1.p2(Static122.aClass12_1.anInt439); Static122.aClass12_1.aClass3_Sub2_Sub6_1.method760(Static6.aClass3_Sub15_Sub1_1, Static122.aClass12_1.anIntArray33); - Static6.aClass3_Sub15_Sub1_1.method2195(Static6.aClass3_Sub15_Sub1_1.anInt2792 - local809); + Static6.aClass3_Sub15_Sub1_1.p1len(Static6.aClass3_Sub15_Sub1_1.offset - local809); continue; } if (local226 == 5060) { local26--; local609 = Static3.aClass100Array176[local26]; Static6.aClass3_Sub15_Sub1_1.method2242(178); - Static6.aClass3_Sub15_Sub1_1.method2178(0); - local803 = Static6.aClass3_Sub15_Sub1_1.anInt2792; - Static6.aClass3_Sub15_Sub1_1.method2166(local609.method3158()); - Static6.aClass3_Sub15_Sub1_1.method2230(Static122.aClass12_1.anInt439); + Static6.aClass3_Sub15_Sub1_1.p1(0); + local803 = Static6.aClass3_Sub15_Sub1_1.offset; + Static6.aClass3_Sub15_Sub1_1.p8(local609.method3158()); + Static6.aClass3_Sub15_Sub1_1.p2(Static122.aClass12_1.anInt439); Static122.aClass12_1.aClass3_Sub2_Sub6_1.method760(Static6.aClass3_Sub15_Sub1_1, Static122.aClass12_1.anIntArray33); - Static6.aClass3_Sub15_Sub1_1.method2195(Static6.aClass3_Sub15_Sub1_1.anInt2792 - local803); + Static6.aClass3_Sub15_Sub1_1.p1len(Static6.aClass3_Sub15_Sub1_1.offset - local803); continue; } if (local226 == 5061) { Static6.aClass3_Sub15_Sub1_1.method2242(167); - Static6.aClass3_Sub15_Sub1_1.method2178(0); - local809 = Static6.aClass3_Sub15_Sub1_1.anInt2792; - Static6.aClass3_Sub15_Sub1_1.method2178(1); - Static6.aClass3_Sub15_Sub1_1.method2230(Static122.aClass12_1.anInt439); + Static6.aClass3_Sub15_Sub1_1.p1(0); + local809 = Static6.aClass3_Sub15_Sub1_1.offset; + Static6.aClass3_Sub15_Sub1_1.p1(1); + Static6.aClass3_Sub15_Sub1_1.p2(Static122.aClass12_1.anInt439); Static122.aClass12_1.aClass3_Sub2_Sub6_1.method760(Static6.aClass3_Sub15_Sub1_1, Static122.aClass12_1.anIntArray33); - Static6.aClass3_Sub15_Sub1_1.method2195(Static6.aClass3_Sub15_Sub1_1.anInt2792 - local809); + Static6.aClass3_Sub15_Sub1_1.p1len(Static6.aClass3_Sub15_Sub1_1.offset - local809); continue; } if (local226 == 5062) { @@ -2906,10 +2905,10 @@ public final class Static88 { local28--; local1052 = Static254.anIntArray487[local28]; Static6.aClass3_Sub15_Sub1_1.method2242(117); - Static6.aClass3_Sub15_Sub1_1.method2178(Static229.method3937(local609) + Static229.method3937(local2522) + 1); - Static6.aClass3_Sub15_Sub1_1.method2171(local609); - Static6.aClass3_Sub15_Sub1_1.method2171(local2522); - Static6.aClass3_Sub15_Sub1_1.method2178(local1052); + Static6.aClass3_Sub15_Sub1_1.p1(Static229.method3937(local609) + Static229.method3937(local2522) + 1); + Static6.aClass3_Sub15_Sub1_1.pjstr(local609); + Static6.aClass3_Sub15_Sub1_1.pjstr(local2522); + Static6.aClass3_Sub15_Sub1_1.p1(local1052); continue; } if (local226 == 5401) { @@ -2970,7 +2969,7 @@ public final class Static88 { try { if (Static232.aClass212_5.anObject6 != null) { @Pc(8281) byte[] local8281 = ((String) Static232.aClass212_5.anObject6).getBytes("ISO-8859-1"); - local609 = Static10.method346(local8281, local8281.length, 0); + local609 = Static10.decodeString(local8281, local8281.length, 0); } } catch (@Pc(8290) UnsupportedEncodingException local8290) { } @@ -3006,13 +3005,13 @@ public final class Static88 { local26 -= 2; local2522 = Static3.aClass100Array176[local26 + 1]; local609 = Static3.aClass100Array176[local26]; - if (local609.method3120() > 0) { + if (local609.length() > 0) { if (Static103.aClass100Array88 == null) { Static103.aClass100Array88 = new JagString[Static132.anIntArray309[Static266.anInt5343]]; } Static103.aClass100Array88[local1052] = local609; } - if (local2522.method3120() > 0) { + if (local2522.length() > 0) { if (Static263.aClass100Array174 == null) { Static263.aClass100Array174 = new JagString[Static132.anIntArray309[Static266.anInt5343]]; } @@ -3964,7 +3963,7 @@ public final class Static88 { if (local609 == null) { Static254.anIntArray487[local28++] = 0; } else { - Static254.anIntArray487[local28++] = local609.method3120(); + Static254.anIntArray487[local28++] = local609.length(); } continue; } @@ -3980,9 +3979,9 @@ public final class Static88 { if (local226 == 4119) { local26--; local609 = Static3.aClass100Array176[local26]; - local2522 = Static87.method1804(local609.method3120()); + local2522 = Static87.method1804(local609.length()); @Pc(12220) boolean local12220 = false; - for (local652 = 0; local652 < local609.method3120(); local652++) { + for (local652 = 0; local652 < local609.length(); local652++) { local4859 = local609.method3149(local652); if (local4859 == 60) { local12220 = true; @@ -4159,7 +4158,7 @@ public final class Static88 { } @OriginalMember(owner = "client!h", name = "a", descriptor = "(Ljava/awt/Component;Z)V") - public static void method1833(@OriginalArg(0) Component arg0) { + public static void method1833(@OriginalArg(0) java.awt.Component arg0) { arg0.addMouseListener(Static93.aClass150_1); arg0.addMouseMotionListener(Static93.aClass150_1); arg0.addFocusListener(Static93.aClass150_1); diff --git a/client/src/main/java/Static9.java b/client/src/main/java/Static9.java index af3c28e..59be640 100644 --- a/client/src/main/java/Static9.java +++ b/client/src/main/java/Static9.java @@ -89,7 +89,7 @@ public final class Static9 { @OriginalMember(owner = "client!al", name = "a", descriptor = "(ILclient!wa;)Lclient!ci;") public static TextureOp29SubOp1 method184(@OriginalArg(1) Buffer arg0) { - return new TextureOp29SubOp1(arg0.method2213(), arg0.method2213(), arg0.method2213(), arg0.method2213(), arg0.method2220(), arg0.method2229()); + return new TextureOp29SubOp1(arg0.g2s(), arg0.g2s(), arg0.g2s(), arg0.g2s(), arg0.g3(), arg0.g1()); } @OriginalMember(owner = "client!al", name = "b", descriptor = "(B)V") diff --git a/client/src/main/java/Static91.java b/client/src/main/java/Static91.java index 5e7505c..f68a63b 100644 --- a/client/src/main/java/Static91.java +++ b/client/src/main/java/Static91.java @@ -37,45 +37,45 @@ public final class Static91 { } local12 = new ClientScript(); @Pc(42) Buffer local42 = new Buffer(local22); - local42.anInt2792 = local42.aByteArray40.length - 2; - @Pc(53) int local53 = local42.method2163(); - @Pc(63) int local63 = local42.aByteArray40.length - local53 - 12 - 2; - local42.anInt2792 = local63; - @Pc(70) int local70 = local42.method2174(); - local12.anInt4667 = local42.method2163(); - local12.anInt4671 = local42.method2163(); - local12.anInt4665 = local42.method2163(); - local12.anInt4669 = local42.method2163(); - @Pc(98) int local98 = local42.method2229(); + local42.offset = local42.data.length - 2; + @Pc(53) int local53 = local42.g2(); + @Pc(63) int local63 = local42.data.length - local53 - 12 - 2; + local42.offset = local63; + @Pc(70) int local70 = local42.g4(); + local12.anInt4667 = local42.g2(); + local12.anInt4671 = local42.g2(); + local12.anInt4665 = local42.g2(); + local12.anInt4669 = local42.g2(); + @Pc(98) int local98 = local42.g1(); @Pc(107) int local107; @Pc(114) int local114; if (local98 > 0) { local12.aClass133Array1 = new HashTable[local98]; for (local107 = 0; local107 < local98; local107++) { - local114 = local42.method2163(); + local114 = local42.g2(); @Pc(121) HashTable local121 = new HashTable(Static165.method3164(local114)); local12.aClass133Array1[local107] = local121; while (local114-- > 0) { - @Pc(136) int local136 = local42.method2174(); - @Pc(140) int local140 = local42.method2174(); + @Pc(136) int local136 = local42.g4(); + @Pc(140) int local140 = local42.g4(); local121.method3862(new IntNode(local140), (long) local136); } } } - local42.anInt2792 = 0; - local12.aClass100_880 = local42.method2176(); + local42.offset = 0; + local12.aClass100_880 = local42.gjstrFast(); local12.anIntArray415 = new int[local70]; local12.aClass100Array140 = new JagString[local70]; local107 = 0; local12.anIntArray416 = new int[local70]; - while (local63 > local42.anInt2792) { - local114 = local42.method2163(); + while (local63 > local42.offset) { + local114 = local42.g2(); if (local114 == 3) { - local12.aClass100Array140[local107] = local42.method2202(); + local12.aClass100Array140[local107] = local42.gjstr(); } else if (local114 >= 100 || local114 == 21 || local114 == 38 || local114 == 39) { - local12.anIntArray416[local107] = local42.method2229(); + local12.anIntArray416[local107] = local42.g1(); } else { - local12.anIntArray416[local107] = local42.method2174(); + local12.anIntArray416[local107] = local42.g4(); } local12.anIntArray415[local107++] = local114; } @@ -104,7 +104,7 @@ public final class Static91 { @OriginalMember(owner = "client!hc", name = "a", descriptor = "(Lclient!na;Z)I") public static int method1879(@OriginalArg(0) JagString arg0) { - if (Static203.aClass134_1 == null || arg0.method3120() == 0) { + if (Static203.aClass134_1 == null || arg0.length() == 0) { return -1; } for (@Pc(20) int local20 = 0; local20 < Static203.aClass134_1.anInt5074; local20++) { diff --git a/client/src/main/java/Static97.java b/client/src/main/java/Static97.java index 32ec20f..afa395d 100644 --- a/client/src/main/java/Static97.java +++ b/client/src/main/java/Static97.java @@ -101,28 +101,28 @@ public final class Static97 { @OriginalMember(owner = "client!hi", name = "a", descriptor = "(Lclient!wa;I)V") public static void method1962(@OriginalArg(0) Buffer arg0) { - @Pc(9) int local9 = arg0.method2204(); + @Pc(9) int local9 = arg0.gSmart1or2(); Static203.aClass32Array1 = new Class32[local9]; @Pc(14) int local14; for (local14 = 0; local14 < local9; local14++) { Static203.aClass32Array1[local14] = new Class32(); - Static203.aClass32Array1[local14].anInt1739 = arg0.method2204(); - Static203.aClass32Array1[local14].aClass100_378 = arg0.method2187(); + Static203.aClass32Array1[local14].anInt1739 = arg0.gSmart1or2(); + Static203.aClass32Array1[local14].aClass100_378 = arg0.gjstr2(); } - Static19.anInt636 = arg0.method2204(); - Static171.anInt4157 = arg0.method2204(); - Static106.anInt2871 = arg0.method2204(); + Static19.anInt636 = arg0.gSmart1or2(); + Static171.anInt4157 = arg0.gSmart1or2(); + Static106.anInt2871 = arg0.gSmart1or2(); Static196.aClass10_Sub1Array2 = new World[Static171.anInt4157 + 1 - Static19.anInt636]; for (local14 = 0; local14 < Static106.anInt2871; local14++) { - @Pc(77) int local77 = arg0.method2204(); + @Pc(77) int local77 = arg0.gSmart1or2(); @Pc(85) World local85 = Static196.aClass10_Sub1Array2[local77] = new World(); - local85.anInt377 = arg0.method2229(); - local85.anInt381 = arg0.method2174(); + local85.anInt377 = arg0.g1(); + local85.anInt381 = arg0.g4(); local85.anInt382 = local77 + Static19.anInt636; - local85.aClass100_69 = arg0.method2187(); - local85.aClass100_71 = arg0.method2187(); + local85.aClass100_69 = arg0.gjstr2(); + local85.aClass100_71 = arg0.gjstr2(); } - Static80.anInt4702 = arg0.method2174(); + Static80.anInt4702 = arg0.g4(); Static61.aBoolean109 = true; } @@ -130,7 +130,7 @@ public final class Static97 { public static JagString method1963(@OriginalArg(0) Component arg0) { if (Static36.method940(arg0).method512() == 0) { return null; - } else if (arg0.aClass100_86 == null || arg0.aClass100_86.method3144().method3120() == 0) { + } else if (arg0.aClass100_86 == null || arg0.aClass100_86.method3144().length() == 0) { return Static121.aBoolean154 ? Static143.aClass100_668 : null; } else { return arg0.aClass100_86; diff --git a/client/src/main/java/StockMarketOffer.java b/client/src/main/java/StockMarketOffer.java index a909e15..fc0fb18 100644 --- a/client/src/main/java/StockMarketOffer.java +++ b/client/src/main/java/StockMarketOffer.java @@ -29,12 +29,12 @@ public final class StockMarketOffer { @OriginalMember(owner = "client!sg", name = "", descriptor = "(Lclient!wa;)V") public StockMarketOffer(@OriginalArg(0) Buffer arg0) { - this.aByte17 = arg0.method2186(); - this.anInt5094 = arg0.method2163(); - this.anInt5099 = arg0.method2174(); - this.anInt5090 = arg0.method2174(); - this.anInt5089 = arg0.method2174(); - this.anInt5092 = arg0.method2174(); + this.aByte17 = arg0.g1s(); + this.anInt5094 = arg0.g2(); + this.anInt5099 = arg0.g4(); + this.anInt5090 = arg0.g4(); + this.anInt5089 = arg0.g4(); + this.anInt5092 = arg0.g4(); } @OriginalMember(owner = "client!sg", name = "a", descriptor = "(Z)I") diff --git a/client/src/main/java/StructType.java b/client/src/main/java/StructType.java index 640b707..1fbe7cb 100644 --- a/client/src/main/java/StructType.java +++ b/client/src/main/java/StructType.java @@ -24,20 +24,20 @@ public final class StructType extends SecondaryNode { if (arg1 != 249) { return; } - @Pc(17) int local17 = arg0.method2229(); + @Pc(17) int local17 = arg0.g1(); @Pc(25) int local25; if (this.aClass133_14 == null) { local25 = Static165.method3164(local17); this.aClass133_14 = new HashTable(local25); } for (local25 = 0; local25 < local17; local25++) { - @Pc(45) boolean local45 = arg0.method2229() == 1; - @Pc(49) int local49 = arg0.method2220(); + @Pc(45) boolean local45 = arg0.g1() == 1; + @Pc(49) int local49 = arg0.g3(); @Pc(58) Node local58; if (local45) { - local58 = new StringNode(arg0.method2202()); + local58 = new StringNode(arg0.gjstr()); } else { - local58 = new IntNode(arg0.method2174()); + local58 = new IntNode(arg0.g4()); } this.aClass133_14.method3862(local58, (long) local49); } @@ -56,7 +56,7 @@ public final class StructType extends SecondaryNode { @OriginalMember(owner = "client!lk", name = "a", descriptor = "(ILclient!wa;)V") public final void method2806(@OriginalArg(1) Buffer arg0) { while (true) { - @Pc(5) int local5 = arg0.method2229(); + @Pc(5) int local5 = arg0.g1(); if (local5 == 0) { return; } diff --git a/client/src/main/java/SynthEnvelope.java b/client/src/main/java/SynthEnvelope.java index 2a9198f..3c5d6e0 100644 --- a/client/src/main/java/SynthEnvelope.java +++ b/client/src/main/java/SynthEnvelope.java @@ -75,20 +75,20 @@ public final class SynthEnvelope { @OriginalMember(owner = "client!ff", name = "a", descriptor = "(Lclient!wa;)V") public final void method1514(@OriginalArg(0) Buffer arg0) { - this.anInt1957 = arg0.method2229(); + this.anInt1957 = arg0.g1(); this.anIntArray157 = new int[this.anInt1957]; this.anIntArray156 = new int[this.anInt1957]; for (@Pc(16) int local16 = 0; local16 < this.anInt1957; local16++) { - this.anIntArray157[local16] = arg0.method2163(); - this.anIntArray156[local16] = arg0.method2163(); + this.anIntArray157[local16] = arg0.g2(); + this.anIntArray156[local16] = arg0.g2(); } } @OriginalMember(owner = "client!ff", name = "b", descriptor = "(Lclient!wa;)V") public final void method1515(@OriginalArg(0) Buffer arg0) { - this.anInt1958 = arg0.method2229(); - this.anInt1959 = arg0.method2174(); - this.anInt1960 = arg0.method2174(); + this.anInt1958 = arg0.g1(); + this.anInt1959 = arg0.g4(); + this.anInt1960 = arg0.g4(); this.method1514(arg0); } } diff --git a/client/src/main/java/SynthFilter.java b/client/src/main/java/SynthFilter.java index a63bf3d..810c86d 100644 --- a/client/src/main/java/SynthFilter.java +++ b/client/src/main/java/SynthFilter.java @@ -20,22 +20,22 @@ public final class SynthFilter { @OriginalMember(owner = "client!nl", name = "a", descriptor = "(Lclient!wa;Lclient!ff;)V") public final void method3249(@OriginalArg(0) Buffer arg0, @OriginalArg(1) SynthEnvelope arg1) { - @Pc(3) int local3 = arg0.method2229(); + @Pc(3) int local3 = arg0.g1(); this.anIntArray368[0] = local3 >> 4; this.anIntArray368[1] = local3 & 0xF; if (local3 == 0) { this.anIntArray369[0] = this.anIntArray369[1] = 0; return; } - this.anIntArray369[0] = arg0.method2163(); - this.anIntArray369[1] = arg0.method2163(); - @Pc(37) int local37 = arg0.method2229(); + this.anIntArray369[0] = arg0.g2(); + this.anIntArray369[1] = arg0.g2(); + @Pc(37) int local37 = arg0.g1(); @Pc(39) int local39; @Pc(44) int local44; for (local39 = 0; local39 < 2; local39++) { for (local44 = 0; local44 < this.anIntArray368[local39]; local44++) { - this.anIntArrayArrayArray14[local39][0][local44] = arg0.method2163(); - this.anIntArrayArrayArray15[local39][0][local44] = arg0.method2163(); + this.anIntArrayArrayArray14[local39][0][local44] = arg0.g2(); + this.anIntArrayArrayArray15[local39][0][local44] = arg0.g2(); } } for (local39 = 0; local39 < 2; local39++) { @@ -44,8 +44,8 @@ public final class SynthFilter { this.anIntArrayArrayArray14[local39][1][local44] = this.anIntArrayArrayArray14[local39][0][local44]; this.anIntArrayArrayArray15[local39][1][local44] = this.anIntArrayArrayArray15[local39][0][local44]; } else { - this.anIntArrayArrayArray14[local39][1][local44] = arg0.method2163(); - this.anIntArrayArrayArray15[local39][1][local44] = arg0.method2163(); + this.anIntArrayArrayArray14[local39][1][local44] = arg0.g2(); + this.anIntArrayArrayArray15[local39][1][local44] = arg0.g2(); } } } diff --git a/client/src/main/java/SynthInstrument.java b/client/src/main/java/SynthInstrument.java index a8a38ee..1d79295 100644 --- a/client/src/main/java/SynthInstrument.java +++ b/client/src/main/java/SynthInstrument.java @@ -266,43 +266,43 @@ public final class SynthInstrument { this.aClass42_5.method1515(arg0); this.aClass42_3 = new SynthEnvelope(); this.aClass42_3.method1515(arg0); - @Pc(21) int local21 = arg0.method2229(); + @Pc(21) int local21 = arg0.g1(); if (local21 != 0) { - arg0.anInt2792--; + arg0.offset--; this.aClass42_9 = new SynthEnvelope(); this.aClass42_9.method1515(arg0); this.aClass42_8 = new SynthEnvelope(); this.aClass42_8.method1515(arg0); } - local21 = arg0.method2229(); + local21 = arg0.g1(); if (local21 != 0) { - arg0.anInt2792--; + arg0.offset--; this.aClass42_7 = new SynthEnvelope(); this.aClass42_7.method1515(arg0); this.aClass42_1 = new SynthEnvelope(); this.aClass42_1.method1515(arg0); } - local21 = arg0.method2229(); + local21 = arg0.g1(); if (local21 != 0) { - arg0.anInt2792--; + arg0.offset--; this.aClass42_2 = new SynthEnvelope(); this.aClass42_2.method1515(arg0); this.aClass42_4 = new SynthEnvelope(); this.aClass42_4.method1515(arg0); } for (@Pc(109) int local109 = 0; local109 < 10; local109++) { - @Pc(116) int local116 = arg0.method2204(); + @Pc(116) int local116 = arg0.gSmart1or2(); if (local116 == 0) { break; } this.anIntArray396[local109] = local116; - this.anIntArray404[local109] = arg0.method2223(); - this.anIntArray397[local109] = arg0.method2204(); + this.anIntArray404[local109] = arg0.gSmart1or2s(); + this.anIntArray397[local109] = arg0.gSmart1or2(); } - this.anInt4547 = arg0.method2204(); - this.anInt4549 = arg0.method2204(); - this.anInt4546 = arg0.method2163(); - this.anInt4548 = arg0.method2163(); + this.anInt4547 = arg0.gSmart1or2(); + this.anInt4549 = arg0.gSmart1or2(); + this.anInt4546 = arg0.g2(); + this.anInt4548 = arg0.g2(); this.aClass110_1 = new SynthFilter(); this.aClass42_6 = new SynthEnvelope(); this.aClass110_1.method3249(arg0, this.aClass42_6); diff --git a/client/src/main/java/SynthSound.java b/client/src/main/java/SynthSound.java index 3782864..8a9ae25 100644 --- a/client/src/main/java/SynthSound.java +++ b/client/src/main/java/SynthSound.java @@ -18,15 +18,15 @@ public final class SynthSound { @OriginalMember(owner = "client!sl", name = "", descriptor = "(Lclient!wa;)V") public SynthSound(@OriginalArg(0) Buffer arg0) { for (@Pc(7) int local7 = 0; local7 < 10; local7++) { - @Pc(14) int local14 = arg0.method2229(); + @Pc(14) int local14 = arg0.g1(); if (local14 != 0) { - arg0.anInt2792--; + arg0.offset--; this.aClass123Array1[local7] = new SynthInstrument(); this.aClass123Array1[local7].method3506(arg0); } } - this.anInt5207 = arg0.method2163(); - this.anInt5206 = arg0.method2163(); + this.anInt5207 = arg0.g2(); + this.anInt5206 = arg0.g2(); } @OriginalMember(owner = "client!sl", name = "a", descriptor = "()[B") diff --git a/client/src/main/java/Texture.java b/client/src/main/java/Texture.java index 7db6dae..656eaae 100644 --- a/client/src/main/java/Texture.java +++ b/client/src/main/java/Texture.java @@ -23,7 +23,7 @@ public final class Texture { @OriginalMember(owner = "client!lc", name = "", descriptor = "(Lclient!wa;)V") public Texture(@OriginalArg(0) Buffer arg0) { - @Pc(7) int local7 = arg0.method2229(); + @Pc(7) int local7 = arg0.g1(); this.aClass3_Sub1Array22 = new TextureOp[local7]; @Pc(14) int[][] local14 = new int[local7][]; @Pc(16) int local16 = 0; @@ -43,7 +43,7 @@ public final class Texture { local45 = local27.aClass3_Sub1Array42.length; local14[local20] = new int[local45]; for (local52 = 0; local52 < local45; local52++) { - local14[local20][local52] = arg0.method2229(); + local14[local20][local52] = arg0.g1(); } this.aClass3_Sub1Array22[local20] = local27; } @@ -67,9 +67,9 @@ public final class Texture { } local14[local20] = null; } - this.aClass3_Sub1_1 = this.aClass3_Sub1Array22[arg0.method2229()]; + this.aClass3_Sub1_1 = this.aClass3_Sub1Array22[arg0.g1()]; local14 = null; - this.aClass3_Sub1_2 = this.aClass3_Sub1Array22[arg0.method2229()]; + this.aClass3_Sub1_2 = this.aClass3_Sub1Array22[arg0.g1()]; } @OriginalMember(owner = "client!lc", name = "a", descriptor = "(IZIDILclient!ve;Lclient!m;Z)[I") diff --git a/client/src/main/java/TextureOp1.java b/client/src/main/java/TextureOp1.java index 9b42845..3640059 100644 --- a/client/src/main/java/TextureOp1.java +++ b/client/src/main/java/TextureOp1.java @@ -64,11 +64,11 @@ public final class TextureOp1 extends TextureOp { @Override public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Buffer arg1) { if (arg0 == 0) { - this.anInt105 = arg1.method2229(); + this.anInt105 = arg1.g1(); } else if (arg0 == 1) { - this.anInt100 = arg1.method2229(); + this.anInt100 = arg1.g1(); } else if (arg0 == 3) { - this.anInt104 = arg1.method2229(); + this.anInt104 = arg1.g1(); } } } diff --git a/client/src/main/java/TextureOp11.java b/client/src/main/java/TextureOp11.java index d79343a..354a4de 100644 --- a/client/src/main/java/TextureOp11.java +++ b/client/src/main/java/TextureOp11.java @@ -21,9 +21,9 @@ public final class TextureOp11 extends TextureOp { @Override public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Buffer arg1) { if (arg0 == 0) { - this.anInt2220 = arg1.method2229(); + this.anInt2220 = arg1.g1(); } else if (arg0 == 1) { - this.anInt2216 = arg1.method2229(); + this.anInt2216 = arg1.g1(); } } diff --git a/client/src/main/java/TextureOp12.java b/client/src/main/java/TextureOp12.java index 69d6c85..5184c5f 100644 --- a/client/src/main/java/TextureOp12.java +++ b/client/src/main/java/TextureOp12.java @@ -27,13 +27,13 @@ public final class TextureOp12 extends TextureOp { @Override public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Buffer arg1) { if (arg0 == 0) { - this.anInt2298 = arg1.method2163(); + this.anInt2298 = arg1.g2(); } else if (arg0 == 1) { - this.anInt2297 = arg1.method2163(); + this.anInt2297 = arg1.g2(); } else if (arg0 == 2) { - this.anInt2296 = arg1.method2163(); + this.anInt2296 = arg1.g2(); } else if (arg0 == 3) { - this.anInt2299 = arg1.method2163(); + this.anInt2299 = arg1.g2(); } } diff --git a/client/src/main/java/TextureOp13.java b/client/src/main/java/TextureOp13.java index 2cb45ae..f5774e8 100644 --- a/client/src/main/java/TextureOp13.java +++ b/client/src/main/java/TextureOp13.java @@ -42,11 +42,11 @@ public final class TextureOp13 extends TextureOp { @Override public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Buffer arg1) { if (arg0 == 0) { - this.anInt2546 = arg1.method2213(); + this.anInt2546 = arg1.g2s(); } else if (arg0 == 1) { - this.anInt2549 = (arg1.method2186() << 12) / 100; + this.anInt2549 = (arg1.g1s() << 12) / 100; } else if (arg0 == 2) { - this.anInt2547 = (arg1.method2186() << 12) / 100; + this.anInt2547 = (arg1.g1s() << 12) / 100; } } diff --git a/client/src/main/java/TextureOp14.java b/client/src/main/java/TextureOp14.java index de0d9ff..a4352d7 100644 --- a/client/src/main/java/TextureOp14.java +++ b/client/src/main/java/TextureOp14.java @@ -139,19 +139,19 @@ public final class TextureOp14 extends TextureOp { @Override public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Buffer arg1) { if (arg0 == 0) { - this.anInt2645 = this.anInt2646 = arg1.method2229(); + this.anInt2645 = this.anInt2646 = arg1.g1(); } else if (arg0 == 1) { - this.anInt2639 = arg1.method2229(); + this.anInt2639 = arg1.g1(); } else if (arg0 == 2) { - this.anInt2636 = arg1.method2163(); + this.anInt2636 = arg1.g2(); } else if (arg0 == 3) { - this.anInt2635 = arg1.method2229(); + this.anInt2635 = arg1.g1(); } else if (arg0 == 4) { - this.anInt2638 = arg1.method2229(); + this.anInt2638 = arg1.g1(); } else if (arg0 == 5) { - this.anInt2645 = arg1.method2229(); + this.anInt2645 = arg1.g1(); } else if (arg0 == 6) { - this.anInt2646 = arg1.method2229(); + this.anInt2646 = arg1.g1(); } } } diff --git a/client/src/main/java/TextureOp15.java b/client/src/main/java/TextureOp15.java index c63c962..9b64865 100644 --- a/client/src/main/java/TextureOp15.java +++ b/client/src/main/java/TextureOp15.java @@ -49,7 +49,7 @@ public final class TextureOp15 extends TextureOp { @Override public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Buffer arg1) { if (arg0 == 0) { - this.aBoolean309 = arg1.method2229() == 1; + this.aBoolean309 = arg1.g1() == 1; } } diff --git a/client/src/main/java/TextureOp16.java b/client/src/main/java/TextureOp16.java index 08138bb..30b0676 100644 --- a/client/src/main/java/TextureOp16.java +++ b/client/src/main/java/TextureOp16.java @@ -65,9 +65,9 @@ public final class TextureOp16 extends TextureOp { @Override public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Buffer arg1) { if (arg0 == 0) { - this.anInt3292 = arg1.method2163() << 4; + this.anInt3292 = arg1.g2() << 4; } else if (arg0 == 1) { - this.aBoolean309 = arg1.method2229() == 1; + this.aBoolean309 = arg1.g1() == 1; } } diff --git a/client/src/main/java/TextureOp17.java b/client/src/main/java/TextureOp17.java index 96d9613..138f04b 100644 --- a/client/src/main/java/TextureOp17.java +++ b/client/src/main/java/TextureOp17.java @@ -64,21 +64,21 @@ public final class TextureOp17 extends TextureOp { @Override public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Buffer arg1) { if (arg0 == 0) { - this.anInt3685 = arg1.method2229(); + this.anInt3685 = arg1.g1(); } else if (arg0 == 1) { - this.anInt3677 = arg1.method2229(); + this.anInt3677 = arg1.g1(); } else if (arg0 == 2) { - this.anInt3681 = arg1.method2163(); + this.anInt3681 = arg1.g2(); } else if (arg0 == 3) { - this.anInt3667 = arg1.method2163(); + this.anInt3667 = arg1.g2(); } else if (arg0 == 4) { - this.anInt3678 = arg1.method2163(); + this.anInt3678 = arg1.g2(); } else if (arg0 == 5) { - this.anInt3675 = arg1.method2163(); + this.anInt3675 = arg1.g2(); } else if (arg0 == 6) { - this.anInt3672 = arg1.method2163(); + this.anInt3672 = arg1.g2(); } else if (arg0 == 7) { - this.anInt3673 = arg1.method2163(); + this.anInt3673 = arg1.g2(); } } diff --git a/client/src/main/java/TextureOp18.java b/client/src/main/java/TextureOp18.java index ba5bd44..a57cf52 100644 --- a/client/src/main/java/TextureOp18.java +++ b/client/src/main/java/TextureOp18.java @@ -24,11 +24,11 @@ public final class TextureOp18 extends TextureOp { @Override public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Buffer arg1) { if (arg0 == 0) { - this.anInt3816 = arg1.method2163(); + this.anInt3816 = arg1.g2(); } else if (arg0 == 1) { - this.anInt3812 = arg1.method2163(); + this.anInt3812 = arg1.g2(); } else if (arg0 == 2) { - this.anInt3815 = arg1.method2163(); + this.anInt3815 = arg1.g2(); } } diff --git a/client/src/main/java/TextureOp19.java b/client/src/main/java/TextureOp19.java index bf00dae..76a8f08 100644 --- a/client/src/main/java/TextureOp19.java +++ b/client/src/main/java/TextureOp19.java @@ -36,19 +36,19 @@ public final class TextureOp19 extends TextureOp { @Override public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Buffer arg1) { if (arg0 == 0) { - this.anInt3860 = arg1.method2163(); + this.anInt3860 = arg1.g2(); } else if (arg0 == 1) { - this.anInt3843 = arg1.method2163(); + this.anInt3843 = arg1.g2(); } else if (arg0 == 2) { - this.anInt3848 = arg1.method2163(); + this.anInt3848 = arg1.g2(); } else if (arg0 == 3) { - this.anInt3854 = arg1.method2163(); + this.anInt3854 = arg1.g2(); } else if (arg0 == 4) { - this.anInt3847 = arg1.method2163(); + this.anInt3847 = arg1.g2(); } else if (arg0 == 5) { - this.anInt3844 = arg1.method2163(); + this.anInt3844 = arg1.g2(); } else if (arg0 == 6) { - this.anInt3862 = arg1.method2163(); + this.anInt3862 = arg1.g2(); } } diff --git a/client/src/main/java/TextureOp2.java b/client/src/main/java/TextureOp2.java index 2ae5216..2a1bfc7 100644 --- a/client/src/main/java/TextureOp2.java +++ b/client/src/main/java/TextureOp2.java @@ -21,11 +21,11 @@ public final class TextureOp2 extends TextureOp { @Override public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Buffer arg1) { if (arg0 == 0) { - this.anInt148 = arg1.method2163(); + this.anInt148 = arg1.g2(); } else if (arg0 == 1) { - this.anInt151 = arg1.method2163(); + this.anInt151 = arg1.g2(); } else if (arg0 == 2) { - this.aBoolean309 = arg1.method2229() == 1; + this.aBoolean309 = arg1.g1() == 1; } } diff --git a/client/src/main/java/TextureOp20.java b/client/src/main/java/TextureOp20.java index 78f2f5e..70d890d 100644 --- a/client/src/main/java/TextureOp20.java +++ b/client/src/main/java/TextureOp20.java @@ -25,7 +25,7 @@ public final class TextureOp20 extends TextureOp { @Override public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Buffer arg1) { if (arg0 == 0) { - this.anInt3894 = (arg1.method2229() << 12) / 255; + this.anInt3894 = (arg1.g1() << 12) / 255; } } diff --git a/client/src/main/java/TextureOp21.java b/client/src/main/java/TextureOp21.java index 6bde2f9..7154162 100644 --- a/client/src/main/java/TextureOp21.java +++ b/client/src/main/java/TextureOp21.java @@ -129,11 +129,11 @@ public final class TextureOp21 extends TextureOp { @Override public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Buffer arg1) { if (arg0 == 0) { - this.anInt4221 = arg1.method2229(); + this.anInt4221 = arg1.g1(); } else if (arg0 == 1) { - this.anInt4223 = arg1.method2229(); + this.anInt4223 = arg1.g1(); } else if (arg0 == 2) { - this.aBoolean309 = arg1.method2229() == 1; + this.aBoolean309 = arg1.g1() == 1; } } } diff --git a/client/src/main/java/TextureOp22.java b/client/src/main/java/TextureOp22.java index ea87a40..400ff14 100644 --- a/client/src/main/java/TextureOp22.java +++ b/client/src/main/java/TextureOp22.java @@ -306,23 +306,23 @@ public final class TextureOp22 extends TextureOp { @Override public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Buffer arg1) { if (arg0 == 0) { - this.anInt4354 = arg1.method2229(); + this.anInt4354 = arg1.g1(); } else if (arg0 == 1) { - this.anInt4345 = arg1.method2163(); + this.anInt4345 = arg1.g2(); } else if (arg0 == 2) { - this.anInt4350 = arg1.method2163(); + this.anInt4350 = arg1.g2(); } else if (arg0 == 3) { - this.anInt4353 = arg1.method2163(); + this.anInt4353 = arg1.g2(); } else if (arg0 == 4) { - this.anInt4346 = arg1.method2163(); + this.anInt4346 = arg1.g2(); } else if (arg0 == 5) { - this.anInt4347 = arg1.method2163(); + this.anInt4347 = arg1.g2(); } else if (arg0 == 6) { - this.anInt4351 = arg1.method2229(); + this.anInt4351 = arg1.g1(); } else if (arg0 == 7) { - this.anInt4344 = arg1.method2163(); + this.anInt4344 = arg1.g2(); } else if (arg0 == 8) { - this.anInt4360 = arg1.method2163(); + this.anInt4360 = arg1.g2(); } } } diff --git a/client/src/main/java/TextureOp23.java b/client/src/main/java/TextureOp23.java index 212be26..795c43c 100644 --- a/client/src/main/java/TextureOp23.java +++ b/client/src/main/java/TextureOp23.java @@ -41,7 +41,7 @@ public final class TextureOp23 extends TextureOp { @Override public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Buffer arg1) { if (arg0 == 0) { - this.anInt4503 = arg1.method2163(); + this.anInt4503 = arg1.g2(); } } } diff --git a/client/src/main/java/TextureOp24.java b/client/src/main/java/TextureOp24.java index e70b85b..14509b2 100644 --- a/client/src/main/java/TextureOp24.java +++ b/client/src/main/java/TextureOp24.java @@ -27,11 +27,11 @@ public final class TextureOp24 extends TextureOp { @Override public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Buffer arg1) { if (arg0 == 0) { - this.anInt4580 = arg1.method2163(); + this.anInt4580 = arg1.g2(); } else if (arg0 == 1) { - this.anInt4577 = arg1.method2163(); + this.anInt4577 = arg1.g2(); } else if (arg0 == 2) { - this.anInt4584 = arg1.method2163(); + this.anInt4584 = arg1.g2(); } } diff --git a/client/src/main/java/TextureOp28.java b/client/src/main/java/TextureOp28.java index 761e04d..533604e 100644 --- a/client/src/main/java/TextureOp28.java +++ b/client/src/main/java/TextureOp28.java @@ -59,7 +59,7 @@ public final class TextureOp28 extends TextureOp { @Override public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Buffer arg1) { if (arg0 == 0) { - this.anInt4971 = arg1.method2163(); + this.anInt4971 = arg1.g2(); } } } diff --git a/client/src/main/java/TextureOp29.java b/client/src/main/java/TextureOp29.java index d11fd03..5e02976 100644 --- a/client/src/main/java/TextureOp29.java +++ b/client/src/main/java/TextureOp29.java @@ -53,9 +53,9 @@ public final class TextureOp29 extends TextureOp { @Override public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Buffer arg1) { if (arg0 == 0) { - this.aClass18Array1 = new TextureOp29SubOp[arg1.method2229()]; + this.aClass18Array1 = new TextureOp29SubOp[arg1.g1()]; for (@Pc(11) int local11 = 0; local11 < this.aClass18Array1.length; local11++) { - @Pc(24) int local24 = arg1.method2229(); + @Pc(24) int local24 = arg1.g1(); if (local24 == 0) { this.aClass18Array1[local11] = Static9.method184(arg1); } else if (local24 == 1) { @@ -67,7 +67,7 @@ public final class TextureOp29 extends TextureOp { } } } else if (arg0 == 1) { - this.aBoolean309 = arg1.method2229() == 1; + this.aBoolean309 = arg1.g1() == 1; } } diff --git a/client/src/main/java/TextureOp3.java b/client/src/main/java/TextureOp3.java index e63d9e5..fe6718d 100644 --- a/client/src/main/java/TextureOp3.java +++ b/client/src/main/java/TextureOp3.java @@ -21,9 +21,9 @@ public final class TextureOp3 extends TextureOp { @Override public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Buffer arg1) { if (arg0 == 0) { - this.anInt316 = arg1.method2163(); + this.anInt316 = arg1.g2(); } else if (arg0 == 1) { - this.aBoolean11 = arg1.method2229() == 1; + this.aBoolean11 = arg1.g1() == 1; } } diff --git a/client/src/main/java/TextureOp30.java b/client/src/main/java/TextureOp30.java index 1af57d5..2e6dd11 100644 --- a/client/src/main/java/TextureOp30.java +++ b/client/src/main/java/TextureOp30.java @@ -30,15 +30,15 @@ public final class TextureOp30 extends TextureOp { @Override public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Buffer arg1) { if (arg0 == 0) { - this.anInt5195 = arg1.method2163(); + this.anInt5195 = arg1.g2(); } else if (arg0 == 1) { - this.anInt5196 = arg1.method2163(); + this.anInt5196 = arg1.g2(); } else if (arg0 == 2) { - this.anInt5197 = arg1.method2163(); + this.anInt5197 = arg1.g2(); } else if (arg0 == 3) { - this.anInt5201 = arg1.method2163(); + this.anInt5201 = arg1.g2(); } else if (arg0 == 4) { - @Pc(65) int local65 = arg1.method2220(); + @Pc(65) int local65 = arg1.g3(); this.anIntArray450[2] = local65 >> 12 & 0x0; this.anIntArray450[1] = local65 >> 4 & 0xFF0; this.anIntArray450[0] = (local65 & 0xFF0000) << 4; diff --git a/client/src/main/java/TextureOp31.java b/client/src/main/java/TextureOp31.java index c7ffbcc..20eb0a3 100644 --- a/client/src/main/java/TextureOp31.java +++ b/client/src/main/java/TextureOp31.java @@ -28,7 +28,7 @@ public final class TextureOp31 extends TextureOp { @Override public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Buffer arg1) { if (arg0 == 0) { - this.aBoolean309 = arg1.method2229() == 1; + this.aBoolean309 = arg1.g1() == 1; } } diff --git a/client/src/main/java/TextureOp32.java b/client/src/main/java/TextureOp32.java index e54f5b7..4bcb74b 100644 --- a/client/src/main/java/TextureOp32.java +++ b/client/src/main/java/TextureOp32.java @@ -76,7 +76,7 @@ public final class TextureOp32 extends TextureOp { @Override public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Buffer arg1) { if (arg0 == 0) { - this.anInt5539 = arg1.method2163(); + this.anInt5539 = arg1.g2(); } } diff --git a/client/src/main/java/TextureOp33.java b/client/src/main/java/TextureOp33.java index f371e24..db81319 100644 --- a/client/src/main/java/TextureOp33.java +++ b/client/src/main/java/TextureOp33.java @@ -37,15 +37,15 @@ public final class TextureOp33 extends TextureOp { @Override public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Buffer arg1) { if (arg0 == 0) { - this.anInt5716 = arg1.method2229(); + this.anInt5716 = arg1.g1(); } else if (arg0 == 1) { - this.anInt5712 = arg1.method2163(); + this.anInt5712 = arg1.g2(); } else if (arg0 == 2) { - this.anInt5715 = arg1.method2229(); + this.anInt5715 = arg1.g1(); } else if (arg0 == 3) { - this.anInt5709 = arg1.method2163(); + this.anInt5709 = arg1.g2(); } else if (arg0 == 4) { - this.anInt5714 = arg1.method2163(); + this.anInt5714 = arg1.g2(); } } diff --git a/client/src/main/java/TextureOp4.java b/client/src/main/java/TextureOp4.java index 6287604..20530a6 100644 --- a/client/src/main/java/TextureOp4.java +++ b/client/src/main/java/TextureOp4.java @@ -158,25 +158,25 @@ public final class TextureOp4 extends TextureOp { @Override public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Buffer arg1) { if (arg0 == 0) { - this.aBoolean44 = arg1.method2229() == 1; + this.aBoolean44 = arg1.g1() == 1; } else if (arg0 == 1) { - this.anInt642 = arg1.method2229(); + this.anInt642 = arg1.g1(); } else if (arg0 == 2) { - this.anInt648 = arg1.method2213(); + this.anInt648 = arg1.g2s(); if (this.anInt648 < 0) { this.aShortArray4 = new short[this.anInt642]; for (@Pc(93) int local93 = 0; local93 < this.anInt642; local93++) { - this.aShortArray4[local93] = (short) arg1.method2213(); + this.aShortArray4[local93] = (short) arg1.g2s(); } } } else if (arg0 == 3) { - this.anInt646 = this.anInt641 = arg1.method2229(); + this.anInt646 = this.anInt641 = arg1.g1(); } else if (arg0 == 4) { - this.anInt650 = arg1.method2229(); + this.anInt650 = arg1.g1(); } else if (arg0 == 5) { - this.anInt646 = arg1.method2229(); + this.anInt646 = arg1.g1(); } else if (arg0 == 6) { - this.anInt641 = arg1.method2229(); + this.anInt641 = arg1.g1(); } } diff --git a/client/src/main/java/TextureOp5.java b/client/src/main/java/TextureOp5.java index 9d0e3cc..593ba85 100644 --- a/client/src/main/java/TextureOp5.java +++ b/client/src/main/java/TextureOp5.java @@ -53,7 +53,7 @@ public final class TextureOp5 extends TextureOp { @Override public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Buffer arg1) { if (arg0 == 0) { - this.aBoolean309 = arg1.method2229() == 1; + this.aBoolean309 = arg1.g1() == 1; } } diff --git a/client/src/main/java/TextureOp6.java b/client/src/main/java/TextureOp6.java index e0bd0e0..858fe0d 100644 --- a/client/src/main/java/TextureOp6.java +++ b/client/src/main/java/TextureOp6.java @@ -52,11 +52,11 @@ public final class TextureOp6 extends TextureOp { @Override public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Buffer arg1) { if (arg0 == 0) { - this.anInt1233 = arg1.method2229(); + this.anInt1233 = arg1.g1(); } else if (arg0 == 1) { - this.anInt1240 = arg1.method2163(); + this.anInt1240 = arg1.g2(); } else if (arg0 == 2) { - this.anInt1234 = arg1.method2229(); + this.anInt1234 = arg1.g1(); } } diff --git a/client/src/main/java/TextureOp7.java b/client/src/main/java/TextureOp7.java index 53acc6d..ace5107 100644 --- a/client/src/main/java/TextureOp7.java +++ b/client/src/main/java/TextureOp7.java @@ -21,11 +21,11 @@ public final class TextureOp7 extends TextureOp { @Override public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Buffer arg1) { if (arg0 == 0) { - this.aBoolean104 = arg1.method2229() == 1; + this.aBoolean104 = arg1.g1() == 1; } else if (arg0 == 1) { - this.aBoolean105 = arg1.method2229() == 1; + this.aBoolean105 = arg1.g1() == 1; } else if (arg0 == 2) { - this.aBoolean309 = arg1.method2229() == 1; + this.aBoolean309 = arg1.g1() == 1; } } diff --git a/client/src/main/java/TextureOp8.java b/client/src/main/java/TextureOp8.java index 35f15b3..60cf2dc 100644 --- a/client/src/main/java/TextureOp8.java +++ b/client/src/main/java/TextureOp8.java @@ -24,11 +24,11 @@ public final class TextureOp8 extends TextureOp { @Override public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Buffer arg1) { if (arg0 == 0) { - this.anInt1934 = arg1.method2229(); + this.anInt1934 = arg1.g1(); } else if (arg0 == 1) { - this.anInt1940 = arg1.method2229(); + this.anInt1940 = arg1.g1(); } else if (arg0 == 2) { - this.anInt1935 = arg1.method2163(); + this.anInt1935 = arg1.g2(); } } diff --git a/client/src/main/java/TextureOp9.java b/client/src/main/java/TextureOp9.java index 2e46bd8..dbaf82a 100644 --- a/client/src/main/java/TextureOp9.java +++ b/client/src/main/java/TextureOp9.java @@ -24,11 +24,11 @@ public final class TextureOp9 extends TextureOp { @Override public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Buffer arg1) { if (arg0 == 0) { - this.anInt2007 = arg1.method2163(); + this.anInt2007 = arg1.g2(); } else if (arg0 == 1) { - this.anInt2002 = arg1.method2163(); + this.anInt2002 = arg1.g2(); } else if (arg0 == 2) { - this.aBoolean309 = arg1.method2229() == 1; + this.aBoolean309 = arg1.g1() == 1; } } diff --git a/client/src/main/java/TextureOpBinary.java b/client/src/main/java/TextureOpBinary.java index 07d2504..1a61031 100644 --- a/client/src/main/java/TextureOpBinary.java +++ b/client/src/main/java/TextureOpBinary.java @@ -35,9 +35,9 @@ public final class TextureOpBinary extends TextureOp { @Override public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Buffer arg1) { if (arg0 == 0) { - this.anInt857 = arg1.method2163(); + this.anInt857 = arg1.g2(); } else if (arg0 == 1) { - this.anInt861 = arg1.method2163(); + this.anInt861 = arg1.g2(); } } } diff --git a/client/src/main/java/TextureOpColorFill.java b/client/src/main/java/TextureOpColorFill.java index 9b8d1a4..895605d 100644 --- a/client/src/main/java/TextureOpColorFill.java +++ b/client/src/main/java/TextureOpColorFill.java @@ -54,7 +54,7 @@ public final class TextureOpColorFill extends TextureOp { @Override public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Buffer arg1) { if (arg0 == 0) { - this.method1595(arg1.method2220()); + this.method1595(arg1.g3()); } } } diff --git a/client/src/main/java/TextureOpColorGradient.java b/client/src/main/java/TextureOpColorGradient.java index c67c613..fd3a3a8 100644 --- a/client/src/main/java/TextureOpColorGradient.java +++ b/client/src/main/java/TextureOpColorGradient.java @@ -226,17 +226,17 @@ public final class TextureOpColorGradient extends TextureOp { if (arg0 != 0) { return; } - @Pc(15) int local15 = arg1.method2229(); + @Pc(15) int local15 = arg1.g1(); if (local15 != 0) { this.method4390(local15); return; } - this.anIntArrayArray39 = new int[arg1.method2229()][4]; + this.anIntArrayArray39 = new int[arg1.g1()][4]; for (@Pc(35) int local35 = 0; local35 < this.anIntArrayArray39.length; local35++) { - this.anIntArrayArray39[local35][0] = arg1.method2163(); - this.anIntArrayArray39[local35][1] = arg1.method2229() << 4; - this.anIntArrayArray39[local35][2] = arg1.method2229() << 4; - this.anIntArrayArray39[local35][3] = arg1.method2229() << 4; + this.anIntArrayArray39[local35][0] = arg1.g2(); + this.anIntArrayArray39[local35][1] = arg1.g1() << 4; + this.anIntArrayArray39[local35][2] = arg1.g1() << 4; + this.anIntArrayArray39[local35][3] = arg1.g1() << 4; } } diff --git a/client/src/main/java/TextureOpCombine.java b/client/src/main/java/TextureOpCombine.java index 8e53a4c..6733f97 100644 --- a/client/src/main/java/TextureOpCombine.java +++ b/client/src/main/java/TextureOpCombine.java @@ -237,9 +237,9 @@ public final class TextureOpCombine extends TextureOp { @Override public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Buffer arg1) { if (arg0 == 0) { - this.anInt4543 = arg1.method2229(); + this.anInt4543 = arg1.g1(); } else if (arg0 == 1) { - this.aBoolean309 = arg1.method2229() == 1; + this.aBoolean309 = arg1.g1() == 1; } } } diff --git a/client/src/main/java/TextureOpCurve.java b/client/src/main/java/TextureOpCurve.java index 1187bb1..e6b201a 100644 --- a/client/src/main/java/TextureOpCurve.java +++ b/client/src/main/java/TextureOpCurve.java @@ -157,11 +157,11 @@ public final class TextureOpCurve extends TextureOp { if (arg0 != 0) { return; } - this.anInt5852 = arg1.method2229(); - this.anIntArrayArray47 = new int[arg1.method2229()][2]; + this.anInt5852 = arg1.g1(); + this.anIntArrayArray47 = new int[arg1.g1()][2]; for (@Pc(23) int local23 = 0; local23 < this.anIntArrayArray47.length; local23++) { - this.anIntArrayArray47[local23][0] = arg1.method2163(); - this.anIntArrayArray47[local23][1] = arg1.method2163(); + this.anIntArrayArray47[local23][0] = arg1.g2(); + this.anIntArrayArray47[local23][1] = arg1.g2(); } } diff --git a/client/src/main/java/TextureOpSprite.java b/client/src/main/java/TextureOpSprite.java index 0b851e2..212d3fe 100644 --- a/client/src/main/java/TextureOpSprite.java +++ b/client/src/main/java/TextureOpSprite.java @@ -80,7 +80,7 @@ public class TextureOpSprite extends TextureOp { @Override public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Buffer arg1) { if (arg0 == 0) { - this.anInt3235 = arg1.method2163(); + this.anInt3235 = arg1.g2(); } } diff --git a/client/src/main/java/VorbisSound.java b/client/src/main/java/VorbisSound.java index 131a6a7..d3274af 100644 --- a/client/src/main/java/VorbisSound.java +++ b/client/src/main/java/VorbisSound.java @@ -96,25 +96,25 @@ public final class VorbisSound extends Node { @OriginalMember(owner = "client!jc", name = "a", descriptor = "([B)V") private void method2342(@OriginalArg(0) byte[] arg0) { @Pc(4) Buffer local4 = new Buffer(arg0); - this.anInt2980 = local4.method2174(); - this.anInt2974 = local4.method2174(); - this.anInt2976 = local4.method2174(); - this.anInt2977 = local4.method2174(); + this.anInt2980 = local4.g4(); + this.anInt2974 = local4.g4(); + this.anInt2976 = local4.g4(); + this.anInt2977 = local4.g4(); if (this.anInt2977 < 0) { this.anInt2977 = ~this.anInt2977; this.aBoolean148 = true; } - @Pc(40) int local40 = local4.method2174(); + @Pc(40) int local40 = local4.g4(); this.aByteArrayArray10 = new byte[local40][]; for (@Pc(46) int local46 = 0; local46 < local40; local46++) { @Pc(51) int local51 = 0; @Pc(55) int local55; do { - local55 = local4.method2229(); + local55 = local4.g1(); local51 += local55; } while (local55 >= 255); @Pc(67) byte[] local67 = new byte[local51]; - local4.method2190(local51, local67); + local4.gBytes(local51, local67); this.aByteArrayArray10[local46] = local67; } } diff --git a/client/src/main/java/WorldMapFont.java b/client/src/main/java/WorldMapFont.java index 18afa36..23ca8b9 100644 --- a/client/src/main/java/WorldMapFont.java +++ b/client/src/main/java/WorldMapFont.java @@ -76,7 +76,7 @@ public final class WorldMapFont { if (this.aBoolean112 || arg3 == 0) { arg4 = false; } - for (@Pc(8) int local8 = 0; local8 < arg0.method3120(); local8++) { + for (@Pc(8) int local8 = 0; local8 < arg0.length(); local8++) { @Pc(20) int local20 = anIntArray155[arg0.method3149(local8)]; if (arg4) { this.method1506(local20, arg1 + 1, arg2, 1, this.aByteArray21); @@ -307,10 +307,10 @@ public final class WorldMapFont { @OriginalMember(owner = "client!fd", name = "a", descriptor = "(Lclient!na;)I") private int method1510(@OriginalArg(0) JagString arg0) { @Pc(1) int local1 = 0; - for (@Pc(3) int local3 = 0; local3 < arg0.method3120(); local3++) { - if (arg0.method3149(local3) == 64 && local3 + 4 < arg0.method3120() && arg0.method3149(local3 + 4) == 64) { + for (@Pc(3) int local3 = 0; local3 < arg0.length(); local3++) { + if (arg0.method3149(local3) == 64 && local3 + 4 < arg0.length() && arg0.method3149(local3 + 4) == 64) { local3 += 4; - } else if (arg0.method3149(local3) == 126 && local3 + 4 < arg0.method3120() && arg0.method3149(local3 + 4) == 126) { + } else if (arg0.method3149(local3) == 126 && local3 + 4 < arg0.length() && arg0.method3149(local3 + 4) == 126) { local3 += 4; } else { local1 += this.aByteArray21[anIntArray155[arg0.method3149(local3)] + 7]; diff --git a/client/src/main/java/client.java b/client/src/main/java/client.java index b8b4964..1e17979 100644 --- a/client/src/main/java/client.java +++ b/client/src/main/java/client.java @@ -33,7 +33,7 @@ public final class client extends GameShell { Static249.aBoolean282 = false; try { @Pc(63) byte[] local63 = arg0[2].getBytes("ISO-8859-1"); - local15 = Static101.method2053(Static10.method346(local63, local63.length, 0)); + local15 = Static101.method2053(Static10.decodeString(local63, local63.length, 0)); } catch (@Pc(74) Exception local74) { } if (local15 != -1) { @@ -591,9 +591,9 @@ public final class client extends GameShell { if (Static4.anInt30 == 2) { Static206.aClass95_3 = new BufferedSocket((Socket) Static37.aClass212_2.anObject6, Static71.aClass213_3); @Pc(194) Buffer local194 = new Buffer(5); - local194.method2178(15); - local194.method2164(530); - Static206.aClass95_3.method2830(local194.aByteArray40, 5); + local194.p1(15); + local194.p4(530); + Static206.aClass95_3.method2830(local194.data, 5); Static4.anInt30++; Static217.aLong165 = MonotonicClock.method5096(); }