Rename Class10_Sub1 to World

This commit is contained in:
Pazaz 2022-04-19 18:35:04 -04:00
parent b0d564250b
commit 4ad0cb9ff1
12 changed files with 17 additions and 17 deletions

View file

@ -20,7 +20,7 @@ public final class Static101 {
public static int anInt2640 = 0;
@OriginalMember(owner = "client!hm", name = "fb", descriptor = "[Lclient!ba;")
public static Class10_Sub1[] aClass10_Sub1Array1 = new Class10_Sub1[0];
public static World[] aClass10_Sub1Array1 = new World[0];
@OriginalMember(owner = "client!hm", name = "lb", descriptor = "Lclient!na;")
public static final JagString aClass100_540 = Static28.method790("Moteur son pr-Bpar-B");

View file

@ -160,7 +160,7 @@ public final class Static164 {
}
@OriginalMember(owner = "client!na", name = "a", descriptor = "(Lclient!ba;Lclient!ba;IIIZZ)I")
public static int method3115(@OriginalArg(0) Class10_Sub1 arg0, @OriginalArg(1) Class10_Sub1 arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) boolean arg4, @OriginalArg(6) boolean arg5) {
public static int method3115(@OriginalArg(0) World arg0, @OriginalArg(1) World arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) boolean arg4, @OriginalArg(6) boolean arg5) {
@Pc(8) int local8 = Static270.method4595(arg1, arg3, arg0, arg5);
if (local8 != 0) {
return arg5 ? -local8 : local8;

View file

@ -31,7 +31,7 @@ public final class Static176 {
@OriginalMember(owner = "client!ob", name = "a", descriptor = "(IB)Z")
public static boolean method3303(@OriginalArg(0) int arg0) {
@Pc(3) Class10_Sub1 local3 = Static54.method1310(arg0);
@Pc(3) World local3 = Static54.method1310(arg0);
if (local3 == null) {
return false;
} else if (SignLink.anInt5928 == 1 || SignLink.anInt5928 == 2 || Static83.anInt370 == 2) {

View file

@ -93,7 +93,7 @@ public final class Static18 {
}
@OriginalMember(owner = "client!bh", name = "a", descriptor = "(B)Lclient!ba;")
public static Class10_Sub1 method556() {
public static World method556() {
Static51.anInt1682 = 0;
return Static88.method1821();
}

View file

@ -5,7 +5,7 @@ import org.openrs2.deob.annotation.Pc;
public final class Static196 {
@OriginalMember(owner = "client!pl", name = "a", descriptor = "[Lclient!ba;")
public static Class10_Sub1[] aClass10_Sub1Array2;
public static World[] aClass10_Sub1Array2;
@OriginalMember(owner = "client!pl", name = "b", descriptor = "Lclient!na;")
private static final JagString aClass100_861 = Static28.method790("Loaded wordpack");

View file

@ -165,10 +165,10 @@ public final class Static207 {
if (Static141.anInt3469 < Static116.anInt2961) {
return -1;
} else if (Static170.method2572(Static229.aByteArray70)) {
Static101.aClass10_Sub1Array1 = new Class10_Sub1[Static106.anInt2871];
Static101.aClass10_Sub1Array1 = new World[Static106.anInt2871];
local124 = 0;
for (@Pc(240) int local240 = Static19.anInt636; local240 <= Static171.anInt4157; local240++) {
@Pc(247) Class10_Sub1 local247 = Static54.method1310(local240);
@Pc(247) World local247 = Static54.method1310(local240);
if (local247 != null) {
Static101.aClass10_Sub1Array1[local124++] = local247;
}

View file

@ -140,7 +140,7 @@ public final class Static270 {
}
@OriginalMember(owner = "client!wb", name = "a", descriptor = "(Lclient!ba;IILclient!ba;Z)I")
public static int method4595(@OriginalArg(0) Class10_Sub1 arg0, @OriginalArg(1) int arg1, @OriginalArg(3) Class10_Sub1 arg2, @OriginalArg(4) boolean arg3) {
public static int method4595(@OriginalArg(0) World arg0, @OriginalArg(1) int arg1, @OriginalArg(3) World arg2, @OriginalArg(4) boolean arg3) {
if (arg1 == 1) {
@Pc(11) int local11 = arg0.anInt379;
@Pc(14) int local14 = arg2.anInt379;

View file

@ -268,7 +268,7 @@ public final class Static54 {
}
@OriginalMember(owner = "client!ed", name = "b", descriptor = "(II)Lclient!ba;")
public static Class10_Sub1 method1310(@OriginalArg(1) int arg0) {
public static World method1310(@OriginalArg(1) int arg0) {
return Static61.aBoolean109 && arg0 >= Static19.anInt636 && arg0 <= Static171.anInt4157 ? Static196.aClass10_Sub1Array2[arg0 - Static19.anInt636] : null;
}

View file

@ -23,12 +23,12 @@ public final class Static79 {
}
@Pc(13) int local13 = (arg2 + arg4) / 2;
@Pc(15) int local15 = arg4;
@Pc(19) Class10_Sub1 local19 = Static101.aClass10_Sub1Array1[local13];
@Pc(19) World local19 = Static101.aClass10_Sub1Array1[local13];
Static101.aClass10_Sub1Array1[local13] = Static101.aClass10_Sub1Array1[arg2];
Static101.aClass10_Sub1Array1[arg2] = local19;
for (@Pc(31) int local31 = arg4; local31 < arg2; local31++) {
if (Static164.method3115(local19, Static101.aClass10_Sub1Array1[local31], arg0, arg1, arg3, arg5) <= 0) {
@Pc(53) Class10_Sub1 local53 = Static101.aClass10_Sub1Array1[local31];
@Pc(53) World local53 = Static101.aClass10_Sub1Array1[local31];
Static101.aClass10_Sub1Array1[local31] = Static101.aClass10_Sub1Array1[local15];
Static101.aClass10_Sub1Array1[local15++] = local53;
}

View file

@ -3697,7 +3697,7 @@ public final class Static88 {
continue;
}
@Pc(10247) Class32 local10247;
@Pc(10191) Class10_Sub1 local10191;
@Pc(10191) World local10191;
if (local226 == 6501) {
local10191 = Static18.method556();
if (local10191 == null) {
@ -3761,7 +3761,7 @@ public final class Static88 {
if (local226 == 6506) {
local28--;
local809 = Static254.anIntArray487[local28];
@Pc(10440) Class10_Sub1 local10440 = Static54.method1310(local809);
@Pc(10440) World local10440 = Static54.method1310(local809);
if (local10440 == null) {
Static254.anIntArray487[local28++] = -1;
Static3.aClass100Array176[local26++] = Static72.aClass100_447;
@ -4154,7 +4154,7 @@ public final class Static88 {
}
@OriginalMember(owner = "client!h", name = "a", descriptor = "(I)Lclient!ba;")
public static Class10_Sub1 method1821() {
public static World method1821() {
return Static101.aClass10_Sub1Array1.length > Static51.anInt1682 ? Static101.aClass10_Sub1Array1[Static51.anInt1682++] : null;
}

View file

@ -112,10 +112,10 @@ public final class Static97 {
Static19.anInt636 = arg0.method2204();
Static171.anInt4157 = arg0.method2204();
Static106.anInt2871 = arg0.method2204();
Static196.aClass10_Sub1Array2 = new Class10_Sub1[Static171.anInt4157 + 1 - Static19.anInt636];
Static196.aClass10_Sub1Array2 = new World[Static171.anInt4157 + 1 - Static19.anInt636];
for (local14 = 0; local14 < Static106.anInt2871; local14++) {
@Pc(77) int local77 = arg0.method2204();
@Pc(85) Class10_Sub1 local85 = Static196.aClass10_Sub1Array2[local77] = new Class10_Sub1();
@Pc(85) World local85 = Static196.aClass10_Sub1Array2[local77] = new World();
local85.anInt377 = arg0.method2229();
local85.anInt381 = arg0.method2174();
local85.anInt382 = local77 + Static19.anInt636;

View file

@ -2,7 +2,7 @@ import org.openrs2.deob.annotation.OriginalClass;
import org.openrs2.deob.annotation.OriginalMember;
@OriginalClass("client!ba")
public final class Class10_Sub1 extends AbstractWorld {
public final class World extends AbstractWorld {
@OriginalMember(owner = "client!ba", name = "t", descriptor = "Lclient!na;")
public JagString aClass100_69;