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

Rename Class8_Sub5 to RawModel

Browse source
This commit is contained in:
Pazaz 2022-04-19 06:53:21 -04:00
parent bfd41663a7
commit 26349d92b1
14 changed files with 75 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

28
client/src/main/java/Class118.java
View file

@ -222,8 +222,8 @@ public final class Class118 {
} }
@OriginalMember(owner = "client!pb", name = "a", descriptor = "(III)Lclient!gb;") @OriginalMember(owner = "client!pb", name = "a", descriptor = "(III)Lclient!gb;")
private Class8_Sub5 method3418(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) { private RawModel method3418(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
@Pc(7) Class8_Sub5 local7 = null; @Pc(7) RawModel local7 = null;
@Pc(10) boolean local10 = this.aBoolean217; @Pc(10) boolean local10 = this.aBoolean217;
if (arg1 == 2 && arg0 > 3) { if (arg1 == 2 && arg0 > 3) {
local10 = !local10; local10 = !local10;
@ -243,7 +243,7 @@ public final class Class118 {
if (local10) { if (local10) {
local60 += 65536; local60 += 65536;
} }
local7 = (Class8_Sub5) Static169.aClass99_24.method3106((long) local60); local7 = (RawModel) Static169.aClass99_24.method3106((long) local60);
if (local7 == null) { if (local7 == null) {
local7 = Static77.method1686(Static121.aClass153_45, local60 & 0xFFFF); local7 = Static77.method1686(Static121.aClass153_45, local60 & 0xFFFF);
if (local7 == null) { if (local7 == null) {
@ -259,7 +259,7 @@ public final class Class118 {
} }
} }
if (local46 > 1) { if (local46 > 1) {
local7 = new Class8_Sub5(Static274.aClass8_Sub5Array5, local46); local7 = new RawModel(Static274.aClass8_Sub5Array5, local46);
} }
} else { } else {
local46 = -1; local46 = -1;
@ -276,7 +276,7 @@ public final class Class118 {
if (local10) { if (local10) {
local48 += 65536; local48 += 65536;
} }
local7 = (Class8_Sub5) Static169.aClass99_24.method3106((long) local48); local7 = (RawModel) Static169.aClass99_24.method3106((long) local48);
if (local7 == null) { if (local7 == null) {
local7 = Static77.method1686(Static121.aClass153_45, local48 & 0xFFFF); local7 = Static77.method1686(Static121.aClass153_45, local48 & 0xFFFF);
if (local7 == null) { if (local7 == null) {
@ -300,7 +300,7 @@ public final class Class118 {
} else { } else {
local230 = true; local230 = true;
} }
@Pc(265) Class8_Sub5 local265 = new Class8_Sub5(local7, arg0 == 0 && !local211 && !local230, this.aShortArray61 == null, this.aShortArray60 == null, true); @Pc(265) RawModel local265 = new RawModel(local7, arg0 == 0 && !local211 && !local230, this.aShortArray61 == null, this.aShortArray60 == null, true);
if (arg1 == 4 && arg0 > 3) { if (arg1 == 4 && arg0 > 3) {
local265.method1682(); local265.method1682();
local265.method1672(45, 0, -45); local265.method1672(45, 0, -45);
@ -641,7 +641,7 @@ public final class Class118 {
} }
local79 = (GlModel) Static169.aClass99_24.method3106(local135); local79 = (GlModel) Static169.aClass99_24.method3106(local135);
if (local79 == null) { if (local79 == null) {
@Pc(175) Class8_Sub5 local175 = null; @Pc(175) RawModel local175 = null;
for (local177 = 0; local177 < local24; local177++) { for (local177 = 0; local177 < local24; local177++) {
local175 = Static77.method1686(Static121.aClass153_45, this.anIntArray379[local177] & 0xFFFF); local175 = Static77.method1686(Static121.aClass153_45, this.anIntArray379[local177] & 0xFFFF);
if (local175 == null) { if (local175 == null) {
@ -652,7 +652,7 @@ public final class Class118 {
} }
} }
if (local24 > 1) { if (local24 > 1) {
local175 = new Class8_Sub5(Static274.aClass8_Sub5Array5, local24); local175 = new RawModel(Static274.aClass8_Sub5Array5, local24);
} }
local79 = new GlModel(local175, local10, local17, arg1); local79 = new GlModel(local175, local10, local17, arg1);
Static169.aClass99_24.method3095(local79, local135); Static169.aClass99_24.method3095(local79, local135);
@ -675,7 +675,7 @@ public final class Class118 {
} }
local79 = (GlModel) Static169.aClass99_24.method3106((long) local26); local79 = (GlModel) Static169.aClass99_24.method3106((long) local26);
if (local79 == null) { if (local79 == null) {
@Pc(90) Class8_Sub5 local90 = Static77.method1686(Static121.aClass153_45, local26 & 0xFFFF); @Pc(90) RawModel local90 = Static77.method1686(Static121.aClass153_45, local26 & 0xFFFF);
if (local90 == null) { if (local90 == null) {
return null; return null;
} }
@ -790,7 +790,7 @@ public final class Class118 {
} }
@Pc(60) Entity local60 = (Entity) Static93.aClass99_14.method3106(local29); @Pc(60) Entity local60 = (Entity) Static93.aClass99_14.method3106(local29);
if (local60 == null) { if (local60 == null) {
@Pc(69) Class8_Sub5 local69 = this.method3418(arg0, arg3); @Pc(69) RawModel local69 = this.method3418(arg0, arg3);
if (local69 == null) { if (local69 == null) {
Static171.aClass139_1.aClass8_10 = null; Static171.aClass139_1.aClass8_10 = null;
return Static171.aClass139_1; return Static171.aClass139_1;
@ -810,13 +810,13 @@ public final class Class118 {
Static93.aClass99_14.method3095(local60, local29); Static93.aClass99_14.method3095(local60, local29);
} }
if (local50) { if (local50) {
local60 = ((Class8_Sub5) local60).method1675(); local60 = ((RawModel) local60).method1675();
} }
if (this.aByte15 != 0) { if (this.aByte15 != 0) {
if (local60 instanceof Class8_Sub1_Sub2) { if (local60 instanceof Class8_Sub1_Sub2) {
local60 = ((Class8_Sub1_Sub2) local60).method4586(this.aByte15, this.aShort26, arg2, arg5, arg1, arg4, arg9, true); local60 = ((Class8_Sub1_Sub2) local60).method4586(this.aByte15, this.aShort26, arg2, arg5, arg1, arg4, arg9, true);
} else if (local60 instanceof Class8_Sub5) { } else if (local60 instanceof RawModel) {
local60 = ((Class8_Sub5) local60).method1670(this.aByte15, this.aShort26, arg2, arg5, arg1, arg4, arg9); local60 = ((RawModel) local60).method1670(this.aByte15, this.aShort26, arg2, arg5, arg1, arg4, arg9);
} }
} }
Static171.aClass139_1.aClass8_10 = local60; Static171.aClass139_1.aClass8_10 = local60;
@ -834,7 +834,7 @@ public final class Class118 {
} }
@Pc(195) Class8_Sub1_Sub2 local195 = (Class8_Sub1_Sub2) Static262.aClass99_36.method3106(local30); @Pc(195) Class8_Sub1_Sub2 local195 = (Class8_Sub1_Sub2) Static262.aClass99_36.method3106(local30);
if (local195 == null) { if (local195 == null) {
@Pc(204) Class8_Sub5 local204 = this.method3418(arg5, arg11); @Pc(204) RawModel local204 = this.method3418(arg5, arg11);
if (local204 == null) { if (local204 == null) {
return null; return null;
} }

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

@ -850,7 +850,7 @@ public final class Class13 {
if (local10 == 1) { if (local10 == 1) {
local61 = (Model) Static124.aClass99_17.method3106((long) ((local10 << 16) + local13)); local61 = (Model) Static124.aClass99_17.method3106((long) ((local10 << 16) + local13));
if (local61 == null) { if (local61 == null) {
@Pc(69) Class8_Sub5 local69 = Static77.method1686(Static203.aClass153_85, local13); @Pc(69) RawModel local69 = Static77.method1686(Static203.aClass153_85, local13);
if (local69 == null) { if (local69 == null) {
Static211.aBoolean72 = true; Static211.aBoolean72 = true;
return null; return null;

14
client/src/main/java/Class30.java
View file

@ -31,15 +31,15 @@ public final class Class30 {
public boolean aBoolean85 = false; public boolean aBoolean85 = false;
@OriginalMember(owner = "client!dm", name = "a", descriptor = "(Z)Lclient!gb;") @OriginalMember(owner = "client!dm", name = "a", descriptor = "(Z)Lclient!gb;")
public final Class8_Sub5 method1198() { public final RawModel method1198() {
@Pc(13) int local13 = 0; @Pc(13) int local13 = 0;
@Pc(16) Class8_Sub5[] local16 = new Class8_Sub5[5]; @Pc(16) RawModel[] local16 = new RawModel[5];
for (@Pc(18) int local18 = 0; local18 < 5; local18++) { for (@Pc(18) int local18 = 0; local18 < 5; local18++) {
if (this.anIntArray113[local18] != -1) { if (this.anIntArray113[local18] != -1) {
local16[local13++] = Static77.method1686(Static14.aClass153_8, this.anIntArray113[local18]); local16[local13++] = Static77.method1686(Static14.aClass153_8, this.anIntArray113[local18]);
} }
} }
@Pc(52) Class8_Sub5 local52 = new Class8_Sub5(local16, local13); @Pc(52) RawModel local52 = new RawModel(local16, local13);
@Pc(58) int local58; @Pc(58) int local58;
if (this.aShortArray12 != null) { if (this.aShortArray12 != null) {
for (local58 = 0; local58 < this.aShortArray12.length; local58++) { for (local58 = 0; local58 < this.aShortArray12.length; local58++) {
@ -106,19 +106,19 @@ public final class Class30 {
} }
@OriginalMember(owner = "client!dm", name = "b", descriptor = "(B)Lclient!gb;") @OriginalMember(owner = "client!dm", name = "b", descriptor = "(B)Lclient!gb;")
public final Class8_Sub5 method1204() { public final RawModel method1204() {
if (this.anIntArray112 == null) { if (this.anIntArray112 == null) {
return null; return null;
} }
@Pc(16) Class8_Sub5[] local16 = new Class8_Sub5[this.anIntArray112.length]; @Pc(16) RawModel[] local16 = new RawModel[this.anIntArray112.length];
for (@Pc(18) int local18 = 0; local18 < this.anIntArray112.length; local18++) { for (@Pc(18) int local18 = 0; local18 < this.anIntArray112.length; local18++) {
local16[local18] = Static77.method1686(Static14.aClass153_8, this.anIntArray112[local18]); local16[local18] = Static77.method1686(Static14.aClass153_8, this.anIntArray112[local18]);
} }
@Pc(56) Class8_Sub5 local56; @Pc(56) RawModel local56;
if (local16.length == 1) { if (local16.length == 1) {
local56 = local16[0]; local56 = local16[0];
} else { } else {
local56 = new Class8_Sub5(local16, local16.length); local56 = new RawModel(local16, local16.length);
} }
@Pc(70) int local70; @Pc(70) int local70;
if (this.aShortArray12 != null) { if (this.aShortArray12 != null) {

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

@ -101,7 +101,7 @@ public final class Class34 {
public final Model method1319(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2) { 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); @Pc(13) Model local13 = (Model) Static56.aClass99_9.method3106((long) this.anInt1751);
if (local13 == null) { if (local13 == null) {
@Pc(28) Class8_Sub5 local28 = Static77.method1686(Static93.aClass153_41, this.anInt1753); @Pc(28) RawModel local28 = Static77.method1686(Static93.aClass153_41, this.anInt1753);
if (local28 == null) { if (local28 == null) {
return null; return null;
} }

30
client/src/main/java/Class55.java
View file

@ -314,7 +314,7 @@ public final class Class55 {
} }
@Pc(76) Model local76 = (Model) Static244.aClass99_32.method3106((long) this.anInt2354); @Pc(76) Model local76 = (Model) Static244.aClass99_32.method3106((long) this.anInt2354);
if (local76 == null) { if (local76 == null) {
@Pc(85) Class8_Sub5 local85 = Static77.method1686(Static230.aClass153_95, this.anInt2320); @Pc(85) RawModel local85 = Static77.method1686(Static230.aClass153_95, this.anInt2320);
if (local85 == null) { if (local85 == null) {
return null; return null;
} }
@ -529,7 +529,7 @@ public final class Class55 {
} }
@OriginalMember(owner = "client!h", name = "a", descriptor = "(ZB)Lclient!gb;") @OriginalMember(owner = "client!h", name = "a", descriptor = "(ZB)Lclient!gb;")
public final Class8_Sub5 method1830(@OriginalArg(0) boolean arg0) { public final RawModel method1830(@OriginalArg(0) boolean arg0) {
@Pc(4) int local4 = this.anInt2364; @Pc(4) int local4 = this.anInt2364;
@Pc(17) int local17 = this.anInt2372; @Pc(17) int local17 = this.anInt2372;
if (arg0) { if (arg0) {
@ -539,11 +539,11 @@ public final class Class55 {
if (local17 == -1) { if (local17 == -1) {
return null; return null;
} }
@Pc(36) Class8_Sub5 local36 = Static77.method1686(Static230.aClass153_95, local17); @Pc(36) RawModel local36 = Static77.method1686(Static230.aClass153_95, local17);
if (local4 != -1) { if (local4 != -1) {
@Pc(44) Class8_Sub5 local44 = Static77.method1686(Static230.aClass153_95, local4); @Pc(44) RawModel local44 = Static77.method1686(Static230.aClass153_95, local4);
@Pc(55) Class8_Sub5[] local55 = new Class8_Sub5[] { local36, local44 }; @Pc(55) RawModel[] local55 = new RawModel[] { local36, local44 };
local36 = new Class8_Sub5(local55, 2); local36 = new RawModel(local55, 2);
} }
@Pc(66) int local66; @Pc(66) int local66;
if (this.aShortArray34 != null) { if (this.aShortArray34 != null) {
@ -560,7 +560,7 @@ public final class Class55 {
} }
@OriginalMember(owner = "client!h", name = "a", descriptor = "(ZI)Lclient!gb;") @OriginalMember(owner = "client!h", name = "a", descriptor = "(ZI)Lclient!gb;")
public final Class8_Sub5 method1831(@OriginalArg(0) boolean arg0) { public final RawModel method1831(@OriginalArg(0) boolean arg0) {
@Pc(4) int local4 = this.anInt2360; @Pc(4) int local4 = this.anInt2360;
@Pc(18) int local18 = this.anInt2341; @Pc(18) int local18 = this.anInt2341;
@Pc(21) int local21 = this.anInt2340; @Pc(21) int local21 = this.anInt2340;
@ -572,16 +572,16 @@ public final class Class55 {
if (local4 == -1) { if (local4 == -1) {
return null; return null;
} }
@Pc(43) Class8_Sub5 local43 = Static77.method1686(Static230.aClass153_95, local4); @Pc(43) RawModel local43 = Static77.method1686(Static230.aClass153_95, local4);
if (local18 != -1) { if (local18 != -1) {
@Pc(54) Class8_Sub5 local54 = Static77.method1686(Static230.aClass153_95, local18); @Pc(54) RawModel local54 = Static77.method1686(Static230.aClass153_95, local18);
if (local21 == -1) { if (local21 == -1) {
@Pc(68) Class8_Sub5[] local68 = new Class8_Sub5[] { local43, local54 }; @Pc(68) RawModel[] local68 = new RawModel[] { local43, local54 };
local43 = new Class8_Sub5(local68, 2); local43 = new RawModel(local68, 2);
} else { } else {
@Pc(81) Class8_Sub5 local81 = Static77.method1686(Static230.aClass153_95, local21); @Pc(81) RawModel local81 = Static77.method1686(Static230.aClass153_95, local21);
@Pc(96) Class8_Sub5[] local96 = new Class8_Sub5[] { local43, local54, local81 }; @Pc(96) RawModel[] local96 = new RawModel[] { local43, local54, local81 };
local43 = new Class8_Sub5(local96, 3); local43 = new RawModel(local96, 3);
} }
} }
if (!arg0 && (this.anInt2330 != 0 || this.anInt2347 != 0 || this.anInt2343 != 0)) { if (!arg0 && (this.anInt2330 != 0 || this.anInt2347 != 0 || this.anInt2343 != 0)) {
@ -626,7 +626,7 @@ public final class Class55 {
@OriginalMember(owner = "client!h", name = "d", descriptor = "(I)Lclient!w;") @OriginalMember(owner = "client!h", name = "d", descriptor = "(I)Lclient!w;")
public final Class8_Sub1_Sub2 method1834() { public final Class8_Sub1_Sub2 method1834() {
@Pc(11) Class8_Sub5 local11 = Static77.method1686(Static230.aClass153_95, this.anInt2320); @Pc(11) RawModel local11 = Static77.method1686(Static230.aClass153_95, this.anInt2320);
if (local11 == null) { if (local11 == null) {
return null; return null;
} }

18
client/src/main/java/Class59.java
View file

@ -35,12 +35,12 @@ public final class Class59 {
@Pc(24) long local24 = (long) arg2 | (long) (arg6 << 16) | (long) arg1 << 32; @Pc(24) long local24 = (long) arg2 | (long) (arg6 << 16) | (long) arg1 << 32;
@Pc(30) Model local30 = (Model) Static139.aClass99_21.method3106(local24); @Pc(30) Model local30 = (Model) Static139.aClass99_21.method3106(local24);
if (local30 == null) { if (local30 == null) {
@Pc(36) Class8_Sub5[] local36 = new Class8_Sub5[3]; @Pc(36) RawModel[] local36 = new RawModel[3];
@Pc(38) int local38 = 0; @Pc(38) int local38 = 0;
if (!Static81.method1752(arg2).method1205() || !Static81.method1752(arg6).method1205() || !Static81.method1752(arg1).method1205()) { if (!Static81.method1752(arg2).method1205() || !Static81.method1752(arg6).method1205() || !Static81.method1752(arg1).method1205()) {
return null; return null;
} }
@Pc(66) Class8_Sub5 local66 = Static81.method1752(arg2).method1198(); @Pc(66) RawModel local66 = Static81.method1752(arg2).method1198();
if (local66 != null) { if (local66 != null) {
local38++; local38++;
local36[0] = local66; local36[0] = local66;
@ -53,7 +53,7 @@ public final class Class59 {
if (local66 != null) { if (local66 != null) {
local36[local38++] = local66; local36[local38++] = local66;
} }
local66 = new Class8_Sub5(local36, local38); local66 = new RawModel(local36, local38);
for (@Pc(110) int local110 = 0; local110 < 5; local110++) { for (@Pc(110) int local110 = 0; local110 < 5; local110++) {
if (this.anIntArray236[local110] < Static33.aShortArrayArray2[local110].length) { if (this.anIntArray236[local110] < Static33.aShortArrayArray2[local110].length) {
local66.method1687(Static200.aShortArray65[local110], Static33.aShortArrayArray2[local110][this.anIntArray236[local110]]); local66.method1687(Static200.aShortArray65[local110], Static33.aShortArrayArray2[local110][this.anIntArray236[local110]]);
@ -211,11 +211,11 @@ public final class Class59 {
} }
} }
if (local154 == null) { if (local154 == null) {
@Pc(239) Class8_Sub5[] local239 = new Class8_Sub5[12]; @Pc(239) RawModel[] local239 = new RawModel[12];
@Pc(250) int local250; @Pc(250) int local250;
for (local169 = 0; local169 < 12; local169++) { for (local169 = 0; local169 < 12; local169++) {
local250 = local38[local169]; local250 = local38[local169];
@Pc(272) Class8_Sub5 local272; @Pc(272) RawModel local272;
if ((local250 & 0x40000000) != 0) { if ((local250 & 0x40000000) != 0) {
local272 = Static71.method1439(local250 & 0x3FFFFFFF).method1831(this.aBoolean141); local272 = Static71.method1439(local250 & 0x3FFFFFFF).method1831(this.aBoolean141);
if (local272 != null) { if (local272 != null) {
@ -286,7 +286,7 @@ public final class Class59 {
} }
} }
} }
@Pc(740) Class8_Sub5 local740 = new Class8_Sub5(local239, local239.length); @Pc(740) RawModel local740 = new RawModel(local239, local239.length);
for (local346 = 0; local346 < 5; local346++) { for (local346 = 0; local346 < 5; local346++) {
if (Static33.aShortArrayArray2[local346].length > this.anIntArray236[local346]) { if (Static33.aShortArrayArray2[local346].length > this.anIntArray236[local346]) {
local740.method1687(Static200.aShortArray65[local346], Static33.aShortArrayArray2[local346][this.anIntArray236[local346]]); local740.method1687(Static200.aShortArray65[local346], Static33.aShortArrayArray2[local346][this.anIntArray236[local346]]);
@ -458,12 +458,12 @@ public final class Class59 {
if (local42) { if (local42) {
return null; return null;
} }
@Pc(100) Class8_Sub5[] local100 = new Class8_Sub5[12]; @Pc(100) RawModel[] local100 = new RawModel[12];
local52 = 0; local52 = 0;
@Pc(114) int local114; @Pc(114) int local114;
for (@Pc(104) int local104 = 0; local104 < 12; local104++) { for (@Pc(104) int local104 = 0; local104 < 12; local104++) {
local114 = this.anIntArray233[local104]; local114 = this.anIntArray233[local104];
@Pc(134) Class8_Sub5 local134; @Pc(134) RawModel local134;
if ((local114 & 0x40000000) != 0) { if ((local114 & 0x40000000) != 0) {
local134 = Static71.method1439(local114 & 0x3FFFFFFF).method1830(this.aBoolean141); local134 = Static71.method1439(local114 & 0x3FFFFFFF).method1830(this.aBoolean141);
if (local134 != null) { if (local134 != null) {
@ -476,7 +476,7 @@ public final class Class59 {
} }
} }
} }
@Pc(171) Class8_Sub5 local171 = new Class8_Sub5(local100, local52); @Pc(171) RawModel local171 = new RawModel(local100, local52);
for (local114 = 0; local114 < 5; local114++) { for (local114 = 0; local114 < 5; local114++) {
if (Static33.aShortArrayArray2[local114].length > this.anIntArray236[local114]) { if (Static33.aShortArrayArray2[local114].length > this.anIntArray236[local114]) {
local171.method1687(Static200.aShortArray65[local114], Static33.aShortArrayArray2[local114][this.anIntArray236[local114]]); local171.method1687(Static200.aShortArray65[local114], Static33.aShortArrayArray2[local114][this.anIntArray236[local114]]);

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

@ -128,7 +128,7 @@ public final class Class8_Sub1_Sub2 extends Model {
} }
@OriginalMember(owner = "client!w", name = "<init>", descriptor = "(Lclient!gb;IIIII)V") @OriginalMember(owner = "client!w", name = "<init>", descriptor = "(Lclient!gb;IIIII)V")
public Class8_Sub1_Sub2(@OriginalArg(0) Class8_Sub5 arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5) { public Class8_Sub1_Sub2(@OriginalArg(0) RawModel arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5) {
arg0.method1668(); arg0.method1668();
arg0.method1683(); arg0.method1683();
this.anInt5788 = arg0.anInt2139; this.anInt5788 = arg0.anInt2139;

12
client/src/main/java/Class96.java
View file

@ -243,7 +243,7 @@ public final class Class96 {
if (local46) { if (local46) {
return null; return null;
} }
@Pc(84) Class8_Sub5[] local84 = new Class8_Sub5[this.anIntArray356.length]; @Pc(84) RawModel[] local84 = new RawModel[this.anIntArray356.length];
for (@Pc(86) int local86 = 0; local86 < this.anIntArray356.length; local86++) { for (@Pc(86) int local86 = 0; local86 < this.anIntArray356.length; local86++) {
if (this.anIntArray356[local86] != -1) { if (this.anIntArray356[local86] != -1) {
local84[local86] = Static77.method1686(Static86.aClass153_37, this.anIntArray356[local86]); local84[local86] = Static77.method1686(Static86.aClass153_37, this.anIntArray356[local86]);
@ -310,11 +310,11 @@ public final class Class96 {
} }
} }
} }
@Pc(593) Class8_Sub5 local593; @Pc(593) RawModel local593;
if (local84.length == 1) { if (local84.length == 1) {
local593 = local84[0]; local593 = local84[0];
} else { } else {
local593 = new Class8_Sub5(local84, local84.length); local593 = new RawModel(local84, local84.length);
} }
if (this.aShortArray38 != null) { if (this.aShortArray38 != null) {
for (local173 = 0; local173 < this.aShortArray38.length; local173++) { for (local173 = 0; local173 < this.aShortArray38.length; local173++) {
@ -518,15 +518,15 @@ public final class Class96 {
if (local46) { if (local46) {
return null; return null;
} }
@Pc(82) Class8_Sub5[] local82 = new Class8_Sub5[this.anIntArray354.length]; @Pc(82) RawModel[] local82 = new RawModel[this.anIntArray354.length];
for (@Pc(84) int local84 = 0; local84 < this.anIntArray354.length; local84++) { for (@Pc(84) int local84 = 0; local84 < this.anIntArray354.length; local84++) {
local82[local84] = Static77.method1686(Static86.aClass153_37, this.anIntArray354[local84]); local82[local84] = Static77.method1686(Static86.aClass153_37, this.anIntArray354[local84]);
} }
@Pc(119) Class8_Sub5 local119; @Pc(119) RawModel local119;
if (local82.length == 1) { if (local82.length == 1) {
local119 = local82[0]; local119 = local82[0];
} else { } else {
local119 = new Class8_Sub5(local82, local82.length); local119 = new RawModel(local82, local82.length);
} }
@Pc(130) int local130; @Pc(130) int local130;
if (this.aShortArray38 != null) { if (this.aShortArray38 != null) {

4
client/src/main/java/GlModel.java
View file

@ -133,7 +133,7 @@ public final class GlModel extends Model {
} }
@OriginalMember(owner = "client!td", name = "<init>", descriptor = "(Lclient!gb;IIZ)V") @OriginalMember(owner = "client!td", name = "<init>", descriptor = "(Lclient!gb;IIZ)V")
public GlModel(@OriginalArg(0) Class8_Sub5 arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) boolean arg3) { public GlModel(@OriginalArg(0) RawModel arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) boolean arg3) {
@Pc(23) int[] local23 = new int[arg0.anInt2136]; @Pc(23) int[] local23 = new int[arg0.anInt2136];
this.anIntArray462 = new int[arg0.anInt2139 + 1]; this.anIntArray462 = new int[arg0.anInt2139 + 1];
for (@Pc(32) int local32 = 0; local32 < arg0.anInt2136; local32++) { for (@Pc(32) int local32 = 0; local32 < arg0.anInt2136; local32++) {
@ -1077,7 +1077,7 @@ public final class GlModel extends Model {
} }
@OriginalMember(owner = "client!td", name = "a", descriptor = "(Lclient!gb;IJIIIIFF)S") @OriginalMember(owner = "client!td", name = "a", descriptor = "(Lclient!gb;IJIIIIFF)S")
private short method4098(@OriginalArg(0) Class8_Sub5 arg0, @OriginalArg(1) int arg1, @OriginalArg(2) long arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) float arg7, @OriginalArg(8) float arg8) { private short method4098(@OriginalArg(0) RawModel arg0, @OriginalArg(1) int arg1, @OriginalArg(2) long arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) float arg7, @OriginalArg(8) float arg8) {
@Pc(4) int local4 = this.anIntArray462[arg1]; @Pc(4) int local4 = this.anIntArray462[arg1];
@Pc(11) int local11 = this.anIntArray462[arg1 + 1]; @Pc(11) int local11 = this.anIntArray462[arg1 + 1];
@Pc(13) int local13 = 0; @Pc(13) int local13 = 0;

28
client/src/main/java/Class8_Sub5.java → client/src/main/java/RawModel.java
View file

@ -4,7 +4,7 @@ import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc; import org.openrs2.deob.annotation.Pc;
@OriginalClass("client!gb") @OriginalClass("client!gb")
public final class Class8_Sub5 extends Entity { public final class RawModel extends Entity {
@OriginalMember(owner = "client!gb", name = "s", descriptor = "[B") @OriginalMember(owner = "client!gb", name = "s", descriptor = "[B")
public byte[] aByteArray26; public byte[] aByteArray26;
@ -145,11 +145,11 @@ public final class Class8_Sub5 extends Entity {
public int anInt2139 = 0; public int anInt2139 = 0;
@OriginalMember(owner = "client!gb", name = "<init>", descriptor = "()V") @OriginalMember(owner = "client!gb", name = "<init>", descriptor = "()V")
private Class8_Sub5() { private RawModel() {
} }
@OriginalMember(owner = "client!gb", name = "<init>", descriptor = "([B)V") @OriginalMember(owner = "client!gb", name = "<init>", descriptor = "([B)V")
public Class8_Sub5(@OriginalArg(0) byte[] arg0) { public RawModel(@OriginalArg(0) byte[] arg0) {
if (arg0[arg0.length - 1] == -1 && arg0[arg0.length - 2] == -1) { if (arg0[arg0.length - 1] == -1 && arg0[arg0.length - 2] == -1) {
this.method1674(arg0); this.method1674(arg0);
} else { } else {
@ -158,7 +158,7 @@ public final class Class8_Sub5 extends Entity {
} }
@OriginalMember(owner = "client!gb", name = "<init>", descriptor = "(III)V") @OriginalMember(owner = "client!gb", name = "<init>", descriptor = "(III)V")
public Class8_Sub5(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) { public RawModel(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
this.anIntArray202 = new int[arg0]; this.anIntArray202 = new int[arg0];
this.anIntArray201 = new int[arg0]; this.anIntArray201 = new int[arg0];
this.anIntArray203 = new int[arg0]; this.anIntArray203 = new int[arg0];
@ -176,7 +176,7 @@ public final class Class8_Sub5 extends Entity {
} }
@OriginalMember(owner = "client!gb", name = "<init>", descriptor = "([Lclient!gb;I)V") @OriginalMember(owner = "client!gb", name = "<init>", descriptor = "([Lclient!gb;I)V")
public Class8_Sub5(@OriginalArg(0) Class8_Sub5[] arg0, @OriginalArg(1) int arg1) { public RawModel(@OriginalArg(0) RawModel[] arg0, @OriginalArg(1) int arg1) {
@Pc(15) boolean local15 = false; @Pc(15) boolean local15 = false;
@Pc(17) boolean local17 = false; @Pc(17) boolean local17 = false;
@Pc(19) boolean local19 = false; @Pc(19) boolean local19 = false;
@ -189,7 +189,7 @@ public final class Class8_Sub5 extends Entity {
this.aByte7 = -1; this.aByte7 = -1;
@Pc(43) int local43; @Pc(43) int local43;
for (local43 = 0; local43 < arg1; local43++) { for (local43 = 0; local43 < arg1; local43++) {
@Pc(50) Class8_Sub5 local50 = arg0[local43]; @Pc(50) RawModel local50 = arg0[local43];
if (local50 != null) { if (local50 != null) {
this.anInt2139 += local50.anInt2139; this.anInt2139 += local50.anInt2139;
this.anInt2136 += local50.anInt2136; this.anInt2136 += local50.anInt2136;
@ -258,7 +258,7 @@ public final class Class8_Sub5 extends Entity {
this.anInt2137 = 0; this.anInt2137 = 0;
for (local43 = 0; local43 < arg1; local43++) { for (local43 = 0; local43 < arg1; local43++) {
@Pc(323) short local323 = (short) (0x1 << local43); @Pc(323) short local323 = (short) (0x1 << local43);
@Pc(327) Class8_Sub5 local327 = arg0[local43]; @Pc(327) RawModel local327 = arg0[local43];
if (local327 != null) { if (local327 != null) {
@Pc(331) int local331; @Pc(331) int local331;
for (local331 = 0; local331 < local327.anInt2136; local331++) { for (local331 = 0; local331 < local327.anInt2136; local331++) {
@ -328,7 +328,7 @@ public final class Class8_Sub5 extends Entity {
} }
@OriginalMember(owner = "client!gb", name = "<init>", descriptor = "(Lclient!gb;ZZZZ)V") @OriginalMember(owner = "client!gb", name = "<init>", descriptor = "(Lclient!gb;ZZZZ)V")
public Class8_Sub5(@OriginalArg(0) Class8_Sub5 arg0, @OriginalArg(1) boolean arg1, @OriginalArg(2) boolean arg2, @OriginalArg(3) boolean arg3, @OriginalArg(4) boolean arg4) { public RawModel(@OriginalArg(0) RawModel arg0, @OriginalArg(1) boolean arg1, @OriginalArg(2) boolean arg2, @OriginalArg(3) boolean arg3, @OriginalArg(4) boolean arg4) {
this.anInt2139 = arg0.anInt2139; this.anInt2139 = arg0.anInt2139;
this.anInt2136 = arg0.anInt2136; this.anInt2136 = arg0.anInt2136;
this.anInt2137 = arg0.anInt2137; this.anInt2137 = arg0.anInt2137;
@ -485,7 +485,7 @@ public final class Class8_Sub5 extends Entity {
} }
@OriginalMember(owner = "client!gb", name = "a", descriptor = "(Lclient!gb;IS)I") @OriginalMember(owner = "client!gb", name = "a", descriptor = "(Lclient!gb;IS)I")
private int method1666(@OriginalArg(0) Class8_Sub5 arg0, @OriginalArg(1) int arg1, @OriginalArg(2) short arg2) { private int method1666(@OriginalArg(0) RawModel arg0, @OriginalArg(1) int arg1, @OriginalArg(2) short arg2) {
@Pc(4) int local4 = arg0.anIntArray202[arg1]; @Pc(4) int local4 = arg0.anIntArray202[arg1];
@Pc(9) int local9 = arg0.anIntArray201[arg1]; @Pc(9) int local9 = arg0.anIntArray201[arg1];
@Pc(14) int local14 = arg0.anIntArray203[arg1]; @Pc(14) int local14 = arg0.anIntArray203[arg1];
@ -631,7 +631,7 @@ public final class Class8_Sub5 extends Entity {
} }
@OriginalMember(owner = "client!gb", name = "a", descriptor = "(II[[I[[IIIIZZ)Lclient!gb;") @OriginalMember(owner = "client!gb", name = "a", descriptor = "(II[[I[[IIIIZZ)Lclient!gb;")
public final Class8_Sub5 method1670(@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) { public final RawModel method1670(@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) {
this.method1664(); this.method1664();
@Pc(6) int local6 = arg4 + this.aShort14; @Pc(6) int local6 = arg4 + this.aShort14;
@Pc(11) int local11 = arg4 + this.aShort16; @Pc(11) int local11 = arg4 + this.aShort16;
@ -656,7 +656,7 @@ public final class Class8_Sub5 extends Entity {
return this; return this;
} }
} }
@Pc(147) Class8_Sub5 local147 = new Class8_Sub5(); @Pc(147) RawModel local147 = new RawModel();
local147.anInt2139 = this.anInt2139; local147.anInt2139 = this.anInt2139;
local147.anInt2136 = this.anInt2136; local147.anInt2136 = this.anInt2136;
local147.anInt2137 = this.anInt2137; local147.anInt2137 = this.anInt2137;
@ -1150,8 +1150,8 @@ public final class Class8_Sub5 extends Entity {
} }
@OriginalMember(owner = "client!gb", name = "i", descriptor = "()Lclient!gb;") @OriginalMember(owner = "client!gb", name = "i", descriptor = "()Lclient!gb;")
public final Class8_Sub5 method1675() { public final RawModel method1675() {
@Pc(3) Class8_Sub5 local3 = new Class8_Sub5(); @Pc(3) RawModel local3 = new RawModel();
if (this.aByteArray30 != null) { if (this.aByteArray30 != null) {
local3.aByteArray30 = new byte[this.anInt2136]; local3.aByteArray30 = new byte[this.anInt2136];
for (@Pc(13) int local13 = 0; local13 < this.anInt2136; local13++) { for (@Pc(13) int local13 = 0; local13 < this.anInt2136; local13++) {
@ -1260,7 +1260,7 @@ public final class Class8_Sub5 extends Entity {
@OriginalMember(owner = "client!gb", name = "a", descriptor = "(Lclient!th;IIIZ)V") @OriginalMember(owner = "client!gb", name = "a", descriptor = "(Lclient!th;IIIZ)V")
@Override @Override
public final void method4544(@OriginalArg(0) Entity arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) boolean arg4) { public final void method4544(@OriginalArg(0) Entity arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) boolean arg4) {
@Pc(2) Class8_Sub5 local2 = (Class8_Sub5) arg0; @Pc(2) RawModel local2 = (RawModel) arg0;
local2.method1664(); local2.method1664();
local2.method1668(); local2.method1668();
Static77.anInt2138++; Static77.anInt2138++;

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

@ -81,7 +81,7 @@ public final class Static220 {
@Pc(4) long local4 = (long) arg2; @Pc(4) long local4 = (long) arg2;
@Pc(10) Model local10 = (Model) Static110.aClass99_15.method3106(local4); @Pc(10) Model local10 = (Model) Static110.aClass99_15.method3106(local4);
if (local10 == null) { if (local10 == null) {
@Pc(22) Class8_Sub5 local22 = Static77.method1686(Static267.aClass153_109, arg2); @Pc(22) RawModel local22 = Static77.method1686(Static267.aClass153_109, arg2);
if (local22 == null) { if (local22 == null) {
return null; return null;
} }

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

@ -22,7 +22,7 @@ public final class Static274 {
public static final Class100 aClass100_942 = Static28.method790("Update)2Liste geladen)3"); public static final Class100 aClass100_942 = Static28.method790("Update)2Liste geladen)3");
@OriginalMember(owner = "client!wf", name = "o", descriptor = "[Lclient!gb;") @OriginalMember(owner = "client!wf", name = "o", descriptor = "[Lclient!gb;")
public static final Class8_Sub5[] aClass8_Sub5Array5 = new Class8_Sub5[4]; public static final RawModel[] aClass8_Sub5Array5 = new RawModel[4];
@OriginalMember(owner = "client!wf", name = "s", descriptor = "Lclient!na;") @OriginalMember(owner = "client!wf", name = "s", descriptor = "Lclient!na;")
public static final Class100 aClass100_943 = Static28.method790("Forced tweening disabled)3"); public static final Class100 aClass100_943 = Static28.method790("Forced tweening disabled)3");

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

@ -63,7 +63,7 @@ public final class Static41 {
local41 = 21; local41 = 21;
} }
@Pc(83) int[] local83 = new int[] { 64, 96, 128 }; @Pc(83) int[] local83 = new int[] { 64, 96, 128 };
@Pc(103) Class8_Sub5 local103 = new Class8_Sub5(local41 * 3 + 1, -local41 + local41 * 3 * 2, 0); @Pc(103) RawModel local103 = new RawModel(local41 * 3 + 1, -local41 + local41 * 3 * 2, 0);
local109 = local103.method1685(0, 0); local109 = local103.method1685(0, 0);
@Pc(113) int[][] local113 = new int[3][local41]; @Pc(113) int[][] local113 = new int[3][local41];
for (local115 = 0; local115 < 3; local115++) { for (local115 = 0; local115 < 3; local115++) {

4
client/src/main/java/Static77.java
View file

@ -34,8 +34,8 @@ public final class Static77 {
} }
@OriginalMember(owner = "client!gb", name = "a", descriptor = "(Lclient!ve;II)Lclient!gb;") @OriginalMember(owner = "client!gb", name = "a", descriptor = "(Lclient!ve;II)Lclient!gb;")
public static Class8_Sub5 method1686(@OriginalArg(0) Js5 arg0, @OriginalArg(1) int arg1) { public static RawModel method1686(@OriginalArg(0) Js5 arg0, @OriginalArg(1) int arg1) {
@Pc(5) byte[] local5 = arg0.method4495(arg1, 0); @Pc(5) byte[] local5 = arg0.method4495(arg1, 0);
return local5 == null ? null : new Class8_Sub5(local5); return local5 == null ? null : new RawModel(local5);
} }
} }