Renamed IsaacRandom methods/fields

This commit is contained in:
Pazaz 2022-06-27 15:04:34 -04:00
parent b6b74ceb36
commit b4353bc7db

View file

@ -9,41 +9,43 @@ import org.openrs2.deob.annotation.Pc;
public final class IsaacRandom {
@OriginalMember(owner = "client!ij", name = "b", descriptor = "I")
private int anInt2912;
private int c;
@OriginalMember(owner = "client!ij", name = "d", descriptor = "I")
private int anInt2914;
private int b;
@OriginalMember(owner = "client!ij", name = "f", descriptor = "I")
private int anInt2916;
private int count;
@OriginalMember(owner = "client!ij", name = "i", descriptor = "[I")
private final int[] anIntArray274 = new int[256];
private final int[] rsl = new int[256];
@OriginalMember(owner = "client!ij", name = "k", descriptor = "[I")
private final int[] anIntArray275 = new int[256];
private final int[] mem = new int[256];
@OriginalMember(owner = "client!ij", name = "l", descriptor = "I")
private int anInt2920;
private int a;
@OriginalMember(owner = "client!ij", name = "<init>", descriptor = "([I)V")
public IsaacRandom(@OriginalArg(0) int[] arg0) {
for (@Pc(13) int local13 = 0; local13 < arg0.length; local13++) {
this.anIntArray274[local13] = arg0[local13];
public IsaacRandom(@OriginalArg(0) int[] seed) {
for (@Pc(13) int i = 0; i < seed.length; i++) {
this.rsl[i] = seed[i];
}
this.method2294();
this.init();
}
public static final int GOLDEN_RATIO = 0x9e3779b9;
@OriginalMember(owner = "client!ij", name = "a", descriptor = "(Z)V")
private void method2294() {
@Pc(14) int local14 = -1640531527;
@Pc(16) int local16 = -1640531527;
@Pc(18) int local18 = -1640531527;
@Pc(20) int local20 = -1640531527;
@Pc(22) int local22 = -1640531527;
@Pc(24) int local24 = -1640531527;
@Pc(26) int local26 = -1640531527;
@Pc(27) int local27 = -1640531527;
private void init() {
@Pc(14) int local14 = GOLDEN_RATIO;
@Pc(16) int local16 = GOLDEN_RATIO;
@Pc(18) int local18 = GOLDEN_RATIO;
@Pc(20) int local20 = GOLDEN_RATIO;
@Pc(22) int local22 = GOLDEN_RATIO;
@Pc(24) int local24 = GOLDEN_RATIO;
@Pc(26) int local26 = GOLDEN_RATIO;
@Pc(27) int local27 = GOLDEN_RATIO;
@Pc(29) int local29;
for (local29 = 0; local29 < 4; local29++) {
local27 ^= local26 << 11;
@ -72,14 +74,14 @@ public final class IsaacRandom {
local27 += local26;
}
for (local29 = 0; local29 < 256; local29 += 8) {
local22 += this.anIntArray274[local29 + 3];
local20 += this.anIntArray274[local29 + 4];
local16 += this.anIntArray274[local29 + 6];
local27 += this.anIntArray274[local29];
local24 += this.anIntArray274[local29 + 2];
local18 += this.anIntArray274[local29 + 5];
local14 += this.anIntArray274[local29 + 7];
local26 += this.anIntArray274[local29 + 1];
local22 += this.rsl[local29 + 3];
local20 += this.rsl[local29 + 4];
local16 += this.rsl[local29 + 6];
local27 += this.rsl[local29];
local24 += this.rsl[local29 + 2];
local18 += this.rsl[local29 + 5];
local14 += this.rsl[local29 + 7];
local26 += this.rsl[local29 + 1];
local27 ^= local26 << 11;
local26 += local24;
local26 ^= local24 >>> 2;
@ -103,26 +105,26 @@ public final class IsaacRandom {
local26 += local16;
local14 ^= local27 >>> 9;
local27 += local26;
this.anIntArray275[local29] = local27;
this.anIntArray275[local29 + 1] = local26;
this.mem[local29] = local27;
this.mem[local29 + 1] = local26;
local24 += local14;
this.anIntArray275[local29 + 2] = local24;
this.anIntArray275[local29 + 3] = local22;
this.anIntArray275[local29 + 4] = local20;
this.anIntArray275[local29 + 5] = local18;
this.anIntArray275[local29 + 6] = local16;
this.anIntArray275[local29 + 7] = local14;
this.mem[local29 + 2] = local24;
this.mem[local29 + 3] = local22;
this.mem[local29 + 4] = local20;
this.mem[local29 + 5] = local18;
this.mem[local29 + 6] = local16;
this.mem[local29 + 7] = local14;
}
for (local29 = 0; local29 < 256; local29 += 8) {
local16 += this.anIntArray275[local29 + 6];
local18 += this.anIntArray275[local29 + 5];
local20 += this.anIntArray275[local29 + 4];
local26 += this.anIntArray275[local29 + 1];
local24 += this.anIntArray275[local29 + 2];
local27 += this.anIntArray275[local29];
local16 += this.mem[local29 + 6];
local18 += this.mem[local29 + 5];
local20 += this.mem[local29 + 4];
local26 += this.mem[local29 + 1];
local24 += this.mem[local29 + 2];
local27 += this.mem[local29];
local27 ^= local26 << 11;
local22 += this.anIntArray275[local29 + 3];
local14 += this.anIntArray275[local29 + 7];
local22 += this.mem[local29 + 3];
local14 += this.mem[local29 + 7];
local22 += local27;
local26 += local24;
local26 ^= local24 >>> 2;
@ -146,52 +148,52 @@ public final class IsaacRandom {
local14 ^= local27 >>> 9;
local24 += local14;
local27 += local26;
this.anIntArray275[local29] = local27;
this.anIntArray275[local29 + 1] = local26;
this.anIntArray275[local29 + 2] = local24;
this.anIntArray275[local29 + 3] = local22;
this.anIntArray275[local29 + 4] = local20;
this.anIntArray275[local29 + 5] = local18;
this.anIntArray275[local29 + 6] = local16;
this.anIntArray275[local29 + 7] = local14;
this.mem[local29] = local27;
this.mem[local29 + 1] = local26;
this.mem[local29 + 2] = local24;
this.mem[local29 + 3] = local22;
this.mem[local29 + 4] = local20;
this.mem[local29 + 5] = local18;
this.mem[local29 + 6] = local16;
this.mem[local29 + 7] = local14;
}
this.method2296();
this.anInt2916 = 256;
this.isaac();
this.count = 256;
}
@OriginalMember(owner = "client!ij", name = "a", descriptor = "(I)I")
public final int getNextKey() {
if (GlobalConfig.USE_ISAAC) {
if (this.anInt2916-- == 0) {
this.method2296();
this.anInt2916 = 255;
if (this.count-- == 0) {
this.isaac();
this.count = 255;
}
return this.anIntArray274[this.anInt2916];
return this.rsl[this.count];
} else {
return 0;
}
}
@OriginalMember(owner = "client!ij", name = "b", descriptor = "(I)V")
private void method2296() {
this.anInt2914 += ++this.anInt2912;
private void isaac() {
this.b += ++this.c;
for (@Pc(17) int local17 = 0; local17 < 256; local17++) {
@Pc(33) int local33 = this.anIntArray275[local17];
@Pc(33) int local33 = this.mem[local17];
if ((local17 & 0x2) == 0) {
if ((local17 & 0x1) == 0) {
this.anInt2920 ^= this.anInt2920 << 13;
this.a ^= this.a << 13;
} else {
this.anInt2920 ^= this.anInt2920 >>> 6;
this.a ^= this.a >>> 6;
}
} else if ((local17 & 0x1) == 0) {
this.anInt2920 ^= this.anInt2920 << 2;
this.a ^= this.a << 2;
} else {
this.anInt2920 ^= this.anInt2920 >>> 16;
this.a ^= this.a >>> 16;
}
this.anInt2920 += this.anIntArray275[local17 + 128 & 0xFF];
this.a += this.mem[local17 + 128 & 0xFF];
@Pc(119) int local119;
this.anIntArray275[local17] = local119 = this.anInt2914 + this.anInt2920 + this.anIntArray275[local33 >> 2 & 0xFF];
this.anIntArray274[local17] = this.anInt2914 = local33 + this.anIntArray275[local119 >> 8 >> 2 & 0xFF];
this.mem[local17] = local119 = this.b + this.a + this.mem[local33 >> 2 & 0xFF];
this.rsl[local17] = this.b = local33 + this.mem[local119 >> 8 >> 2 & 0xFF];
}
}
}