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

Rename Class118 to LocType

Browse source
This commit is contained in:
Pazaz 2022-04-19 17:40:46 -04:00
parent 62e1277190
commit 1d599cf06a
21 changed files with 29 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -27,7 +27,7 @@ public final class Class3_Sub12 extends Node {
public int anInt2034; public int anInt2034;
@OriginalMember(owner = "client!fl", name = "E", descriptor = "Lclient!pb;") @OriginalMember(owner = "client!fl", name = "E", descriptor = "Lclient!pb;")
public Class118 aClass118_1; public LocType aClass118_1;
@OriginalMember(owner = "client!fl", name = "F", descriptor = "I") @OriginalMember(owner = "client!fl", name = "F", descriptor = "I")
public int anInt2037; public int anInt2037;
@ -63,7 +63,7 @@ public final class Class3_Sub12 extends Node {
public final void method1567() { public final void method1567() {
@Pc(8) int local8 = this.anInt2044; @Pc(8) int local8 = this.anInt2044;
if (this.aClass118_1 != null) { if (this.aClass118_1 != null) {
@Pc(17) Class118 local17 = this.aClass118_1.method3417(); @Pc(17) LocType local17 = this.aClass118_1.method3417();
if (local17 == null) { if (local17 == null) {
this.anInt2044 = -1; this.anInt2044 = -1;
this.anIntArray181 = null; this.anIntArray181 = null;

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

@ -77,7 +77,7 @@ public final class Loc extends Entity {
this.anInt1307 = arg1; this.anInt1307 = arg1;
this.anInt1299 = arg0; this.anInt1299 = arg0;
this.anInt1300 = arg5; this.anInt1300 = arg5;
@Pc(67) Class118 local67; @Pc(67) LocType local67;
if (Static239.aBoolean269 && arg8 != null) { if (Static239.aBoolean269 && arg8 != null) {
if (arg8 instanceof Loc) { if (arg8 instanceof Loc) {
((Loc) arg8).method1046(); ((Loc) arg8).method1046();
@ -222,7 +222,7 @@ public final class Loc extends Entity {
@OriginalMember(owner = "client!dc", name = "a", descriptor = "(ZI)Lclient!th;") @OriginalMember(owner = "client!dc", name = "a", descriptor = "(ZI)Lclient!th;")
private Entity method1048(@OriginalArg(0) boolean arg0) { private Entity method1048(@OriginalArg(0) boolean arg0) {
@Pc(12) boolean local12 = Static107.anIntArrayArrayArray10 != Static83.anIntArrayArrayArray4; @Pc(12) boolean local12 = Static107.anIntArrayArrayArray10 != Static83.anIntArrayArrayArray4;
@Pc(19) Class118 local19 = Static271.method4601(this.anInt1299); @Pc(19) LocType local19 = Static271.method4601(this.anInt1299);
@Pc(22) int local22 = local19.anInt4430; @Pc(22) int local22 = local19.anInt4430;
if (local19.anIntArray380 != null) { if (local19.anIntArray380 != null) {
local19 = local19.method3417(); local19 = local19.method3417();

6
client/src/main/java/Class118.java → client/src/main/java/LocType.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!pb") @OriginalClass("client!pb")
public final class Class118 { public final class LocType {
@OriginalMember(owner = "client!pb", name = "a", descriptor = "[S") @OriginalMember(owner = "client!pb", name = "a", descriptor = "[S")
private short[] aShortArray60; private short[] aShortArray60;
@ -206,7 +206,7 @@ public final class Class118 {
} }
@OriginalMember(owner = "client!pb", name = "a", descriptor = "(I)Lclient!pb;") @OriginalMember(owner = "client!pb", name = "a", descriptor = "(I)Lclient!pb;")
public final Class118 method3417() { public final LocType method3417() {
@Pc(26) int local26 = -1; @Pc(26) int local26 = -1;
if (this.anInt4425 != -1) { if (this.anInt4425 != -1) {
local26 = Static155.method2945(this.anInt4425); local26 = Static155.method2945(this.anInt4425);
@ -363,7 +363,7 @@ public final class Class118 {
} }
for (@Pc(44) int local44 = 0; local44 < this.anIntArray380.length; local44++) { for (@Pc(44) int local44 = 0; local44 < this.anIntArray380.length; local44++) {
if (this.anIntArray380[local44] != -1) { if (this.anIntArray380[local44] != -1) {
@Pc(70) Class118 local70 = Static271.method4601(this.anIntArray380[local44]); @Pc(70) LocType local70 = Static271.method4601(this.anIntArray380[local44]);
if (local70.anInt4412 != -1 || local70.anIntArray381 != null) { if (local70.anInt4412 != -1 || local70.anIntArray381 != null) {
return true; return true;
} }

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

@ -40,7 +40,7 @@ public final class Static113 {
if (arg1 >= 5 && arg1 <= 8) { if (arg1 >= 5 && arg1 <= 8) {
arg1 = 4; arg1 = 4;
} }
@Pc(30) Class118 local30 = Static271.method4601(arg0); @Pc(30) LocType local30 = Static271.method4601(arg0);
return local30.method3416(arg1); return local30.method3416(arg1);
} }
} }

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

@ -37,7 +37,7 @@ public final class Static122 {
} }
@OriginalMember(owner = "client!jh", name = "a", descriptor = "(IZLclient!pb;ILclient!km;IILclient!e;)V") @OriginalMember(owner = "client!jh", name = "a", descriptor = "(IZLclient!pb;ILclient!km;IILclient!e;)V")
public static void method2411(@OriginalArg(0) int arg0, @OriginalArg(2) Class118 arg1, @OriginalArg(3) int arg2, @OriginalArg(4) Npc arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5, @OriginalArg(7) Player arg6) { public static void method2411(@OriginalArg(0) int arg0, @OriginalArg(2) LocType arg1, @OriginalArg(3) int arg2, @OriginalArg(4) Npc arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5, @OriginalArg(7) Player arg6) {
@Pc(13) Class3_Sub12 local13 = new Class3_Sub12(); @Pc(13) Class3_Sub12 local13 = new Class3_Sub12();
local13.anInt2029 = arg0 * 128; local13.anInt2029 = arg0 * 128;
local13.anInt2041 = arg4 * 128; local13.anInt2041 = arg4 * 128;

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

@ -52,13 +52,13 @@ public final class Static137 {
for (local76 = 0; local76 < 104; local76++) { for (local76 = 0; local76 < 104; local76++) {
@Pc(169) long local169 = Static20.method602(Static55.anInt1735, local37 + 0, local76); @Pc(169) long local169 = Static20.method602(Static55.anInt1735, local37 + 0, local76);
if (local169 != 0L) { if (local169 != 0L) {
@Pc(184) Class118 local184 = Static271.method4601((int) (local169 >>> 32) & Integer.MAX_VALUE); @Pc(184) LocType local184 = Static271.method4601((int) (local169 >>> 32) & Integer.MAX_VALUE);
@Pc(187) int local187 = local184.anInt4400; @Pc(187) int local187 = local184.anInt4400;
@Pc(194) int local194; @Pc(194) int local194;
if (local184.anIntArray380 != null) { if (local184.anIntArray380 != null) {
for (local194 = 0; local194 < local184.anIntArray380.length; local194++) { for (local194 = 0; local194 < local184.anIntArray380.length; local194++) {
if (local184.anIntArray380[local194] != -1) { if (local184.anIntArray380[local194] != -1) {
@Pc(216) Class118 local216 = Static271.method4601(local184.anIntArray380[local194]); @Pc(216) LocType local216 = Static271.method4601(local184.anIntArray380[local194]);
if (local216.anInt4400 >= 0) { if (local216.anInt4400 >= 0) {
local187 = local216.anInt4400; local187 = local216.anInt4400;
break; break;

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

@ -40,7 +40,7 @@ public final class Static164 {
@Pc(28) int local28; @Pc(28) int local28;
@Pc(35) int local35; @Pc(35) int local35;
@Pc(42) int local42; @Pc(42) int local42;
@Pc(46) Class118 local46; @Pc(46) LocType local46;
@Pc(65) int local65; @Pc(65) int local65;
@Pc(75) int[] local75; @Pc(75) int[] local75;
@Pc(90) int local90; @Pc(90) int local90;
@ -151,7 +151,7 @@ public final class Static164 {
if (local14 != 0L) { if (local14 != 0L) {
local28 = (int) local14 >> 20 & 0x3; local28 = (int) local14 >> 20 & 0x3;
local35 = (int) (local14 >>> 32) & Integer.MAX_VALUE; local35 = (int) (local14 >>> 32) & Integer.MAX_VALUE;
@Pc(586) Class118 local586 = Static271.method4601(local35); @Pc(586) LocType local586 = Static271.method4601(local35);
if (local586.anInt4415 != -1 && !Static33.method867(arg0, local586, arg2, local28)) { if (local586.anInt4415 != -1 && !Static33.method867(arg0, local586, arg2, local28)) {
return false; return false;
} }

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

@ -76,7 +76,7 @@ public final class Static166 {
Static83.anIntArrayArrayArray3[local84][local95] = new int[4096]; Static83.anIntArrayArrayArray3[local84][local95] = new int[4096];
} }
local214--; local214--;
@Pc(312) Class118 local312 = Static271.method4601(local214); @Pc(312) LocType local312 = Static271.method4601(local214);
if (local312.anIntArray380 != null) { if (local312.anIntArray380 != null) {
local312 = local312.method3417(); local312 = local312.method3417();
if (local312 == null || local312.anInt4400 == -1) { if (local312 == null || local312.anInt4400 == -1) {

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

@ -99,7 +99,7 @@ public final class Static176 {
local112 = local121; local112 = local121;
@Pc(240) int local240; @Pc(240) int local240;
if (local133 == 2 && Static257.method523(Static55.anInt1735, local47, local147, local121)) { if (local133 == 2 && Static257.method523(Static55.anInt1735, local47, local147, local121)) {
@Pc(172) Class118 local172 = Static271.method4601(local140); @Pc(172) LocType local172 = Static271.method4601(local140);
if (local172.anIntArray380 != null) { if (local172.anIntArray380 != null) {
local172 = local172.method3417(); local172 = local172.method3417();
} }

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

@ -39,7 +39,7 @@ public final class Static185 {
if (arg2 < Static146.anInt3508) { if (arg2 < Static146.anInt3508) {
Static146.anInt3508 = arg2; Static146.anInt3508 = arg2;
} }
@Pc(62) Class118 local62 = Static271.method4601(arg5); @Pc(62) LocType local62 = Static271.method4601(arg5);
if (Static239.aBoolean269 && local62.aBoolean216) { if (Static239.aBoolean269 && local62.aBoolean216) {
return; return;
} }

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

@ -33,7 +33,7 @@ public final class Static192 {
local40 = Static175.aClass8_Sub4_Sub2Array1[local29]; local40 = Static175.aClass8_Sub4_Sub2Array1[local29];
} }
if (local40 != null) { if (local40 != null) {
@Pc(63) Class118 local63 = Static271.method4601(local17.anInt1189); @Pc(63) LocType local63 = Static271.method4601(local17.anInt1189);
if (Static55.anInt1735 < 3) { if (Static55.anInt1735 < 3) {
} }
@Pc(86) int local86; @Pc(86) int local86;

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

@ -20,7 +20,7 @@ public final class Static209 {
public static volatile long aLong161 = 0L; public static volatile long aLong161 = 0L;
@OriginalMember(owner = "client!ra", name = "a", descriptor = "(ILclient!pb;BII)V") @OriginalMember(owner = "client!ra", name = "a", descriptor = "(ILclient!pb;BII)V")
public static void method3701(@OriginalArg(0) int arg0, @OriginalArg(1) Class118 arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3) { public static void method3701(@OriginalArg(0) int arg0, @OriginalArg(1) LocType arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3) {
for (@Pc(10) Class3_Sub12 local10 = (Class3_Sub12) Static3.aClass69_135.method2289(); local10 != null; local10 = (Class3_Sub12) Static3.aClass69_135.method2288()) { for (@Pc(10) Class3_Sub12 local10 = (Class3_Sub12) Static3.aClass69_135.method2289(); local10 != null; local10 = (Class3_Sub12) Static3.aClass69_135.method2288()) {
if (arg3 == local10.anInt2033 && local10.anInt2041 == arg0 * 128 && local10.anInt2029 == arg2 * 128 && arg1.anInt4426 == local10.aClass118_1.anInt4426) { if (arg3 == local10.anInt2033 && local10.anInt2041 == arg0 * 128 && local10.anInt2029 == arg2 * 128 && arg1.anInt4426 == local10.aClass118_1.anInt4426) {
if (local10.aClass3_Sub3_Sub1_1 != null) { if (local10.aClass3_Sub3_Sub1_1 != null) {

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

@ -157,7 +157,7 @@ public final class Static217 {
@Pc(68) int local68 = local64 >> 2; @Pc(68) int local68 = local64 >> 2;
@Pc(72) int local72 = local64 & 0x3; @Pc(72) int local72 = local64 & 0x3;
if (arg3 == local60 && local56 >= arg8 && local56 < arg8 + 8 && arg9 <= local50 && arg9 + 8 > local50) { if (arg3 == local60 && local56 >= arg8 && local56 < arg8 + 8 && arg9 <= local50 && arg9 + 8 > local50) {
@Pc(103) Class118 local103 = Static271.method4601(local7); @Pc(103) LocType local103 = Static271.method4601(local7);
@Pc(120) int local120 = Static52.method1286(local50 & 0x7, arg4, local72, local103.anInt4403, local103.anInt4397, local56 & 0x7) + arg5; @Pc(120) int local120 = Static52.method1286(local50 & 0x7, arg4, local72, local103.anInt4403, local103.anInt4397, local56 & 0x7) + arg5;
@Pc(137) int local137 = Static241.method4541(local103.anInt4397, arg4, local103.anInt4403, local56 & 0x7, local72, local50 & 0x7) + arg6; @Pc(137) int local137 = Static241.method4541(local103.anInt4397, arg4, local103.anInt4403, local56 & 0x7, local72, local50 & 0x7) + arg6;
if (local120 > 0 && local137 > 0 && local120 < 103 && local137 < 103) { if (local120 > 0 && local137 > 0 && local120 < 103 && local137 < 103) {

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

@ -62,7 +62,7 @@ public final class Static232 {
@Pc(203) int local203 = (local50 + arg4 & 0x3F) + ((arg6 + local119 & 0x3F) << 6); @Pc(203) int local203 = (local50 + arg4 & 0x3F) + ((arg6 + local119 & 0x3F) << 6);
@Pc(209) int local209 = local116[local163][local203]; @Pc(209) int local209 = local116[local163][local203];
if (local209 != 0) { if (local209 != 0) {
@Pc(222) Class118 local222 = Static271.method4601(local209 - 1); @Pc(222) LocType local222 = Static271.method4601(local209 - 1);
if (!Static258.aBooleanArray130[local222.anInt4400]) { if (!Static258.aBooleanArray130[local222.anInt4400]) {
if (local11 != -1 && local222.anInt4400 == Static9.anInt172) { if (local11 != -1 && local222.anInt4400 == Static9.anInt172) {
@Pc(243) Class3_Sub26 local243 = new Class3_Sub26(); @Pc(243) Class3_Sub26 local243 = new Class3_Sub26();

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

@ -131,7 +131,7 @@ public final class Static233 {
@Pc(24) int local24 = (int) arg0 >> 20 & 0x3; @Pc(24) int local24 = (int) arg0 >> 20 & 0x3;
@Pc(31) int local31 = (int) (arg0 >>> 32) & Integer.MAX_VALUE; @Pc(31) int local31 = (int) (arg0 >>> 32) & Integer.MAX_VALUE;
if (local12 == 10 || local12 == 11 || local12 == 22) { if (local12 == 10 || local12 == 11 || local12 == 22) {
@Pc(46) Class118 local46 = Static271.method4601(local31); @Pc(46) LocType local46 = Static271.method4601(local31);
@Pc(62) int local62; @Pc(62) int local62;
@Pc(59) int local59; @Pc(59) int local59;
if (local24 == 0 || local24 == 2) { if (local24 == 0 || local24 == 2) {

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

@ -48,13 +48,13 @@ public final class Static271 {
} }
@OriginalMember(owner = "client!wc", name = "a", descriptor = "(II)Lclient!pb;") @OriginalMember(owner = "client!wc", name = "a", descriptor = "(II)Lclient!pb;")
public static Class118 method4601(@OriginalArg(1) int arg0) { public static LocType method4601(@OriginalArg(1) int arg0) {
@Pc(15) Class118 local15 = (Class118) Static179.aClass99_25.method3106((long) arg0); @Pc(15) LocType local15 = (LocType) Static179.aClass99_25.method3106((long) arg0);
if (local15 != null) { if (local15 != null) {
return local15; return local15;
} }
@Pc(30) byte[] local30 = Static146.aClass153_54.method4495(Static253.method4328(arg0), Static33.method872(arg0)); @Pc(30) byte[] local30 = Static146.aClass153_54.method4495(Static253.method4328(arg0), Static33.method872(arg0));
local15 = new Class118(); local15 = new LocType();
local15.anInt4426 = arg0; local15.anInt4426 = arg0;
if (local30 != null) { if (local30 != null) {
local15.method3424(new Buffer(local30)); local15.method3424(new Buffer(local30));

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

@ -21,7 +21,7 @@ public final class Static33 {
public static final int[] anIntArray79 = new int[32768]; public static final int[] anIntArray79 = new int[32768];
@OriginalMember(owner = "client!cj", name = "a", descriptor = "(ILclient!pb;ZIIII)Z") @OriginalMember(owner = "client!cj", name = "a", descriptor = "(ILclient!pb;ZIIII)Z")
public static boolean method867(@OriginalArg(0) int arg0, @OriginalArg(1) Class118 arg1, @OriginalArg(5) int arg2, @OriginalArg(6) int arg3) { public static boolean method867(@OriginalArg(0) int arg0, @OriginalArg(1) LocType arg1, @OriginalArg(5) int arg2, @OriginalArg(6) int arg3) {
@Pc(10) Class2 local10 = Static40.method1013(arg1.anInt4415); @Pc(10) Class2 local10 = Static40.method1013(arg1.anInt4415);
if (local10.anInt12 == -1) { if (local10.anInt12 == -1) {
return true; return true;

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

@ -70,7 +70,7 @@ public final class Static43 {
} }
@Pc(57) int local57 = (int) local9 >> 14 & 0x1F; @Pc(57) int local57 = (int) local9 >> 14 & 0x1F;
@Pc(70) int local70 = (int) (local9 >>> 32) & Integer.MAX_VALUE; @Pc(70) int local70 = (int) (local9 >>> 32) & Integer.MAX_VALUE;
@Pc(74) Class118 local74 = Static271.method4601(local70); @Pc(74) LocType local74 = Static271.method4601(local70);
if (local74.method3422()) { if (local74.method3422()) {
Static209.method3701(arg1, local74, arg0, arg2); Static209.method3701(arg1, local74, arg0, arg2);
} }

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

@ -49,7 +49,7 @@ public final class Static49 {
@Pc(39) boolean local39 = false; @Pc(39) boolean local39 = false;
while (true) { while (true) {
@Pc(78) int local78; @Pc(78) int local78;
@Pc(95) Class118 local95; @Pc(95) LocType local95;
do { do {
@Pc(72) int local72; @Pc(72) int local72;
@Pc(68) int local68; @Pc(68) int local68;

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

@ -88,7 +88,7 @@ public final class Static54 {
for (local146 = 0; local146 < Static251.anInt5454; local146++) { for (local146 = 0; local146 < Static251.anInt5454; local146++) {
local181 = Static145.anIntArray331[local146] * 4 + 2 - Static173.aClass8_Sub4_Sub1_2.anInt3412 / 32; local181 = Static145.anIntArray331[local146] * 4 + 2 - Static173.aClass8_Sub4_Sub1_2.anInt3412 / 32;
local150 = Static93.anIntArray219[local146] * 4 + 2 - Static173.aClass8_Sub4_Sub1_2.anInt3421 / 32; local150 = Static93.anIntArray219[local146] * 4 + 2 - Static173.aClass8_Sub4_Sub1_2.anInt3421 / 32;
@Pc(382) Class118 local382 = Static271.method4601(Static199.anIntArray417[local146]); @Pc(382) LocType local382 = Static271.method4601(Static199.anIntArray417[local146]);
if (local382.anIntArray380 != null) { if (local382.anIntArray380 != null) {
local382 = local382.method3417(); local382 = local382.method3417();
if (local382 == null || local382.anInt4400 == -1) { if (local382 == null || local382.anInt4400 == -1) {

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

@ -17,7 +17,7 @@ public final class Static9 {
public static final JagString aClass100_35 = Static28.method790("showVideoAd"); public static final JagString aClass100_35 = Static28.method790("showVideoAd");
@OriginalMember(owner = "client!al", name = "a", descriptor = "(Lclient!pb;BIIIIIII)V") @OriginalMember(owner = "client!al", name = "a", descriptor = "(Lclient!pb;BIIIIIII)V")
public static void method181(@OriginalArg(0) Class118 arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5, @OriginalArg(7) int arg6, @OriginalArg(8) int arg7) { public static void method181(@OriginalArg(0) LocType arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5, @OriginalArg(7) int arg6, @OriginalArg(8) int arg7) {
@Pc(5) int local5 = arg2 & 0x3; @Pc(5) int local5 = arg2 & 0x3;
@Pc(28) int local28; @Pc(28) int local28;
@Pc(31) int local31; @Pc(31) int local31;