From 32546a07de401c9de9e19f07cc1a3f517f2e9d47 Mon Sep 17 00:00:00 2001 From: Pazaz Date: Tue, 19 Apr 2022 06:41:36 -0400 Subject: [PATCH] Rename Class8_Sub1 to Model --- client/src/main/java/Class13.java | 10 +++++----- client/src/main/java/Class144.java | 16 ++++++++-------- client/src/main/java/Class34.java | 6 +++--- client/src/main/java/Class55.java | 4 ++-- client/src/main/java/Class59.java | 16 ++++++++-------- client/src/main/java/Class8_Sub1_Sub2.java | 12 ++++++------ client/src/main/java/Class8_Sub2.java | 6 +++--- client/src/main/java/Class8_Sub4.java | 4 ++-- client/src/main/java/Class8_Sub4_Sub1.java | 14 +++++++------- client/src/main/java/Class8_Sub4_Sub2.java | 4 ++-- client/src/main/java/Class8_Sub5.java | 2 +- client/src/main/java/Class8_Sub6.java | 6 +++--- client/src/main/java/Class8_Sub7.java | 2 +- client/src/main/java/Class96.java | 12 ++++++------ client/src/main/java/GlModel.java | 10 +++++----- .../main/java/{Class8_Sub1.java => Model.java} | 8 ++++---- client/src/main/java/Static185.java | 4 ++-- client/src/main/java/Static220.java | 4 ++-- client/src/main/java/Static41.java | 4 ++-- client/src/main/java/Static87.java | 2 +- 20 files changed, 73 insertions(+), 73 deletions(-) rename client/src/main/java/{Class8_Sub1.java => Model.java} (97%) diff --git a/client/src/main/java/Class13.java b/client/src/main/java/Class13.java index 5a0ffef..cd400b7 100644 --- a/client/src/main/java/Class13.java +++ b/client/src/main/java/Class13.java @@ -830,7 +830,7 @@ public final class Class13 { } @OriginalMember(owner = "client!be", name = "a", descriptor = "(ILclient!tk;IIIZLclient!hh;)Lclient!ak;") - public final Class8_Sub1 method488(@OriginalArg(0) int arg0, @OriginalArg(1) Class144 arg1, @OriginalArg(2) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) boolean arg4, @OriginalArg(6) Class59 arg5) { + public final Model method488(@OriginalArg(0) int arg0, @OriginalArg(1) Class144 arg1, @OriginalArg(2) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) boolean arg4, @OriginalArg(6) Class59 arg5) { Static211.aBoolean72 = false; @Pc(10) int local10; @Pc(13) int local13; @@ -846,9 +846,9 @@ public final class Class13 { } else if (local10 == 1 && local13 == -1) { return null; } else { - @Pc(61) Class8_Sub1 local61; + @Pc(61) Model local61; if (local10 == 1) { - local61 = (Class8_Sub1) Static124.aClass99_17.method3106((long) ((local10 << 16) + local13)); + local61 = (Model) Static124.aClass99_17.method3106((long) ((local10 << 16) + local13)); if (local61 == null) { @Pc(69) Class8_Sub5 local69 = Static77.method1686(Static203.aClass153_85, local13); if (local69 == null) { @@ -883,7 +883,7 @@ public final class Class13 { } } else if (local10 == 4) { @Pc(164) Class55 local164 = Static71.method1439(local13); - @Pc(173) Class8_Sub1 local173 = local164.method1824(arg0, arg3, arg1, 10, arg2); + @Pc(173) Model local173 = local164.method1824(arg0, arg3, arg1, 10, arg2); if (local173 == null) { Static211.aBoolean72 = true; return null; @@ -906,7 +906,7 @@ public final class Class13 { @Pc(227) int local227 = this.anInt463 >>> 16; @Pc(232) int local232 = this.anInt463 & 0xFFFF; @Pc(235) int local235 = this.anInt498; - @Pc(246) Class8_Sub1 local246 = arg5.method1946(arg0, local235, local227, arg3, arg1, arg2, local232); + @Pc(246) Model local246 = arg5.method1946(arg0, local235, local227, arg3, arg1, arg2, local232); if (local246 == null) { Static211.aBoolean72 = true; return null; diff --git a/client/src/main/java/Class144.java b/client/src/main/java/Class144.java index 9f2bd46..ddd2df4 100644 --- a/client/src/main/java/Class144.java +++ b/client/src/main/java/Class144.java @@ -72,7 +72,7 @@ public final class Class144 { } @OriginalMember(owner = "client!tk", name = "a", descriptor = "(IIILclient!ak;II)Lclient!ak;") - public final Class8_Sub1 method4214(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) Class8_Sub1 arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4) { + public final Model method4214(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) Model arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4) { @Pc(10) int local10 = this.anIntArray474[arg0]; @Pc(15) int local15 = this.anIntArray473[arg0]; @Pc(23) Class3_Sub2_Sub7 local23 = Static72.method1566(local15 >> 16); @@ -87,7 +87,7 @@ public final class Class144 { local41 = Static72.method1566(local69 >> 16); arg1 = local69 & 0xFFFF; } - @Pc(124) Class8_Sub1 local124; + @Pc(124) Model local124; if (local41 == null) { local124 = arg2.method4568(!local23.method901(local27), !local23.method903(local27), !this.aBoolean278); } else { @@ -128,7 +128,7 @@ public final class Class144 { } @OriginalMember(owner = "client!tk", name = "a", descriptor = "(Lclient!ak;BIII)Lclient!ak;") - public final Class8_Sub1 method4215(@OriginalArg(0) Class8_Sub1 arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3) { + public final Model method4215(@OriginalArg(0) Model arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3) { @Pc(8) int local8 = this.anIntArray473[arg3]; @Pc(13) int local13 = this.anIntArray474[arg3]; @Pc(19) Class3_Sub2_Sub7 local19 = Static72.method1566(local8 >> 16); @@ -176,7 +176,7 @@ public final class Class144 { local163 &= !local81.method901(local85); local172 &= !local81.method903(local85); } - @Pc(258) Class8_Sub1 local258 = arg0.method4572(local163, local172, !this.aBoolean278); + @Pc(258) Model local258 = arg0.method4572(local163, local172, !this.aBoolean278); local258.method4558(local19, local23, local34, arg1, arg2 - 1, local13, this.aBoolean278); if (local71 != null) { local258.method4558(local71, local83, local81, local85, arg2 - 1, local13, this.aBoolean278); @@ -185,7 +185,7 @@ public final class Class144 { } @OriginalMember(owner = "client!tk", name = "a", descriptor = "(IIIILclient!ak;I)Lclient!ak;") - public final Class8_Sub1 method4216(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) Class8_Sub1 arg4) { + public final Model method4216(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) Model arg4) { @Pc(6) int local6 = this.anIntArray474[arg1]; @Pc(11) int local11 = this.anIntArray473[arg1]; @Pc(19) Class3_Sub2_Sub7 local19 = Static72.method1566(local11 >> 16); @@ -200,7 +200,7 @@ public final class Class144 { local42 = Static72.method1566(local66 >> 16); arg0 = local66 & 0xFFFF; } - @Pc(106) Class8_Sub1 local106; + @Pc(106) Model local106; if (local42 == null) { local106 = arg4.method4572(!local19.method901(local27), !local19.method903(local27), !this.aBoolean278); } else { @@ -260,7 +260,7 @@ public final class Class144 { } @OriginalMember(owner = "client!tk", name = "a", descriptor = "(IIIBLclient!ak;)Lclient!ak;") - public final Class8_Sub1 method4219(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(4) Class8_Sub1 arg3) { + public final Model method4219(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(4) Model arg3) { @Pc(16) int local16 = this.anIntArray474[arg2]; @Pc(21) int local21 = this.anIntArray473[arg2]; @Pc(27) Class3_Sub2_Sub7 local27 = Static72.method1566(local21 >> 16); @@ -274,7 +274,7 @@ public final class Class144 { local42 = Static72.method1566(local65 >> 16); arg0 = local65 & 0xFFFF; } - @Pc(103) Class8_Sub1 local103; + @Pc(103) Model local103; if (local42 == null) { local103 = arg3.method4560(!local27.method901(local31), !local27.method903(local31), !this.aBoolean278); } else { diff --git a/client/src/main/java/Class34.java b/client/src/main/java/Class34.java index b959fa0..760251d 100644 --- a/client/src/main/java/Class34.java +++ b/client/src/main/java/Class34.java @@ -98,8 +98,8 @@ public final class Class34 { } @OriginalMember(owner = "client!eg", name = "a", descriptor = "(IBII)Lclient!ak;") - public final Class8_Sub1 method1319(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2) { - @Pc(13) Class8_Sub1 local13 = (Class8_Sub1) Static56.aClass99_9.method3106((long) this.anInt1751); + public final Model method1319(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2) { + @Pc(13) Model local13 = (Model) Static56.aClass99_9.method3106((long) this.anInt1751); if (local13 == null) { @Pc(28) Class8_Sub5 local28 = Static77.method1686(Static93.aClass153_41, this.anInt1753); if (local28 == null) { @@ -119,7 +119,7 @@ public final class Class34 { local13 = local28.method1679(this.anInt1749 + 64, this.anInt1748 + 850, -30, -50, -30); Static56.aClass99_9.method3095(local13, (long) this.anInt1751); } - @Pc(118) Class8_Sub1 local118; + @Pc(118) Model local118; if (this.anInt1754 == -1 || arg1 == -1) { local118 = local13.method4560(true, true, true); } else { diff --git a/client/src/main/java/Class55.java b/client/src/main/java/Class55.java index 95bb0fd..9d075fa 100644 --- a/client/src/main/java/Class55.java +++ b/client/src/main/java/Class55.java @@ -300,7 +300,7 @@ public final class Class55 { } @OriginalMember(owner = "client!h", name = "a", descriptor = "(IIILclient!tk;II)Lclient!ak;") - public final Class8_Sub1 method1824(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) Class144 arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4) { + public final Model method1824(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) Class144 arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4) { if (this.anIntArray214 != null && arg3 > 1) { @Pc(22) int local22 = -1; for (@Pc(24) int local24 = 0; local24 < 10; local24++) { @@ -312,7 +312,7 @@ public final class Class55 { return Static71.method1439(local22).method1824(arg0, arg1, arg2, 1, arg4); } } - @Pc(76) Class8_Sub1 local76 = (Class8_Sub1) Static244.aClass99_32.method3106((long) this.anInt2354); + @Pc(76) Model local76 = (Model) Static244.aClass99_32.method3106((long) this.anInt2354); if (local76 == null) { @Pc(85) Class8_Sub5 local85 = Static77.method1686(Static230.aClass153_95, this.anInt2320); if (local85 == null) { diff --git a/client/src/main/java/Class59.java b/client/src/main/java/Class59.java index 2d42d1e..8c97923 100644 --- a/client/src/main/java/Class59.java +++ b/client/src/main/java/Class59.java @@ -31,9 +31,9 @@ public final class Class59 { public boolean aBoolean141; @OriginalMember(owner = "client!hh", name = "a", descriptor = "(IIIILclient!tk;III)Lclient!ak;") - public final Class8_Sub1 method1946(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) Class144 arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6) { + public final Model method1946(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) Class144 arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6) { @Pc(24) long local24 = (long) arg2 | (long) (arg6 << 16) | (long) arg1 << 32; - @Pc(30) Class8_Sub1 local30 = (Class8_Sub1) Static139.aClass99_21.method3106(local24); + @Pc(30) Model local30 = (Model) Static139.aClass99_21.method3106(local24); if (local30 == null) { @Pc(36) Class8_Sub5[] local36 = new Class8_Sub5[3]; @Pc(38) int local38 = 0; @@ -146,7 +146,7 @@ public final class Class59 { } @OriginalMember(owner = "client!hh", name = "a", descriptor = "([Lclient!ub;ILclient!tk;Lclient!tk;IIIIZII)Lclient!ak;") - public final Class8_Sub1 method1954(@OriginalArg(0) Class147[] arg0, @OriginalArg(1) int arg1, @OriginalArg(2) Class144 arg2, @OriginalArg(3) Class144 arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(7) int arg6, @OriginalArg(9) int arg7, @OriginalArg(10) int arg8) { + public final Model method1954(@OriginalArg(0) Class147[] arg0, @OriginalArg(1) int arg1, @OriginalArg(2) Class144 arg2, @OriginalArg(3) Class144 arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(7) int arg6, @OriginalArg(9) int arg7, @OriginalArg(10) int arg8) { if (this.anInt2492 != -1) { return Static214.method4363(this.anInt2492).method2937(arg0, arg5, arg8, arg1, arg6, arg7, arg2, arg4, arg3); } @@ -176,7 +176,7 @@ public final class Class59 { } } } - @Pc(154) Class8_Sub1 local154 = (Class8_Sub1) Static250.aClass99_33.method3106(local41); + @Pc(154) Model local154 = (Model) Static250.aClass99_33.method3106(local41); @Pc(158) boolean local158; @Pc(353) int local353; @Pc(360) int local360; @@ -204,7 +204,7 @@ public final class Class59 { } if (local158) { if (this.aLong87 != -1L) { - local154 = (Class8_Sub1) Static250.aClass99_33.method3106(this.aLong87); + local154 = (Model) Static250.aClass99_33.method3106(this.aLong87); } if (local154 == null) { return null; @@ -411,7 +411,7 @@ public final class Class59 { } } } - @Pc(1284) Class8_Sub1 local1284 = local154.method4572(!local827, !local836, !local838); + @Pc(1284) Model local1284 = local154.method4572(!local827, !local836, !local838); local481 = 0; local598 = 1; while (local481 < local346) { @@ -437,11 +437,11 @@ public final class Class59 { } @OriginalMember(owner = "client!hh", name = "a", descriptor = "(IBLclient!tk;II)Lclient!ak;") - public final Class8_Sub1 method1956(@OriginalArg(0) int arg0, @OriginalArg(2) Class144 arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3) { + public final Model method1956(@OriginalArg(0) int arg0, @OriginalArg(2) Class144 arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3) { if (this.anInt2492 != -1) { return Static214.method4363(this.anInt2492).method2943(arg1, arg0, arg3, arg2); } - @Pc(30) Class8_Sub1 local30 = (Class8_Sub1) Static139.aClass99_21.method3106(this.aLong88); + @Pc(30) Model local30 = (Model) Static139.aClass99_21.method3106(this.aLong88); if (local30 == null) { @Pc(42) boolean local42 = false; @Pc(52) int local52; diff --git a/client/src/main/java/Class8_Sub1_Sub2.java b/client/src/main/java/Class8_Sub1_Sub2.java index 8b07cc1..e3aff30 100644 --- a/client/src/main/java/Class8_Sub1_Sub2.java +++ b/client/src/main/java/Class8_Sub1_Sub2.java @@ -4,7 +4,7 @@ import org.openrs2.deob.annotation.OriginalMember; import org.openrs2.deob.annotation.Pc; @OriginalClass("client!w") -public final class Class8_Sub1_Sub2 extends Class8_Sub1 { +public final class Class8_Sub1_Sub2 extends Model { @OriginalMember(owner = "client!w", name = "t", descriptor = "[S") private short[] aShortArray89; @@ -512,7 +512,7 @@ public final class Class8_Sub1_Sub2 extends Class8_Sub1 { } @OriginalMember(owner = "client!w", name = "a", descriptor = "(ZZLclient!w;[B[S[I[I[I)Lclient!ak;") - private Class8_Sub1 method4584(@OriginalArg(0) boolean arg0, @OriginalArg(1) boolean arg1, @OriginalArg(2) Class8_Sub1_Sub2 arg2, @OriginalArg(3) byte[] arg3, @OriginalArg(4) short[] arg4, @OriginalArg(5) int[] arg5, @OriginalArg(6) int[] arg6, @OriginalArg(7) int[] arg7) { + private Model method4584(@OriginalArg(0) boolean arg0, @OriginalArg(1) boolean arg1, @OriginalArg(2) Class8_Sub1_Sub2 arg2, @OriginalArg(3) byte[] arg3, @OriginalArg(4) short[] arg4, @OriginalArg(5) int[] arg5, @OriginalArg(6) int[] arg6, @OriginalArg(7) int[] arg7) { arg2.anInt5788 = this.anInt5788; arg2.anInt5787 = this.anInt5787; arg2.anInt5789 = this.anInt5789; @@ -1161,7 +1161,7 @@ public final class Class8_Sub1_Sub2 extends Class8_Sub1 { @OriginalMember(owner = "client!w", name = "a", descriptor = "(ZZZ)Lclient!ak;") @Override - public final Class8_Sub1 method4560(@OriginalArg(0) boolean arg0, @OriginalArg(1) boolean arg1, @OriginalArg(2) boolean arg2) { + public final Model method4560(@OriginalArg(0) boolean arg0, @OriginalArg(1) boolean arg1, @OriginalArg(2) boolean arg2) { if (!arg0 && Static268.aByteArray77.length < this.anInt5787) { Static268.aByteArray77 = new byte[this.anInt5787 + 100]; } @@ -1184,7 +1184,7 @@ public final class Class8_Sub1_Sub2 extends Class8_Sub1 { } @OriginalMember(owner = "client!w", name = "a", descriptor = "(Lclient!ak;)Lclient!ak;") - public final Class8_Sub1 method4588(@OriginalArg(0) Class8_Sub1 arg0) { + public final Model method4588(@OriginalArg(0) Model arg0) { return new Class8_Sub1_Sub2(new Class8_Sub1_Sub2[] { this, (Class8_Sub1_Sub2) arg0 }, 2); } @@ -1398,7 +1398,7 @@ public final class Class8_Sub1_Sub2 extends Class8_Sub1 { @OriginalMember(owner = "client!w", name = "c", descriptor = "(ZZZ)Lclient!ak;") @Override - public final Class8_Sub1 method4572(@OriginalArg(0) boolean arg0, @OriginalArg(1) boolean arg1, @OriginalArg(2) boolean arg2) { + public final Model method4572(@OriginalArg(0) boolean arg0, @OriginalArg(1) boolean arg1, @OriginalArg(2) boolean arg2) { if (!arg0 && Static268.aByteArray76.length < this.anInt5787) { Static268.aByteArray76 = new byte[this.anInt5787 + 100]; } @@ -2346,7 +2346,7 @@ public final class Class8_Sub1_Sub2 extends Class8_Sub1 { @OriginalMember(owner = "client!w", name = "b", descriptor = "(ZZZ)Lclient!ak;") @Override - public final Class8_Sub1 method4568(@OriginalArg(0) boolean arg0, @OriginalArg(1) boolean arg1, @OriginalArg(2) boolean arg2) { + public final Model method4568(@OriginalArg(0) boolean arg0, @OriginalArg(1) boolean arg1, @OriginalArg(2) boolean arg2) { if (!arg0 && Static268.aByteArray78.length < this.anInt5787) { Static268.aByteArray78 = new byte[this.anInt5787 + 100]; } diff --git a/client/src/main/java/Class8_Sub2.java b/client/src/main/java/Class8_Sub2.java index 877ff63..497bd4c 100644 --- a/client/src/main/java/Class8_Sub2.java +++ b/client/src/main/java/Class8_Sub2.java @@ -63,9 +63,9 @@ public final class Class8_Sub2 extends Entity { } @OriginalMember(owner = "client!bh", name = "b", descriptor = "(Z)Lclient!ak;") - private Class8_Sub1 method552() { + private Model method552() { @Pc(8) Class34 local8 = Static34.method877(this.anInt596); - @Pc(26) Class8_Sub1 local26; + @Pc(26) Model local26; if (this.aBoolean41) { local26 = local8.method1319(-1, -1, 0); } else { @@ -83,7 +83,7 @@ public final class Class8_Sub2 extends Entity { @OriginalMember(owner = "client!bh", name = "a", descriptor = "(IIIIIIIIJILclient!ga;)V") @Override public final void method4546(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7, @OriginalArg(8) long arg8, @OriginalArg(9) int arg9, @OriginalArg(10) Class47_Sub1 arg10) { - @Pc(7) Class8_Sub1 local7 = this.method552(); + @Pc(7) Model local7 = this.method552(); if (local7 != null) { local7.method4546(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, this.aClass47_Sub1_1); this.anInt603 = local7.method4549(); diff --git a/client/src/main/java/Class8_Sub4.java b/client/src/main/java/Class8_Sub4.java index 404e780..95314ba 100644 --- a/client/src/main/java/Class8_Sub4.java +++ b/client/src/main/java/Class8_Sub4.java @@ -347,7 +347,7 @@ public abstract class Class8_Sub4 extends Entity { } @OriginalMember(owner = "client!fe", name = "a", descriptor = "(BLclient!ak;I)V") - protected final void method2685(@OriginalArg(1) Class8_Sub1 arg0, @OriginalArg(2) int arg1) { + protected final void method2685(@OriginalArg(1) Model arg0, @OriginalArg(2) int arg1) { Static102.anInt2680 = 0; Static101.anInt2640 = 0; Static62.anInt1938 = 0; @@ -414,7 +414,7 @@ public abstract class Class8_Sub4 extends Entity { } @OriginalMember(owner = "client!fe", name = "a", descriptor = "(Lclient!ak;B)V") - protected final void method2687(@OriginalArg(0) Class8_Sub1 arg0) { + protected final void method2687(@OriginalArg(0) Model arg0) { @Pc(16) Class20 local16 = this.method2681(); if (local16.anInt1064 == 0 && local16.anInt1041 == 0) { return; diff --git a/client/src/main/java/Class8_Sub4_Sub1.java b/client/src/main/java/Class8_Sub4_Sub1.java index 3744423..fa7afc0 100644 --- a/client/src/main/java/Class8_Sub4_Sub1.java +++ b/client/src/main/java/Class8_Sub4_Sub1.java @@ -173,7 +173,7 @@ public final class Class8_Sub4_Sub1 extends Class8_Sub4 { } @Pc(25) Class144 local25 = this.anInt3369 != -1 && this.anInt3420 == 0 ? Static36.method941(this.anInt3369) : null; @Pc(54) Class144 local54 = this.anInt3366 == -1 || this.aBoolean98 || this.anInt3366 == this.method2681().anInt1037 && local25 != null ? null : Static36.method941(this.anInt3366); - @Pc(76) Class8_Sub1 local76 = this.aClass59_1.method1954(this.aClass147Array3, this.anInt3373, local54, local25, this.anInt3396, this.anInt3388, this.anInt3360, this.anInt3425, this.anInt3407); + @Pc(76) Model local76 = this.aClass59_1.method1954(this.aClass147Array3, this.anInt3373, local54, local25, this.anInt3396, this.anInt3388, this.anInt3360, this.anInt3425, this.anInt3407); @Pc(79) int local79 = Static198.method1029(); if (Static239.aBoolean269 && Static238.anInt5316 < 96 && local79 > 50) { Static16.method501(); @@ -194,7 +194,7 @@ public final class Class8_Sub4_Sub1 extends Class8_Sub4 { return; } this.anInt3413 = local76.method4549(); - @Pc(184) Class8_Sub1 local184; + @Pc(184) Model local184; if (Static209.aBoolean240 && (this.aClass59_1.anInt2492 == -1 || Static214.method4363(this.aClass59_1.anInt2492).aBoolean180)) { local184 = Static41.method1043(160, this.aBoolean171, local54 == null ? local25 : local54, this.anInt3412, 0, this.anInt3421, 0, 1, local76, arg0, local54 == null ? this.anInt3425 : this.anInt3407, this.anInt3424, 240); if (Static239.aBoolean269) { @@ -260,16 +260,16 @@ public final class Class8_Sub4_Sub1 extends Class8_Sub4 { } } } - @Pc(515) Class8_Sub1 local515 = null; + @Pc(515) Model local515 = null; if (!this.aBoolean98 && this.anObject5 != null) { if (Static83.anInt372 >= this.anInt3375) { this.anObject5 = null; } if (this.anInt3390 <= Static83.anInt372 && this.anInt3375 > Static83.anInt372) { if (this.anObject5 instanceof Class8_Sub3) { - local515 = (Class8_Sub1) ((Class8_Sub3) this.anObject5).method1049(); + local515 = (Model) ((Class8_Sub3) this.anObject5).method1049(); } else { - local515 = (Class8_Sub1) this.anObject5; + local515 = (Model) this.anObject5; } local515.method4575(this.anInt3379 - this.anInt3412, this.anInt3406 + -this.anInt3424, this.anInt3426 - this.anInt3421); if (this.anInt3400 == 512) { @@ -312,13 +312,13 @@ public final class Class8_Sub4_Sub1 extends Class8_Sub4 { } @OriginalMember(owner = "client!e", name = "a", descriptor = "(Lclient!ga;ILclient!ak;IIIIIIIIIIII)V") - private void method1263(@OriginalArg(0) Class47_Sub1 arg0, @OriginalArg(1) int arg1, @OriginalArg(2) Class8_Sub1 arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(7) int arg6, @OriginalArg(8) int arg7, @OriginalArg(9) int arg8, @OriginalArg(10) int arg9, @OriginalArg(11) int arg10, @OriginalArg(12) int arg11, @OriginalArg(13) int arg12, @OriginalArg(14) int arg13) { + private void method1263(@OriginalArg(0) Class47_Sub1 arg0, @OriginalArg(1) int arg1, @OriginalArg(2) Model arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(7) int arg6, @OriginalArg(8) int arg7, @OriginalArg(9) int arg8, @OriginalArg(10) int arg9, @OriginalArg(11) int arg10, @OriginalArg(12) int arg11, @OriginalArg(13) int arg12, @OriginalArg(14) int arg13) { @Pc(12) int local12 = arg3 * arg3 + arg1 * arg1; if (local12 < 16 || local12 > 360000) { return; } @Pc(34) int local34 = (int) (Math.atan2((double) arg3, (double) arg1) * 325.949D) & 0x7FF; - @Pc(46) Class8_Sub1 local46 = Static220.method3800(local34, this.anInt3421, arg11, this.anInt3412, arg2, this.anInt3424); + @Pc(46) Model local46 = Static220.method3800(local34, this.anInt3421, arg11, this.anInt3412, arg2, this.anInt3424); if (local46 == null) { return; } diff --git a/client/src/main/java/Class8_Sub4_Sub2.java b/client/src/main/java/Class8_Sub4_Sub2.java index f6d5c23..85e48e7 100644 --- a/client/src/main/java/Class8_Sub4_Sub2.java +++ b/client/src/main/java/Class8_Sub4_Sub2.java @@ -28,7 +28,7 @@ public final class Class8_Sub4_Sub2 extends Class8_Sub4 { } @Pc(29) Class144 local29 = this.anInt3369 != -1 && this.anInt3420 == 0 ? Static36.method941(this.anInt3369) : null; @Pc(53) Class144 local53 = this.anInt3366 == -1 || this.anInt3366 == this.method2681().anInt1037 && local29 != null ? null : Static36.method941(this.anInt3366); - @Pc(74) Class8_Sub1 local74 = this.aClass96_1.method2937(this.aClass147Array3, this.anInt3388, this.anInt3407, this.anInt3373, this.anInt3360, this.anInt3425, local53, this.anInt3396, local29); + @Pc(74) Model local74 = this.aClass96_1.method2937(this.aClass147Array3, this.anInt3388, this.anInt3407, this.anInt3373, this.anInt3360, this.anInt3425, local53, this.anInt3396, local29); if (local74 == null) { return; } @@ -37,7 +37,7 @@ public final class Class8_Sub4_Sub2 extends Class8_Sub4 { if (local84.anIntArray357 != null) { local84 = local84.method2932(); } - @Pc(140) Class8_Sub1 local140; + @Pc(140) Model local140; if (Static209.aBoolean240 && local84.aBoolean180) { local140 = Static41.method1043(this.aClass96_1.aByte13, this.aBoolean171, local53 == null ? local29 : local53, this.anInt3412, this.aClass96_1.aShort23, this.anInt3421, this.aClass96_1.aShort24, this.aClass96_1.anInt3713, local74, arg0, local53 == null ? this.anInt3425 : this.anInt3407, this.anInt3424, this.aClass96_1.aByte12); if (Static239.aBoolean269) { diff --git a/client/src/main/java/Class8_Sub5.java b/client/src/main/java/Class8_Sub5.java index 829daae..ca6020b 100644 --- a/client/src/main/java/Class8_Sub5.java +++ b/client/src/main/java/Class8_Sub5.java @@ -1230,7 +1230,7 @@ public final class Class8_Sub5 extends Entity { } @OriginalMember(owner = "client!gb", name = "c", descriptor = "(IIIII)Lclient!ak;") - public final Class8_Sub1 method1679(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4) { + public final Model method1679(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4) { if (Static239.aBoolean269) { @Pc(9) GlModel local9 = new GlModel(this, arg0, arg1, true); local9.method4099(); diff --git a/client/src/main/java/Class8_Sub6.java b/client/src/main/java/Class8_Sub6.java index 9067d18..b7d38ea 100644 --- a/client/src/main/java/Class8_Sub6.java +++ b/client/src/main/java/Class8_Sub6.java @@ -118,9 +118,9 @@ public final class Class8_Sub6 extends Entity { } @OriginalMember(owner = "client!ra", name = "b", descriptor = "(I)Lclient!ak;") - private Class8_Sub1 method3703() { + private Model method3703() { @Pc(14) Class34 local14 = Static34.method877(this.anInt4816); - @Pc(24) Class8_Sub1 local24 = local14.method1319(this.anInt4798, this.anInt4820, this.anInt4796); + @Pc(24) Model local24 = local14.method1319(this.anInt4798, this.anInt4820, this.anInt4796); if (local24 == null) { return null; } else { @@ -196,7 +196,7 @@ public final class Class8_Sub6 extends Entity { @OriginalMember(owner = "client!ra", name = "a", descriptor = "(IIIIIIIIJILclient!ga;)V") @Override public final void method4546(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7, @OriginalArg(8) long arg8, @OriginalArg(9) int arg9, @OriginalArg(10) Class47_Sub1 arg10) { - @Pc(3) Class8_Sub1 local3 = this.method3703(); + @Pc(3) Model local3 = this.method3703(); if (local3 != null) { local3.method4546(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, this.aClass47_Sub1_6); this.anInt4814 = local3.method4549(); diff --git a/client/src/main/java/Class8_Sub7.java b/client/src/main/java/Class8_Sub7.java index 35af70d..d4cefd1 100644 --- a/client/src/main/java/Class8_Sub7.java +++ b/client/src/main/java/Class8_Sub7.java @@ -23,7 +23,7 @@ public final class Class8_Sub7 extends Entity { @OriginalMember(owner = "client!uj", name = "a", descriptor = "(IIIIIIIIJILclient!ga;)V") @Override public final void method4546(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7, @OriginalArg(8) long arg8, @OriginalArg(9) int arg9, @OriginalArg(10) Class47_Sub1 arg10) { - @Pc(16) Class8_Sub1 local16 = Static71.method1439(this.anInt5555).method1824(-1, 0, null, this.anInt5550, 0); + @Pc(16) Model local16 = Static71.method1439(this.anInt5555).method1824(-1, 0, null, this.anInt5550, 0); if (local16 != null) { local16.method4546(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10); this.anInt5553 = local16.method4549(); diff --git a/client/src/main/java/Class96.java b/client/src/main/java/Class96.java index 2307d0f..daf6181 100644 --- a/client/src/main/java/Class96.java +++ b/client/src/main/java/Class96.java @@ -215,12 +215,12 @@ public final class Class96 { } @OriginalMember(owner = "client!me", name = "a", descriptor = "([Lclient!ub;IBIIIILclient!tk;ILclient!tk;)Lclient!ak;") - public final Class8_Sub1 method2937(@OriginalArg(0) Class147[] arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5, @OriginalArg(7) Class144 arg6, @OriginalArg(8) int arg7, @OriginalArg(9) Class144 arg8) { + public final Model method2937(@OriginalArg(0) Class147[] arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5, @OriginalArg(7) Class144 arg6, @OriginalArg(8) int arg7, @OriginalArg(9) Class144 arg8) { if (this.anIntArray357 != null) { @Pc(13) Class96 local13 = this.method2932(); return local13 == null ? null : local13.method2937(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8); } - @Pc(40) Class8_Sub1 local40 = (Class8_Sub1) Static125.aClass99_18.method3106((long) this.anInt3741); + @Pc(40) Model local40 = (Model) Static125.aClass99_18.method3106((long) this.anInt3741); @Pc(46) boolean local46; @Pc(173) int local173; @Pc(235) int local235; @@ -379,7 +379,7 @@ public final class Class96 { } } if (!local46 && arg8 == null && arg6 == null) { - @Pc(933) Class8_Sub1 local933 = local40.method4572(true, true, true); + @Pc(933) Model local933 = local40.method4572(true, true, true); if (this.anInt3729 != 128 || this.anInt3731 != 128) { local933.method4559(this.anInt3729, this.anInt3731, this.anInt3729); } @@ -448,7 +448,7 @@ public final class Class96 { } } } - @Pc(1218) Class8_Sub1 local1218 = local40.method4572(!local721, !local723, !local725); + @Pc(1218) Model local1218 = local40.method4572(!local721, !local723, !local725); local330 = 1; for (local318 = 0; local318 < local173; local318++) { if (Static6.aClass3_Sub2_Sub7Array1[local318] != null) { @@ -500,14 +500,14 @@ public final class Class96 { } @OriginalMember(owner = "client!me", name = "a", descriptor = "(Lclient!tk;IIII)Lclient!ak;") - public final Class8_Sub1 method2943(@OriginalArg(0) Class144 arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(4) int arg3) { + public final Model method2943(@OriginalArg(0) Class144 arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(4) int arg3) { if (this.anIntArray357 != null) { @Pc(13) Class96 local13 = this.method2932(); return local13 == null ? null : local13.method2943(arg0, arg1, arg2, arg3); } else if (this.anIntArray354 == null) { return null; } else { - @Pc(41) Class8_Sub1 local41 = (Class8_Sub1) Static262.aClass99_35.method3106((long) this.anInt3741); + @Pc(41) Model local41 = (Model) Static262.aClass99_35.method3106((long) this.anInt3741); if (local41 == null) { @Pc(46) boolean local46 = false; for (@Pc(48) int local48 = 0; local48 < this.anIntArray354.length; local48++) { diff --git a/client/src/main/java/GlModel.java b/client/src/main/java/GlModel.java index 88fafc5..87c0901 100644 --- a/client/src/main/java/GlModel.java +++ b/client/src/main/java/GlModel.java @@ -6,7 +6,7 @@ import org.openrs2.deob.annotation.OriginalMember; import org.openrs2.deob.annotation.Pc; @OriginalClass("client!td") -public final class GlModel extends Class8_Sub1 { +public final class GlModel extends Model { @OriginalMember(owner = "client!td", name = "t", descriptor = "[S") private short[] aShortArray75; @@ -617,7 +617,7 @@ public final class GlModel extends Class8_Sub1 { @OriginalMember(owner = "client!td", name = "a", descriptor = "(ZZZ)Lclient!ak;") @Override - public final Class8_Sub1 method4560(@OriginalArg(0) boolean arg0, @OriginalArg(1) boolean arg1, @OriginalArg(2) boolean arg2) { + public final Model method4560(@OriginalArg(0) boolean arg0, @OriginalArg(1) boolean arg1, @OriginalArg(2) boolean arg2) { return this.method4114(arg0, arg1, arg2, Static237.aClass8_Sub1_Sub1_4, Static237.aClass8_Sub1_Sub1_3); } @@ -902,7 +902,7 @@ public final class GlModel extends Class8_Sub1 { @OriginalMember(owner = "client!td", name = "b", descriptor = "(ZZZ)Lclient!ak;") @Override - public final Class8_Sub1 method4568(@OriginalArg(0) boolean arg0, @OriginalArg(1) boolean arg1, @OriginalArg(2) boolean arg2) { + public final Model method4568(@OriginalArg(0) boolean arg0, @OriginalArg(1) boolean arg1, @OriginalArg(2) boolean arg2) { return this.method4114(arg0, arg1, arg2, Static237.aClass8_Sub1_Sub1_6, Static237.aClass8_Sub1_Sub1_5); } @@ -1655,7 +1655,7 @@ public final class GlModel extends Class8_Sub1 { @OriginalMember(owner = "client!td", name = "c", descriptor = "(ZZZ)Lclient!ak;") @Override - public final Class8_Sub1 method4572(@OriginalArg(0) boolean arg0, @OriginalArg(1) boolean arg1, @OriginalArg(2) boolean arg2) { + public final Model method4572(@OriginalArg(0) boolean arg0, @OriginalArg(1) boolean arg1, @OriginalArg(2) boolean arg2) { return this.method4114(arg0, arg1, arg2, Static237.aClass8_Sub1_Sub1_2, Static237.aClass8_Sub1_Sub1_1); } @@ -2343,7 +2343,7 @@ public final class GlModel extends Class8_Sub1 { } @OriginalMember(owner = "client!td", name = "a", descriptor = "(ZZZLclient!td;Lclient!td;)Lclient!ak;") - private Class8_Sub1 method4114(@OriginalArg(0) boolean arg0, @OriginalArg(1) boolean arg1, @OriginalArg(2) boolean arg2, @OriginalArg(3) GlModel arg3, @OriginalArg(4) GlModel arg4) { + private Model method4114(@OriginalArg(0) boolean arg0, @OriginalArg(1) boolean arg1, @OriginalArg(2) boolean arg2, @OriginalArg(3) GlModel arg3, @OriginalArg(4) GlModel arg4) { arg3.anInt5295 = this.anInt5295; arg3.anInt5296 = this.anInt5296; arg3.anInt5297 = this.anInt5297; diff --git a/client/src/main/java/Class8_Sub1.java b/client/src/main/java/Model.java similarity index 97% rename from client/src/main/java/Class8_Sub1.java rename to client/src/main/java/Model.java index d0494b6..69de9c0 100644 --- a/client/src/main/java/Class8_Sub1.java +++ b/client/src/main/java/Model.java @@ -4,7 +4,7 @@ import org.openrs2.deob.annotation.OriginalMember; import org.openrs2.deob.annotation.Pc; @OriginalClass("client!ak") -public abstract class Class8_Sub1 extends Entity { +public abstract class Model extends Entity { @OriginalMember(owner = "client!ak", name = "s", descriptor = "Z") public boolean aBoolean303 = false; @@ -221,7 +221,7 @@ public abstract class Class8_Sub1 extends Entity { public abstract void method4559(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2); @OriginalMember(owner = "client!ak", name = "a", descriptor = "(ZZZ)Lclient!ak;") - public abstract Class8_Sub1 method4560(@OriginalArg(0) boolean arg0, @OriginalArg(1) boolean arg1, @OriginalArg(2) boolean arg2); + public abstract Model method4560(@OriginalArg(0) boolean arg0, @OriginalArg(1) boolean arg1, @OriginalArg(2) boolean arg2); @OriginalMember(owner = "client!ak", name = "g", descriptor = "()I") public abstract int method4561(); @@ -260,7 +260,7 @@ public abstract class Class8_Sub1 extends Entity { protected abstract void method4567(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3); @OriginalMember(owner = "client!ak", name = "b", descriptor = "(ZZZ)Lclient!ak;") - public abstract Class8_Sub1 method4568(@OriginalArg(0) boolean arg0, @OriginalArg(1) boolean arg1, @OriginalArg(2) boolean arg2); + public abstract Model method4568(@OriginalArg(0) boolean arg0, @OriginalArg(1) boolean arg1, @OriginalArg(2) boolean arg2); @OriginalMember(owner = "client!ak", name = "a", descriptor = "(I[IIIIZ)V") protected abstract void method4569(@OriginalArg(0) int arg0, @OriginalArg(1) int[] arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) boolean arg5); @@ -301,7 +301,7 @@ public abstract class Class8_Sub1 extends Entity { public abstract void method4571(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5, @OriginalArg(7) long arg6); @OriginalMember(owner = "client!ak", name = "c", descriptor = "(ZZZ)Lclient!ak;") - public abstract Class8_Sub1 method4572(@OriginalArg(0) boolean arg0, @OriginalArg(1) boolean arg1, @OriginalArg(2) boolean arg2); + public abstract Model method4572(@OriginalArg(0) boolean arg0, @OriginalArg(1) boolean arg1, @OriginalArg(2) boolean arg2); @OriginalMember(owner = "client!ak", name = "a", descriptor = "([[IIIIII)V") protected final void method4573(@OriginalArg(0) int[][] arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5) { diff --git a/client/src/main/java/Static185.java b/client/src/main/java/Static185.java index 0d3dad8..9bf7b59 100644 --- a/client/src/main/java/Static185.java +++ b/client/src/main/java/Static185.java @@ -133,8 +133,8 @@ public final class Static185 { @Pc(531) boolean local531 = Static5.method35(arg2, arg7, arg8, local199, local84, local81, local387, local261); if (local62.aBoolean215 && local531 && arg1) { @Pc(541) int local541 = 15; - if (local387 instanceof Class8_Sub1) { - local541 = ((Class8_Sub1) local387).method4566() / 4; + if (local387 instanceof Model) { + local541 = ((Model) local387).method4566() / 4; if (local541 > 30) { local541 = 30; } diff --git a/client/src/main/java/Static220.java b/client/src/main/java/Static220.java index 58db525..11f5e4d 100644 --- a/client/src/main/java/Static220.java +++ b/client/src/main/java/Static220.java @@ -77,9 +77,9 @@ public final class Static220 { } @OriginalMember(owner = "client!rm", name = "a", descriptor = "(ZIIIILclient!ak;I)Lclient!ak;") - public static Class8_Sub1 method3800(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) Class8_Sub1 arg4, @OriginalArg(6) int arg5) { + public static Model method3800(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) Model arg4, @OriginalArg(6) int arg5) { @Pc(4) long local4 = (long) arg2; - @Pc(10) Class8_Sub1 local10 = (Class8_Sub1) Static110.aClass99_15.method3106(local4); + @Pc(10) Model local10 = (Model) Static110.aClass99_15.method3106(local4); if (local10 == null) { @Pc(22) Class8_Sub5 local22 = Static77.method1686(Static267.aClass153_109, arg2); if (local22 == null) { diff --git a/client/src/main/java/Static41.java b/client/src/main/java/Static41.java index 082952d..0c115b4 100644 --- a/client/src/main/java/Static41.java +++ b/client/src/main/java/Static41.java @@ -41,9 +41,9 @@ public final class Static41 { public static Class100 aClass100_272 = aClass100_267; @OriginalMember(owner = "client!dc", name = "a", descriptor = "(IZLclient!tk;IIIIILclient!ak;IIIIB)Lclient!ak;") - public static Class8_Sub1 method1043(@OriginalArg(0) int arg0, @OriginalArg(1) boolean arg1, @OriginalArg(2) Class144 arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7, @OriginalArg(8) Class8_Sub1 arg8, @OriginalArg(9) int arg9, @OriginalArg(10) int arg10, @OriginalArg(11) int arg11, @OriginalArg(12) int arg12) { + public static Model method1043(@OriginalArg(0) int arg0, @OriginalArg(1) boolean arg1, @OriginalArg(2) Class144 arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7, @OriginalArg(8) Model arg8, @OriginalArg(9) int arg9, @OriginalArg(10) int arg10, @OriginalArg(11) int arg11, @OriginalArg(12) int arg12) { @Pc(23) long local23 = ((long) arg4 << 48) + (long) (arg7 + (arg0 << 16) + (arg12 << 24)) + ((long) arg6 << 32); - @Pc(33) Class8_Sub1 local33 = (Class8_Sub1) Static45.aClass99_6.method3106(local23); + @Pc(33) Model local33 = (Model) Static45.aClass99_6.method3106(local23); @Pc(109) int local109; @Pc(115) int local115; @Pc(126) int local126; diff --git a/client/src/main/java/Static87.java b/client/src/main/java/Static87.java index b392dc3..a25a8eb 100644 --- a/client/src/main/java/Static87.java +++ b/client/src/main/java/Static87.java @@ -665,7 +665,7 @@ public final class Static87 { @Pc(2611) Class55 local2611; if (local30.anInt452 == 6) { @Pc(2587) boolean local2587 = Static154.method2926(local30); - @Pc(2589) Class8_Sub1 local2589 = null; + @Pc(2589) Model local2589 = null; if (local2587) { local276 = local30.anInt462; } else {