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

@ -15,25 +15,25 @@ public final class AreaSound extends Node {
public int anInt2032;
@OriginalMember(owner = "client!fl", name = "v", descriptor = "Lclient!b;")
public SoundPcmStream aClass3_Sub3_Sub1_1;
public SoundPcmStream primaryStream;
@OriginalMember(owner = "client!fl", name = "x", descriptor = "I")
public int anInt2033;
@OriginalMember(owner = "client!fl", name = "y", descriptor = "Lclient!b;")
public SoundPcmStream aClass3_Sub3_Sub1_2;
public SoundPcmStream secondaryStream;
@OriginalMember(owner = "client!fl", name = "z", descriptor = "I")
public int anInt2034;
@OriginalMember(owner = "client!fl", name = "E", descriptor = "Lclient!pb;")
public LocType aClass118_1;
public LocType locType;
@OriginalMember(owner = "client!fl", name = "F", descriptor = "I")
public int anInt2037;
@OriginalMember(owner = "client!fl", name = "I", descriptor = "Lclient!km;")
public Npc aClass8_Sub4_Sub2_1;
public Npc npc;
@OriginalMember(owner = "client!fl", name = "K", descriptor = "I")
public int anInt2040;
@ -42,62 +42,62 @@ public final class AreaSound extends Node {
public int anInt2041;
@OriginalMember(owner = "client!fl", name = "M", descriptor = "Lclient!e;")
public Player aClass8_Sub4_Sub1_1;
public Player player;
@OriginalMember(owner = "client!fl", name = "N", descriptor = "I")
public int anInt2042;
public int radius;
@OriginalMember(owner = "client!fl", name = "O", descriptor = "Z")
public boolean aBoolean117;
public boolean multiLocOrNpc;
@OriginalMember(owner = "client!fl", name = "R", descriptor = "I")
public int anInt2044;
public int sound;
@OriginalMember(owner = "client!fl", name = "T", descriptor = "[I")
public int[] anIntArray181;
public int[] sounds;
@OriginalMember(owner = "client!fl", name = "G", descriptor = "I")
public int anInt2038 = 0;
@OriginalMember(owner = "client!fl", name = "c", descriptor = "(I)V")
public final void method1567() {
@Pc(8) int local8 = this.anInt2044;
if (this.aClass118_1 != null) {
@Pc(17) LocType local17 = this.aClass118_1.method3417();
public final void update() {
@Pc(8) int local8 = this.sound;
if (this.locType != null) {
@Pc(17) LocType local17 = this.locType.getMultiLoc();
if (local17 == null) {
this.anInt2044 = -1;
this.anIntArray181 = null;
this.sound = -1;
this.sounds = null;
this.anInt2040 = 0;
this.anInt2042 = 0;
this.radius = 0;
this.anInt2032 = 0;
} else {
this.anInt2040 = local17.anInt4414;
this.anInt2044 = local17.anInt4412;
this.sound = local17.sound;
this.anInt2032 = local17.anInt4419;
this.anInt2042 = local17.anInt4402 * 128;
this.anIntArray181 = local17.anIntArray381;
this.radius = local17.soundRadius * 128;
this.sounds = local17.anIntArray381;
}
} else if (this.aClass8_Sub4_Sub2_1 != null) {
@Pc(92) int local92 = Static112.method2299(this.aClass8_Sub4_Sub2_1);
} else if (this.npc != null) {
@Pc(92) int local92 = Static112.getSound(this.npc);
if (local8 != local92) {
@Pc(100) NpcType local100 = this.aClass8_Sub4_Sub2_1.aClass96_1;
this.anInt2044 = local92;
@Pc(100) NpcType local100 = this.npc.type;
this.sound = local92;
if (local100.anIntArray357 != null) {
local100 = local100.method2932();
local100 = local100.getMultiNpc();
}
if (local100 == null) {
this.anInt2042 = 0;
this.radius = 0;
} else {
this.anInt2042 = local100.anInt3746 * 128;
this.radius = local100.soundRadius * 128;
}
}
} else if (this.aClass8_Sub4_Sub1_1 != null) {
this.anInt2044 = Static140.method2706(this.aClass8_Sub4_Sub1_1);
this.anInt2042 = this.aClass8_Sub4_Sub1_1.anInt1664 * 128;
} else if (this.player != null) {
this.sound = Static140.getSound(this.player);
this.radius = this.player.soundRadius * 128;
}
if (this.anInt2044 != local8 && this.aClass3_Sub3_Sub1_1 != null) {
Static204.soundStream.method1347(this.aClass3_Sub3_Sub1_1);
this.aClass3_Sub3_Sub1_1 = null;
if (this.sound != local8 && this.primaryStream != null) {
Static204.soundStream.removeSubStream(this.primaryStream);
this.primaryStream = null;
}
}
}