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

Loads of refactoring, renamed Class3_Sub13 to EnumStringEntry too

Browse source
This commit is contained in:
Pazaz 2022-04-23 16:25:30 -04:00
parent e11ef7d372
commit d2c6c19cb8
263 changed files with 2432 additions and 2436 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -7,7 +7,7 @@ import org.openrs2.deob.annotation.Pc;
public final class Npc extends PathingEntity {
@OriginalMember(owner = "client!km", name = "rc", descriptor = "Lclient!me;")
public NpcType aClass96_1;
public NpcType type;
@OriginalMember(owner = "client!km", name = "finalize", descriptor = "()V")
@Override
@ -23,23 +23,23 @@ public final class Npc extends PathingEntity {
@OriginalMember(owner = "client!km", 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) ParticleSystem arg10) {
if (this.aClass96_1 == null) {
if (this.type == null) {
return;
}
@Pc(29) SeqType local29 = this.anInt3369 != -1 && this.anInt3420 == 0 ? Static36.method941(this.anInt3369) : null;
@Pc(53) SeqType local53 = this.anInt3366 == -1 || this.anInt3366 == this.method2681().anInt1037 && local29 != null ? null : Static36.method941(this.anInt3366);
@Pc(74) Model local74 = this.aClass96_1.method2937(this.aClass147Array3, this.anInt3388, this.anInt3407, this.anInt3373, this.anInt3360, this.anInt3425, local53, this.anInt3396, local29);
@Pc(53) SeqType local53 = this.anInt3366 == -1 || this.anInt3366 == this.method2681().idleAnimationId && local29 != null ? null : Static36.method941(this.anInt3366);
@Pc(74) Model local74 = this.type.method2937(this.aClass147Array3, this.anInt3388, this.anInt3407, this.anInt3373, this.anInt3360, this.anInt3425, local53, this.anInt3396, local29);
if (local74 == null) {
return;
}
this.anInt3413 = local74.method4549();
@Pc(84) NpcType local84 = this.aClass96_1;
@Pc(84) NpcType local84 = this.type;
if (local84.anIntArray357 != null) {
local84 = local84.method2932();
local84 = local84.getMultiNpc();
}
@Pc(140) Model local140;
if (Static209.characterShadowsOn && 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);
local140 = Static41.method1043(this.type.aByte13, this.aBoolean171, local53 == null ? local29 : local53, this.xFine, this.type.aShort23, this.zFine, this.type.aShort24, this.type.anInt3713, local74, arg0, local53 == null ? this.anInt3425 : this.anInt3407, this.anInt3424, this.type.aByte12);
if (GlRenderer.enabled) {
@Pc(144) float local144 = GlRenderer.method4179();
@Pc(146) float local146 = GlRenderer.method4166();
@ -77,18 +77,18 @@ public final class Npc extends PathingEntity {
if (local140 != null) {
local74 = ((SoftwareModel) local74).method4588(local140);
}
if (this.aClass96_1.anInt3713 == 1) {
if (this.type.anInt3713 == 1) {
local74.aBoolean303 = true;
}
local74.method4546(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, this.aClass47_Sub1_5);
return;
}
if (this.aClass96_1.anInt3713 == 1) {
if (this.type.anInt3713 == 1) {
local74.aBoolean303 = true;
}
local74.method4546(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, this.aClass47_Sub1_5);
if (local140 != null) {
if (this.aClass96_1.anInt3713 == 1) {
if (this.type.anInt3713 == 1) {
local140.aBoolean303 = true;
}
local140.method4546(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, this.aClass47_Sub1_5);
@ -98,8 +98,8 @@ public final class Npc extends PathingEntity {
@OriginalMember(owner = "client!km", name = "b", descriptor = "(I)I")
@Override
protected final int method2688() {
if (Static266.game != 0 && this.aClass96_1.anIntArray357 != null) {
@Pc(17) NpcType local17 = this.aClass96_1.method2932();
if (Static266.game != 0 && this.type.anIntArray357 != null) {
@Pc(17) NpcType local17 = this.type.getMultiNpc();
if (local17 != null && local17.anInt3737 != -1) {
return local17.anInt3737;
}
@ -110,7 +110,7 @@ public final class Npc extends PathingEntity {
@OriginalMember(owner = "client!km", name = "a", descriptor = "(IIIII)V")
@Override
public final void method4545(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4) {
if (this.aClass96_1 == null) {
if (this.type == null) {
;
}
}
@ -118,12 +118,12 @@ public final class Npc extends PathingEntity {
@OriginalMember(owner = "client!km", name = "a", descriptor = "(B)Z")
@Override
public final boolean method2682() {
return this.aClass96_1 != null;
return this.type != null;
}
@OriginalMember(owner = "client!km", name = "a", descriptor = "(ILclient!me;)V")
public final void method2698(@OriginalArg(1) NpcType arg0) {
this.aClass96_1 = arg0;
this.type = arg0;
if (this.aClass47_Sub1_5 != null) {
this.aClass47_Sub1_5.method1646();
}