Created TypeList classes and moved static members to them

This commit is contained in:
Pazaz 2022-04-25 02:11:03 -04:00
parent 6ba1f2f808
commit b3a5fdbec9
356 changed files with 6604 additions and 6652 deletions

View file

@ -3,35 +3,61 @@ import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc;
public class SoundPlayer {
@OriginalMember(owner = "client!qe", name = "t", descriptor = "[I")
public static final int[] anIntArray421 = new int[50];
@OriginalMember(owner = "client!wh", name = "g", descriptor = "[I")
public static final int[] anIntArray563 = new int[50];
@OriginalMember(owner = "client!na", name = "mb", descriptor = "[I")
public static final int[] anIntArray362 = new int[50];
@OriginalMember(owner = "client!nk", name = "n", descriptor = "[Lclient!sl;")
public static final SynthSound[] aClass138Array1 = new SynthSound[50];
@OriginalMember(owner = "client!ca", name = "fb", descriptor = "[I")
public static final int[] anIntArray68 = new int[50];
@OriginalMember(owner = "client!pe", name = "j", descriptor = "I")
public static int anInt4451 = 0;
@OriginalMember(owner = "client!ma", name = "a", descriptor = "(ILclient!tk;IIZI)V")
public static void playSeqSound(@OriginalArg(0) int arg0, @OriginalArg(1) SeqType arg1, @OriginalArg(3) int arg2, @OriginalArg(4) boolean arg3, @OriginalArg(5) int arg4) {
if (Static189.anInt4451 >= 50 || (arg1.anIntArrayArray38 == null || arg4 >= arg1.anIntArrayArray38.length || arg1.anIntArrayArray38[arg4] == null)) {
public static void playSeqSound(@OriginalArg(0) int arg0, @OriginalArg(1) SeqType arg1, @OriginalArg(3) int arg2, @OriginalArg(4) boolean self, @OriginalArg(5) int arg4) {
if (anInt4451 >= 50 || (arg1.sounds == null || arg4 >= arg1.sounds.length || arg1.sounds[arg4] == null)) {
return;
}
@Pc(36) int local36 = arg1.anIntArrayArray38[arg4][0];
@Pc(36) int local36 = arg1.sounds[arg4][0];
@Pc(40) int local40 = local36 >> 8;
@Pc(57) int local57;
if (arg1.anIntArrayArray38[arg4].length > 1) {
local57 = (int) ((double) arg1.anIntArrayArray38[arg4].length * Math.random());
if (arg1.sounds[arg4].length > 1) {
local57 = (int) ((double) arg1.sounds[arg4].length * Math.random());
if (local57 > 0) {
local40 = arg1.anIntArrayArray38[arg4][local57];
local40 = arg1.sounds[arg4][local57];
}
}
@Pc(73) int local73 = local36 >> 5 & 0x7;
@Pc(77) int local77 = local36 & 0x1F;
if (local77 == 0) {
if (arg3) {
Static26.method744(local73, local40, 0);
@Pc(77) int minDistance = local36 & 0x1F;
if (minDistance == 0) {
if (self) {
play(local73, local40, 0);
}
} else if (Preferences.ambientSoundsVolume != 0) {
Static200.anIntArray421[Static189.anInt4451] = local40;
Static276.anIntArray563[Static189.anInt4451] = local73;
anIntArray421[anInt4451] = local40;
anIntArray563[anInt4451] = local73;
@Pc(111) int local111 = (arg0 - 64) / 128;
local57 = (arg2 - 64) / 128;
Static164.anIntArray362[Static189.anInt4451] = 0;
Static173.aClass138Array1[Static189.anInt4451] = null;
Static26.anIntArray68[Static189.anInt4451] = local77 + (local57 << 16) + (local111 << 8);
Static189.anInt4451++;
anIntArray362[anInt4451] = 0;
aClass138Array1[anInt4451] = null;
anIntArray68[anInt4451] = minDistance + (local57 << 16) + (local111 << 8);
anInt4451++;
}
}
@OriginalMember(owner = "client!ca", name = "a", descriptor = "(IIII)V")
public static void play(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
if (Preferences.soundEffectVolume == 0 || arg0 == 0 || anInt4451 >= 50 || arg1 == -1) {
return;
}
anIntArray421[anInt4451] = arg1;
anIntArray563[anInt4451] = arg0;
anIntArray362[anInt4451] = arg2;
aClass138Array1[anInt4451] = null;
anIntArray68[anInt4451] = 0;
anInt4451++;
}
}