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

Rename Class8_Sub3 to Loc

Browse source
This commit is contained in:
Pazaz 2022-04-19 06:52:20 -04:00
parent e7c74fff76
commit bfd41663a7
5 changed files with 51 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -266,8 +266,8 @@ public final class Class8_Sub4_Sub1 extends Class8_Sub4 {
this.anObject5 = null;
}
if (this.anInt3390 <= Static83.anInt372 && this.anInt3375 > Static83.anInt372) {
if (this.anObject5 instanceof Class8_Sub3) {
local515 = (Model) ((Class8_Sub3) this.anObject5).method1049();
if (this.anObject5 instanceof Loc) {
local515 = (Model) ((Loc) this.anObject5).method1049();
} else {
local515 = (Model) this.anObject5;
}

12
client/src/main/java/Class8_Sub3.java → client/src/main/java/Loc.java
View file

@ -4,7 +4,7 @@ import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc;
@OriginalClass("client!dc")
public final class Class8_Sub3 extends Entity {
public final class Loc extends Entity {
@OriginalMember(owner = "client!dc", name = "U", descriptor = "Lclient!ga;")
private ParticleSystem aClass47_Sub1_2;
@ -70,7 +70,7 @@ public final class Class8_Sub3 extends Entity {
private int anInt1320;
@OriginalMember(owner = "client!dc", name = "<init>", descriptor = "(IIIIIIIZLclient!th;)V")
public Class8_Sub3(@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) boolean arg7, @OriginalArg(8) Entity arg8) {
public Loc(@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) boolean arg7, @OriginalArg(8) Entity arg8) {
this.anInt1303 = arg3;
this.anInt1295 = arg2;
this.anInt1308 = arg4;
@ -79,8 +79,8 @@ public final class Class8_Sub3 extends Entity {
this.anInt1300 = arg5;
@Pc(67) Class118 local67;
if (Static239.aBoolean269 && arg8 != null) {
if (arg8 instanceof Class8_Sub3) {
((Class8_Sub3) arg8).method1046();
if (arg8 instanceof Loc) {
((Loc) arg8).method1046();
} else {
local67 = Static271.method4601(this.anInt1299);
if (local67.anIntArray380 != null) {
@ -101,8 +101,8 @@ public final class Class8_Sub3 extends Entity {
}
this.anInt1317 = 1;
this.anInt1320 = Static83.anInt372 - 1;
if (this.aClass144_2.anInt5347 == 0 && arg8 != null && arg8 instanceof Class8_Sub3) {
@Pc(142) Class8_Sub3 local142 = (Class8_Sub3) arg8;
if (this.aClass144_2.anInt5347 == 0 && arg8 != null && arg8 instanceof Loc) {
@Pc(142) Loc local142 = (Loc) arg8;
if (this.aClass144_2 == local142.aClass144_2) {
this.anInt1297 = local142.anInt1297;
this.anInt1320 = local142.anInt1320;

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

@ -112,7 +112,7 @@ public final class Static185 {
}
local387 = local403.aClass8_10;
} else {
local387 = new Class8_Sub3(arg5, 22, arg9, arg0, arg7, arg8, local62.anInt4430, local62.aBoolean209, null);
local387 = new Loc(arg5, 22, arg9, arg0, arg7, arg8, local62.anInt4430, local62.aBoolean209, null);
}
Static170.method2570(arg2, arg7, arg8, local199, local387, local261, local62.aBoolean211);
if (local62.anInt4435 == 1 && arg4 != null) {
@ -127,7 +127,7 @@ public final class Static185 {
}
local387 = local403.aClass8_10;
} else {
local387 = new Class8_Sub3(arg5, 10, arg6 == 11 ? arg9 + 4 : arg9, arg0, arg7, arg8, local62.anInt4430, local62.aBoolean209, null);
local387 = new Loc(arg5, 10, arg6 == 11 ? arg9 + 4 : arg9, arg0, arg7, arg8, local62.anInt4430, local62.aBoolean209, null);
}
if (local387 != null) {
@Pc(531) boolean local531 = Static5.method35(arg2, arg7, arg8, local199, local84, local81, local387, local261);
@ -159,7 +159,7 @@ public final class Static185 {
}
local387 = local403.aClass8_10;
} else {
local387 = new Class8_Sub3(arg5, arg6, arg9, arg0, arg7, arg8, local62.anInt4430, local62.aBoolean209, null);
local387 = new Loc(arg5, arg6, arg9, arg0, arg7, arg8, local62.anInt4430, local62.aBoolean209, null);
}
Static5.method35(arg2, arg7, arg8, local199, 1, 1, local387, local261);
if (arg1 && arg6 >= 12 && arg6 <= 17 && arg6 != 13 && arg2 > 0) {
@ -176,7 +176,7 @@ public final class Static185 {
}
local387 = local403.aClass8_10;
} else {
local387 = new Class8_Sub3(arg5, 0, arg9, arg0, arg7, arg8, local62.anInt4430, local62.aBoolean209, null);
local387 = new Loc(arg5, 0, arg9, arg0, arg7, arg8, local62.anInt4430, local62.aBoolean209, null);
}
Static262.method4508(arg2, arg7, arg8, local199, local387, null, Static267.anIntArray517[arg9], 0, local261);
if (arg1) {
@ -228,7 +228,7 @@ public final class Static185 {
}
local387 = local403.aClass8_10;
} else {
local387 = new Class8_Sub3(arg5, 1, arg9, arg0, arg7, arg8, local62.anInt4430, local62.aBoolean209, null);
local387 = new Loc(arg5, 1, arg9, arg0, arg7, arg8, local62.anInt4430, local62.aBoolean209, null);
}
Static262.method4508(arg2, arg7, arg8, local199, local387, null, Static78.anIntArray204[arg9], 0, local261);
if (local62.aBoolean215 && arg1) {
@ -263,8 +263,8 @@ public final class Static185 {
}
local1269 = local1287.aClass8_10;
} else {
local1254 = new Class8_Sub3(arg5, 2, arg9 + 4, arg0, arg7, arg8, local62.anInt4430, local62.aBoolean209, null);
local1269 = new Class8_Sub3(arg5, 2, local1226, arg0, arg7, arg8, local62.anInt4430, local62.aBoolean209, null);
local1254 = new Loc(arg5, 2, arg9 + 4, arg0, arg7, arg8, local62.anInt4430, local62.aBoolean209, null);
local1269 = new Loc(arg5, 2, local1226, arg0, arg7, arg8, local62.anInt4430, local62.aBoolean209, null);
}
Static262.method4508(arg2, arg7, arg8, local199, local1254, local1269, Static267.anIntArray517[arg9], Static267.anIntArray517[local1226], local261);
if (local62.aBoolean220 && arg1) {
@ -296,7 +296,7 @@ public final class Static185 {
}
local387 = local403.aClass8_10;
} else {
local387 = new Class8_Sub3(arg5, 3, arg9, arg0, arg7, arg8, local62.anInt4430, local62.aBoolean209, null);
local387 = new Loc(arg5, 3, arg9, arg0, arg7, arg8, local62.anInt4430, local62.aBoolean209, null);
}
Static262.method4508(arg2, arg7, arg8, local199, local387, null, Static78.anIntArray204[arg9], 0, local261);
if (local62.aBoolean215 && arg1) {
@ -321,7 +321,7 @@ public final class Static185 {
}
local387 = local403.aClass8_10;
} else {
local387 = new Class8_Sub3(arg5, arg6, arg9, arg0, arg7, arg8, local62.anInt4430, local62.aBoolean209, null);
local387 = new Loc(arg5, arg6, arg9, arg0, arg7, arg8, local62.anInt4430, local62.aBoolean209, null);
}
Static5.method35(arg2, arg7, arg8, local199, 1, 1, local387, local261);
if (local62.anInt4435 != 0 && arg4 != null) {
@ -338,7 +338,7 @@ public final class Static185 {
}
local387 = local403.aClass8_10;
} else {
local387 = new Class8_Sub3(arg5, 4, arg9, arg0, arg7, arg8, local62.anInt4430, local62.aBoolean209, null);
local387 = new Loc(arg5, 4, arg9, arg0, arg7, arg8, local62.anInt4430, local62.aBoolean209, null);
}
Static91.method1880(arg2, arg7, arg8, local199, local387, null, Static267.anIntArray517[arg9], 0, 0, 0, local261);
} else {
@ -358,7 +358,7 @@ public final class Static185 {
}
local1934 = local1950.aClass8_10;
} else {
local1934 = new Class8_Sub3(arg5, 4, arg9, arg0, arg7, arg8, local62.anInt4430, local62.aBoolean209, null);
local1934 = new Loc(arg5, 4, arg9, arg0, arg7, arg8, local62.anInt4430, local62.aBoolean209, null);
}
Static91.method1880(arg2, arg7, arg8, local199, local1934, null, Static267.anIntArray517[arg9], 0, local1226 * Static34.anIntArray80[arg9], Static238.anIntArray469[arg9] * local1226, local261);
} else if (arg6 == 6) {
@ -374,7 +374,7 @@ public final class Static185 {
}
local1934 = local1950.aClass8_10;
} else {
local1934 = new Class8_Sub3(arg5, 4, arg9 + 4, arg0, arg7, arg8, local62.anInt4430, local62.aBoolean209, null);
local1934 = new Loc(arg5, 4, arg9 + 4, arg0, arg7, arg8, local62.anInt4430, local62.aBoolean209, null);
}
Static91.method1880(arg2, arg7, arg8, local199, local1934, null, 256, arg9, local1226 * Static114.anIntArray565[arg9], local1226 * Static64.anIntArray154[arg9], local261);
} else if (arg6 == 7) {
@ -386,7 +386,7 @@ public final class Static185 {
}
local387 = local2183.aClass8_10;
} else {
local387 = new Class8_Sub3(arg5, 4, local2137 + 4, arg0, arg7, arg8, local62.anInt4430, local62.aBoolean209, null);
local387 = new Loc(arg5, 4, local2137 + 4, arg0, arg7, arg8, local62.anInt4430, local62.aBoolean209, null);
}
Static91.method1880(arg2, arg7, arg8, local199, local387, null, 256, local2137, 0, 0, local261);
} else if (arg6 == 8) {
@ -411,8 +411,8 @@ public final class Static185 {
}
local2289 = local2319.aClass8_10;
} else {
local1934 = new Class8_Sub3(arg5, 4, arg9 + 4, arg0, arg7, arg8, local62.anInt4430, local62.aBoolean209, null);
local2289 = new Class8_Sub3(arg5, 4, local2244 + 4, arg0, arg7, arg8, local62.anInt4430, local62.aBoolean209, null);
local1934 = new Loc(arg5, 4, arg9 + 4, arg0, arg7, arg8, local62.anInt4430, local62.aBoolean209, null);
local2289 = new Loc(arg5, 4, local2244 + 4, arg0, arg7, arg8, local62.anInt4430, local62.aBoolean209, null);
}
Static91.method1880(arg2, arg7, arg8, local199, local1934, local2289, 256, arg9, local1226 * Static114.anIntArray565[arg9], Static64.anIntArray154[arg9] * local1226, local261);
}

36
client/src/main/java/Static43.java
View file

@ -116,53 +116,53 @@ public final class Static43 {
return;
}
if (local57 == 2) {
if (local100 instanceof Class8_Sub3) {
((Class8_Sub3) local100).method1046();
if (local100 instanceof Loc) {
((Loc) local100).method1046();
} else {
Static9.method181(local74, 0, local92 + 4, 0, local57, arg1, arg0, arg4);
}
if (local102 instanceof Class8_Sub3) {
((Class8_Sub3) local102).method1046();
if (local102 instanceof Loc) {
((Loc) local102).method1046();
} else {
Static9.method181(local74, 0, local92 + 1 & 0x3, 0, local57, arg1, arg0, arg4);
}
} else if (local57 == 5) {
if (local100 instanceof Class8_Sub3) {
((Class8_Sub3) local100).method1046();
if (local100 instanceof Loc) {
((Loc) local100).method1046();
} else {
Static9.method181(local74, Static238.anIntArray469[local92] * 8, local92, Static34.anIntArray80[local92] * 8, 4, arg1, arg0, arg4);
}
} else if (local57 == 6) {
if (local100 instanceof Class8_Sub3) {
((Class8_Sub3) local100).method1046();
if (local100 instanceof Loc) {
((Loc) local100).method1046();
} else {
Static9.method181(local74, Static64.anIntArray154[local92] * 8, local92 + 4, Static114.anIntArray565[local92] * 8, 4, arg1, arg0, arg4);
}
} else if (local57 == 7) {
if (local100 instanceof Class8_Sub3) {
((Class8_Sub3) local100).method1046();
if (local100 instanceof Loc) {
((Loc) local100).method1046();
} else {
Static9.method181(local74, 0, (local92 + 2 & 0x3) + 4, 0, 4, arg1, arg0, arg4);
}
} else if (local57 == 8) {
if (local100 instanceof Class8_Sub3) {
((Class8_Sub3) local100).method1046();
if (local100 instanceof Loc) {
((Loc) local100).method1046();
} else {
Static9.method181(local74, Static64.anIntArray154[local92] * 8, local92 + 4, Static114.anIntArray565[local92] * 8, 4, arg1, arg0, arg4);
}
if (local102 instanceof Class8_Sub3) {
((Class8_Sub3) local102).method1046();
if (local102 instanceof Loc) {
((Loc) local102).method1046();
} else {
Static9.method181(local74, Static64.anIntArray154[local92] * 8, (local92 + 2 & 0x3) + 4, Static114.anIntArray565[local92] * 8, 4, arg1, arg0, arg4);
}
} else if (local57 == 11) {
if (local100 instanceof Class8_Sub3) {
((Class8_Sub3) local100).method1046();
if (local100 instanceof Loc) {
((Loc) local100).method1046();
} else {
Static9.method181(local74, 0, local92 + 4, 0, 10, arg1, arg0, arg4);
}
} else if (local100 instanceof Class8_Sub3) {
((Class8_Sub3) local100).method1046();
} else if (local100 instanceof Loc) {
((Loc) local100).method1046();
} else {
Static9.method181(local74, 0, local92, 0, local57, arg1, arg0, arg4);
}

20
client/src/main/java/Static92.java
View file

@ -45,10 +45,10 @@ public final class Static92 {
if (local28 != null) {
local38 = Integer.MAX_VALUE & (int) (local28.aLong107 >>> 32);
if (arg2 == 2) {
local28.aClass8_5 = new Class8_Sub3(local38, 2, arg1 + 4, arg0, arg5, arg3, arg6, false, local28.aClass8_5);
local28.aClass8_6 = new Class8_Sub3(local38, 2, arg1 + 1 & 0x3, arg0, arg5, arg3, arg6, false, local28.aClass8_6);
local28.aClass8_5 = new Loc(local38, 2, arg1 + 4, arg0, arg5, arg3, arg6, false, local28.aClass8_5);
local28.aClass8_6 = new Loc(local38, 2, arg1 + 1 & 0x3, arg0, arg5, arg3, arg6, false, local28.aClass8_6);
} else {
local28.aClass8_5 = new Class8_Sub3(local38, arg2, arg1, arg0, arg5, arg3, arg6, false, local28.aClass8_5);
local28.aClass8_5 = new Loc(local38, arg2, arg1, arg0, arg5, arg3, arg6, false, local28.aClass8_5);
}
}
}
@ -57,14 +57,14 @@ public final class Static92 {
if (local106 != null) {
local38 = (int) (local106.aLong52 >>> 32) & Integer.MAX_VALUE;
if (arg2 == 4 || arg2 == 5) {
local106.aClass8_3 = new Class8_Sub3(local38, 4, arg1, arg0, arg5, arg3, arg6, false, local106.aClass8_3);
local106.aClass8_3 = new Loc(local38, 4, arg1, arg0, arg5, arg3, arg6, false, local106.aClass8_3);
} else if (arg2 == 6) {
local106.aClass8_3 = new Class8_Sub3(local38, 4, arg1 + 4, arg0, arg5, arg3, arg6, false, local106.aClass8_3);
local106.aClass8_3 = new Loc(local38, 4, arg1 + 4, arg0, arg5, arg3, arg6, false, local106.aClass8_3);
} else if (arg2 == 7) {
local106.aClass8_3 = new Class8_Sub3(local38, 4, (arg1 + 2 & 0x3) + 4, arg0, arg5, arg3, arg6, false, local106.aClass8_3);
local106.aClass8_3 = new Loc(local38, 4, (arg1 + 2 & 0x3) + 4, arg0, arg5, arg3, arg6, false, local106.aClass8_3);
} else if (arg2 == 8) {
local106.aClass8_3 = new Class8_Sub3(local38, 4, arg1 + 4, arg0, arg5, arg3, arg6, false, local106.aClass8_3);
local106.aClass8_2 = new Class8_Sub3(local38, 4, (arg1 + 2 & 0x3) + 4, arg0, arg5, arg3, arg6, false, local106.aClass8_2);
local106.aClass8_3 = new Loc(local38, 4, arg1 + 4, arg0, arg5, arg3, arg6, false, local106.aClass8_3);
local106.aClass8_2 = new Loc(local38, 4, (arg1 + 2 & 0x3) + 4, arg0, arg5, arg3, arg6, false, local106.aClass8_2);
}
}
}
@ -74,13 +74,13 @@ public final class Static92 {
}
@Pc(255) Scenery local255 = Static133.method4008(arg0, arg5, arg3);
if (local255 != null) {
local255.aClass8_4 = new Class8_Sub3((int) (local255.aLong56 >>> 32) & Integer.MAX_VALUE, arg2, arg1, arg0, arg5, arg3, arg6, false, local255.aClass8_4);
local255.aClass8_4 = new Loc((int) (local255.aLong56 >>> 32) & Integer.MAX_VALUE, arg2, arg1, arg0, arg5, arg3, arg6, false, local255.aClass8_4);
}
}
if (arg4 == 3) {
@Pc(290) GroundDecor local290 = Static269.method2210(arg0, arg5, arg3);
if (local290 != null) {
local290.aClass8_1 = new Class8_Sub3(Integer.MAX_VALUE & (int) (local290.aLong26 >>> 32), 22, arg1, arg0, arg5, arg3, arg6, false, local290.aClass8_1);
local290.aClass8_1 = new Loc(Integer.MAX_VALUE & (int) (local290.aLong26 >>> 32), 22, arg1, arg0, arg5, arg3, arg6, false, local290.aClass8_1);
}
}
}