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 Class96 to NpcType

Browse source
This commit is contained in:
Pazaz 2022-04-19 17:41:50 -04:00
parent 1d599cf06a
commit 08fa06c251
11 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -80,7 +80,7 @@ public final class Class3_Sub12 extends Node {
} else if (this.aClass8_Sub4_Sub2_1 != null) {
@Pc(92) int local92 = Static112.method2299(this.aClass8_Sub4_Sub2_1);
if (local8 != local92) {
@Pc(100) Class96 local100 = this.aClass8_Sub4_Sub2_1.aClass96_1;
@Pc(100) NpcType local100 = this.aClass8_Sub4_Sub2_1.aClass96_1;
this.anInt2044 = local92;
if (local100.anIntArray357 != null) {
local100 = local100.method2932();

8
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 Class96 aClass96_1;
public NpcType aClass96_1;
@OriginalMember(owner = "client!km", name = "finalize", descriptor = "()V")
@Override
@ -33,7 +33,7 @@ public final class Npc extends PathingEntity {
return;
}
this.anInt3413 = local74.method4549();
@Pc(84) Class96 local84 = this.aClass96_1;
@Pc(84) NpcType local84 = this.aClass96_1;
if (local84.anIntArray357 != null) {
local84 = local84.method2932();
}
@ -99,7 +99,7 @@ public final class Npc extends PathingEntity {
@Override
protected final int method2688() {
if (Static266.anInt5343 != 0 && this.aClass96_1.anIntArray357 != null) {
@Pc(17) Class96 local17 = this.aClass96_1.method2932();
@Pc(17) NpcType local17 = this.aClass96_1.method2932();
if (local17 != null && local17.anInt3737 != -1) {
return local17.anInt3737;
}
@ -122,7 +122,7 @@ public final class Npc extends PathingEntity {
}
@OriginalMember(owner = "client!km", name = "a", descriptor = "(ILclient!me;)V")
public final void method2698(@OriginalArg(1) Class96 arg0) {
public final void method2698(@OriginalArg(1) NpcType arg0) {
this.aClass96_1 = arg0;
if (this.aClass47_Sub1_5 != null) {
this.aClass47_Sub1_5.method1646();

10
client/src/main/java/Class96.java → client/src/main/java/NpcType.java
View file

@ -4,7 +4,7 @@ import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc;
@OriginalClass("client!me")
public final class Class96 {
public final class NpcType {
@OriginalMember(owner = "client!me", name = "b", descriptor = "[S")
private short[] aShortArray37;
@ -154,7 +154,7 @@ public final class Class96 {
public int anInt3752 = -1;
@OriginalMember(owner = "client!me", name = "a", descriptor = "(B)Lclient!me;")
public final Class96 method2932() {
public final NpcType method2932() {
@Pc(5) int local5 = -1;
if (this.anInt3723 != -1) {
local5 = Static155.method2945(this.anInt3723);
@ -195,7 +195,7 @@ public final class Class96 {
}
for (@Pc(35) int local35 = 0; local35 < this.anIntArray357.length; local35++) {
if (this.anIntArray357[local35] != -1) {
@Pc(60) Class96 local60 = Static214.method4363(this.anIntArray357[local35]);
@Pc(60) NpcType local60 = Static214.method4363(this.anIntArray357[local35]);
if (local60.anInt3728 != -1 || local60.anInt3747 != -1 || local60.anInt3734 != -1) {
return true;
}
@ -217,7 +217,7 @@ public final class Class96 {
@OriginalMember(owner = "client!me", name = "a", descriptor = "([Lclient!ub;IBIIIILclient!tk;ILclient!tk;)Lclient!ak;")
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();
@Pc(13) NpcType local13 = this.method2932();
return local13 == null ? null : local13.method2937(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
}
@Pc(40) Model local40 = (Model) Static125.aClass99_18.method3106((long) this.anInt3741);
@ -502,7 +502,7 @@ public final class Class96 {
@OriginalMember(owner = "client!me", name = "a", descriptor = "(Lclient!tk;IIII)Lclient!ak;")
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();
@Pc(13) NpcType local13 = this.method2932();
return local13 == null ? null : local13.method2943(arg0, arg1, arg2, arg3);
} else if (this.anIntArray354 == null) {
return null;

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

@ -211,7 +211,7 @@ public final class Static103 {
Static122.anInt3047 = Static7.anInt985;
local192 = Static175.aClass8_Sub4_Sub2Array1[local36];
if (local192 != null) {
@Pc(884) Class96 local884 = local192.aClass96_1;
@Pc(884) NpcType local884 = local192.aClass96_1;
if (local884.anIntArray357 != null) {
local884 = local884.method2932();
}

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

@ -117,7 +117,7 @@ public final class Static112 {
@OriginalMember(owner = "client!ij", name = "a", descriptor = "(Lclient!km;I)I")
public static int method2299(@OriginalArg(0) Npc arg0) {
@Pc(13) Class96 local13 = arg0.aClass96_1;
@Pc(13) NpcType local13 = arg0.aClass96_1;
if (local13.anIntArray357 != null) {
local13 = local13.method2932();
if (local13 == null) {

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

@ -67,7 +67,7 @@ public final class Static122 {
Static3.aClass69_135.method2282(local13);
} else if (arg3 != null) {
local13.aClass8_Sub4_Sub2_1 = arg3;
@Pc(138) Class96 local138 = arg3.aClass96_1;
@Pc(138) NpcType local138 = arg3.aClass96_1;
if (local138.anIntArray357 != null) {
local13.aBoolean117 = true;
local138 = local138.method2932();

6
client/src/main/java/Static142.java
View file

@ -36,7 +36,7 @@ public final class Static142 {
local17 = Static175.aClass8_Sub4_Sub2Array1[Static33.anIntArray79[local5 - Static267.anInt5774]];
}
if (local17 != null && local17.method2682()) {
@Pc(58) Class96 local58;
@Pc(58) NpcType local58;
if (local17 instanceof Npc) {
local58 = ((Npc) local17).aClass96_1;
if (local58.anIntArray357 != null) {
@ -137,7 +137,7 @@ public final class Static142 {
local512 = local528[1];
local508 = local528[0];
}
@Pc(571) Class96 local571 = local518.aClass96_1;
@Pc(571) NpcType local571 = local518.aClass96_1;
if (local571.anInt3730 == -1) {
local310 = local17.method2691();
} else {
@ -170,7 +170,7 @@ public final class Static142 {
if (local17.anIntArray319[local74] > Static83.anInt372) {
if (local17 instanceof Npc) {
@Pc(725) Npc local725 = (Npc) local17;
@Pc(728) Class96 local728 = local725.aClass96_1;
@Pc(728) NpcType local728 = local725.aClass96_1;
if (local728.anInt3730 == -1) {
local265 = local17.method2691() / 2;
} else {

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

@ -156,7 +156,7 @@ public final class Static158 {
@Pc(125) int local125 = local113 + (Static238.anIntArray470[local16] >> 8) * 64 - Static225.anInt5068;
@Pc(129) int local129 = local103 & 0x3F;
@Pc(142) int local142 = local129 + (Static238.anIntArray470[local16] & 0xFF) * 64 - Static142.anInt3483;
@Pc(148) Class96 local148 = Static214.method4363(local74.method2163());
@Pc(148) NpcType local148 = Static214.method4363(local74.method2163());
if (Static175.aClass8_Sub4_Sub2Array1[local97] == null && (local148.aByte10 & 0x1) > 0 && local107 == Static41.anInt1316 && local125 >= 0 && local148.anInt3713 + local125 < 104 && local142 >= 0 && local142 + local148.anInt3713 < 104) {
Static175.aClass8_Sub4_Sub2Array1[local97] = new Npc();
@Pc(198) Npc local198 = Static175.aClass8_Sub4_Sub2Array1[local97];

6
client/src/main/java/Static214.java
View file

@ -61,13 +61,13 @@ public final class Static214 {
}
@OriginalMember(owner = "client!rg", name = "b", descriptor = "(II)Lclient!me;")
public static Class96 method4363(@OriginalArg(0) int arg0) {
@Pc(10) Class96 local10 = (Class96) Static93.aClass99_13.method3106((long) arg0);
public static NpcType method4363(@OriginalArg(0) int arg0) {
@Pc(10) NpcType local10 = (NpcType) Static93.aClass99_13.method3106((long) arg0);
if (local10 != null) {
return local10;
}
@Pc(26) byte[] local26 = Static58.aClass153_28.method4495(Static60.method1447(arg0), Static179.method3322(arg0));
local10 = new Class96();
local10 = new NpcType();
local10.anInt3741 = arg0;
if (local26 != null) {
local10.method2939(new Buffer(local26));

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

@ -46,7 +46,7 @@ public final class Static246 {
}
@OriginalMember(owner = "client!u", name = "a", descriptor = "(Lclient!me;IIII)V")
public static void method4240(@OriginalArg(0) Class96 arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3) {
public static void method4240(@OriginalArg(0) NpcType arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3) {
if (Static231.anInt5204 >= 400) {
return;
}

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

@ -110,7 +110,7 @@ public final class Static54 {
for (local146 = 0; local146 < Static272.anInt5214; local146++) {
@Pc(498) Npc local498 = Static175.aClass8_Sub4_Sub2Array1[Static33.anIntArray79[local146]];
if (local498 != null && local498.method2682()) {
@Pc(507) Class96 local507 = local498.aClass96_1;
@Pc(507) NpcType local507 = local498.aClass96_1;
if (local507 != null && local507.anIntArray357 != null) {
local507 = local507.method2932();
}