Loads of refactoring, renamed Class3_Sub13 to EnumStringEntry too

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

View file

@ -8,65 +8,68 @@ import org.openrs2.deob.annotation.Pc;
@OriginalClass("client!ge")
public final class Cache {
@OriginalMember(owner = "client!wc", name = "i", descriptor = "[B")
public static final byte[] buffer = new byte[520];
@OriginalMember(owner = "client!ge", name = "a", descriptor = "Lclient!en;")
private BufferedFile aClass38_1 = null;
private BufferedFile data = null;
@OriginalMember(owner = "client!ge", name = "f", descriptor = "Lclient!en;")
private BufferedFile aClass38_2 = null;
private BufferedFile index = null;
@OriginalMember(owner = "client!ge", name = "l", descriptor = "I")
private int anInt2156 = 65000;
private int maxLen = 65000;
@OriginalMember(owner = "client!ge", name = "c", descriptor = "I")
private final int anInt2150;
private final int archive;
@OriginalMember(owner = "client!ge", name = "<init>", descriptor = "(ILclient!en;Lclient!en;I)V")
public Cache(@OriginalArg(0) int arg0, @OriginalArg(1) BufferedFile arg1, @OriginalArg(2) BufferedFile arg2, @OriginalArg(3) int arg3) {
this.anInt2156 = arg3;
this.aClass38_2 = arg2;
this.anInt2150 = arg0;
this.aClass38_1 = arg1;
this.maxLen = arg3;
this.index = arg2;
this.archive = arg0;
this.data = arg1;
}
@OriginalMember(owner = "client!ge", name = "toString", descriptor = "()Ljava/lang/String;")
@Override
public final String toString() {
return "Cache:" + this.anInt2150;
return "Cache:" + this.archive;
}
@OriginalMember(owner = "client!ge", name = "a", descriptor = "(II[BB)Z")
public final boolean method1700(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) byte[] arg2) {
@Pc(7) BufferedFile local7 = this.aClass38_1;
synchronized (this.aClass38_1) {
if (arg1 < 0 || arg1 > this.anInt2156) {
public final boolean write(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) byte[] arg2) {
@Pc(7) BufferedFile local7 = this.data;
synchronized (this.data) {
if (arg1 < 0 || arg1 > this.maxLen) {
throw new IllegalArgumentException();
}
@Pc(35) boolean local35 = this.method1704(arg1, arg0, arg2, true);
@Pc(35) boolean local35 = this.write(arg1, arg0, arg2, true);
if (!local35) {
local35 = this.method1704(arg1, arg0, arg2, false);
local35 = this.write(arg1, arg0, arg2, false);
}
return local35;
}
}
@OriginalMember(owner = "client!ge", name = "a", descriptor = "(IB)[B")
public final byte[] method1701(@OriginalArg(0) int arg0) {
@Pc(9) BufferedFile local9 = this.aClass38_1;
synchronized (this.aClass38_1) {
public final byte[] read(@OriginalArg(0) int group) {
@Pc(9) BufferedFile local9 = this.data;
synchronized (this.data) {
try {
@Pc(27) Object local27;
if (this.aClass38_2.length() < (long) (arg0 * 6 + 6)) {
if (this.index.length() < (long) (group * 6 + 6)) {
local27 = null;
return (byte[]) local27;
}
this.aClass38_2.seek((long) (arg0 * 6));
this.aClass38_2.read(0, Static271.aByteArray79, 6);
@Pc(69) int local69 = ((Static271.aByteArray79[3] & 0xFF) << 16) - (-((Static271.aByteArray79[4] & 0xFF) << 8) - (Static271.aByteArray79[5] & 0xFF));
@Pc(99) int local99 = (Static271.aByteArray79[2] & 0xFF) + ((Static271.aByteArray79[1] & 0xFF) << 8) + ((Static271.aByteArray79[0] & 0xFF) << 16);
if (local99 < 0 || this.anInt2156 < local99) {
this.index.seek((long) (group * 6));
this.index.read(0, buffer, 6);
@Pc(69) int local69 = ((buffer[3] & 0xFF) << 16) - (-((buffer[4] & 0xFF) << 8) - (buffer[5] & 0xFF));
@Pc(99) int local99 = (buffer[2] & 0xFF) + ((buffer[1] & 0xFF) << 8) + ((buffer[0] & 0xFF) << 16);
if (local99 < 0 || this.maxLen < local99) {
local27 = null;
return (byte[]) local27;
} else if (local69 <= 0 || (long) local69 > this.aClass38_1.length() / 520L) {
} else if (local69 <= 0 || (long) local69 > this.data.length() / 520L) {
local27 = null;
return (byte[]) local27;
} else {
@ -79,25 +82,25 @@ public final class Cache {
return (byte[]) local27;
}
@Pc(157) int local157 = local99 - local136;
this.aClass38_1.seek((long) (local69 * 520));
this.data.seek((long) (local69 * 520));
if (local157 > 512) {
local157 = 512;
}
this.aClass38_1.read(0, Static271.aByteArray79, local157 + 8);
@Pc(197) int local197 = ((Static271.aByteArray79[0] & 0xFF) << 8) + (Static271.aByteArray79[1] & 0xFF);
@Pc(211) int local211 = (Static271.aByteArray79[3] & 0xFF) + ((Static271.aByteArray79[2] & 0xFF) << 8);
@Pc(217) int local217 = Static271.aByteArray79[7] & 0xFF;
@Pc(239) int local239 = (Static271.aByteArray79[6] & 0xFF) + ((Static271.aByteArray79[5] & 0xFF) << 8) + ((Static271.aByteArray79[4] & 0xFF) << 16);
if (arg0 != local197 || local138 != local211 || this.anInt2150 != local217) {
this.data.read(0, buffer, local157 + 8);
@Pc(197) int local197 = ((buffer[0] & 0xFF) << 8) + (buffer[1] & 0xFF);
@Pc(211) int local211 = (buffer[3] & 0xFF) + ((buffer[2] & 0xFF) << 8);
@Pc(217) int local217 = buffer[7] & 0xFF;
@Pc(239) int local239 = (buffer[6] & 0xFF) + ((buffer[5] & 0xFF) << 8) + ((buffer[4] & 0xFF) << 16);
if (group != local197 || local138 != local211 || this.archive != local217) {
local27 = null;
return (byte[]) local27;
}
if (local239 < 0 || (long) local239 > this.aClass38_1.length() / 520L) {
if (local239 < 0 || (long) local239 > this.data.length() / 520L) {
local27 = null;
return (byte[]) local27;
}
for (@Pc(272) int local272 = 0; local272 < local157; local272++) {
local134[local136++] = Static271.aByteArray79[local272 + 8];
local134[local136++] = buffer[local272 + 8];
}
local138++;
local69 = local239;
@ -112,61 +115,61 @@ public final class Cache {
}
@OriginalMember(owner = "client!ge", name = "a", descriptor = "(BII[BZ)Z")
private boolean method1704(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) byte[] arg2, @OriginalArg(4) boolean arg3) {
@Pc(9) BufferedFile local9 = this.aClass38_1;
synchronized (this.aClass38_1) {
private boolean write(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) byte[] arg2, @OriginalArg(4) boolean arg3) {
@Pc(9) BufferedFile local9 = this.data;
synchronized (this.data) {
try {
@Pc(67) int local67;
@Pc(27) boolean local27;
if (arg3) {
if (this.aClass38_2.length() < (long) (arg1 * 6 + 6)) {
if (this.index.length() < (long) (arg1 * 6 + 6)) {
local27 = false;
return local27;
}
this.aClass38_2.seek((long) (arg1 * 6));
this.aClass38_2.read(0, Static271.aByteArray79, 6);
local67 = ((Static271.aByteArray79[3] & 0xFF) << 16) + (Static271.aByteArray79[4] << 8 & 0xFF00) + (Static271.aByteArray79[5] & 0xFF);
if (local67 <= 0 || this.aClass38_1.length() / 520L < (long) local67) {
this.index.seek((long) (arg1 * 6));
this.index.read(0, buffer, 6);
local67 = ((buffer[3] & 0xFF) << 16) + (buffer[4] << 8 & 0xFF00) + (buffer[5] & 0xFF);
if (local67 <= 0 || this.data.length() / 520L < (long) local67) {
local27 = false;
return local27;
}
} else {
local67 = (int) ((this.aClass38_1.length() + 519L) / 520L);
local67 = (int) ((this.data.length() + 519L) / 520L);
if (local67 == 0) {
local67 = 1;
}
}
Static271.aByteArray79[0] = (byte) (arg0 >> 16);
Static271.aByteArray79[4] = (byte) (local67 >> 8);
buffer[0] = (byte) (arg0 >> 16);
buffer[4] = (byte) (local67 >> 8);
@Pc(125) int local125 = 0;
Static271.aByteArray79[5] = (byte) local67;
Static271.aByteArray79[2] = (byte) arg0;
Static271.aByteArray79[3] = (byte) (local67 >> 16);
buffer[5] = (byte) local67;
buffer[2] = (byte) arg0;
buffer[3] = (byte) (local67 >> 16);
@Pc(156) int local156 = 0;
Static271.aByteArray79[1] = (byte) (arg0 >> 8);
this.aClass38_2.seek((long) (arg1 * 6));
this.aClass38_2.write(Static271.aByteArray79, 0, 6);
buffer[1] = (byte) (arg0 >> 8);
this.index.seek((long) (arg1 * 6));
this.index.write(buffer, 0, 6);
while (true) {
if (local125 < arg0) {
label134: {
@Pc(189) int local189 = 0;
@Pc(248) int local248;
if (arg3) {
this.aClass38_1.seek((long) (local67 * 520));
this.data.seek((long) (local67 * 520));
try {
this.aClass38_1.read(0, Static271.aByteArray79, 8);
this.data.read(0, buffer, 8);
} catch (@Pc(209) EOFException local209) {
break label134;
}
local189 = ((Static271.aByteArray79[4] & 0xFF) << 16) + ((Static271.aByteArray79[5] & 0xFF) << 8) + (Static271.aByteArray79[6] & 0xFF);
local248 = (Static271.aByteArray79[1] & 0xFF) + ((Static271.aByteArray79[0] & 0xFF) << 8);
@Pc(254) int local254 = Static271.aByteArray79[7] & 0xFF;
@Pc(268) int local268 = (Static271.aByteArray79[3] & 0xFF) + ((Static271.aByteArray79[2] & 0xFF) << 8);
if (local248 != arg1 || local156 != local268 || this.anInt2150 != local254) {
local189 = ((buffer[4] & 0xFF) << 16) + ((buffer[5] & 0xFF) << 8) + (buffer[6] & 0xFF);
local248 = (buffer[1] & 0xFF) + ((buffer[0] & 0xFF) << 8);
@Pc(254) int local254 = buffer[7] & 0xFF;
@Pc(268) int local268 = (buffer[3] & 0xFF) + ((buffer[2] & 0xFF) << 8);
if (local248 != arg1 || local156 != local268 || this.archive != local254) {
local27 = false;
return local27;
}
if (local189 < 0 || (long) local189 > this.aClass38_1.length() / 520L) {
if (local189 < 0 || (long) local189 > this.data.length() / 520L) {
local27 = false;
return local27;
}
@ -174,7 +177,7 @@ public final class Cache {
local248 = arg0 - local125;
if (local189 == 0) {
arg3 = false;
local189 = (int) ((this.aClass38_1.length() + 519L) / 520L);
local189 = (int) ((this.data.length() + 519L) / 520L);
if (local189 == 0) {
local189++;
}
@ -182,25 +185,25 @@ public final class Cache {
local189++;
}
}
Static271.aByteArray79[7] = (byte) this.anInt2150;
Static271.aByteArray79[0] = (byte) (arg1 >> 8);
buffer[7] = (byte) this.archive;
buffer[0] = (byte) (arg1 >> 8);
if (arg0 - local125 <= 512) {
local189 = 0;
}
Static271.aByteArray79[4] = (byte) (local189 >> 16);
buffer[4] = (byte) (local189 >> 16);
if (local248 > 512) {
local248 = 512;
}
Static271.aByteArray79[1] = (byte) arg1;
Static271.aByteArray79[6] = (byte) local189;
Static271.aByteArray79[2] = (byte) (local156 >> 8);
Static271.aByteArray79[3] = (byte) local156;
buffer[1] = (byte) arg1;
buffer[6] = (byte) local189;
buffer[2] = (byte) (local156 >> 8);
buffer[3] = (byte) local156;
local156++;
Static271.aByteArray79[5] = (byte) (local189 >> 8);
this.aClass38_1.seek((long) (local67 * 520));
buffer[5] = (byte) (local189 >> 8);
this.data.seek((long) (local67 * 520));
local67 = local189;
this.aClass38_1.write(Static271.aByteArray79, 0, 8);
this.aClass38_1.write(arg2, local125, local248);
this.data.write(buffer, 0, 8);
this.data.write(arg2, local125, local248);
local125 += local248;
continue;
}