2009Scape/rt4-client
1
0
Fork 0
mirror of https://gitlab.com/2009scape/rt4-client.git synced 2025-12-10 10:20:44 -07:00
Code Issues Projects Releases Packages Wiki Activity

Refactored some anim/area sound classes

Browse source
This commit is contained in:
Pazaz 2022-04-28 02:35:11 -04:00
parent dbca509eb5
commit fd3572f709
108 changed files with 1063 additions and 1078 deletions
Download patch file Download diff file Expand all files Collapse all files

30
client/src/main/java/rt4/AnimBase.java
View file

@ -27,30 +27,30 @@ public final class AnimBase extends Node {
public final int[] parts;
@OriginalMember(owner = "client!jm", name = "<init>", descriptor = "(I[B)V")
public AnimBase(@OriginalArg(0) int arg0, @OriginalArg(1) byte[] arg1) {
this.id = arg0;
@Pc(9) Buffer buffer = new Buffer(arg1);
public AnimBase(@OriginalArg(0) int id, @OriginalArg(1) byte[] bytes) {
this.id = id;
@Pc(9) Buffer buffer = new Buffer(bytes);
this.transforms = buffer.g1();
this.bones = new int[this.transforms][];
this.types = new int[this.transforms];
this.shadow = new boolean[this.transforms];
this.parts = new int[this.transforms];
@Pc(36) int local36;
for (local36 = 0; local36 < this.transforms; local36++) {
this.types[local36] = buffer.g1();
@Pc(36) int i;
for (i = 0; i < this.transforms; i++) {
this.types[i] = buffer.g1();
}
for (local36 = 0; local36 < this.transforms; local36++) {
this.shadow[local36] = buffer.g1() == 1;
for (i = 0; i < this.transforms; i++) {
this.shadow[i] = buffer.g1() == 1;
}
for (local36 = 0; local36 < this.transforms; local36++) {
this.parts[local36] = buffer.g2();
for (i = 0; i < this.transforms; i++) {
this.parts[i] = buffer.g2();
}
for (local36 = 0; local36 < this.transforms; local36++) {
this.bones[local36] = new int[buffer.g1()];
for (i = 0; i < this.transforms; i++) {
this.bones[i] = new int[buffer.g1()];
}
for (local36 = 0; local36 < this.transforms; local36++) {
for (@Pc(118) int local118 = 0; local118 < this.bones[local36].length; local118++) {
this.bones[local36][local118] = buffer.g1();
for (i = 0; i < this.transforms; i++) {
for (@Pc(118) int j = 0; j < this.bones[i].length; j++) {
this.bones[i][j] = buffer.g1();
}
}
}

132
client/src/main/java/rt4/AnimFrame.java
View file

@ -8,6 +8,24 @@ import org.openrs2.deob.annotation.Pc;
@OriginalClass("client!ne")
public final class AnimFrame {
@OriginalMember(owner = "client!ne", name = "p", descriptor = "[S")
public static final short[] tempIndices = new short[500];
@OriginalMember(owner = "client!ne", name = "m", descriptor = "[S")
public static final short[] tempX = new short[500];
@OriginalMember(owner = "client!ne", name = "j", descriptor = "[S")
public static final short[] tempY = new short[500];
@OriginalMember(owner = "client!ne", name = "i", descriptor = "[S")
public static final short[] tempZ = new short[500];
@OriginalMember(owner = "client!ne", name = "h", descriptor = "[B")
public static final byte[] tempFlags = new byte[500];
@OriginalMember(owner = "client!ne", name = "k", descriptor = "[S")
public static final short[] tempPrevOriginIndices = new short[500];
@OriginalMember(owner = "client!ne", name = "c", descriptor = "Lclient!jm;")
public AnimBase base = null;
@ -24,13 +42,13 @@ public final class AnimFrame {
public final short[] indices;
@OriginalMember(owner = "client!ne", name = "g", descriptor = "[S")
public final short[] aShortArray44;
public final short[] x;
@OriginalMember(owner = "client!ne", name = "o", descriptor = "[S")
public final short[] aShortArray50;
public final short[] y;
@OriginalMember(owner = "client!ne", name = "n", descriptor = "[S")
public final short[] aShortArray49;
public final short[] z;
@OriginalMember(owner = "client!ne", name = "f", descriptor = "[S")
public final short[] prevOriginIndices;
@ -39,84 +57,84 @@ public final class AnimFrame {
public final byte[] flags;
@OriginalMember(owner = "client!ne", name = "<init>", descriptor = "([BLclient!jm;)V")
public AnimFrame(@OriginalArg(0) byte[] arg0, @OriginalArg(1) AnimBase arg1) {
this.base = arg1;
@Pc(21) Buffer local21 = new Buffer(arg0);
@Pc(26) Buffer local26 = new Buffer(arg0);
local21.offset = 2;
@Pc(33) int local33 = local21.g1();
public AnimFrame(@OriginalArg(0) byte[] bytes, @OriginalArg(1) AnimBase base) {
this.base = base;
@Pc(21) Buffer headerBuffer = new Buffer(bytes);
@Pc(26) Buffer buffer = new Buffer(bytes);
headerBuffer.offset = 2;
@Pc(33) int headerLen = headerBuffer.g1();
@Pc(35) int len = 0;
@Pc(37) int local37 = -1;
@Pc(39) int local39 = -1;
local26.offset = local21.offset + local33;
@Pc(47) int local47;
for (local47 = 0; local47 < local33; local47++) {
@Pc(56) int local56 = this.base.types[local47];
if (local56 == 0) {
local37 = local47;
@Pc(37) int prevOriginIndex = -1;
@Pc(39) int prevUsedOriginIndex = -1;
buffer.offset = headerBuffer.offset + headerLen;
@Pc(47) int i;
for (i = 0; i < headerLen; i++) {
@Pc(56) int type = this.base.types[i];
if (type == 0) {
prevOriginIndex = i;
}
@Pc(64) int local64 = local21.g1();
if (local64 > 0) {
if (local56 == 0) {
local39 = local47;
@Pc(64) int attributes = headerBuffer.g1();
if (attributes > 0) {
if (type == 0) {
prevUsedOriginIndex = i;
}
Static168.tempIndices[len] = (short) local47;
@Pc(77) short local77 = 0;
if (local56 == 3) {
local77 = 128;
tempIndices[len] = (short) i;
@Pc(77) short defaultValue = 0;
if (type == 3) {
defaultValue = 128;
}
if ((local64 & 0x1) == 0) {
Static168.tempX[len] = local77;
if ((attributes & 0x1) == 0) {
tempX[len] = defaultValue;
} else {
Static168.tempX[len] = (short) local26.gSmart1or2s();
tempX[len] = (short) buffer.gSmart1or2s();
}
if ((local64 & 0x2) == 0) {
Static168.tempY[len] = local77;
if ((attributes & 0x2) == 0) {
tempY[len] = defaultValue;
} else {
Static168.tempY[len] = (short) local26.gSmart1or2s();
tempY[len] = (short) buffer.gSmart1or2s();
}
if ((local64 & 0x4) == 0) {
Static168.tempZ[len] = local77;
if ((attributes & 0x4) == 0) {
tempZ[len] = defaultValue;
} else {
Static168.tempZ[len] = (short) local26.gSmart1or2s();
tempZ[len] = (short) buffer.gSmart1or2s();
}
Static168.tempFlags[len] = (byte) (local64 >>> 3 & 0x3);
if (local56 == 2) {
Static168.tempX[len] = (short) (((Static168.tempX[len] & 0xFF) << 3) + (Static168.tempX[len] >> 8 & 0x7));
Static168.tempY[len] = (short) (((Static168.tempY[len] & 0xFF) << 3) + (Static168.tempY[len] >> 8 & 0x7));
Static168.tempZ[len] = (short) (((Static168.tempZ[len] & 0xFF) << 3) + (Static168.tempZ[len] >> 8 & 0x7));
tempFlags[len] = (byte) (attributes >>> 3 & 0x3);
if (type == 2) {
tempX[len] = (short) (((tempX[len] & 0xFF) << 3) + (tempX[len] >> 8 & 0x7));
tempY[len] = (short) (((tempY[len] & 0xFF) << 3) + (tempY[len] >> 8 & 0x7));
tempZ[len] = (short) (((tempZ[len] & 0xFF) << 3) + (tempZ[len] >> 8 & 0x7));
}
Static168.tempPrevOriginIndices[len] = -1;
if (local56 == 1 || local56 == 2 || local56 == 3) {
if (local37 > local39) {
Static168.tempPrevOriginIndices[len] = (short) local37;
local39 = local37;
tempPrevOriginIndices[len] = -1;
if (type == 1 || type == 2 || type == 3) {
if (prevOriginIndex > prevUsedOriginIndex) {
tempPrevOriginIndices[len] = (short) prevOriginIndex;
prevUsedOriginIndex = prevOriginIndex;
}
} else if (local56 == 5) {
} else if (type == 5) {
this.transformsAlpha = true;
} else if (local56 == 7) {
} else if (type == 7) {
this.transformsColor = true;
}
len++;
}
}
if (local26.offset != arg0.length) {
if (buffer.offset != bytes.length) {
throw new RuntimeException();
}
this.length = len;
this.indices = new short[len];
this.aShortArray44 = new short[len];
this.aShortArray50 = new short[len];
this.aShortArray49 = new short[len];
this.x = new short[len];
this.y = new short[len];
this.z = new short[len];
this.prevOriginIndices = new short[len];
this.flags = new byte[len];
for (local47 = 0; local47 < len; local47++) {
this.indices[local47] = Static168.tempIndices[local47];
this.aShortArray44[local47] = Static168.tempX[local47];
this.aShortArray50[local47] = Static168.tempY[local47];
this.aShortArray49[local47] = Static168.tempZ[local47];
this.prevOriginIndices[local47] = Static168.tempPrevOriginIndices[local47];
this.flags[local47] = Static168.tempFlags[local47];
for (i = 0; i < len; i++) {
this.indices[i] = tempIndices[i];
this.x[i] = tempX[i];
this.y[i] = tempY[i];
this.z[i] = tempZ[i];
this.prevOriginIndices[i] = tempPrevOriginIndices[i];
this.flags[i] = tempFlags[i];
}
}
}

74
client/src/main/java/rt4/AnimFrameset.java
View file

@ -12,39 +12,65 @@ public final class AnimFrameset extends SecondaryNode {
public final AnimFrame[] frames;
@OriginalMember(owner = "client!cl", name = "<init>", descriptor = "(Lclient!ve;Lclient!ve;IZ)V")
public AnimFrameset(@OriginalArg(0) Js5 arg0, @OriginalArg(1) Js5 arg1, @OriginalArg(2) int arg2, @OriginalArg(3) boolean arg3) {
@Pc(5) LinkedList local5 = new LinkedList();
@Pc(10) int local10 = arg0.getGroupCapacity(arg2);
this.frames = new AnimFrame[local10];
@Pc(19) int[] local19 = arg0.getFileIds(arg2);
for (@Pc(21) int local21 = 0; local21 < local19.length; local21++) {
@Pc(37) byte[] local37 = arg0.getFile(arg2, local19[local21]);
@Pc(51) int local51 = local37[1] & 0xFF | (local37[0] & 0xFF) << 8;
@Pc(56) AnimBase local56 = (AnimBase) local5.start();
@Pc(58) AnimBase local58 = null;
while (local56 != null) {
if (local56.id == local51) {
local58 = local56;
public AnimFrameset(@OriginalArg(0) Js5 animsArchive, @OriginalArg(1) Js5 basesArchive, @OriginalArg(2) int id, @OriginalArg(3) boolean arg3) {
@Pc(5) LinkedList bases = new LinkedList();
@Pc(10) int capacity = animsArchive.getGroupCapacity(id);
this.frames = new AnimFrame[capacity];
@Pc(19) int[] fileIds = animsArchive.getFileIds(id);
for (@Pc(21) int i = 0; i < fileIds.length; i++) {
@Pc(37) byte[] bytes = animsArchive.getFile(id, fileIds[i]);
@Pc(51) int baseId = bytes[1] & 0xFF | (bytes[0] & 0xFF) << 8;
@Pc(56) AnimBase b = (AnimBase) bases.head();
@Pc(58) AnimBase base = null;
while (b != null) {
if (b.id == baseId) {
base = b;
break;
}
local56 = (AnimBase) local5.next();
b = (AnimBase) bases.next();
}
if (local58 == null) {
@Pc(85) byte[] local85 = arg1.method4502(0, local51);
local58 = new AnimBase(local51, local85);
local5.addTail(local58);
if (base == null) {
@Pc(85) byte[] baseBytes = basesArchive.fetchFileNoDiscard(0, baseId);
base = new AnimBase(baseId, baseBytes);
bases.addTail(base);
}
this.frames[local19[local21]] = new AnimFrame(local37, local58);
this.frames[fileIds[i]] = new AnimFrame(bytes, base);
}
}
@OriginalMember(owner = "client!cl", name = "c", descriptor = "(II)Z")
public final boolean isAlphaTransformed(@OriginalArg(1) int arg0) {
return this.frames[arg0].transformsAlpha;
@OriginalMember(owner = "client!gn", name = "a", descriptor = "(Lclient!ve;ZLclient!ve;BI)Lclient!cl;")
public static AnimFrameset create(@OriginalArg(0) Js5 animsArchive, @OriginalArg(2) Js5 basesArchive, @OriginalArg(4) int id) {
@Pc(5) boolean ready = true;
@Pc(16) int[] fileIds = animsArchive.getFileIds(id);
for (@Pc(18) int i = 0; i < fileIds.length; i++) {
@Pc(30) byte[] bytes = animsArchive.fetchFileNoDiscard(fileIds[i], id);
if (bytes == null) {
ready = false;
} else {
@Pc(49) int baseId = (bytes[0] & 0xFF) << 8 | bytes[1] & 0xFF;
@Pc(57) byte[] baseBytes = basesArchive.fetchFileNoDiscard(0, baseId);
if (baseBytes == null) {
ready = false;
}
}
}
if (!ready) {
return null;
}
try {
return new AnimFrameset(animsArchive, basesArchive, id, false);
} catch (@Pc(84) Exception local84) {
return null;
}
}
@OriginalMember(owner = "client!cl", name = "c", descriptor = "(II)Z")
public final boolean isAlphaTransformed(@OriginalArg(1) int frame) {
return this.frames[frame].transformsAlpha;
}
@OriginalMember(owner = "client!cl", name = "a", descriptor = "(IB)Z")
public final boolean isColorTransformed(@OriginalArg(0) int arg0) {
return this.frames[arg0].transformsColor;
public final boolean isColorTransformed(@OriginalArg(0) int frame) {
return this.frames[frame].transformsColor;
}
}

58
client/src/main/java/rt4/AreaSound.java
View file

@ -8,40 +8,40 @@ import org.openrs2.deob.annotation.Pc;
public final class AreaSound extends Node {
@OriginalMember(owner = "client!fl", name = "p", descriptor = "I")
public int anInt2028;
public int maxZFine;
@OriginalMember(owner = "client!fl", name = "q", descriptor = "I")
public int anInt2029;
public int minZFine;
@OriginalMember(owner = "client!fl", name = "t", descriptor = "I")
public int anInt2032;
public int minInterval;
@OriginalMember(owner = "client!fl", name = "v", descriptor = "Lclient!b;")
public SoundPcmStream primaryStream;
@OriginalMember(owner = "client!fl", name = "x", descriptor = "I")
public int anInt2033;
public int level;
@OriginalMember(owner = "client!fl", name = "y", descriptor = "Lclient!b;")
public SoundPcmStream secondaryStream;
@OriginalMember(owner = "client!fl", name = "z", descriptor = "I")
public int anInt2034;
public int remainingLoops;
@OriginalMember(owner = "client!fl", name = "E", descriptor = "Lclient!pb;")
public LocType locType;
@OriginalMember(owner = "client!fl", name = "F", descriptor = "I")
public int anInt2037;
public int maxXFine;
@OriginalMember(owner = "client!fl", name = "I", descriptor = "Lclient!km;")
public Npc npc;
@OriginalMember(owner = "client!fl", name = "K", descriptor = "I")
public int anInt2040;
public int maxInterval;
@OriginalMember(owner = "client!fl", name = "L", descriptor = "I")
public int anInt2041;
public int minXFine;
@OriginalMember(owner = "client!fl", name = "M", descriptor = "Lclient!e;")
public Player player;
@ -59,45 +59,45 @@ public final class AreaSound extends Node {
public int[] sounds;
@OriginalMember(owner = "client!fl", name = "G", descriptor = "I")
public int anInt2038 = 0;
public int movementSpeed = 0;
@OriginalMember(owner = "client!fl", name = "c", descriptor = "(I)V")
public final void update() {
@Pc(8) int local8 = this.sound;
@Pc(8) int prevSound = this.sound;
if (this.locType != null) {
@Pc(17) LocType local17 = this.locType.getMultiLoc();
if (local17 == null) {
@Pc(17) LocType locType = this.locType.getMultiLoc();
if (locType == null) {
this.sound = -1;
this.sounds = null;
this.anInt2040 = 0;
this.maxInterval = 0;
this.radius = 0;
this.anInt2032 = 0;
this.minInterval = 0;
} else {
this.anInt2040 = local17.anInt4414;
this.sound = local17.sound;
this.anInt2032 = local17.anInt4419;
this.radius = local17.soundRadius * 128;
this.sounds = local17.anIntArray381;
this.maxInterval = locType.anInt4414;
this.sound = locType.sound;
this.minInterval = locType.anInt4419;
this.radius = locType.soundRadius * 128;
this.sounds = locType.anIntArray381;
}
} else if (this.npc != null) {
@Pc(92) int local92 = Static112.getSound(this.npc);
if (local8 != local92) {
@Pc(100) NpcType local100 = this.npc.type;
this.sound = local92;
if (local100.multiNpcs != null) {
local100 = local100.getMultiNpc();
@Pc(92) int sound = Npc.getSound(this.npc);
if (prevSound != sound) {
@Pc(100) NpcType npcType = this.npc.type;
this.sound = sound;
if (npcType.multiNpcs != null) {
npcType = npcType.getMultiNpc();
}
if (local100 == null) {
if (npcType == null) {
this.radius = 0;
} else {
this.radius = local100.soundRadius * 128;
this.radius = npcType.soundRadius * 128;
}
}
} else if (this.player != null) {
this.sound = Static140.getSound(this.player);
this.sound = Player.getSound(this.player);
this.radius = this.player.soundRadius * 128;
}
if (this.sound != local8 && this.primaryStream != null) {
if (this.sound != prevSound && this.primaryStream != null) {
client.soundStream.removeSubStream(this.primaryStream);
this.primaryStream = null;
}

316
client/src/main/java/rt4/AreaSoundManager.java
View file

@ -6,85 +6,285 @@ import org.openrs2.deob.annotation.Pc;
public class AreaSoundManager {
@OriginalMember(owner = "client!he", name = "ab", descriptor = "Lclient!sc;")
public static final HashTable aClass133_7 = new HashTable(16);
public static final HashTable playerSounds = new HashTable(16);
@OriginalMember(owner = "client!ab", name = "n", descriptor = "Lclient!ih;")
public static final LinkedList locSounds = new LinkedList();
@OriginalMember(owner = "client!ma", name = "x", descriptor = "Lclient!ih;")
public static final LinkedList npcSounds = new LinkedList();
@OriginalMember(owner = "client!wc", name = "a", descriptor = "(Lclient!e;I)V")
public static void remove(@OriginalArg(0) Player arg0) {
@Pc(10) AreaSound local10 = (AreaSound) aClass133_7.get(arg0.username.encode37());
if (local10 == null) {
public static void remove(@OriginalArg(0) Player player) {
@Pc(10) AreaSound areaSound = (AreaSound) playerSounds.get(player.username.encode37());
if (areaSound == null) {
return;
}
if (local10.primaryStream != null) {
client.soundStream.removeSubStream(local10.primaryStream);
local10.primaryStream = null;
if (areaSound.primaryStream != null) {
client.soundStream.removeSubStream(areaSound.primaryStream);
areaSound.primaryStream = null;
}
local10.unlink();
areaSound.unlink();
}
@OriginalMember(owner = "client!jh", name = "a", descriptor = "(IZLclient!pb;ILclient!km;IILclient!e;)V")
public static void add(@OriginalArg(0) int arg0, @OriginalArg(2) LocType arg1, @OriginalArg(3) int arg2, @OriginalArg(4) Npc arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5, @OriginalArg(7) Player arg6) {
@Pc(13) AreaSound local13 = new AreaSound();
local13.anInt2029 = arg0 * 128;
local13.anInt2041 = arg4 * 128;
local13.anInt2033 = arg5;
if (arg1 != null) {
local13.sounds = arg1.anIntArray381;
local13.radius = arg1.soundRadius * 128;
local13.anInt2040 = arg1.anInt4414;
local13.locType = arg1;
local13.sound = arg1.sound;
local13.anInt2032 = arg1.anInt4419;
@Pc(57) int local57 = arg1.width;
@Pc(60) int local60 = arg1.length;
public static void add(@OriginalArg(0) int z, @OriginalArg(2) LocType loc, @OriginalArg(3) int arg2, @OriginalArg(4) Npc npc, @OriginalArg(5) int x, @OriginalArg(6) int level, @OriginalArg(7) Player player) {
@Pc(13) AreaSound sound = new AreaSound();
sound.minZFine = z * 128;
sound.minXFine = x * 128;
sound.level = level;
if (loc != null) {
sound.sounds = loc.anIntArray381;
sound.radius = loc.soundRadius * 128;
sound.maxInterval = loc.anInt4414;
sound.locType = loc;
sound.sound = loc.sound;
sound.minInterval = loc.anInt4419;
@Pc(57) int local57 = loc.width;
@Pc(60) int local60 = loc.length;
if (arg2 == 1 || arg2 == 3) {
local57 = arg1.length;
local60 = arg1.width;
local57 = loc.length;
local60 = loc.width;
}
local13.anInt2028 = (local60 + arg0) * 128;
local13.anInt2037 = (arg4 + local57) * 128;
if (arg1.multiLocs != null) {
local13.multiLocOrNpc = true;
local13.update();
sound.maxZFine = (local60 + z) * 128;
sound.maxXFine = (x + local57) * 128;
if (loc.multiLocs != null) {
sound.multiLocOrNpc = true;
sound.update();
}
if (local13.sounds != null) {
local13.anInt2034 = local13.anInt2032 + (int) (Math.random() * (double) (local13.anInt2040 - local13.anInt2032));
if (sound.sounds != null) {
sound.remainingLoops = sound.minInterval + (int) (Math.random() * (double) (sound.maxInterval - sound.minInterval));
}
Static3.aClass69_135.addTail(local13);
} else if (arg3 != null) {
local13.npc = arg3;
@Pc(138) NpcType local138 = arg3.type;
if (local138.multiNpcs != null) {
local13.multiLocOrNpc = true;
local138 = local138.getMultiNpc();
locSounds.addTail(sound);
} else if (npc != null) {
sound.npc = npc;
@Pc(138) NpcType npcType = npc.type;
if (npcType.multiNpcs != null) {
sound.multiLocOrNpc = true;
npcType = npcType.getMultiNpc();
}
if (local138 != null) {
local13.anInt2028 = (local138.size + arg0) * 128;
local13.anInt2037 = (arg4 + local138.size) * 128;
local13.sound = Static112.getSound(arg3);
local13.radius = local138.soundRadius * 128;
if (npcType != null) {
sound.maxZFine = (npcType.size + z) * 128;
sound.maxXFine = (npcType.size + x) * 128;
sound.sound = Npc.getSound(npc);
sound.radius = npcType.soundRadius * 128;
}
Static152.aClass69_87.addTail(local13);
} else if (arg6 != null) {
local13.player = arg6;
local13.anInt2037 = (arg6.getSize() + arg4) * 128;
local13.anInt2028 = (arg6.getSize() + arg0) * 128;
local13.sound = Static140.getSound(arg6);
local13.radius = arg6.soundRadius * 128;
aClass133_7.put(local13, arg6.username.encode37());
npcSounds.addTail(sound);
} else if (player != null) {
sound.player = player;
sound.maxXFine = (player.getSize() + x) * 128;
sound.maxZFine = (player.getSize() + z) * 128;
sound.sound = Player.getSound(player);
sound.radius = player.soundRadius * 128;
playerSounds.put(sound, player.username.encode37());
}
}
@OriginalMember(owner = "client!hc", name = "a", descriptor = "(Lclient!km;Z)V")
public static void remove(@OriginalArg(0) Npc arg0) {
for (@Pc(13) AreaSound local13 = (AreaSound) Static152.aClass69_87.start(); local13 != null; local13 = (AreaSound) Static152.aClass69_87.next()) {
if (arg0 == local13.npc) {
if (local13.primaryStream != null) {
client.soundStream.removeSubStream(local13.primaryStream);
local13.primaryStream = null;
public static void remove(@OriginalArg(0) Npc npc) {
for (@Pc(13) AreaSound areaSound = (AreaSound) npcSounds.head(); areaSound != null; areaSound = (AreaSound) npcSounds.next()) {
if (npc == areaSound.npc) {
if (areaSound.primaryStream != null) {
client.soundStream.removeSubStream(areaSound.primaryStream);
areaSound.primaryStream = null;
}
local13.unlink();
areaSound.unlink();
return;
}
}
}
@OriginalMember(owner = "client!ih", name = "a", descriptor = "(IIIII)V")
public static void redraw(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) {
@Pc(6) AreaSound areaSound;
for (areaSound = (AreaSound) locSounds.head(); areaSound != null; areaSound = (AreaSound) locSounds.next()) {
redraw(arg1, areaSound, arg3, arg0, arg2);
}
@Pc(37) byte movementSpeed;
@Pc(42) BasType basType;
@Pc(141) int sound;
for (areaSound = (AreaSound) npcSounds.head(); areaSound != null; areaSound = (AreaSound) npcSounds.next()) {
movementSpeed = 1;
basType = areaSound.npc.getBasType();
if (basType.idleAnimationId == areaSound.npc.movementSeqId) {
movementSpeed = 0;
} else if (basType.runAnimationId == areaSound.npc.movementSeqId || basType.runAnimationId2 == areaSound.npc.movementSeqId || basType.runAnimationId4 == areaSound.npc.movementSeqId || basType.runAnimationId3 == areaSound.npc.movementSeqId) {
movementSpeed = 2;
} else if (basType.anInt1062 == areaSound.npc.movementSeqId || basType.anInt1042 == areaSound.npc.movementSeqId || areaSound.npc.movementSeqId == basType.anInt1048 || basType.anInt1066 == areaSound.npc.movementSeqId) {
movementSpeed = 3;
}
if (areaSound.movementSpeed != movementSpeed) {
sound = Npc.getSound(areaSound.npc);
if (sound != areaSound.sound) {
if (areaSound.primaryStream != null) {
client.soundStream.removeSubStream(areaSound.primaryStream);
areaSound.primaryStream = null;
}
areaSound.sound = sound;
}
areaSound.movementSpeed = movementSpeed;
}
areaSound.minXFine = areaSound.npc.xFine;
areaSound.maxXFine = areaSound.npc.xFine + areaSound.npc.getSize() * 64;
areaSound.minZFine = areaSound.npc.zFine;
areaSound.maxZFine = areaSound.npc.zFine + areaSound.npc.getSize() * 64;
redraw(arg1, areaSound, arg3, arg0, arg2);
}
for (areaSound = (AreaSound) playerSounds.head(); areaSound != null; areaSound = (AreaSound) playerSounds.next()) {
movementSpeed = 1;
basType = areaSound.player.getBasType();
if (areaSound.player.movementSeqId == basType.idleAnimationId) {
movementSpeed = 0;
} else if (areaSound.player.movementSeqId == basType.runAnimationId || areaSound.player.movementSeqId == basType.runAnimationId2 || areaSound.player.movementSeqId == basType.runAnimationId4 || basType.runAnimationId3 == areaSound.player.movementSeqId) {
movementSpeed = 2;
} else if (basType.anInt1062 == areaSound.player.movementSeqId || areaSound.player.movementSeqId == basType.anInt1042 || areaSound.player.movementSeqId == basType.anInt1048 || areaSound.player.movementSeqId == basType.anInt1066) {
movementSpeed = 3;
}
if (areaSound.movementSpeed != movementSpeed) {
sound = Player.getSound(areaSound.player);
if (areaSound.sound != sound) {
if (areaSound.primaryStream != null) {
client.soundStream.removeSubStream(areaSound.primaryStream);
areaSound.primaryStream = null;
}
areaSound.sound = sound;
}
areaSound.movementSpeed = movementSpeed;
}
areaSound.minXFine = areaSound.player.xFine;
areaSound.maxXFine = areaSound.player.xFine + areaSound.player.getSize() * 64;
areaSound.minZFine = areaSound.player.zFine;
areaSound.maxZFine = areaSound.player.zFine + areaSound.player.getSize() * 64;
redraw(arg1, areaSound, arg3, arg0, arg2);
}
}
@OriginalMember(owner = "client!je", name = "k", descriptor = "(I)V")
public static void updateMulti() {
@Pc(6) AreaSound areaSound;
for (areaSound = (AreaSound) locSounds.head(); areaSound != null; areaSound = (AreaSound) locSounds.next()) {
if (areaSound.multiLocOrNpc) {
areaSound.update();
}
}
for (areaSound = (AreaSound) npcSounds.head(); areaSound != null; areaSound = (AreaSound) npcSounds.next()) {
if (areaSound.multiLocOrNpc) {
areaSound.update();
}
}
}
@OriginalMember(owner = "client!ra", name = "a", descriptor = "(ILclient!pb;BII)V")
public static void remove(@OriginalArg(0) int x, @OriginalArg(1) LocType locType, @OriginalArg(3) int z, @OriginalArg(4) int level) {
for (@Pc(10) AreaSound areaSound = (AreaSound) locSounds.head(); areaSound != null; areaSound = (AreaSound) locSounds.next()) {
if (level == areaSound.level && areaSound.minXFine == x * 128 && areaSound.minZFine == z * 128 && locType.id == areaSound.locType.id) {
if (areaSound.primaryStream != null) {
client.soundStream.removeSubStream(areaSound.primaryStream);
areaSound.primaryStream = null;
}
if (areaSound.secondaryStream != null) {
client.soundStream.removeSubStream(areaSound.secondaryStream);
areaSound.secondaryStream = null;
}
areaSound.unlink();
return;
}
}
}
@OriginalMember(owner = "client!vd", name = "a", descriptor = "(BZ)V")
public static void clear(@OriginalArg(1) boolean pathingEntities) {
@Pc(14) AreaSound areaSound;
for (areaSound = (AreaSound) locSounds.head(); areaSound != null; areaSound = (AreaSound) locSounds.next()) {
if (areaSound.primaryStream != null) {
client.soundStream.removeSubStream(areaSound.primaryStream);
areaSound.primaryStream = null;
}
if (areaSound.secondaryStream != null) {
client.soundStream.removeSubStream(areaSound.secondaryStream);
areaSound.secondaryStream = null;
}
areaSound.unlink();
}
if (!pathingEntities) {
return;
}
for (areaSound = (AreaSound) npcSounds.head(); areaSound != null; areaSound = (AreaSound) npcSounds.next()) {
if (areaSound.primaryStream != null) {
client.soundStream.removeSubStream(areaSound.primaryStream);
areaSound.primaryStream = null;
}
areaSound.unlink();
}
for (areaSound = (AreaSound) playerSounds.head(); areaSound != null; areaSound = (AreaSound) playerSounds.next()) {
if (areaSound.primaryStream != null) {
client.soundStream.removeSubStream(areaSound.primaryStream);
areaSound.primaryStream = null;
}
areaSound.unlink();
}
}
@OriginalMember(owner = "client!lk", name = "a", descriptor = "(ILclient!fl;IIII)V")
public static void redraw(@OriginalArg(0) int x, @OriginalArg(1) AreaSound areaSound, @OriginalArg(2) int level, @OriginalArg(3) int loops, @OriginalArg(4) int z) {
if (areaSound.sound == -1 && areaSound.sounds == null) {
return;
}
@Pc(20) int distance = 0;
if (areaSound.maxXFine < x) {
distance = x - areaSound.maxXFine;
} else if (areaSound.minXFine > x) {
distance = areaSound.minXFine - x;
}
if (areaSound.maxZFine < z) {
distance += z - areaSound.maxZFine;
} else if (z < areaSound.minZFine) {
distance += areaSound.minZFine - z;
}
if (areaSound.radius == 0 || areaSound.radius < distance - 64 || Preferences.ambientSoundsVolume == 0 || level != areaSound.level) {
if (areaSound.primaryStream != null) {
client.soundStream.removeSubStream(areaSound.primaryStream);
areaSound.primaryStream = null;
}
if (areaSound.secondaryStream != null) {
client.soundStream.removeSubStream(areaSound.secondaryStream);
areaSound.secondaryStream = null;
}
return;
}
distance -= 64;
if (distance < 0) {
distance = 0;
}
@Pc(134) int volume = (areaSound.radius - distance) * Preferences.ambientSoundsVolume / areaSound.radius;
if (areaSound.primaryStream != null) {
areaSound.primaryStream.setVolume(volume);
} else if (areaSound.sound >= 0) {
@Pc(150) SynthSound synthSound = SynthSound.create(client.js5Archive4, areaSound.sound, 0);
if (synthSound != null) {
@Pc(158) PcmSound pcmSound = synthSound.toPcmSound().resample(client.resampler);
@Pc(163) SoundPcmStream stream = SoundPcmStream.create(pcmSound, volume);
stream.setLoops(-1);
client.soundStream.addSubStream(stream);
areaSound.primaryStream = stream;
}
}
if (areaSound.secondaryStream != null) {
areaSound.secondaryStream.setVolume(volume);
if (!areaSound.secondaryStream.isLinked()) {
areaSound.secondaryStream = null;
}
} else if (areaSound.sounds != null && (areaSound.remainingLoops -= loops) <= 0) {
@Pc(219) int index = (int) ((double) areaSound.sounds.length * Math.random());
@Pc(227) SynthSound synthSound = SynthSound.create(client.js5Archive4, areaSound.sounds[index], 0);
if (synthSound != null) {
@Pc(236) PcmSound pcmSound = synthSound.toPcmSound().resample(client.resampler);
@Pc(241) SoundPcmStream stream = SoundPcmStream.create(pcmSound, volume);
stream.setLoops(0);
client.soundStream.addSubStream(stream);
areaSound.remainingLoops = (int) ((double) (areaSound.maxInterval - areaSound.minInterval) * Math.random()) + areaSound.minInterval;
areaSound.secondaryStream = stream;
}
}
}
}

229
client/src/main/java/rt4/AttachLocRequest.java
View file

@ -1,100 +1,141 @@
package rt4;
import org.openrs2.deob.annotation.OriginalClass;
import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc;
public class AttachLocRequest {
@OriginalMember(owner = "client!ph", name = "a", descriptor = "(B)V")
public static void loop() {
while (true) {
@Pc(17) AttachLocRequest_Class3_Sub8 local17 = (AttachLocRequest_Class3_Sub8) Static128.aClass69_77.removeHead();
if (local17 == null) {
return;
}
@Pc(40) PathingEntity local40;
@Pc(29) int local29;
if (local17.anInt1192 < 0) {
local29 = -local17.anInt1192 - 1;
if (local29 == PlayerList.selfId) {
local40 = PlayerList.self;
} else {
local40 = PlayerList.players[local29];
}
} else {
local29 = local17.anInt1192 - 1;
local40 = NpcList.npcs[local29];
}
if (local40 != null) {
@Pc(63) LocType local63 = LocTypeList.get(local17.anInt1189);
if (Player.level < 3) {
}
@Pc(86) int local86;
@Pc(83) int local83;
if (local17.anInt1206 == 1 || local17.anInt1206 == 3) {
local83 = local63.width;
local86 = local63.length;
} else {
local86 = local63.width;
local83 = local63.length;
}
@Pc(103) int local103 = (local86 + 1 >> 1) + local17.anInt1190;
@Pc(110) int local110 = (local86 >> 1) + local17.anInt1190;
@Pc(117) int local117 = (local83 >> 1) + local17.anInt1204;
@Pc(126) int local126 = (local83 + 1 >> 1) + local17.anInt1204;
@Pc(130) int[][] local130 = Static83.activeTileHeightMap[Player.level];
@Pc(157) int local157 = local130[local103][local126] + local130[local110][local126] + local130[local110][local117] + local130[local103][local117] >> 2;
@Pc(159) Entity local159 = null;
@Pc(164) int local164 = Static133.anIntArray453[local17.anInt1198];
if (local164 == 0) {
@Pc(176) Wall local176 = Static262.method4509(Player.level, local17.anInt1190, local17.anInt1204);
if (local176 != null) {
local159 = local176.aClass8_5;
}
} else if (local164 == 1) {
@Pc(231) WallDecor local231 = Static83.method435(Player.level, local17.anInt1190, local17.anInt1204);
if (local231 != null) {
local159 = local231.aClass8_3;
}
} else if (local164 == 2) {
@Pc(198) Scenery local198 = Static133.method4008(Player.level, local17.anInt1190, local17.anInt1204);
if (local198 != null) {
local159 = local198.aClass8_4;
}
} else if (local164 == 3) {
@Pc(216) GroundDecor local216 = Static269.method2210(Player.level, local17.anInt1190, local17.anInt1204);
if (local216 != null) {
local159 = local216.aClass8_1;
}
}
if (local159 != null) {
Static29.method800(Player.level, local17.anInt1204, 0, local17.anInt1190, local17.anInt1205 + 1, -1, local164, 0, local17.anInt1187 + 1);
local40.anInt3375 = local17.anInt1205 + client.loop;
local40.anInt3426 = local83 * 64 + local17.anInt1204 * 128;
local40.anInt3379 = local86 * 64 + local17.anInt1190 * 128;
local40.attachment = local159;
@Pc(292) int local292 = local17.anInt1188;
local40.anInt3406 = local157;
local40.anInt3390 = client.loop + local17.anInt1187;
@Pc(304) int local304 = local17.anInt1191;
@Pc(307) int local307 = local17.anInt1197;
@Pc(310) int local310 = local17.anInt1200;
@Pc(316) int local316;
if (local292 > local304) {
local316 = local292;
local292 = local304;
local304 = local316;
}
local40.anInt3411 = local17.anInt1190 + local304;
if (local307 > local310) {
local316 = local307;
local307 = local310;
local310 = local316;
}
local40.anInt3374 = local17.anInt1204 + local307;
local40.anInt3410 = local310 + local17.anInt1204;
local40.anInt3384 = local17.anInt1190 + local292;
}
}
}
}
@OriginalClass("client!cn")
public final class AttachLocRequest extends Node {
@OriginalMember(owner = "client!ka", name = "q", descriptor = "Lclient!ih;")
public static final LinkedList queue = new LinkedList();
@OriginalMember(owner = "client!cn", name = "p", descriptor = "I")
public int anInt1187;
@OriginalMember(owner = "client!cn", name = "r", descriptor = "I")
public int anInt1188;
@OriginalMember(owner = "client!cn", name = "t", descriptor = "I")
public int locId;
@OriginalMember(owner = "client!cn", name = "u", descriptor = "I")
public int x;
@OriginalMember(owner = "client!cn", name = "v", descriptor = "I")
public int anInt1191;
@OriginalMember(owner = "client!cn", name = "w", descriptor = "I")
public int entityId;
@OriginalMember(owner = "client!cn", name = "D", descriptor = "I")
public int anInt1197;
@OriginalMember(owner = "client!cn", name = "E", descriptor = "I")
public int shape;
@OriginalMember(owner = "client!cn", name = "H", descriptor = "I")
public int anInt1200;
@OriginalMember(owner = "client!cn", name = "M", descriptor = "I")
public int z;
@OriginalMember(owner = "client!cn", name = "N", descriptor = "I")
public int anInt1205;
@OriginalMember(owner = "client!cn", name = "O", descriptor = "I")
public int angle;
@OriginalMember(owner = "client!ph", name = "a", descriptor = "(B)V")
public static void loop() {
while (true) {
@Pc(17) AttachLocRequest request = (AttachLocRequest) queue.removeHead();
if (request == null) {
return;
}
@Pc(40) PathingEntity entity;
@Pc(29) int playerId;
if (request.entityId < 0) {
playerId = -request.entityId - 1;
if (playerId == PlayerList.selfId) {
entity = PlayerList.self;
} else {
entity = PlayerList.players[playerId];
}
} else {
playerId = request.entityId - 1;
entity = NpcList.npcs[playerId];
}
if (entity != null) {
@Pc(63) LocType type = LocTypeList.get(request.locId);
if (Player.level < 3) {
}
@Pc(86) int width;
@Pc(83) int length;
if (request.angle == 1 || request.angle == 3) {
length = type.width;
width = type.length;
} else {
width = type.width;
length = type.length;
}
@Pc(103) int centerX1 = (width + 1 >> 1) + request.x;
@Pc(110) int centerX0 = (width >> 1) + request.x;
@Pc(117) int centerZ0 = (length >> 1) + request.z;
@Pc(126) int centerZ1 = (length + 1 >> 1) + request.z;
@Pc(130) int[][] tileHeights = SceneGraph.activeTileHeightMap[Player.level];
@Pc(157) int y = tileHeights[centerX1][centerZ1] + tileHeights[centerX0][centerZ1] + tileHeights[centerX0][centerZ0] + tileHeights[centerX1][centerZ0] >> 2;
@Pc(159) Entity attachment = null;
@Pc(164) int layer = Loc.LAYERS[request.shape];
if (layer == 0) {
@Pc(176) Wall wall = SceneGraph.getWall(Player.level, request.x, request.z);
if (wall != null) {
attachment = wall.primary;
}
} else if (layer == 1) {
@Pc(231) WallDecor wallDecor = SceneGraph.getWallDecor(Player.level, request.x, request.z);
if (wallDecor != null) {
attachment = wallDecor.primary;
}
} else if (layer == 2) {
@Pc(198) Scenery scenery = SceneGraph.getScenery(Player.level, request.x, request.z);
if (scenery != null) {
attachment = scenery.primary;
}
} else if (layer == 3) {
@Pc(216) GroundDecor groundDecor = SceneGraph.getGroundDecor(Player.level, request.x, request.z);
if (groundDecor != null) {
attachment = groundDecor.primary;
}
}
if (attachment != null) {
ChangeLocRequest.push(Player.level, request.z, 0, request.x, request.anInt1205 + 1, -1, layer, 0, request.anInt1187 + 1);
entity.anInt3375 = request.anInt1205 + client.loop;
entity.attachmentZFine = length * 64 + request.z * 128;
entity.attachmentXFine = width * 64 + request.x * 128;
entity.attachment = attachment;
@Pc(292) int x0Delta = request.anInt1188;
entity.attachmentY = y;
entity.anInt3390 = client.loop + request.anInt1187;
@Pc(304) int x1Delta = request.anInt1191;
@Pc(307) int z0Delta = request.anInt1197;
@Pc(310) int z1Delta = request.anInt1200;
@Pc(316) int temp;
if (x0Delta > x1Delta) {
temp = x0Delta;
x0Delta = x1Delta;
x1Delta = temp;
}
entity.attachmentX1 = request.x + x1Delta;
if (z0Delta > z1Delta) {
temp = z0Delta;
z0Delta = z1Delta;
z1Delta = temp;
}
entity.attachmentZ0 = request.z + z0Delta;
entity.attachmentZ1 = z1Delta + request.z;
entity.atachmentX0 = request.x + x0Delta;
}
}
}
}
}

44
client/src/main/java/rt4/AttachLocRequest_Class3_Sub8.java
View file

@ -1,44 +0,0 @@
package rt4;
import org.openrs2.deob.annotation.OriginalClass;
import org.openrs2.deob.annotation.OriginalMember;
@OriginalClass("client!cn")
public final class AttachLocRequest_Class3_Sub8 extends Node {
@OriginalMember(owner = "client!cn", name = "p", descriptor = "I")
public int anInt1187;
@OriginalMember(owner = "client!cn", name = "r", descriptor = "I")
public int anInt1188;
@OriginalMember(owner = "client!cn", name = "t", descriptor = "I")
public int anInt1189;
@OriginalMember(owner = "client!cn", name = "u", descriptor = "I")
public int anInt1190;
@OriginalMember(owner = "client!cn", name = "v", descriptor = "I")
public int anInt1191;
@OriginalMember(owner = "client!cn", name = "w", descriptor = "I")
public int anInt1192;
@OriginalMember(owner = "client!cn", name = "D", descriptor = "I")
public int anInt1197;
@OriginalMember(owner = "client!cn", name = "E", descriptor = "I")
public int anInt1198;
@OriginalMember(owner = "client!cn", name = "H", descriptor = "I")
public int anInt1200;
@OriginalMember(owner = "client!cn", name = "M", descriptor = "I")
public int anInt1204;
@OriginalMember(owner = "client!cn", name = "N", descriptor = "I")
public int anInt1205;
@OriginalMember(owner = "client!cn", name = "O", descriptor = "I")
public int anInt1206;
}

44
client/src/main/java/rt4/AudioChannel.java
View file

@ -15,8 +15,10 @@ public class AudioChannel {
public static int threadPriority;
@OriginalMember(owner = "client!em", name = "x", descriptor = "Lclient!cj;")
public static AudioThread thread;
@OriginalMember(owner = "client!dh", name = "h", descriptor = "I")
public static int sampleRate;
@OriginalMember(owner = "client!vh", name = "h", descriptor = "Lclient!qb;")
@OriginalMember(owner = "client!vh", name = "h", descriptor = "Lclient!qb;")
private PcmStream stream;
@OriginalMember(owner = "client!vh", name = "n", descriptor = "[I")
@ -26,7 +28,7 @@ public class AudioChannel {
private int anInt4637;
@OriginalMember(owner = "client!vh", name = "H", descriptor = "I")
public int sampleRate;
public int sampleRate2;
@OriginalMember(owner = "client!vh", name = "K", descriptor = "I")
public int bufferCapacity;
@ -65,27 +67,27 @@ public class AudioChannel {
private int prevBufferSize = 0;
@OriginalMember(owner = "client!dc", name = "a", descriptor = "(IIIZ)V")
public static void init(@OriginalArg(3) boolean arg0) {
public static void init(@OriginalArg(3) boolean stereo) {
threadPriority = 2;
stereo = arg0;
Static44.sampleRate = 22050;
AudioChannel.stereo = stereo;
sampleRate = 22050;
}
@OriginalMember(owner = "client!id", name = "a", descriptor = "(ILsignlink!ll;Ljava/awt/Component;II)Lclient!vh;")
public static AudioChannel create(@OriginalArg(0) int arg0, @OriginalArg(1) SignLink arg1, @OriginalArg(2) Component arg2, @OriginalArg(3) int arg3) {
if (Static44.sampleRate == 0) {
if (sampleRate == 0) {
throw new IllegalStateException();
}
try {
@Pc(33) AudioChannel local33 = (AudioChannel) Class.forName("rt4.JavaAudioChannel").getDeclaredConstructor().newInstance();
local33.sampleRate = arg0;
local33.samples = new int[(stereo ? 2 : 1) * 256];
local33.init(arg2);
local33.bufferCapacity = (arg0 & -1024) + 1024;
if (local33.bufferCapacity > 16384) {
local33.bufferCapacity = 16384;
@Pc(33) AudioChannel audioChannel = (AudioChannel) Class.forName("rt4.JavaAudioChannel").getDeclaredConstructor().newInstance();
audioChannel.sampleRate2 = arg0;
audioChannel.samples = new int[(stereo ? 2 : 1) * 256];
audioChannel.init(arg2);
audioChannel.bufferCapacity = (arg0 & -1024) + 1024;
if (audioChannel.bufferCapacity > 16384) {
audioChannel.bufferCapacity = 16384;
}
local33.open(local33.bufferCapacity);
audioChannel.open(audioChannel.bufferCapacity);
if (threadPriority > 0 && thread == null) {
thread = new AudioThread();
thread.signLink = arg1;
@ -95,14 +97,14 @@ public class AudioChannel {
if (thread.channels[arg3] != null) {
throw new IllegalArgumentException();
}
thread.channels[arg3] = local33;
thread.channels[arg3] = audioChannel;
}
return local33;
return audioChannel;
} catch (@Pc(109) Throwable local109) {
try {
@Pc(120) SignLinkAudioChannel local120 = new SignLinkAudioChannel(arg1, arg3);
local120.samples = new int[(stereo ? 2 : 1) * 256];
local120.sampleRate = arg0;
local120.sampleRate2 = arg0;
local120.init(arg2);
local120.bufferCapacity = 16384;
local120.open(local120.bufferCapacity);
@ -145,7 +147,7 @@ public class AudioChannel {
Static289.clear(arg0, 0, local1);
this.anInt4638 -= 256;
if (this.stream != null && this.anInt4638 <= 0) {
this.anInt4638 += Static44.sampleRate >> 4;
this.anInt4638 += sampleRate >> 4;
Static167.setInactive(this.stream);
this.method3567(this.stream, this.stream.method4407());
@Pc(45) int local45 = 0;
@ -252,7 +254,7 @@ public class AudioChannel {
if (this.consumedSamples < this.prevBufferSize - local38) {
this.consumedSamples = this.prevBufferSize - local38;
}
@Pc(65) int local65 = this.sampleRate + this.anInt4637;
@Pc(65) int local65 = this.sampleRate2 + this.anInt4637;
if (local65 + 256 > 16384) {
local65 = 16128;
}
@ -266,7 +268,7 @@ public class AudioChannel {
this.open(this.bufferCapacity);
if (this.bufferCapacity < local65 + 256) {
local65 = this.bufferCapacity - 256;
this.anInt4637 = local65 - this.sampleRate;
this.anInt4637 = local65 - this.sampleRate2;
}
this.skipConsumptionCheck = true;
}
@ -300,7 +302,7 @@ public class AudioChannel {
}
while (now > this.time + 5000L) {
this.skip();
this.time += 256000 / Static44.sampleRate;
this.time += 256000 / sampleRate;
}
} catch (@Pc(247) Exception local247) {
this.time = now;

2
client/src/main/java/rt4/Camera.java
View file

@ -38,7 +38,7 @@ public class Camera {
if (local80 < 3 && (Static12.tileSettings[1][local64][local73] & 0x2) == 2) {
local80++;
}
@Pc(117) int local117 = (Static232.aByteArrayArrayArray13[local80][local64][local73] & 0xFF) * 8 + local43 - Static83.activeTileHeightMap[local80][local64][local73];
@Pc(117) int local117 = (Static232.aByteArrayArrayArray13[local80][local64][local73] & 0xFF) * 8 + local43 - SceneGraph.activeTileHeightMap[local80][local64][local73];
if (local117 > local45) {
local45 = local117;
}

28
client/src/main/java/rt4/ChangeLocRequest.java
View file

@ -1,12 +1,13 @@
package rt4;
import org.openrs2.deob.annotation.OriginalArg;
import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc;
public class ChangeLocRequest {
@OriginalMember(owner = "client!ug", name = "a", descriptor = "(B)V")
public static void loop() {
for (@Pc(10) SceneryStack local10 = (SceneryStack) Static26.sceneryList.start(); local10 != null; local10 = (SceneryStack) Static26.sceneryList.next()) {
for (@Pc(10) SceneryStack local10 = (SceneryStack) Static26.sceneryList.head(); local10 != null; local10 = (SceneryStack) Static26.sceneryList.next()) {
if (local10.anInt924 > 0) {
local10.anInt924--;
}
@ -29,4 +30,29 @@ public class ChangeLocRequest {
}
}
}
@OriginalMember(owner = "client!ce", name = "a", descriptor = "(IIIIIIIIII)V")
public static void push(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5, @OriginalArg(7) int arg6, @OriginalArg(8) int arg7, @OriginalArg(9) int arg8) {
@Pc(9) SceneryStack local9 = null;
for (@Pc(14) SceneryStack local14 = (SceneryStack) Static26.sceneryList.head(); local14 != null; local14 = (SceneryStack) Static26.sceneryList.next()) {
if (local14.level == arg0 && arg3 == local14.x && local14.z == arg1 && arg6 == local14.anInt927) {
local9 = local14;
break;
}
}
if (local9 == null) {
local9 = new SceneryStack();
local9.x = arg3;
local9.z = arg1;
local9.level = arg0;
local9.anInt927 = arg6;
Static226.method3898(local9);
Static26.sceneryList.addTail(local9);
}
local9.anInt926 = arg7;
local9.anInt925 = arg8;
local9.anInt924 = arg4;
local9.anInt929 = arg5;
local9.anInt922 = arg2;
}
}

6
client/src/main/java/rt4/Cheat.java
View file

@ -193,11 +193,11 @@ public class Cheat {
Static121.aBoolean154 = true;
}
if (arg0.equalsIgnoreCase(TWEENING)) {
if (client.applyTweening) {
client.applyTweening = false;
if (SeqType.applyTweening) {
SeqType.applyTweening = false;
Chat.add(null, 0, aClass100_943);
} else {
client.applyTweening = true;
SeqType.applyTweening = true;
Chat.add(null, 0, aClass100_362);
}
}

4
client/src/main/java/rt4/ClientProt.java
View file

@ -1005,7 +1005,7 @@ public class ClientProt {
}
}
}
Static260.clearAmbientSounds(false);
AreaSoundManager.clear(false);
if (GlRenderer.enabled) {
Static242.shadowMapImage.method1392();
for (i = 0; i < 13; i++) {
@ -1089,7 +1089,7 @@ public class ClientProt {
if (GlRenderer.enabled) {
for (chunkX = 0; chunkX < 13; chunkX++) {
for (chunkZ = 0; chunkZ < 13; chunkZ++) {
Static242.shadows[chunkX][chunkZ].method4676(Static83.activeTileHeightMap[0], chunkX * 8, chunkZ * 8);
Static242.shadows[chunkX][chunkZ].method4676(SceneGraph.activeTileHeightMap[0], chunkX * 8, chunkZ * 8);
}
}
}

2
client/src/main/java/rt4/GroundDecor.java
View file

@ -7,7 +7,7 @@ import org.openrs2.deob.annotation.OriginalMember;
public final class GroundDecor {
@OriginalMember(owner = "client!bm", name = "c", descriptor = "Lclient!th;")
public Entity aClass8_1;
public Entity primary;
@OriginalMember(owner = "client!bm", name = "g", descriptor = "I")
public int anInt732;

2
client/src/main/java/rt4/JavaAudioChannel.java
View file

@ -53,7 +53,7 @@ public final class JavaAudioChannel extends AudioChannel {
}
}
}
this.anAudioFormat1 = new AudioFormat((float) Static44.sampleRate, 16, AudioChannel.stereo ? 2 : 1, true, false);
this.anAudioFormat1 = new AudioFormat((float) AudioChannel.sampleRate, 16, AudioChannel.stereo ? 2 : 1, true, false);
this.aByteArray64 = new byte[0x100 << (AudioChannel.stereo ? 2 : 1)];
}

2
client/src/main/java/rt4/Js5.java
View file

@ -459,7 +459,7 @@ public final class Js5 {
}
@OriginalMember(owner = "client!ve", name = "b", descriptor = "(III)[B")
public final byte[] method4502(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
public final byte[] fetchFileNoDiscard(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
if (!this.method4501(arg1, arg0)) {
return null;
}

10
client/src/main/java/rt4/Js5CachedResourceProvider.java
View file

@ -98,7 +98,7 @@ public final class Js5CachedResourceProvider extends Js5ResourceProvider {
return;
}
@Pc(15) Node local15;
for (local15 = this.aClass69_16.start(); local15 != null; local15 = this.aClass69_16.next()) {
for (local15 = this.aClass69_16.head(); local15 != null; local15 = this.aClass69_16.next()) {
if (local15.key == (long) arg0) {
return;
}
@ -190,7 +190,7 @@ public final class Js5CachedResourceProvider extends Js5ResourceProvider {
if (this.aClass70_1 == null) {
return 0;
} else if (this.aBoolean35) {
@Pc(25) Node local25 = this.aClass69_17.start();
@Pc(25) Node local25 = this.aClass69_17.head();
return local25 == null ? 0 : (int) local25.key;
} else {
return this.aClass70_1.anInt2902;
@ -208,7 +208,7 @@ public final class Js5CachedResourceProvider extends Js5ResourceProvider {
@Pc(43) int local43;
if (this.aBoolean35) {
local32 = true;
for (local37 = this.aClass69_17.start(); local37 != null; local37 = this.aClass69_17.next()) {
for (local37 = this.aClass69_17.head(); local37 != null; local37 = this.aClass69_17.next()) {
local43 = (int) local37.key;
if (this.aByteArray9[local43] == 0) {
this.method536(1, local43);
@ -245,7 +245,7 @@ public final class Js5CachedResourceProvider extends Js5ResourceProvider {
}
} else if (this.aBoolean36) {
local32 = true;
for (local37 = this.aClass69_17.start(); local37 != null; local37 = this.aClass69_17.next()) {
for (local37 = this.aClass69_17.head(); local37 != null; local37 = this.aClass69_17.next()) {
local43 = (int) local37.key;
if (this.aByteArray9[local43] != 1) {
this.method536(2, local43);
@ -434,7 +434,7 @@ public final class Js5CachedResourceProvider extends Js5ResourceProvider {
if (this.aClass69_17 == null || this.method521() == null) {
return;
}
for (@Pc(21) Node local21 = this.aClass69_16.start(); local21 != null; local21 = this.aClass69_16.next()) {
for (@Pc(21) Node local21 = this.aClass69_16.head(); local21 != null; local21 = this.aClass69_16.next()) {
@Pc(28) int local28 = (int) local21.key;
if (local28 < 0 || this.aClass70_1.anInt2907 <= local28 || this.aClass70_1.anIntArray272[local28] == 0) {
local21.unlink();

2
client/src/main/java/rt4/LinkedList.java
View file

@ -102,7 +102,7 @@ public final class LinkedList {
}
@OriginalMember(owner = "client!ih", name = "f", descriptor = "(I)Lclient!ab;")
public final Node start() {
public final Node head() {
@Pc(3) Node local3 = this.aClass3_109.aClass3_222;
if (this.aClass3_109 == local3) {
this.aClass3_110 = null;

14
client/src/main/java/rt4/Loc.java
View file

@ -8,7 +8,9 @@ import org.openrs2.deob.annotation.Pc;
@OriginalClass("client!dc")
public final class Loc extends Entity {
@OriginalMember(owner = "client!ci", name = "q", descriptor = "Lclient!ek;")
@OriginalMember(owner = "client!kf", name = "h", descriptor = "[I")
public static final int[] LAYERS = new int[] { 0, 0, 0, 0, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3 };
@OriginalMember(owner = "client!ci", name = "q", descriptor = "Lclient!ek;")
public static SoftwareIndexedSprite aClass36_Sub1_1 = null;
@OriginalMember(owner = "client!dc", name = "U", descriptor = "Lclient!ga;")
private ParticleSystem aClass47_Sub1_2;
@ -225,7 +227,7 @@ public final class Loc extends Entity {
@OriginalMember(owner = "client!dc", name = "a", descriptor = "(ZI)Lclient!th;")
private Entity method1048(@OriginalArg(0) boolean arg0) {
@Pc(12) boolean local12 = Static107.surfaceTileHeightMap != Static83.activeTileHeightMap;
@Pc(12) boolean local12 = Static107.surfaceTileHeightMap != SceneGraph.activeTileHeightMap;
@Pc(19) LocType local19 = LocTypeList.get(this.anInt1299);
@Pc(22) int local22 = local19.anInt4430;
if (local19.multiLocs != null) {
@ -273,11 +275,11 @@ public final class Loc extends Entity {
@Pc(192) int local192 = (local157 >> 1) + this.anInt1300;
@Pc(201) int local201 = (local157 + 1 >> 1) + this.anInt1300;
this.method1047(local192 * 128, local185 * 128);
@Pc(256) boolean local256 = !local12 && local19.aBoolean212 && (local19.id != this.anInt1321 || (this.anInt1297 != this.anInt1322 || this.aClass144_2 != null && (this.aClass144_2.aBoolean280 || client.applyTweening) && this.anInt1297 != this.anInt1304) && Preferences.sceneryShadowsType >= 2);
@Pc(256) boolean local256 = !local12 && local19.aBoolean212 && (local19.id != this.anInt1321 || (this.anInt1297 != this.anInt1322 || this.aClass144_2 != null && (this.aClass144_2.aBoolean280 || SeqType.applyTweening) && this.anInt1297 != this.anInt1304) && Preferences.sceneryShadowsType >= 2);
if (arg0 && !local256) {
return null;
}
@Pc(267) int[][] local267 = Static83.activeTileHeightMap[this.anInt1303];
@Pc(267) int[][] local267 = SceneGraph.activeTileHeightMap[this.anInt1303];
@Pc(293) int local293 = local267[local178][local201] + local267[local185][local201] + local267[local185][local192] + local267[local178][local192] >> 2;
@Pc(302) int local302 = (local160 << 6) + (this.anInt1308 << 7);
@Pc(311) int local311 = (local157 << 6) + (this.anInt1300 << 7);
@ -285,7 +287,7 @@ public final class Loc extends Entity {
if (local12) {
local314 = Static107.surfaceTileHeightMap[0];
} else if (this.anInt1303 < 3) {
local314 = Static83.activeTileHeightMap[this.anInt1303 + 1];
local314 = SceneGraph.activeTileHeightMap[this.anInt1303 + 1];
}
if (GlRenderer.enabled && local256) {
Static242.method4207(this.aClass36_Sub1_2, this.anInt1296, this.anInt1294, this.anInt1319);
@ -306,7 +308,7 @@ public final class Loc extends Entity {
}
@Pc(429) int local429 = 0;
if (this.anInt1303 != 0) {
@Pc(439) int[][] local439 = Static83.activeTileHeightMap[0];
@Pc(439) int[][] local439 = SceneGraph.activeTileHeightMap[0];
local429 = local293 - (local439[local178][local192] + local439[local185][local192] + local439[local185][local201] + local439[local178][local201] >> 2);
}
@Pc(471) SoftwareIndexedSprite local471 = local389.aClass36_Sub1_3;

4
client/src/main/java/rt4/Map.java
View file

@ -75,7 +75,7 @@ public final class Map extends SecondaryNode {
if (this.anInt763 > arg1 || arg1 > this.anInt770 || arg0 < this.anInt771 || arg0 > this.anInt758) {
return false;
}
for (@Pc(33) MapChunk local33 = (MapChunk) this.chunks.start(); local33 != null; local33 = (MapChunk) this.chunks.next()) {
for (@Pc(33) MapChunk local33 = (MapChunk) this.chunks.head(); local33 != null; local33 = (MapChunk) this.chunks.next()) {
if (local33.method2760(arg0, arg1)) {
return true;
}
@ -89,7 +89,7 @@ public final class Map extends SecondaryNode {
this.anInt770 = 0;
this.anInt758 = 0;
this.anInt763 = 12800;
for (@Pc(29) MapChunk local29 = (MapChunk) this.chunks.start(); local29 != null; local29 = (MapChunk) this.chunks.next()) {
for (@Pc(29) MapChunk local29 = (MapChunk) this.chunks.head(); local29 != null; local29 = (MapChunk) this.chunks.next()) {
if (local29.anInt3522 < this.anInt771) {
this.anInt771 = local29.anInt3522;
}

4
client/src/main/java/rt4/MapList.java
View file

@ -29,7 +29,7 @@ public class MapList {
@OriginalMember(owner = "client!jk", name = "a", descriptor = "(ILclient!na;)Lclient!bn;")
public static Map get(@OriginalArg(1) JagString arg0) {
for (@Pc(15) Map local15 = (Map) aClass69_120.start(); local15 != null; local15 = (Map) aClass69_120.next()) {
for (@Pc(15) Map local15 = (Map) aClass69_120.head(); local15 != null; local15 = (Map) aClass69_120.next()) {
if (local15.group.strEquals(arg0)) {
return local15;
}
@ -39,7 +39,7 @@ public class MapList {
@OriginalMember(owner = "client!ce", name = "a", descriptor = "(IBI)Lclient!bn;")
public static Map getContainingSource(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) {
for (@Pc(10) Map local10 = (Map) aClass69_120.start(); local10 != null; local10 = (Map) aClass69_120.next()) {
for (@Pc(10) Map local10 = (Map) aClass69_120.head(); local10 != null; local10 = (Map) aClass69_120.next()) {
if (local10.aBoolean50 && local10.method664(arg1, arg0)) {
return local10;
}

18
client/src/main/java/rt4/MidiNoteStream.java
View file

@ -38,7 +38,7 @@ public final class MidiNoteStream extends PcmStream {
@OriginalMember(owner = "client!te", name = "b", descriptor = "()Lclient!qb;")
@Override
public final PcmStream method4406() {
@Pc(9) MidiNote local9 = (MidiNote) this.aClass69_126.start();
@Pc(9) MidiNote local9 = (MidiNote) this.aClass69_126.head();
if (local9 == null) {
return null;
} else if (local9.aClass3_Sub3_Sub1_3 == null) {
@ -51,7 +51,7 @@ public final class MidiNoteStream extends PcmStream {
@OriginalMember(owner = "client!te", name = "a", descriptor = "(Lclient!mf;II)V")
private void method4141(@OriginalArg(0) MidiNote arg0, @OriginalArg(2) int arg1) {
if ((this.aClass3_Sub3_Sub4_3.anIntArray508[arg0.anInt3773] & 0x4) != 0 && arg0.anInt3767 < 0) {
@Pc(27) int local27 = this.aClass3_Sub3_Sub4_3.anIntArray503[arg0.anInt3773] / Static44.sampleRate;
@Pc(27) int local27 = this.aClass3_Sub3_Sub4_3.anIntArray503[arg0.anInt3773] / AudioChannel.sampleRate;
@Pc(37) int local37 = (local27 + 1048575 - arg0.anInt3775) / local27;
arg0.anInt3775 = local27 * arg1 + arg0.anInt3775 & 0xFFFFF;
if (arg1 >= local37) {
@ -62,7 +62,7 @@ public final class MidiNoteStream extends PcmStream {
this.aClass3_Sub3_Sub4_3.method4442(arg0, arg0.aClass3_Sub18_1.aShortArray36[arg0.anInt3779] < 0);
}
if (arg0.aClass3_Sub18_1.aShortArray36[arg0.anInt3779] < 0) {
arg0.aClass3_Sub3_Sub1_3.method396(-1);
arg0.aClass3_Sub3_Sub1_3.setLoops(-1);
}
arg1 = arg0.anInt3775 / local27;
}
@ -80,7 +80,7 @@ public final class MidiNoteStream extends PcmStream {
@Override
public final void skip(@OriginalArg(0) int arg0) {
this.aClass3_Sub3_Sub2_2.skip(arg0);
for (@Pc(15) MidiNote local15 = (MidiNote) this.aClass69_126.start(); local15 != null; local15 = (MidiNote) this.aClass69_126.next()) {
for (@Pc(15) MidiNote local15 = (MidiNote) this.aClass69_126.head(); local15 != null; local15 = (MidiNote) this.aClass69_126.next()) {
if (!this.aClass3_Sub3_Sub4_3.method4445(local15)) {
@Pc(27) int local27 = arg0;
do {
@ -100,7 +100,7 @@ public final class MidiNoteStream extends PcmStream {
@Override
public final void read(@OriginalArg(0) int[] arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
this.aClass3_Sub3_Sub2_2.read(arg0, arg1, arg2);
for (@Pc(17) MidiNote local17 = (MidiNote) this.aClass69_126.start(); local17 != null; local17 = (MidiNote) this.aClass69_126.next()) {
for (@Pc(17) MidiNote local17 = (MidiNote) this.aClass69_126.head(); local17 != null; local17 = (MidiNote) this.aClass69_126.next()) {
if (!this.aClass3_Sub3_Sub4_3.method4445(local17)) {
@Pc(29) int local29 = arg2;
@Pc(31) int local31 = arg1;
@ -121,7 +121,7 @@ public final class MidiNoteStream extends PcmStream {
@OriginalMember(owner = "client!te", name = "a", descriptor = "([ILclient!mf;IIIB)V")
private void method4146(@OriginalArg(0) int[] arg0, @OriginalArg(1) MidiNote arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4) {
if ((this.aClass3_Sub3_Sub4_3.anIntArray508[arg1.anInt3773] & 0x4) != 0 && arg1.anInt3767 < 0) {
@Pc(26) int local26 = this.aClass3_Sub3_Sub4_3.anIntArray503[arg1.anInt3773] / Static44.sampleRate;
@Pc(26) int local26 = this.aClass3_Sub3_Sub4_3.anIntArray503[arg1.anInt3773] / AudioChannel.sampleRate;
while (true) {
@Pc(36) int local36 = (local26 + 1048575 - arg1.anInt3775) / local26;
if (arg3 < local36) {
@ -130,7 +130,7 @@ public final class MidiNoteStream extends PcmStream {
}
arg3 -= local36;
arg1.aClass3_Sub3_Sub1_3.read(arg0, arg2, local36);
@Pc(55) int local55 = Static44.sampleRate / 100;
@Pc(55) int local55 = AudioChannel.sampleRate / 100;
@Pc(58) SoundPcmStream local58 = arg1.aClass3_Sub3_Sub1_3;
@Pc(62) int local62 = 262144 / local26;
if (local62 < local55) {
@ -145,13 +145,13 @@ public final class MidiNoteStream extends PcmStream {
arg1.aClass3_Sub3_Sub1_3.method398(local55, local58.method392());
}
if (arg1.aClass3_Sub18_1.aShortArray36[arg1.anInt3779] < 0) {
arg1.aClass3_Sub3_Sub1_3.method396(-1);
arg1.aClass3_Sub3_Sub1_3.setLoops(-1);
}
arg2 += local36;
local58.method384(local55);
local58.read(arg0, arg2, arg4 - arg2);
if (local58.method412()) {
this.aClass3_Sub3_Sub2_2.method1343(local58);
this.aClass3_Sub3_Sub2_2.addSubStream(local58);
}
}
}

26
client/src/main/java/rt4/MidiPcmStream.java
View file

@ -214,12 +214,12 @@ public final class MidiPcmStream extends PcmStream {
@OriginalMember(owner = "client!va", name = "a", descriptor = "(BI)V")
private void method4422(@OriginalArg(1) int arg0) {
for (@Pc(20) MidiNote local20 = (MidiNote) this.aClass3_Sub3_Sub3_1.aClass69_126.start(); local20 != null; local20 = (MidiNote) this.aClass3_Sub3_Sub3_1.aClass69_126.next()) {
for (@Pc(20) MidiNote local20 = (MidiNote) this.aClass3_Sub3_Sub3_1.aClass69_126.head(); local20 != null; local20 = (MidiNote) this.aClass3_Sub3_Sub3_1.aClass69_126.next()) {
if (arg0 < 0 || local20.anInt3773 == arg0) {
if (local20.aClass3_Sub3_Sub1_3 != null) {
local20.aClass3_Sub3_Sub1_3.method384(Static44.sampleRate / 100);
local20.aClass3_Sub3_Sub1_3.method384(AudioChannel.sampleRate / 100);
if (local20.aClass3_Sub3_Sub1_3.method412()) {
this.aClass3_Sub3_Sub3_1.aClass3_Sub3_Sub2_2.method1343(local20.aClass3_Sub3_Sub1_3);
this.aClass3_Sub3_Sub3_1.aClass3_Sub3_Sub2_2.addSubStream(local20.aClass3_Sub3_Sub1_3);
}
local20.method2957();
}
@ -308,7 +308,7 @@ public final class MidiPcmStream extends PcmStream {
this.method4442(local133, local118.aShortArray36[arg2] < 0);
}
if (local118.aShortArray36[arg2] < 0) {
local133.aClass3_Sub3_Sub1_3.method396(-1);
local133.aClass3_Sub3_Sub1_3.setLoops(-1);
}
if (local133.anInt3776 >= 0) {
@Pc(289) MidiNote local289 = this.aClass3_Sub25ArrayArray2[arg1][local133.anInt3776];
@ -478,7 +478,7 @@ public final class MidiPcmStream extends PcmStream {
@OriginalMember(owner = "client!va", name = "d", descriptor = "(II)V")
private void method4430(@OriginalArg(1) int arg0) {
for (@Pc(12) MidiNote local12 = (MidiNote) this.aClass3_Sub3_Sub3_1.aClass69_126.start(); local12 != null; local12 = (MidiNote) this.aClass3_Sub3_Sub3_1.aClass69_126.next()) {
for (@Pc(12) MidiNote local12 = (MidiNote) this.aClass3_Sub3_Sub3_1.aClass69_126.head(); local12 != null; local12 = (MidiNote) this.aClass3_Sub3_Sub3_1.aClass69_126.next()) {
if ((arg0 < 0 || arg0 == local12.anInt3773) && local12.anInt3767 < 0) {
this.aClass3_Sub25ArrayArray1[local12.anInt3773][local12.anInt3779] = null;
local12.anInt3767 = 0;
@ -495,7 +495,7 @@ public final class MidiPcmStream extends PcmStream {
@Override
public final synchronized void read(@OriginalArg(0) int[] arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
if (this.aClass84_1.method2628()) {
@Pc(18) int local18 = this.aClass84_1.anInt3303 * this.anInt5646 / Static44.sampleRate;
@Pc(18) int local18 = this.aClass84_1.anInt3303 * this.anInt5646 / AudioChannel.sampleRate;
do {
@Pc(28) long local28 = this.aLong189 + (long) arg2 * (long) local18;
if (this.aLong188 - local28 >= 0L) {
@ -515,7 +515,7 @@ public final class MidiPcmStream extends PcmStream {
@OriginalMember(owner = "client!va", name = "a", descriptor = "(IILclient!mf;B[I)Z")
public final boolean method4433(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) MidiNote arg2, @OriginalArg(4) int[] arg3) {
arg2.anInt3771 = Static44.sampleRate / 100;
arg2.anInt3771 = AudioChannel.sampleRate / 100;
if (arg2.anInt3767 >= 0 && (arg2.aClass3_Sub3_Sub1_3 == null || arg2.aClass3_Sub3_Sub1_3.method411())) {
arg2.method2957();
arg2.unlink();
@ -585,7 +585,7 @@ public final class MidiPcmStream extends PcmStream {
arg2.aClass3_Sub3_Sub1_3.read(arg3, arg1, arg0);
}
if (arg2.aClass3_Sub3_Sub1_3.method412()) {
this.aClass3_Sub3_Sub3_1.aClass3_Sub3_Sub2_2.method1343(arg2.aClass3_Sub3_Sub1_3);
this.aClass3_Sub3_Sub3_1.aClass3_Sub3_Sub2_2.addSubStream(arg2.aClass3_Sub3_Sub1_3);
}
arg2.method2957();
if (arg2.anInt3767 >= 0) {
@ -614,7 +614,7 @@ public final class MidiPcmStream extends PcmStream {
local12.anInt3767 = 0;
return;
}
for (@Pc(44) MidiNote local44 = (MidiNote) this.aClass3_Sub3_Sub3_1.aClass69_126.start(); local44 != null; local44 = (MidiNote) this.aClass3_Sub3_Sub3_1.aClass69_126.next()) {
for (@Pc(44) MidiNote local44 = (MidiNote) this.aClass3_Sub3_Sub3_1.aClass69_126.head(); local44 != null; local44 = (MidiNote) this.aClass3_Sub3_Sub3_1.aClass69_126.next()) {
if (local44.anInt3773 == local12.anInt3773 && local44.anInt3767 < 0 && local44 != local12) {
local12.anInt3767 = 0;
break;
@ -688,7 +688,7 @@ public final class MidiPcmStream extends PcmStream {
@Override
public final synchronized void skip(@OriginalArg(0) int arg0) {
if (this.aClass84_1.method2628()) {
@Pc(15) int local15 = this.aClass84_1.anInt3303 * this.anInt5646 / Static44.sampleRate;
@Pc(15) int local15 = this.aClass84_1.anInt3303 * this.anInt5646 / AudioChannel.sampleRate;
do {
@Pc(25) long local25 = this.aLong189 + (long) arg0 * (long) local15;
if (this.aLong188 - local25 >= 0L) {
@ -710,7 +710,7 @@ public final class MidiPcmStream extends PcmStream {
if ((this.anIntArray508[arg0] & 0x4) == 0) {
return;
}
for (@Pc(24) MidiNote local24 = (MidiNote) this.aClass3_Sub3_Sub3_1.aClass69_126.start(); local24 != null; local24 = (MidiNote) this.aClass3_Sub3_Sub3_1.aClass69_126.next()) {
for (@Pc(24) MidiNote local24 = (MidiNote) this.aClass3_Sub3_Sub3_1.aClass69_126.head(); local24 != null; local24 = (MidiNote) this.aClass3_Sub3_Sub3_1.aClass69_126.next()) {
if (local24.anInt3773 == arg0) {
local24.anInt3775 = 0;
}
@ -733,7 +733,7 @@ public final class MidiPcmStream extends PcmStream {
@Pc(102) double local102 = Math.sin((double) (arg0.anInt3768 & 0x1FF) * 0.01227184630308513D);
local17 += (int) ((double) local62 * local102);
}
local62 = (int) ((double) (arg0.aClass3_Sub16_Sub1_1.anInt3316 * 256) * Math.pow(2.0D, (double) local17 * 3.255208333333333E-4D) / (double) Static44.sampleRate + 0.5D);
local62 = (int) ((double) (arg0.aClass3_Sub16_Sub1_1.anInt3316 * 256) * Math.pow(2.0D, (double) local17 * 3.255208333333333E-4D) / (double) AudioChannel.sampleRate + 0.5D);
return local62 >= 1 ? local62 : 1;
}
@ -782,7 +782,7 @@ public final class MidiPcmStream extends PcmStream {
if ((this.anIntArray508[arg0] & 0x2) == 0) {
return;
}
for (@Pc(20) MidiNote local20 = (MidiNote) this.aClass3_Sub3_Sub3_1.aClass69_126.start(); local20 != null; local20 = (MidiNote) this.aClass3_Sub3_Sub3_1.aClass69_126.next()) {
for (@Pc(20) MidiNote local20 = (MidiNote) this.aClass3_Sub3_Sub3_1.aClass69_126.head(); local20 != null; local20 = (MidiNote) this.aClass3_Sub3_Sub3_1.aClass69_126.next()) {
if (arg0 == local20.anInt3773 && this.aClass3_Sub25ArrayArray1[arg0][local20.anInt3779] == null && local20.anInt3767 < 0) {
local20.anInt3767 = 0;
}

14
client/src/main/java/rt4/MixerPcmStream.java
View file

@ -33,7 +33,7 @@ public final class MixerPcmStream extends PcmStream {
}
@OriginalMember(owner = "client!ei", name = "a", descriptor = "(Lclient!qb;)V")
public final synchronized void method1343(@OriginalArg(0) PcmStream arg0) {
public final synchronized void addSubStream(@OriginalArg(0) PcmStream arg0) {
this.aClass69_43.addHead(arg0);
}
@ -56,7 +56,7 @@ public final class MixerPcmStream extends PcmStream {
arg2 -= local33;
this.anInt1780 += local33;
this.method1344();
@Pc(60) MixerListener local60 = (MixerListener) this.aClass69_44.start();
@Pc(60) MixerListener local60 = (MixerListener) this.aClass69_44.head();
synchronized (local60) {
@Pc(68) int local68 = local60.method779(this);
if (local68 < 0) {
@ -75,7 +75,7 @@ public final class MixerPcmStream extends PcmStream {
if (this.anInt1780 <= 0) {
return;
}
for (@Pc(8) MixerListener local8 = (MixerListener) this.aClass69_44.start(); local8 != null; local8 = (MixerListener) this.aClass69_44.next()) {
for (@Pc(8) MixerListener local8 = (MixerListener) this.aClass69_44.head(); local8 != null; local8 = (MixerListener) this.aClass69_44.next()) {
local8.anInt905 -= this.anInt1780;
}
this.anInt1781 -= this.anInt1780;
@ -85,19 +85,19 @@ public final class MixerPcmStream extends PcmStream {
@OriginalMember(owner = "client!ei", name = "b", descriptor = "()Lclient!qb;")
@Override
public final PcmStream method4406() {
return (PcmStream) this.aClass69_43.start();
return (PcmStream) this.aClass69_43.head();
}
@OriginalMember(owner = "client!ei", name = "d", descriptor = "(I)V")
private void method1345(@OriginalArg(0) int arg0) {
for (@Pc(5) PcmStream local5 = (PcmStream) this.aClass69_43.start(); local5 != null; local5 = (PcmStream) this.aClass69_43.next()) {
for (@Pc(5) PcmStream local5 = (PcmStream) this.aClass69_43.head(); local5 != null; local5 = (PcmStream) this.aClass69_43.next()) {
local5.skip(arg0);
}
}
@OriginalMember(owner = "client!ei", name = "c", descriptor = "([III)V")
private void method1346(@OriginalArg(0) int[] arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
for (@Pc(5) PcmStream local5 = (PcmStream) this.aClass69_43.start(); local5 != null; local5 = (PcmStream) this.aClass69_43.next()) {
for (@Pc(5) PcmStream local5 = (PcmStream) this.aClass69_43.head(); local5 != null; local5 = (PcmStream) this.aClass69_43.next()) {
local5.method4405(arg0, arg1, arg2);
}
}
@ -131,7 +131,7 @@ public final class MixerPcmStream extends PcmStream {
arg0 -= local29;
this.anInt1780 += local29;
this.method1344();
@Pc(50) MixerListener local50 = (MixerListener) this.aClass69_44.start();
@Pc(50) MixerListener local50 = (MixerListener) this.aClass69_44.head();
synchronized (local50) {
@Pc(58) int local58 = local50.method779(this);
if (local58 < 0) {

18
client/src/main/java/rt4/Model.java
View file

@ -56,9 +56,9 @@ public abstract class Model extends Entity {
}
local42 = arg8 & arg0.parts[local14];
if (local42 == 65535) {
this.method4569(arg0.types[local14], arg0.bones[local14], arg1.aShortArray44[local5], arg1.aShortArray50[local5], arg1.aShortArray49[local5], arg7);
this.method4569(arg0.types[local14], arg0.bones[local14], arg1.x[local5], arg1.y[local5], arg1.z[local5], arg7);
} else {
this.method4577(arg0.types[local14], arg0.bones[local14], arg1.aShortArray44[local5], arg1.aShortArray50[local5], arg1.aShortArray49[local5], arg7, local42, arg9);
this.method4577(arg0.types[local14], arg0.bones[local14], arg1.x[local5], arg1.y[local5], arg1.z[local5], arg7, local42, arg9);
}
}
}
@ -88,9 +88,9 @@ public abstract class Model extends Entity {
@Pc(228) short local228;
@Pc(233) byte local233;
if (local144) {
local213 = arg1.aShortArray44[local5];
local218 = arg1.aShortArray50[local5];
local223 = arg1.aShortArray49[local5];
local213 = arg1.x[local5];
local218 = arg1.y[local5];
local223 = arg1.z[local5];
local228 = arg1.prevOriginIndices[local5];
local233 = arg1.flags[local5];
local5++;
@ -107,9 +107,9 @@ public abstract class Model extends Entity {
@Pc(267) short local267;
@Pc(272) byte local272;
if (local158) {
local252 = arg2.aShortArray44[local136];
local257 = arg2.aShortArray50[local136];
local262 = arg2.aShortArray49[local136];
local252 = arg2.x[local136];
local257 = arg2.y[local136];
local262 = arg2.z[local136];
local267 = arg2.prevOriginIndices[local136];
local272 = arg2.flags[local136];
local136++;
@ -206,7 +206,7 @@ public abstract class Model extends Entity {
if (local12.prevOriginIndices[local17] != -1) {
this.method4567(0, 0, 0, 0);
}
this.method4567(local15.types[local26], local12.aShortArray44[local17], local12.aShortArray50[local17], local12.aShortArray49[local17]);
this.method4567(local15.types[local26], local12.x[local17], local12.y[local17], local12.z[local17]);
}
}
this.method4557();

2
client/src/main/java/rt4/Node.java
View file

@ -16,7 +16,7 @@ public class Node {
public Node aClass3_223;
@OriginalMember(owner = "client!ab", name = "a", descriptor = "(I)Z")
public final boolean method4654() {
public final boolean isLinked() {
return this.aClass3_223 != null;
}

25
client/src/main/java/rt4/Npc.java
View file

@ -11,7 +11,28 @@ public final class Npc extends PathingEntity {
@OriginalMember(owner = "client!km", name = "rc", descriptor = "Lclient!me;")
public NpcType type;
@OriginalMember(owner = "client!km", name = "finalize", descriptor = "()V")
@OriginalMember(owner = "client!ij", name = "a", descriptor = "(Lclient!km;I)I")
public static int getSound(@OriginalArg(0) Npc arg0) {
@Pc(13) NpcType local13 = arg0.type;
if (local13.multiNpcs != null) {
local13 = local13.getMultiNpc();
if (local13 == null) {
return -1;
}
}
@Pc(29) int local29 = local13.walkSound;
@Pc(33) BasType local33 = arg0.getBasType();
if (local33.idleAnimationId == arg0.movementSeqId) {
local29 = local13.idleSound;
} else if (arg0.movementSeqId == local33.runAnimationId || local33.runAnimationId2 == arg0.movementSeqId || arg0.movementSeqId == local33.runAnimationId4 || arg0.movementSeqId == local33.runAnimationId3) {
local29 = local13.runSound;
} else if (local33.anInt1062 == arg0.movementSeqId || arg0.movementSeqId == local33.anInt1042 || arg0.movementSeqId == local33.anInt1048 || arg0.movementSeqId == local33.anInt1066) {
local29 = local13.crawlSound;
}
return local29;
}
@OriginalMember(owner = "client!km", name = "finalize", descriptor = "()V")
@Override
public final void finalize() {
}
@ -30,7 +51,7 @@ public final class Npc extends PathingEntity {
}
@Pc(29) SeqType local29 = this.seqId != -1 && this.anInt3420 == 0 ? SeqTypeList.get(this.seqId) : null;
@Pc(53) SeqType local53 = this.anInt3366 == -1 || this.anInt3366 == this.method2681().idleAnimationId && local29 != null ? null : SeqTypeList.get(this.anInt3366);
@Pc(53) SeqType local53 = this.movementSeqId == -1 || this.movementSeqId == this.getBasType().idleAnimationId && local29 != null ? null : SeqTypeList.get(this.movementSeqId);
@Pc(74) Model body = this.type.getBodyModel(this.aClass147Array3, this.anInt3388, this.anInt3407, this.anInt3373, this.anInt3360, this.anInt3425, local53, this.anInt3396, local29);
if (body == null) {
return;

18
client/src/main/java/rt4/NpcType.java
View file

@ -352,7 +352,7 @@ public final class NpcType {
local46 = true;
local200 = seqs[local235].anInt5399;
local214 = local753.frames[local200];
Static6.aClass3_Sub2_Sub7Array1[local235] = Static72.getAnimFrameset(local214 >>> 16);
Static6.aClass3_Sub2_Sub7Array1[local235] = SeqTypeList.getAnimFrameset(local214 >>> 16);
local214 &= 0xFFFF;
Static107.anIntArray259[local235] = local214;
if (Static6.aClass3_Sub2_Sub7Array1[local235] != null) {
@ -360,11 +360,11 @@ public final class NpcType {
local721 |= Static6.aClass3_Sub2_Sub7Array1[local235].isAlphaTransformed(local214);
local725 |= local753.aBoolean278;
}
if ((local753.tween || client.applyTweening) && local207 != -1 && local753.frames.length > local207) {
if ((local753.tween || SeqType.applyTweening) && local207 != -1 && local753.frames.length > local207) {
Static71.anIntArray147[local235] = local753.anIntArray474[local200];
Static214.anIntArray492[local235] = seqs[local235].anInt5404;
local228 = local753.frames[local207];
Static131.aClass3_Sub2_Sub7Array5[local235] = Static72.getAnimFrameset(local228 >>> 16);
Static131.aClass3_Sub2_Sub7Array5[local235] = SeqTypeList.getAnimFrameset(local228 >>> 16);
local228 &= 0xFFFF;
Static61.anIntArray148[local235] = local228;
if (Static131.aClass3_Sub2_Sub7Array5[local235] != null) {
@ -397,13 +397,13 @@ public final class NpcType {
local235 = seqType2.frames[arg5];
local228 = local235 >>> 16;
local235 &= 0xFFFF;
local962 = Static72.getAnimFrameset(local228);
local962 = SeqTypeList.getAnimFrameset(local228);
if (local962 != null) {
local723 |= local962.isColorTransformed(local235);
local721 |= local962.isAlphaTransformed(local235);
local725 |= seqType2.aBoolean278;
}
if ((seqType2.tween || client.applyTweening) && arg3 != -1 && seqType2.frames.length > arg3) {
if ((seqType2.tween || SeqType.applyTweening) && arg3 != -1 && seqType2.frames.length > arg3) {
local200 = seqType2.anIntArray474[arg5];
local221 = seqType2.frames[arg3];
local1040 = local221 >>> 16;
@ -411,7 +411,7 @@ public final class NpcType {
if (local228 == local1040) {
local964 = local962;
} else {
local964 = Static72.getAnimFrameset(local221 >>> 16);
local964 = SeqTypeList.getAnimFrameset(local221 >>> 16);
}
if (local964 != null) {
local723 |= local964.isColorTransformed(local221);
@ -428,13 +428,13 @@ public final class NpcType {
local228 = seqType1.frames[arg2];
local324 = local228 >>> 16;
local228 &= 0xFFFF;
local1088 = Static72.getAnimFrameset(local324);
local1088 = SeqTypeList.getAnimFrameset(local324);
if (local1088 != null) {
local723 |= local1088.isColorTransformed(local228);
local721 |= local1088.isAlphaTransformed(local228);
local725 |= seqType1.aBoolean278;
}
if ((seqType1.tween || client.applyTweening) && arg1 != -1 && arg1 < seqType1.frames.length) {
if ((seqType1.tween || SeqType.applyTweening) && arg1 != -1 && arg1 < seqType1.frames.length) {
local300 = seqType1.anIntArray474[arg2];
local1040 = seqType1.frames[arg1];
local318 = local1040 >>> 16;
@ -442,7 +442,7 @@ public final class NpcType {
if (local318 == local324) {
local1092 = local1088;
} else {
local1092 = Static72.getAnimFrameset(local1040 >>> 16);
local1092 = SeqTypeList.getAnimFrameset(local1040 >>> 16);
}
if (local1092 != null) {
local723 |= local1092.isColorTransformed(local1040);

22
client/src/main/java/rt4/PathingEntity.java
View file

@ -17,10 +17,10 @@ public abstract class PathingEntity extends Entity {
public int hitpointsBar;
@OriginalMember(owner = "client!fe", name = "U", descriptor = "I")
public int anInt3374;
public int attachmentZ0;
@OriginalMember(owner = "client!fe", name = "Z", descriptor = "I")
public int anInt3379;
public int attachmentXFine;
@OriginalMember(owner = "client!fe", name = "bb", descriptor = "I")
public int anInt3380;
@ -29,7 +29,7 @@ public abstract class PathingEntity extends Entity {
public int anInt3381;
@OriginalMember(owner = "client!fe", name = "fb", descriptor = "I")
public int anInt3384;
public int atachmentX0;
@OriginalMember(owner = "client!fe", name = "hb", descriptor = "I")
public int anInt3386;
@ -53,13 +53,13 @@ public abstract class PathingEntity extends Entity {
public int anInt3400;
@OriginalMember(owner = "client!fe", name = "Jb", descriptor = "I")
public int anInt3406;
public int attachmentY;
@OriginalMember(owner = "client!fe", name = "Ob", descriptor = "I")
public int anInt3410;
public int attachmentZ1;
@OriginalMember(owner = "client!fe", name = "Pb", descriptor = "I")
public int anInt3411;
public int attachmentX1;
@OriginalMember(owner = "client!fe", name = "Qb", descriptor = "I")
public int xFine;
@ -74,7 +74,7 @@ public abstract class PathingEntity extends Entity {
public int anInt3424;
@OriginalMember(owner = "client!fe", name = "fc", descriptor = "I")
public int anInt3426;
public int attachmentZFine;
@OriginalMember(owner = "client!fe", name = "hc", descriptor = "I")
public int anInt3428;
@ -215,7 +215,7 @@ public abstract class PathingEntity extends Entity {
public int anInt3414 = 0;
@OriginalMember(owner = "client!fe", name = "H", descriptor = "I")
public int anInt3366 = -1;
public int movementSeqId = -1;
@OriginalMember(owner = "client!fe", name = "gc", descriptor = "I")
private int anInt3427 = 0;
@ -257,7 +257,7 @@ public abstract class PathingEntity extends Entity {
public int anInt3418 = -1;
@OriginalMember(owner = "client!fe", name = "b", descriptor = "(Z)Lclient!ck;")
public final BasType method2681() {
public final BasType getBasType() {
@Pc(7) int local7 = this.method2688();
return local7 == -1 ? Static4.aClass20_1 : BasTypeList.get(local7);
}
@ -355,7 +355,7 @@ public abstract class PathingEntity extends Entity {
Static102.anInt2680 = 0;
Static101.anInt2640 = 0;
Static62.anInt1938 = 0;
@Pc(21) BasType local21 = this.method2681();
@Pc(21) BasType local21 = this.getBasType();
@Pc(24) int local24 = local21.anInt1059;
@Pc(27) int local27 = local21.anInt1050;
if (local24 == 0 || local27 == 0) {
@ -419,7 +419,7 @@ public abstract class PathingEntity extends Entity {
@OriginalMember(owner = "client!fe", name = "a", descriptor = "(Lclient!ak;B)V")
protected final void method2687(@OriginalArg(0) Model arg0) {
@Pc(16) BasType local16 = this.method2681();
@Pc(16) BasType local16 = this.getBasType();
if (local16.anInt1064 == 0 && local16.anInt1041 == 0) {
return;
}

2
client/src/main/java/rt4/PcmSound.java
View file

@ -40,7 +40,7 @@ public final class PcmSound extends Sound {
}
@OriginalMember(owner = "client!kj", name = "a", descriptor = "(Lclient!vj;)Lclient!kj;")
public final PcmSound method2648(@OriginalArg(0) Resampler arg0) {
public final PcmSound resample(@OriginalArg(0) Resampler arg0) {
this.aByteArray47 = arg0.method4520(this.aByteArray47);
this.anInt3316 = arg0.method4524(this.anInt3316);
if (this.anInt3315 == this.anInt3314) {

22
client/src/main/java/rt4/Player.java
View file

@ -163,7 +163,21 @@ public final class Player extends PathingEntity {
}
}
@OriginalMember(owner = "client!e", name = "c", descriptor = "(B)I")
@OriginalMember(owner = "client!la", name = "a", descriptor = "(ILclient!e;)I")
public static int getSound(@OriginalArg(1) Player arg0) {
@Pc(14) int local14 = arg0.anInt1654;
@Pc(18) BasType local18 = arg0.getBasType();
if (local18.idleAnimationId == arg0.movementSeqId) {
local14 = arg0.anInt1648;
} else if (local18.runAnimationId == arg0.movementSeqId || arg0.movementSeqId == local18.runAnimationId2 || arg0.movementSeqId == local18.runAnimationId4 || local18.runAnimationId3 == arg0.movementSeqId) {
local14 = arg0.anInt1670;
} else if (arg0.movementSeqId == local18.anInt1062 || arg0.movementSeqId == local18.anInt1042 || arg0.movementSeqId == local18.anInt1048 || arg0.movementSeqId == local18.anInt1066) {
local14 = arg0.anInt1658;
}
return local14;
}
@OriginalMember(owner = "client!e", name = "c", descriptor = "(B)I")
@Override
public final int getSize() {
return this.appearance == null || this.appearance.anInt2492 == -1 ? super.getSize() : NpcTypeList.get(this.appearance.anInt2492).size;
@ -281,7 +295,7 @@ public final class Player extends PathingEntity {
return;
}
@Pc(25) SeqType local25 = this.seqId != -1 && this.anInt3420 == 0 ? SeqTypeList.get(this.seqId) : null;
@Pc(54) SeqType local54 = this.anInt3366 == -1 || this.aBoolean98 || this.anInt3366 == this.method2681().idleAnimationId && local25 != null ? null : SeqTypeList.get(this.anInt3366);
@Pc(54) SeqType local54 = this.movementSeqId == -1 || this.aBoolean98 || this.movementSeqId == this.getBasType().idleAnimationId && local25 != null ? null : SeqTypeList.get(this.movementSeqId);
@Pc(76) Model local76 = this.appearance.method1954(this.aClass147Array3, this.anInt3373, local54, local25, this.anInt3396, this.anInt3388, this.anInt3360, this.anInt3425, this.anInt3407);
@Pc(79) int local79 = Static198.method1029();
if (GlRenderer.enabled && GameShell.maxMemory < 96 && local79 > 50) {
@ -380,7 +394,7 @@ public final class Player extends PathingEntity {
} else {
local515 = (Model) this.attachment;
}
local515.translate(this.anInt3379 - this.xFine, this.anInt3406 + -this.anInt3424, this.anInt3426 - this.zFine);
local515.translate(this.attachmentXFine - this.xFine, this.attachmentY + -this.anInt3424, this.attachmentZFine - this.zFine);
if (this.anInt3400 == 512) {
local515.method4578();
} else if (this.anInt3400 == 1024) {
@ -417,7 +431,7 @@ public final class Player extends PathingEntity {
} else if (this.anInt3400 == 1536) {
local515.method4578();
}
local515.translate(this.xFine - this.anInt3379, -this.anInt3406 + this.anInt3424, this.zFine - this.anInt3426);
local515.translate(this.xFine - this.attachmentXFine, -this.attachmentY + this.anInt3424, this.zFine - this.attachmentZFine);
}
@OriginalMember(owner = "client!e", name = "a", descriptor = "(Lclient!ga;ILclient!ak;IIIIIIIIIIII)V")

18
client/src/main/java/rt4/PlayerAppearance.java
View file

@ -364,7 +364,7 @@ public final class PlayerAppearance {
local374 = arg0[local353].anInt5399;
local367 = arg0[local353].anInt5398;
local381 = local858.frames[local374];
Static276.aClass3_Sub2_Sub7Array8[local353] = Static72.getAnimFrameset(local381 >>> 16);
Static276.aClass3_Sub2_Sub7Array8[local353] = SeqTypeList.getAnimFrameset(local381 >>> 16);
local381 &= 0xFFFF;
Static241.anIntArray520[local353] = local381;
if (Static276.aClass3_Sub2_Sub7Array8[local353] != null) {
@ -372,11 +372,11 @@ public final class PlayerAppearance {
local827 |= Static276.aClass3_Sub2_Sub7Array8[local353].isAlphaTransformed(local381);
local838 |= local858.aBoolean278;
}
if ((local858.tween || client.applyTweening) && local367 != -1 && local367 < local858.frames.length) {
if ((local858.tween || SeqType.applyTweening) && local367 != -1 && local367 < local858.frames.length) {
Static262.anIntArray515[local353] = local858.anIntArray474[local374];
Static73.anIntArray183[local353] = arg0[local353].anInt5404;
local979 = local858.frames[local367];
Static133.aClass3_Sub2_Sub7Array7[local353] = Static72.getAnimFrameset(local979 >>> 16);
Static133.aClass3_Sub2_Sub7Array7[local353] = SeqTypeList.getAnimFrameset(local979 >>> 16);
@Pc(991) int local991 = local979 & 0xFFFF;
anIntArray187[local353] = local991;
if (Static133.aClass3_Sub2_Sub7Array7[local353] != null) {
@ -403,14 +403,14 @@ public final class PlayerAppearance {
if (arg3 != null) {
local353 = arg3.frames[arg7];
local979 = local353 >>> 16;
local1042 = Static72.getAnimFrameset(local979);
local1042 = SeqTypeList.getAnimFrameset(local979);
local353 &= 0xFFFF;
if (local1042 != null) {
local836 |= local1042.isColorTransformed(local353);
local827 |= local1042.isAlphaTransformed(local353);
local838 |= arg3.aBoolean278;
}
if ((arg3.tween || client.applyTweening) && arg1 != -1 && arg3.frames.length > arg1) {
if ((arg3.tween || SeqType.applyTweening) && arg1 != -1 && arg3.frames.length > arg1) {
local360 = arg3.frames[arg1];
local451 = local360 >>> 16;
local360 &= 0xFFFF;
@ -418,7 +418,7 @@ public final class PlayerAppearance {
if (local979 == local451) {
local1040 = local1042;
} else {
local1040 = Static72.getAnimFrameset(local360 >>> 16);
local1040 = SeqTypeList.getAnimFrameset(local360 >>> 16);
}
if (local1040 != null) {
local836 |= local1040.isColorTransformed(local360);
@ -435,13 +435,13 @@ public final class PlayerAppearance {
local979 = arg2.frames[arg8];
local475 = local979 >>> 16;
local979 &= 0xFFFF;
local1154 = Static72.getAnimFrameset(local475);
local1154 = SeqTypeList.getAnimFrameset(local475);
if (local1154 != null) {
local836 |= local1154.isColorTransformed(local979);
local827 |= local1154.isAlphaTransformed(local979);
local838 |= arg2.aBoolean278;
}
if ((arg2.tween || client.applyTweening) && arg5 != -1 && arg2.frames.length > arg5) {
if ((arg2.tween || SeqType.applyTweening) && arg5 != -1 && arg2.frames.length > arg5) {
local457 = arg2.anIntArray474[arg8];
local451 = arg2.frames[arg5];
local481 = local451 >>> 16;
@ -449,7 +449,7 @@ public final class PlayerAppearance {
if (local475 == local481) {
local1156 = local1154;
} else {
local1156 = Static72.getAnimFrameset(local451 >>> 16);
local1156 = SeqTypeList.getAnimFrameset(local451 >>> 16);
}
if (local1156 != null) {
local836 |= local1156.isColorTransformed(local451);

22
client/src/main/java/rt4/Protocol.java
View file

@ -50,12 +50,12 @@ public class Protocol {
int local15 = inboundBuffer.g1neg();
int local19 = local15 & 0x3;
int local23 = local15 >> 2;
int local27 = Static133.anIntArray453[local23];
int local27 = Loc.LAYERS[local23];
int local31 = inboundBuffer.g1();
int local39 = (local31 >> 4 & 0x7) + Static115.currentChunkX;
int local45 = (local31 & 0x7) + Static180.currentChunkZ;
if (local39 >= 0 && local45 >= 0 && local39 < 104 && local45 < 104) {
Static29.method800(Player.level, local45, local19, local39, -1, -1, local27, local23, 0);
ChangeLocRequest.push(Player.level, local45, local19, local39, -1, -1, local27, local23, 0);
}
} else if (opcode == ServerProt.LOCATION_PACKET_33) {
int local15 = inboundBuffer.g2le();
@ -116,13 +116,13 @@ public class Protocol {
int local15 = inboundBuffer.g1add();
int local23 = local15 >> 2;
int local19 = local15 & 0x3;
int local27 = Static133.anIntArray453[local23];
int local27 = Loc.LAYERS[local23];
int local31 = inboundBuffer.g1();
int local39 = Static115.currentChunkX + (local31 >> 4 & 0x7);
int local45 = (local31 & 0x7) + Static180.currentChunkZ;
int local218 = inboundBuffer.g2sub();
if (local39 >= 0 && local45 >= 0 && local39 < 104 && local45 < 104) {
Static29.method800(Player.level, local45, local19, local39, -1, local218, local27, local23, 0);
ChangeLocRequest.push(Player.level, local45, local19, local39, -1, local218, local27, local23, 0);
}
} else if (opcode == ServerProt.LOCATION_PACKET_20) {
int local15 = inboundBuffer.g1ssub();
@ -131,7 +131,7 @@ public class Protocol {
int local27 = inboundBuffer.g1ssub();
int local31 = local27 >> 2;
int local39 = local27 & 0x3;
int local45 = Static133.anIntArray453[local31];
int local45 = Loc.LAYERS[local31];
int local218 = inboundBuffer.g2le();
if (local218 == 65535) {
local218 = -1;
@ -165,7 +165,7 @@ public class Protocol {
if (local23 >= 0 && local19 >= 0 && local23 < 104 && local19 < 104) {
@Pc(710) LinkedList local710 = Static159.aClass69ArrayArrayArray1[Player.level][local23][local19];
if (local710 != null) {
for (@Pc(718) ObjStackNode local718 = (ObjStackNode) local710.start(); local718 != null; local718 = (ObjStackNode) local710.next()) {
for (@Pc(718) ObjStackNode local718 = (ObjStackNode) local710.head(); local718 != null; local718 = (ObjStackNode) local710.next()) {
@Pc(723) ObjStack local723 = local718.aClass8_Sub7_1;
if ((local27 & 0x7FFF) == local723.anInt5555 && local31 == local723.anInt5550) {
local723.anInt5550 = local39;
@ -262,7 +262,7 @@ public class Protocol {
}
}
if (local1198 != null) {
@Pc(1232) BasType local1232 = local1198.method2681();
@Pc(1232) BasType local1232 = local1198.getBasType();
if (local1232.modelRotateTranslate != null && local1232.modelRotateTranslate[local1194] != null) {
local1188 = local1232.modelRotateTranslate[local1194][0];
local224 -= local1232.modelRotateTranslate[local1194][1];
@ -311,13 +311,13 @@ public class Protocol {
if (local23 >= 0 && local19 >= 0 && local23 < 104 && local19 < 104) {
@Pc(1565) LinkedList local1565 = Static159.aClass69ArrayArrayArray1[Player.level][local23][local19];
if (local1565 != null) {
for (@Pc(1572) ObjStackNode local1572 = (ObjStackNode) local1565.start(); local1572 != null; local1572 = (ObjStackNode) local1565.next()) {
for (@Pc(1572) ObjStackNode local1572 = (ObjStackNode) local1565.head(); local1572 != null; local1572 = (ObjStackNode) local1565.next()) {
if (local1572.aClass8_Sub7_1.anInt5555 == (local27 & 0x7FFF)) {
local1572.unlink();
break;
}
}
if (local1565.start() == null) {
if (local1565.head() == null) {
Static159.aClass69ArrayArrayArray1[Player.level][local23][local19] = null;
}
Static220.spawnGroundObject(local19, local23);
@ -1444,7 +1444,7 @@ public class Protocol {
}
}
}
for (@Pc(2604) SceneryStack loc = (SceneryStack) Static26.sceneryList.start(); loc != null; loc = (SceneryStack) Static26.sceneryList.next()) {
for (@Pc(2604) SceneryStack loc = (SceneryStack) Static26.sceneryList.head(); loc != null; loc = (SceneryStack) Static26.sceneryList.next()) {
if (loc.x >= Static115.currentChunkX && Static115.currentChunkX + 8 > loc.x && loc.z >= Static180.currentChunkZ && loc.z < Static180.currentChunkZ + 8 && loc.level == Player.level) {
loc.anInt924 = 0;
}
@ -1869,7 +1869,7 @@ public class Protocol {
int slot = inboundBuffer.g1ssub();
int type = slot >> 2;
int rotation = slot & 0x3;
int type2 = Static133.anIntArray453[type];
int type2 = Loc.LAYERS[type];
int seqId = inboundBuffer.g2();
int pos = inboundBuffer.g4();
if (seqId == 65535) {

2
client/src/main/java/rt4/ReflectionCheck.java
View file

@ -40,7 +40,7 @@ public final class ReflectionCheck extends Node {
@OriginalMember(owner = "client!t", name = "a", descriptor = "(Lclient!i;II)V")
public static void loop(@OriginalArg(0) Packet arg0) {
while (true) {
@Pc(18) ReflectionCheck local18 = (ReflectionCheck) Static204.aClass69_113.start();
@Pc(18) ReflectionCheck local18 = (ReflectionCheck) Static204.aClass69_113.head();
if (local18 == null) {
return;
}

42
client/src/main/java/rt4/SceneGraph.java
View file

@ -8,6 +8,9 @@ public class SceneGraph {
@OriginalMember(owner = "client!kc", name = "o", descriptor = "[[[Lclient!bj;")
public static Tile[][][] tiles;
@OriginalMember(owner = "client!gj", name = "m", descriptor = "[[[I")
public static int[][][] activeTileHeightMap;
@OriginalMember(owner = "client!km", name = "f", descriptor = "(I)Z")
public static boolean allLevelsAreVisible() {
return GlRenderer.enabled || Preferences.allLevelsVisible;
@ -15,7 +18,7 @@ public class SceneGraph {
@OriginalMember(owner = "client!ql", name = "a", descriptor = "(IIII)I")
public static int getTileHeight(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2) {
if (Static83.activeTileHeightMap == null) {
if (activeTileHeightMap == null) {
return 0;
}
@Pc(12) int local12 = arg1 >> 7;
@ -29,8 +32,8 @@ public class SceneGraph {
if (arg0 < 3 && (Static12.tileSettings[1][local12][local16] & 0x2) == 2) {
local42 = arg0 + 1;
}
@Pc(91) int local91 = local36 * Static83.activeTileHeightMap[local42][local12 + 1][local16 + 1] + Static83.activeTileHeightMap[local42][local12][local16 + 1] * (128 - local36) >> 7;
@Pc(118) int local118 = local36 * Static83.activeTileHeightMap[local42][local12 + 1][local16] + (128 - local36) * Static83.activeTileHeightMap[local42][local12][local16] >> 7;
@Pc(91) int local91 = local36 * activeTileHeightMap[local42][local12 + 1][local16 + 1] + activeTileHeightMap[local42][local12][local16 + 1] * (128 - local36) >> 7;
@Pc(118) int local118 = local36 * activeTileHeightMap[local42][local12 + 1][local16] + (128 - local36) * activeTileHeightMap[local42][local12][local16] >> 7;
return local40 * local91 + (128 - local40) * local118 >> 7;
}
@ -89,4 +92,37 @@ public class SceneGraph {
}
}
}
@OriginalMember(owner = "client!vf", name = "a", descriptor = "(III)Lclient!jh;")
public static Wall getWall(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
@Pc(7) Tile local7 = tiles[arg0][arg1][arg2];
return local7 == null ? null : local7.aClass77_1;
}
@OriginalMember(owner = "client!gj", name = "a", descriptor = "(III)Lclient!df;")
public static WallDecor getWallDecor(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
@Pc(7) Tile local7 = tiles[arg0][arg1][arg2];
return local7 == null ? null : local7.aClass24_1;
}
@OriginalMember(owner = "client!kf", name = "b", descriptor = "(III)Lclient!ec;")
public static Scenery getScenery(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
@Pc(7) Tile local7 = tiles[arg0][arg1][arg2];
if (local7 == null) {
return null;
}
for (@Pc(13) int local13 = 0; local13 < local7.anInt662; local13++) {
@Pc(22) Scenery local22 = local7.aClass31Array1[local13];
if ((local22.aLong56 >> 29 & 0x3L) == 2L && local22.anInt1701 == arg1 && local22.anInt1696 == arg2) {
return local22;
}
}
return null;
}
@OriginalMember(owner = "client!wa", name = "a", descriptor = "(III)Lclient!bm;")
public static GroundDecor getGroundDecor(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
@Pc(7) Tile local7 = tiles[arg0][arg1][arg2];
return local7 == null || local7.aClass15_1 == null ? null : local7.aClass15_1;
}
}

2
client/src/main/java/rt4/Scenery.java
View file

@ -10,7 +10,7 @@ public final class Scenery {
public int anInt1696;
@OriginalMember(owner = "client!ec", name = "c", descriptor = "Lclient!th;")
public Entity aClass8_4;
public Entity primary;
@OriginalMember(owner = "client!ec", name = "e", descriptor = "I")
public int anInt1698;

4
client/src/main/java/rt4/ScriptRunner.java
View file

@ -2907,10 +2907,10 @@ public final class ScriptRunner {
if (opcode == 5401) {
isp -= 2;
client.aShortArray88[intStack[isp]] = (short) Static105.method2253(intStack[isp + 1]);
Static211.method924();
Static211.clearObjectModelCache();
Static269.clearObjectSpriteCache();
Static278.method4649();
Static11.method443();
Static11.clearNpcHeadCache();
Static87.method1807();
continue;
}

33
client/src/main/java/rt4/SeqType.java
View file

@ -8,6 +8,9 @@ import org.openrs2.deob.annotation.Pc;
@OriginalClass("client!tk")
public final class SeqType {
@OriginalMember(owner = "client!qi", name = "v", descriptor = "Z")
public static boolean applyTweening = GlobalConfig.USE_TWEENING;
@OriginalMember(owner = "client!tk", name = "g", descriptor = "[I")
public int[] frames;
@ -77,16 +80,16 @@ public final class SeqType {
public final Model method4214(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) Model arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4) {
@Pc(10) int local10 = this.anIntArray474[arg0];
@Pc(15) int local15 = this.frames[arg0];
@Pc(23) AnimFrameset local23 = Static72.getAnimFrameset(local15 >> 16);
@Pc(23) AnimFrameset local23 = SeqTypeList.getAnimFrameset(local15 >> 16);
@Pc(27) int local27 = local15 & 0xFFFF;
if (local23 == null) {
return arg2.method4568(true, true, true);
}
@Pc(39) int local39 = arg3 & 0x3;
@Pc(41) AnimFrameset local41 = null;
if ((this.tween || client.applyTweening) && arg1 != -1 && this.frames.length > arg1) {
if ((this.tween || applyTweening) && arg1 != -1 && this.frames.length > arg1) {
@Pc(69) int local69 = this.frames[arg1];
local41 = Static72.getAnimFrameset(local69 >> 16);
local41 = SeqTypeList.getAnimFrameset(local69 >> 16);
arg1 = local69 & 0xFFFF;
}
@Pc(124) Model local124;
@ -133,15 +136,15 @@ public final class SeqType {
public final Model method4215(@OriginalArg(0) Model arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3) {
@Pc(8) int local8 = this.frames[arg3];
@Pc(13) int local13 = this.anIntArray474[arg3];
@Pc(19) AnimFrameset local19 = Static72.getAnimFrameset(local8 >> 16);
@Pc(19) AnimFrameset local19 = SeqTypeList.getAnimFrameset(local8 >> 16);
@Pc(23) int local23 = local8 & 0xFFFF;
if (local19 == null) {
return arg0.method4572(true, true, true);
}
@Pc(34) AnimFrameset local34 = null;
if ((this.tween || client.applyTweening) && arg1 != -1 && arg1 < this.frames.length) {
if ((this.tween || applyTweening) && arg1 != -1 && arg1 < this.frames.length) {
@Pc(59) int local59 = this.frames[arg1];
local34 = Static72.getAnimFrameset(local59 >> 16);
local34 = SeqTypeList.getAnimFrameset(local59 >> 16);
arg1 = local59 & 0xFFFF;
}
@Pc(71) AnimFrameset local71 = null;
@ -152,14 +155,14 @@ public final class SeqType {
if (this.anIntArray475.length > arg3) {
local83 = this.anIntArray475[arg3];
if (local83 != 65535) {
local71 = Static72.getAnimFrameset(local83 >> 16);
local71 = SeqTypeList.getAnimFrameset(local83 >> 16);
local83 &= 0xFFFF;
}
}
if ((this.tween || client.applyTweening) && arg1 != -1 && this.anIntArray475.length > arg1) {
if ((this.tween || applyTweening) && arg1 != -1 && this.anIntArray475.length > arg1) {
local85 = this.anIntArray475[arg1];
if (local85 != 65535) {
local81 = Static72.getAnimFrameset(local85 >> 16);
local81 = SeqTypeList.getAnimFrameset(local85 >> 16);
local85 &= 0xFFFF;
}
}
@ -190,16 +193,16 @@ public final class SeqType {
public final Model method4216(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) Model arg4) {
@Pc(6) int local6 = this.anIntArray474[arg1];
@Pc(11) int local11 = this.frames[arg1];
@Pc(19) AnimFrameset local19 = Static72.getAnimFrameset(local11 >> 16);
@Pc(19) AnimFrameset local19 = SeqTypeList.getAnimFrameset(local11 >> 16);
@Pc(27) int local27 = local11 & 0xFFFF;
if (local19 == null) {
return arg4.method4572(true, true, true);
}
@Pc(40) int local40 = arg3 & 0x3;
@Pc(42) AnimFrameset local42 = null;
if ((this.tween || client.applyTweening) && arg0 != -1 && arg0 < this.frames.length) {
if ((this.tween || applyTweening) && arg0 != -1 && arg0 < this.frames.length) {
@Pc(66) int local66 = this.frames[arg0];
local42 = Static72.getAnimFrameset(local66 >> 16);
local42 = SeqTypeList.getAnimFrameset(local66 >> 16);
arg0 = local66 & 0xFFFF;
}
@Pc(106) Model local106;
@ -265,15 +268,15 @@ public final class SeqType {
public final Model method4219(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(4) Model arg3) {
@Pc(16) int local16 = this.anIntArray474[arg2];
@Pc(21) int local21 = this.frames[arg2];
@Pc(27) AnimFrameset local27 = Static72.getAnimFrameset(local21 >> 16);
@Pc(27) AnimFrameset local27 = SeqTypeList.getAnimFrameset(local21 >> 16);
@Pc(31) int local31 = local21 & 0xFFFF;
if (local27 == null) {
return arg3.method4560(true, true, true);
}
@Pc(42) AnimFrameset local42 = null;
if ((this.tween || client.applyTweening) && arg0 != -1 && this.frames.length > arg0) {
if ((this.tween || applyTweening) && arg0 != -1 && this.frames.length > arg0) {
@Pc(65) int local65 = this.frames[arg0];
local42 = Static72.getAnimFrameset(local65 >> 16);
local42 = SeqTypeList.getAnimFrameset(local65 >> 16);
arg0 = local65 & 0xFFFF;
}
@Pc(103) Model local103;

29
client/src/main/java/rt4/SeqTypeList.java
View file

@ -8,13 +8,13 @@ public class SeqTypeList {
@OriginalMember(owner = "client!lc", name = "e", descriptor = "Lclient!n;")
public static final SoftLruHashTable types = new SoftLruHashTable(64);
@OriginalMember(owner = "client!vl", name = "a", descriptor = "Lclient!n;")
public static final SoftLruHashTable aClass99_37 = new SoftLruHashTable(100);
public static final SoftLruHashTable animFramesets = new SoftLruHashTable(100);
@OriginalMember(owner = "client!tk", name = "s", descriptor = "Lclient!ve;")
public static Js5 archive;
@OriginalMember(owner = "client!af", name = "a", descriptor = "Lclient!ve;")
public static Js5 aClass153_1;
public static Js5 basesArchive;
@OriginalMember(owner = "client!se", name = "l", descriptor = "Lclient!ve;")
public static Js5 aClass153_92;
public static Js5 animsArchive;
@OriginalMember(owner = "client!client", name = "a", descriptor = "(IB)Lclient!tk;")
public static SeqType get(@OriginalArg(0) int id) {
@ -46,25 +46,38 @@ public class SeqTypeList {
@OriginalMember(owner = "client!lb", name = "a", descriptor = "(Lclient!ve;Lclient!ve;ILclient!ve;)V")
public static void init(@OriginalArg(0) Js5 arg0, @OriginalArg(1) Js5 arg1, @OriginalArg(3) Js5 arg2) {
archive = arg1;
aClass153_1 = arg0;
aClass153_92 = arg2;
basesArchive = arg0;
animsArchive = arg2;
}
@OriginalMember(owner = "client!an", name = "a", descriptor = "(Z)V")
public static void method350() {
types.clear();
aClass99_37.clear();
animFramesets.clear();
}
@OriginalMember(owner = "client!sg", name = "a", descriptor = "(B)V")
public static void method3903() {
types.method3103();
aClass99_37.method3103();
animFramesets.method3103();
}
@OriginalMember(owner = "client!fl", name = "a", descriptor = "(IB)V")
public static void clean() {
types.clean(5);
aClass99_37.clean(5);
animFramesets.clean(5);
}
@OriginalMember(owner = "client!fl", name = "b", descriptor = "(II)Lclient!cl;")
public static AnimFrameset getAnimFrameset(@OriginalArg(0) int id) {
@Pc(19) AnimFrameset frameset = (AnimFrameset) animFramesets.get((long) id);
if (frameset != null) {
return frameset;
}
frameset = AnimFrameset.create(animsArchive, basesArchive, id);
if (frameset != null) {
animFramesets.put(frameset, (long) id);
}
return frameset;
}
}

2
client/src/main/java/rt4/ShadowModelList.java
View file

@ -82,7 +82,7 @@ public class ShadowModelList {
local130 = arg8.method4550();
if (arg2 != null) {
@Pc(403) int local403 = arg2.frames[arg10];
local386 = Static72.getAnimFrameset(local403 >> 16);
local386 = SeqTypeList.getAnimFrameset(local403 >> 16);
arg10 = local403 & 0xFFFF;
}
local109 = local367;

2
client/src/main/java/rt4/SignLinkAudioChannel.java
View file

@ -35,7 +35,7 @@ public final class SignLinkAudioChannel extends AudioChannel {
@OriginalMember(owner = "client!hl", name = "a", descriptor = "(Ljava/awt/Component;)V")
@Override
public final void init(@OriginalArg(0) Component component) throws Exception {
audioSource.init(Static44.sampleRate, component, AudioChannel.stereo);
audioSource.init(AudioChannel.sampleRate, component, AudioChannel.stereo);
}
@OriginalMember(owner = "client!hl", name = "b", descriptor = "()V")

2
client/src/main/java/rt4/SoundBank.java
View file

@ -39,7 +39,7 @@ public final class SoundBank {
if (local59 == null) {
return null;
}
local37 = local59.method3989();
local37 = local59.toPcmSound();
this.aClass133_12.put(local37, local30);
if (arg0 != null) {
arg0[0] -= local37.aByteArray47.length;

11
client/src/main/java/rt4/SoundPcmStream.java
View file

@ -79,7 +79,12 @@ public final class SoundPcmStream extends PcmStream {
this.method416();
}
@OriginalMember(owner = "client!b", name = "b", descriptor = "([III)V")
@OriginalMember(owner = "client!b", name = "a", descriptor = "(Lclient!kj;II)Lclient!b;")
public static SoundPcmStream create(@OriginalArg(0) PcmSound arg0, @OriginalArg(2) int arg1) {
return arg0.aByteArray47 == null || arg0.aByteArray47.length == 0 ? null : new SoundPcmStream(arg0, (int) ((long) arg0.anInt3316 * 256L * (long) 100 / (long) (AudioChannel.sampleRate * 100)), arg1 << 6);
}
@OriginalMember(owner = "client!b", name = "b", descriptor = "([III)V")
@Override
public final synchronized void read(@OriginalArg(0) int[] arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
if (this.anInt343 == 0 && this.anInt351 == 0) {
@ -379,7 +384,7 @@ public final class SoundPcmStream extends PcmStream {
}
@OriginalMember(owner = "client!b", name = "e", descriptor = "(I)V")
public final synchronized void method386(@OriginalArg(0) int arg0) {
public final synchronized void setVolume(@OriginalArg(0) int arg0) {
this.method408(arg0 << 6, this.method418());
}
@ -554,7 +559,7 @@ public final class SoundPcmStream extends PcmStream {
}
@OriginalMember(owner = "client!b", name = "f", descriptor = "(I)V")
public final synchronized void method396(@OriginalArg(0) int arg0) {
public final synchronized void setLoops(@OriginalArg(0) int arg0) {
this.anInt350 = arg0;
}

8
client/src/main/java/rt4/SoundPlayer.java
View file

@ -104,10 +104,10 @@ public class SoundPlayer {
local209 = Preferences.ambientSoundsVolume * (local125 - local180) / local125;
}
if (local209 > 0) {
@Pc(223) PcmSound local223 = local79.method3989().method2648(client.resampler);
@Pc(228) SoundPcmStream local228 = Static284.method404(local223, local209);
local228.method396(anIntArray563[local5] - 1);
client.soundStream.method1343(local228);
@Pc(223) PcmSound local223 = local79.toPcmSound().resample(client.resampler);
@Pc(228) SoundPcmStream local228 = SoundPcmStream.create(local223, local209);
local228.setLoops(anIntArray563[local5] - 1);
client.soundStream.addSubStream(local228);
}
anIntArray362[local5] = -100;
}

2
client/src/main/java/rt4/Static1.java
View file

@ -579,7 +579,7 @@ public final class Static1 {
} else {
local225 = Static91.anInt2428 * 25;
}
for (@Pc(238) MapElement local238 = (MapElement) WorldMap.mapElements.start(); local238 != null; local238 = (MapElement) WorldMap.mapElements.next()) {
for (@Pc(238) MapElement local238 = (MapElement) WorldMap.mapElements.head(); local238 != null; local238 = (MapElement) WorldMap.mapElements.next()) {
if (local238.id == Static9.anInt172) {
@Pc(258) int local258 = arg3 + local238.anInt4314 * arg1 / WorldMap.length;
@Pc(267) int local267 = arg2 * local238.anInt4307 / WorldMap.width + arg0;

34
client/src/main/java/rt4/Static104.java
View file

@ -8,8 +8,8 @@ public final class Static104 {
@OriginalMember(owner = "client!ia", name = "a", descriptor = "(BLclient!fe;)V")
public static void method2247(@OriginalArg(1) PathingEntity arg0) {
@Pc(9) BasType local9 = arg0.method2681();
arg0.anInt3366 = local9.idleAnimationId;
@Pc(9) BasType local9 = arg0.getBasType();
arg0.movementSeqId = local9.idleAnimationId;
if (arg0.movementQueueSize == 0) {
arg0.anInt3417 = 0;
return;
@ -73,7 +73,7 @@ public final class Static104 {
if (local227 == -1) {
local227 = local9.walkAnimation;
}
arg0.anInt3366 = local227;
arg0.movementSeqId = local227;
if (arg0 instanceof Npc) {
local233 = ((Npc) arg0).type.aBoolean181;
}
@ -112,24 +112,24 @@ public final class Static104 {
}
if (local273 < 8 || local9.runAnimationId == -1) {
if (local9.anInt1062 != -1 && local235 == 0) {
if (local9.turnAnimation1 == arg0.anInt3366 && local9.anInt1042 != -1) {
arg0.anInt3366 = local9.anInt1042;
} else if (local9.turnAnimation2 == arg0.anInt3366 && local9.anInt1066 != -1) {
arg0.anInt3366 = local9.anInt1066;
} else if (local9.turnAnimation3 == arg0.anInt3366 && local9.anInt1048 != -1) {
arg0.anInt3366 = local9.anInt1048;
if (local9.turnAnimation1 == arg0.movementSeqId && local9.anInt1042 != -1) {
arg0.movementSeqId = local9.anInt1042;
} else if (local9.turnAnimation2 == arg0.movementSeqId && local9.anInt1066 != -1) {
arg0.movementSeqId = local9.anInt1066;
} else if (local9.turnAnimation3 == arg0.movementSeqId && local9.anInt1048 != -1) {
arg0.movementSeqId = local9.anInt1048;
} else {
arg0.anInt3366 = local9.anInt1062;
arg0.movementSeqId = local9.anInt1062;
}
}
} else if (local9.turnAnimation1 == arg0.anInt3366 && local9.runAnimationId2 != -1) {
arg0.anInt3366 = local9.runAnimationId2;
} else if (arg0.anInt3366 == local9.turnAnimation2 && local9.runAnimationId3 != -1) {
arg0.anInt3366 = local9.runAnimationId3;
} else if (arg0.anInt3366 == local9.turnAnimation3 && local9.runAnimationId4 != -1) {
arg0.anInt3366 = local9.runAnimationId4;
} else if (local9.turnAnimation1 == arg0.movementSeqId && local9.runAnimationId2 != -1) {
arg0.movementSeqId = local9.runAnimationId2;
} else if (arg0.movementSeqId == local9.turnAnimation2 && local9.runAnimationId3 != -1) {
arg0.movementSeqId = local9.runAnimationId3;
} else if (arg0.movementSeqId == local9.turnAnimation3 && local9.runAnimationId4 != -1) {
arg0.movementSeqId = local9.runAnimationId4;
} else {
arg0.anInt3366 = local9.runAnimationId;
arg0.movementSeqId = local9.runAnimationId;
}
if (local9.anInt1032 != -1) {
local273 <<= 0x7;

4
client/src/main/java/rt4/Static105.java
View file

@ -104,7 +104,7 @@ public final class Static105 {
@OriginalMember(owner = "client!ib", name = "a", descriptor = "(IIIIIIIILclient!th;IZJ)Z")
public static boolean method2256(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7, @OriginalArg(8) Entity arg8, @OriginalArg(9) int arg9, @OriginalArg(10) boolean arg10, @OriginalArg(11) long arg11) {
@Pc(6) boolean local6 = Static83.activeTileHeightMap == Static80.underWaterTileHeightMap;
@Pc(6) boolean local6 = SceneGraph.activeTileHeightMap == Static80.underWaterTileHeightMap;
@Pc(8) int local8 = 0;
@Pc(17) int local17;
for (@Pc(10) int local10 = arg1; local10 < arg1 + arg3; local10++) {
@ -124,7 +124,7 @@ public final class Static105 {
local58.anInt1699 = arg5;
local58.anInt1703 = arg6;
local58.anInt1706 = arg7;
local58.aClass8_4 = arg8;
local58.primary = arg8;
local58.anInt1714 = arg9;
local58.anInt1701 = arg1;
local58.anInt1696 = arg2;

2
client/src/main/java/rt4/Static11.java
View file

@ -5,7 +5,7 @@ import org.openrs2.deob.annotation.OriginalMember;
public final class Static11 {
@OriginalMember(owner = "client!ba", name = "e", descriptor = "(I)V")
public static void method443() {
public static void clearNpcHeadCache() {
NpcTypeList.headModels.clear();
}

66
client/src/main/java/rt4/Static110.java
View file

@ -2,7 +2,6 @@ package rt4;
import org.openrs2.deob.annotation.OriginalArg;
import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc;
public final class Static110 {
@ -11,71 +10,6 @@ public final class Static110 {
Static182.aClass3_Sub14ArrayArray2[arg0] = arg1;
}
@OriginalMember(owner = "client!ih", name = "a", descriptor = "(IIIII)V")
public static void method2281(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) {
@Pc(6) AreaSound local6;
for (local6 = (AreaSound) Static3.aClass69_135.start(); local6 != null; local6 = (AreaSound) Static3.aClass69_135.next()) {
Static150.method2804(arg1, local6, arg3, arg0, arg2);
}
@Pc(37) byte local37;
@Pc(42) BasType local42;
@Pc(141) int local141;
for (local6 = (AreaSound) Static152.aClass69_87.start(); local6 != null; local6 = (AreaSound) Static152.aClass69_87.next()) {
local37 = 1;
local42 = local6.npc.method2681();
if (local42.idleAnimationId == local6.npc.anInt3366) {
local37 = 0;
} else if (local42.runAnimationId == local6.npc.anInt3366 || local42.runAnimationId2 == local6.npc.anInt3366 || local42.runAnimationId4 == local6.npc.anInt3366 || local42.runAnimationId3 == local6.npc.anInt3366) {
local37 = 2;
} else if (local42.anInt1062 == local6.npc.anInt3366 || local42.anInt1042 == local6.npc.anInt3366 || local6.npc.anInt3366 == local42.anInt1048 || local42.anInt1066 == local6.npc.anInt3366) {
local37 = 3;
}
if (local6.anInt2038 != local37) {
local141 = Static112.getSound(local6.npc);
if (local141 != local6.sound) {
if (local6.primaryStream != null) {
client.soundStream.removeSubStream(local6.primaryStream);
local6.primaryStream = null;
}
local6.sound = local141;
}
local6.anInt2038 = local37;
}
local6.anInt2041 = local6.npc.xFine;
local6.anInt2037 = local6.npc.xFine + local6.npc.getSize() * 64;
local6.anInt2029 = local6.npc.zFine;
local6.anInt2028 = local6.npc.zFine + local6.npc.getSize() * 64;
Static150.method2804(arg1, local6, arg3, arg0, arg2);
}
for (local6 = (AreaSound) AreaSoundManager.aClass133_7.head(); local6 != null; local6 = (AreaSound) AreaSoundManager.aClass133_7.next()) {
local37 = 1;
local42 = local6.player.method2681();
if (local6.player.anInt3366 == local42.idleAnimationId) {
local37 = 0;
} else if (local6.player.anInt3366 == local42.runAnimationId || local6.player.anInt3366 == local42.runAnimationId2 || local6.player.anInt3366 == local42.runAnimationId4 || local42.runAnimationId3 == local6.player.anInt3366) {
local37 = 2;
} else if (local42.anInt1062 == local6.player.anInt3366 || local6.player.anInt3366 == local42.anInt1042 || local6.player.anInt3366 == local42.anInt1048 || local6.player.anInt3366 == local42.anInt1066) {
local37 = 3;
}
if (local6.anInt2038 != local37) {
local141 = Static140.getSound(local6.player);
if (local6.sound != local141) {
if (local6.primaryStream != null) {
client.soundStream.removeSubStream(local6.primaryStream);
local6.primaryStream = null;
}
local6.sound = local141;
}
local6.anInt2038 = local37;
}
local6.anInt2041 = local6.player.xFine;
local6.anInt2037 = local6.player.xFine + local6.player.getSize() * 64;
local6.anInt2029 = local6.player.zFine;
local6.anInt2028 = local6.player.zFine + local6.player.getSize() * 64;
Static150.method2804(arg1, local6, arg3, arg0, arg2);
}
}
@OriginalMember(owner = "client!ih", name = "a", descriptor = "(ZII)Lclient!na;")
public static JagString method2285(@OriginalArg(2) int arg0) {
return Static198.method1025(true, arg0);

21
client/src/main/java/rt4/Static112.java
View file

@ -1,6 +1,5 @@
package rt4;
import org.openrs2.deob.annotation.OriginalArg;
import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc;
@ -114,24 +113,4 @@ public final class Static112 {
Static121.method2407(Static183.anInt4271, Static229.anInt5138, Static13.anInt436, Static24.anInt761);
}
@OriginalMember(owner = "client!ij", name = "a", descriptor = "(Lclient!km;I)I")
public static int getSound(@OriginalArg(0) Npc arg0) {
@Pc(13) NpcType local13 = arg0.type;
if (local13.multiNpcs != null) {
local13 = local13.getMultiNpc();
if (local13 == null) {
return -1;
}
}
@Pc(29) int local29 = local13.walkSound;
@Pc(33) BasType local33 = arg0.method2681();
if (local33.idleAnimationId == arg0.anInt3366) {
local29 = local13.idleSound;
} else if (arg0.anInt3366 == local33.runAnimationId || local33.runAnimationId2 == arg0.anInt3366 || arg0.anInt3366 == local33.runAnimationId4 || arg0.anInt3366 == local33.runAnimationId3) {
local29 = local13.runSound;
} else if (local33.anInt1062 == arg0.anInt3366 || arg0.anInt3366 == local33.anInt1042 || arg0.anInt3366 == local33.anInt1048 || arg0.anInt3366 == local33.anInt1066) {
local29 = local13.crawlSound;
}
return local29;
}
}

16
client/src/main/java/rt4/Static119.java
View file

@ -1,7 +1,6 @@
package rt4;
import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc;
public final class Static119 {
@ -28,19 +27,4 @@ public final class Static119 {
return -1;
}
@OriginalMember(owner = "client!je", name = "k", descriptor = "(I)V")
public static void method2386() {
@Pc(6) AreaSound local6;
for (local6 = (AreaSound) Static3.aClass69_135.start(); local6 != null; local6 = (AreaSound) Static3.aClass69_135.next()) {
if (local6.multiLocOrNpc) {
local6.update();
}
}
for (local6 = (AreaSound) Static152.aClass69_87.start(); local6 != null; local6 = (AreaSound) Static152.aClass69_87.next()) {
if (local6.multiLocOrNpc) {
local6.update();
}
}
}
}

2
client/src/main/java/rt4/Static127.java
View file

@ -126,7 +126,7 @@ public final class Static127 {
}
}
}
for (@Pc(451) SceneryStack local451 = (SceneryStack) Static26.sceneryList.start(); local451 != null; local451 = (SceneryStack) Static26.sceneryList.next()) {
for (@Pc(451) SceneryStack local451 = (SceneryStack) Static26.sceneryList.head(); local451 != null; local451 = (SceneryStack) Static26.sceneryList.next()) {
local451.z -= local81;
local451.x -= local86;
if (local451.x < 0 || local451.z < 0 || local451.x >= 104 || local451.z >= 104) {

5
client/src/main/java/rt4/Static128.java
View file

@ -7,10 +7,7 @@ public final class Static128 {
@OriginalMember(owner = "client!ka", name = "r", descriptor = "[I")
public static int[] anIntArray293;
@OriginalMember(owner = "client!ka", name = "q", descriptor = "Lclient!ih;")
public static final LinkedList aClass69_77 = new LinkedList();
@OriginalMember(owner = "client!ka", name = "t", descriptor = "[I")
@OriginalMember(owner = "client!ka", name = "t", descriptor = "[I")
public static final int[] anIntArray294 = new int[] { 0, 0, 2, 0, 0, 2, 1, 1, 0 };
}

8
client/src/main/java/rt4/Static132.java
View file

@ -77,10 +77,10 @@ public final class Static132 {
@Pc(21) int local21 = local20 = local7 + 128;
@Pc(26) int local26;
@Pc(27) int local27 = local26 = local15 + 128;
@Pc(37) int local37 = Static83.activeTileHeightMap[arg1][arg6][arg7] - Static123.anInt3947;
@Pc(49) int local49 = Static83.activeTileHeightMap[arg1][arg6 + 1][arg7] - Static123.anInt3947;
@Pc(63) int local63 = Static83.activeTileHeightMap[arg1][arg6 + 1][arg7 + 1] - Static123.anInt3947;
@Pc(75) int local75 = Static83.activeTileHeightMap[arg1][arg6][arg7 + 1] - Static123.anInt3947;
@Pc(37) int local37 = SceneGraph.activeTileHeightMap[arg1][arg6][arg7] - Static123.anInt3947;
@Pc(49) int local49 = SceneGraph.activeTileHeightMap[arg1][arg6 + 1][arg7] - Static123.anInt3947;
@Pc(63) int local63 = SceneGraph.activeTileHeightMap[arg1][arg6 + 1][arg7 + 1] - Static123.anInt3947;
@Pc(75) int local75 = SceneGraph.activeTileHeightMap[arg1][arg6][arg7 + 1] - Static123.anInt3947;
@Pc(85) int local85 = local15 * arg4 + local7 * arg5 >> 16;
@Pc(95) int local95 = local15 * arg5 - local7 * arg4 >> 16;
@Pc(97) int local97 = local85;

20
client/src/main/java/rt4/Static133.java
View file

@ -12,28 +12,10 @@ public final class Static133 {
@OriginalMember(owner = "client!kf", name = "d", descriptor = "[Lclient!cl;")
public static final AnimFrameset[] aClass3_Sub2_Sub7Array7 = new AnimFrameset[14];
@OriginalMember(owner = "client!kf", name = "h", descriptor = "[I")
public static final int[] anIntArray453 = new int[] { 0, 0, 0, 0, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3 };
@OriginalMember(owner = "client!kf", name = "l", descriptor = "I")
public static int anInt5235 = 0;
@OriginalMember(owner = "client!kf", name = "b", descriptor = "(III)Lclient!ec;")
public static Scenery method4008(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
@Pc(7) Tile local7 = SceneGraph.tiles[arg0][arg1][arg2];
if (local7 == null) {
return null;
}
for (@Pc(13) int local13 = 0; local13 < local7.anInt662; local13++) {
@Pc(22) Scenery local22 = local7.aClass31Array1[local13];
if ((local22.aLong56 >> 29 & 0x3L) == 2L && local22.anInt1701 == arg1 && local22.anInt1696 == arg2) {
return local22;
}
}
return null;
}
@OriginalMember(owner = "client!kf", name = "a", descriptor = "(IIBII)V")
@OriginalMember(owner = "client!kf", name = "a", descriptor = "(IIBII)V")
public static void method4012(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3) {
for (@Pc(12) int local12 = 0; local12 < InterfaceList.anInt766; local12++) {
if (Static224.anIntArray443[local12] + Static264.anIntArray410[local12] > arg0 && arg1 + arg0 > Static264.anIntArray410[local12] && arg2 < Static67.anIntArray320[local12] + Static50.anIntArray133[local12] && Static50.anIntArray133[local12] < arg2 + arg3) {

16
client/src/main/java/rt4/Static140.java
View file

@ -1,26 +1,10 @@
package rt4;
import org.openrs2.deob.annotation.OriginalArg;
import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc;
public final class Static140 {
@OriginalMember(owner = "client!la", name = "i", descriptor = "[[[I")
public static int[][][] anIntArrayArrayArray12;
@OriginalMember(owner = "client!la", name = "a", descriptor = "(ILclient!e;)I")
public static int getSound(@OriginalArg(1) Player arg0) {
@Pc(14) int local14 = arg0.anInt1654;
@Pc(18) BasType local18 = arg0.method2681();
if (local18.idleAnimationId == arg0.anInt3366) {
local14 = arg0.anInt1648;
} else if (local18.runAnimationId == arg0.anInt3366 || arg0.anInt3366 == local18.runAnimationId2 || arg0.anInt3366 == local18.runAnimationId4 || local18.runAnimationId3 == arg0.anInt3366) {
local14 = arg0.anInt1670;
} else if (arg0.anInt3366 == local18.anInt1062 || arg0.anInt3366 == local18.anInt1042 || arg0.anInt3366 == local18.anInt1048 || arg0.anInt3366 == local18.anInt1066) {
local14 = arg0.anInt1658;
}
return local14;
}
}

63
client/src/main/java/rt4/Static150.java
View file

@ -72,67 +72,4 @@ public final class Static150 {
}
}
@OriginalMember(owner = "client!lk", name = "a", descriptor = "(ILclient!fl;IIII)V")
public static void method2804(@OriginalArg(0) int arg0, @OriginalArg(1) AreaSound arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4) {
if (arg1.sound == -1 && arg1.sounds == null) {
return;
}
@Pc(20) int local20 = 0;
if (arg1.anInt2037 < arg0) {
local20 = arg0 - arg1.anInt2037;
} else if (arg1.anInt2041 > arg0) {
local20 = arg1.anInt2041 - arg0;
}
if (arg1.anInt2028 < arg4) {
local20 += arg4 - arg1.anInt2028;
} else if (arg4 < arg1.anInt2029) {
local20 += arg1.anInt2029 - arg4;
}
if (arg1.radius == 0 || arg1.radius < local20 - 64 || Preferences.ambientSoundsVolume == 0 || arg2 != arg1.anInt2033) {
if (arg1.primaryStream != null) {
client.soundStream.removeSubStream(arg1.primaryStream);
arg1.primaryStream = null;
}
if (arg1.secondaryStream != null) {
client.soundStream.removeSubStream(arg1.secondaryStream);
arg1.secondaryStream = null;
}
return;
}
local20 -= 64;
if (local20 < 0) {
local20 = 0;
}
@Pc(134) int local134 = (arg1.radius - local20) * Preferences.ambientSoundsVolume / arg1.radius;
if (arg1.primaryStream != null) {
arg1.primaryStream.method386(local134);
} else if (arg1.sound >= 0) {
@Pc(150) SynthSound local150 = SynthSound.create(client.js5Archive4, arg1.sound, 0);
if (local150 != null) {
@Pc(158) PcmSound local158 = local150.method3989().method2648(client.resampler);
@Pc(163) SoundPcmStream local163 = Static284.method404(local158, local134);
local163.method396(-1);
client.soundStream.method1343(local163);
arg1.primaryStream = local163;
}
}
if (arg1.secondaryStream != null) {
arg1.secondaryStream.method386(local134);
if (!arg1.secondaryStream.method4654()) {
arg1.secondaryStream = null;
}
} else if (arg1.sounds != null && (arg1.anInt2034 -= arg3) <= 0) {
@Pc(219) int local219 = (int) ((double) arg1.sounds.length * Math.random());
@Pc(227) SynthSound local227 = SynthSound.create(client.js5Archive4, arg1.sounds[local219], 0);
if (local227 != null) {
@Pc(236) PcmSound local236 = local227.method3989().method2648(client.resampler);
@Pc(241) SoundPcmStream local241 = Static284.method404(local236, local134);
local241.method396(0);
client.soundStream.method1343(local241);
arg1.anInt2034 = (int) ((double) (arg1.anInt2040 - arg1.anInt2032) * Math.random()) + arg1.anInt2032;
arg1.secondaryStream = local241;
}
}
}
}

3
client/src/main/java/rt4/Static152.java
View file

@ -8,9 +8,6 @@ public final class Static152 {
@OriginalMember(owner = "client!ma", name = "i", descriptor = "I")
public static int mapSizeX;
@OriginalMember(owner = "client!ma", name = "x", descriptor = "Lclient!ih;")
public static final LinkedList aClass69_87 = new LinkedList();
@OriginalMember(owner = "client!ma", name = "z", descriptor = "I")
public static int anInt3604 = -1;

16
client/src/main/java/rt4/Static16.java
View file

@ -30,8 +30,8 @@ public final class Static16 {
@Pc(54) Tile local54 = local30[local32][local42];
if (local54 != null) {
@Pc(71) GlModel local71;
if (local54.aClass15_1 != null && local54.aClass15_1.aClass8_1 instanceof GlModel) {
local71 = (GlModel) local54.aClass15_1.aClass8_1;
if (local54.aClass15_1 != null && local54.aClass15_1.primary instanceof GlModel) {
local71 = (GlModel) local54.aClass15_1.primary;
if ((local54.aClass15_1.aLong26 & Long.MIN_VALUE) == 0L) {
local71.method4111(false, true, true, false, true, true);
} else {
@ -39,8 +39,8 @@ public final class Static16 {
}
}
if (local54.aClass24_1 != null) {
if (local54.aClass24_1.aClass8_3 instanceof GlModel) {
local71 = (GlModel) local54.aClass24_1.aClass8_3;
if (local54.aClass24_1.primary instanceof GlModel) {
local71 = (GlModel) local54.aClass24_1.primary;
if ((local54.aClass24_1.key & Long.MIN_VALUE) == 0L) {
local71.method4111(false, true, true, false, true, true);
} else {
@ -57,8 +57,8 @@ public final class Static16 {
}
}
if (local54.aClass77_1 != null) {
if (local54.aClass77_1.aClass8_5 instanceof GlModel) {
local71 = (GlModel) local54.aClass77_1.aClass8_5;
if (local54.aClass77_1.primary instanceof GlModel) {
local71 = (GlModel) local54.aClass77_1.primary;
if ((local54.aClass77_1.key & Long.MIN_VALUE) == 0L) {
local71.method4111(false, true, true, false, true, true);
} else {
@ -75,8 +75,8 @@ public final class Static16 {
}
}
for (@Pc(270) int local270 = 0; local270 < local54.anInt662; local270++) {
if (local54.aClass31Array1[local270].aClass8_4 instanceof GlModel) {
@Pc(293) GlModel local293 = (GlModel) local54.aClass31Array1[local270].aClass8_4;
if (local54.aClass31Array1[local270].primary instanceof GlModel) {
@Pc(293) GlModel local293 = (GlModel) local54.aClass31Array1[local270].primary;
if ((Long.MIN_VALUE & local54.aClass31Array1[local270].aLong56) == 0L) {
local293.method4111(false, true, true, false, true, true);
} else {

24
client/src/main/java/rt4/Static168.java
View file

@ -1,24 +0,0 @@
package rt4;
import org.openrs2.deob.annotation.OriginalMember;
public final class Static168 {
@OriginalMember(owner = "client!ne", name = "h", descriptor = "[B")
public static final byte[] tempFlags = new byte[500];
@OriginalMember(owner = "client!ne", name = "i", descriptor = "[S")
public static final short[] tempZ = new short[500];
@OriginalMember(owner = "client!ne", name = "j", descriptor = "[S")
public static final short[] tempY = new short[500];
@OriginalMember(owner = "client!ne", name = "k", descriptor = "[S")
public static final short[] tempPrevOriginIndices = new short[500];
@OriginalMember(owner = "client!ne", name = "m", descriptor = "[S")
public static final short[] tempX = new short[500];
@OriginalMember(owner = "client!ne", name = "p", descriptor = "[S")
public static final short[] tempIndices = new short[500];
}

18
client/src/main/java/rt4/Static170.java
View file

@ -24,7 +24,7 @@ public final class Static170 {
return;
}
@Pc(6) GroundDecor local6 = new GroundDecor();
local6.aClass8_1 = arg4;
local6.primary = arg4;
local6.anInt732 = arg1 * 128 + 64;
local6.anInt736 = arg2 * 128 + 64;
local6.anInt733 = arg3;
@ -38,20 +38,20 @@ public final class Static170 {
@OriginalMember(owner = "client!nh", name = "a", descriptor = "(IIIIIIIIIIIII)V")
public static void method2574(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7, @OriginalArg(8) int arg8, @OriginalArg(9) int arg9, @OriginalArg(11) int arg10, @OriginalArg(12) int arg11) {
@Pc(7) AttachLocRequest_Class3_Sub8 local7 = new AttachLocRequest_Class3_Sub8();
local7.anInt1206 = arg6;
@Pc(7) AttachLocRequest local7 = new AttachLocRequest();
local7.angle = arg6;
local7.anInt1205 = arg3;
local7.anInt1187 = arg1;
local7.anInt1200 = arg5;
local7.anInt1192 = arg2;
local7.anInt1190 = arg8;
local7.entityId = arg2;
local7.x = arg8;
local7.anInt1197 = arg10;
local7.anInt1204 = arg4;
local7.anInt1189 = arg11;
local7.z = arg4;
local7.locId = arg11;
local7.anInt1188 = arg7;
local7.anInt1191 = arg0;
local7.anInt1198 = arg9;
Static128.aClass69_77.addTail(local7);
local7.shape = arg9;
AttachLocRequest.queue.addTail(local7);
}
}

2
client/src/main/java/rt4/Static183.java
View file

@ -29,7 +29,7 @@ public final class Static183 {
@OriginalMember(owner = "client!ok", name = "a", descriptor = "(IIB)Lclient!ce;")
public static SecondaryLinkedList method3333(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
@Pc(9) SecondaryLinkedList local9 = new SecondaryLinkedList();
for (@Pc(14) Map local14 = (Map) MapList.aClass69_120.start(); local14 != null; local14 = (Map) MapList.aClass69_120.next()) {
for (@Pc(14) Map local14 = (Map) MapList.aClass69_120.head(); local14 != null; local14 = (Map) MapList.aClass69_120.next()) {
if (local14.aBoolean50 && local14.method664(arg1, arg0)) {
local9.addTail(local14);
}

6
client/src/main/java/rt4/Static185.java
View file

@ -56,14 +56,14 @@ public final class Static185 {
local129 = (local81 >> 1) + arg8;
local133 = arg8 + (local81 + 1 >> 1);
}
@Pc(153) int[][] local153 = Static83.activeTileHeightMap[arg0];
@Pc(153) int[][] local153 = SceneGraph.activeTileHeightMap[arg0];
@Pc(165) int local165 = (local84 << 6) + (arg7 << 7);
@Pc(173) int local173 = (local81 << 6) + (arg8 << 7);
@Pc(199) int local199 = local153[local103][local133] + local153[local112][local129] + local153[local103][local129] + local153[local112][local133] >> 2;
@Pc(201) int local201 = 0;
@Pc(213) int[][] local213;
if (GlRenderer.enabled && arg0 != 0) {
local213 = Static83.activeTileHeightMap[0];
local213 = SceneGraph.activeTileHeightMap[0];
local201 = local199 - (local213[local112][local133] + local213[local112][local129] + local213[local103][local129] + local213[local103][local133] >> 2);
}
local213 = null;
@ -71,7 +71,7 @@ public final class Static185 {
if (arg3) {
local213 = Static107.surfaceTileHeightMap[0];
} else if (arg0 < 3) {
local213 = Static83.activeTileHeightMap[arg0 + 1];
local213 = SceneGraph.activeTileHeightMap[arg0 + 1];
}
if (local62.anInt4429 == 0 || arg3) {
local261 |= Long.MIN_VALUE;

2
client/src/main/java/rt4/Static195.java
View file

@ -16,7 +16,7 @@ public final class Static195 {
@OriginalMember(owner = "client!pk", name = "i", descriptor = "(I)V")
public static void method3532() {
for (@Pc(16) ProjAnimNode local16 = (ProjAnimNode) Static217.aClass69_116.start(); local16 != null; local16 = (ProjAnimNode) Static217.aClass69_116.next()) {
for (@Pc(16) ProjAnimNode local16 = (ProjAnimNode) Static217.aClass69_116.head(); local16 != null; local16 = (ProjAnimNode) Static217.aClass69_116.next()) {
@Pc(21) ProjAnim local21 = local16.aClass8_Sub6_1;
if (Player.level != local21.anInt4810 || local21.anInt4800 < client.loop) {
local16.unlink();

2
client/src/main/java/rt4/Static2.java
View file

@ -276,7 +276,7 @@ public final class Static2 {
arg0.modelId = ((int) PlayerList.self.username.encode37() << 11) + 2047;
arg0.anInt496 = PlayerList.self.anInt3388;
arg0.anInt500 = 0;
arg0.modelSeqId = PlayerList.self.anInt3366;
arg0.modelSeqId = PlayerList.self.movementSeqId;
arg0.anInt510 = PlayerList.self.anInt3407;
}
}

18
client/src/main/java/rt4/Static209.java
View file

@ -6,24 +6,6 @@ import org.openrs2.deob.annotation.Pc;
public final class Static209 {
@OriginalMember(owner = "client!ra", name = "a", descriptor = "(ILclient!pb;BII)V")
public static void method3701(@OriginalArg(0) int arg0, @OriginalArg(1) LocType arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3) {
for (@Pc(10) AreaSound local10 = (AreaSound) Static3.aClass69_135.start(); local10 != null; local10 = (AreaSound) Static3.aClass69_135.next()) {
if (arg3 == local10.anInt2033 && local10.anInt2041 == arg0 * 128 && local10.anInt2029 == arg2 * 128 && arg1.id == local10.locType.id) {
if (local10.primaryStream != null) {
client.soundStream.removeSubStream(local10.primaryStream);
local10.primaryStream = null;
}
if (local10.secondaryStream != null) {
client.soundStream.removeSubStream(local10.secondaryStream);
local10.secondaryStream = null;
}
local10.unlink();
return;
}
}
}
@OriginalMember(owner = "client!ra", name = "a", descriptor = "(BI)Z")
public static boolean method3702(@OriginalArg(1) int arg0) {
return arg0 == (-arg0 & arg0);

2
client/src/main/java/rt4/Static211.java
View file

@ -31,7 +31,7 @@ public final class Static211 {
}
@OriginalMember(owner = "client!rc", name = "a", descriptor = "(Z)V")
public static void method924() {
public static void clearObjectModelCache() {
ObjTypeList.models.clear();
}

2
client/src/main/java/rt4/Static214.java
View file

@ -14,7 +14,7 @@ public final class Static214 {
@OriginalMember(owner = "client!rg", name = "a", descriptor = "(Lclient!e;I)V")
public static void method4359(@OriginalArg(0) Player arg0) {
@Pc(12) AreaSound local12 = (AreaSound) AreaSoundManager.aClass133_7.get(arg0.username.encode37());
@Pc(12) AreaSound local12 = (AreaSound) AreaSoundManager.playerSounds.get(arg0.username.encode37());
if (local12 == null) {
AreaSoundManager.add(arg0.movementQueueZ[0], null, 0, null, arg0.movementQueueX[0], Player.level, arg0);
} else {

2
client/src/main/java/rt4/Static219.java
View file

@ -37,7 +37,7 @@ public final class Static219 {
@OriginalMember(owner = "client!rl", name = "i", descriptor = "(I)V")
public static void method3796() {
for (@Pc(10) SceneryStack local10 = (SceneryStack) Static26.sceneryList.start(); local10 != null; local10 = (SceneryStack) Static26.sceneryList.next()) {
for (@Pc(10) SceneryStack local10 = (SceneryStack) Static26.sceneryList.head(); local10 != null; local10 = (SceneryStack) Static26.sceneryList.next()) {
if (local10.anInt924 == -1) {
local10.anInt925 = 0;
Static226.method3898(local10);

24
client/src/main/java/rt4/Static220.java
View file

@ -22,7 +22,7 @@ public final class Static220 {
@Pc(28) int local28 = -99999999;
@Pc(30) ObjStackNode local30 = null;
@Pc(35) ObjStackNode local35;
for (local35 = (ObjStackNode) local9.start(); local35 != null; local35 = (ObjStackNode) local9.next()) {
for (local35 = (ObjStackNode) local9.head(); local35 != null; local35 = (ObjStackNode) local9.next()) {
@Pc(44) ObjType local44 = ObjTypeList.get(local35.aClass8_Sub7_1.anInt5555);
@Pc(47) int local47 = local44.cost;
if (local44.stackable == 1) {
@ -40,7 +40,7 @@ public final class Static220 {
local9.addHead(local30);
@Pc(89) ObjStack local89 = null;
@Pc(91) ObjStack local91 = null;
for (local35 = (ObjStackNode) local9.start(); local35 != null; local35 = (ObjStackNode) local9.next()) {
for (local35 = (ObjStackNode) local9.head(); local35 != null; local35 = (ObjStackNode) local9.next()) {
@Pc(103) ObjStack local103 = local35.aClass8_Sub7_1;
if (local103.anInt5555 != local30.aClass8_Sub7_1.anInt5555) {
if (local89 == null) {
@ -63,26 +63,26 @@ public final class Static220 {
@Pc(22) Tile local22 = SceneGraph.tiles[local1][local6][local11];
if (local22 != null) {
@Pc(27) Wall local27 = local22.aClass77_1;
if (local27 != null && local27.aClass8_5.method4543()) {
Static69.method1544(local27.aClass8_5, local1, local6, local11, 1, 1);
if (local27 != null && local27.primary.method4543()) {
Static69.method1544(local27.primary, local1, local6, local11, 1, 1);
if (local27.aClass8_6 != null && local27.aClass8_6.method4543()) {
Static69.method1544(local27.aClass8_6, local1, local6, local11, 1, 1);
local27.aClass8_5.method4544(local27.aClass8_6, 0, 0, 0, false);
local27.primary.method4544(local27.aClass8_6, 0, 0, 0, false);
local27.aClass8_6 = local27.aClass8_6.method4539();
}
local27.aClass8_5 = local27.aClass8_5.method4539();
local27.primary = local27.primary.method4539();
}
for (@Pc(83) int local83 = 0; local83 < local22.anInt662; local83++) {
@Pc(92) Scenery local92 = local22.aClass31Array1[local83];
if (local92 != null && local92.aClass8_4.method4543()) {
Static69.method1544(local92.aClass8_4, local1, local6, local11, local92.anInt1713 + 1 - local92.anInt1701, local92.anInt1698 - local92.anInt1696 + 1);
local92.aClass8_4 = local92.aClass8_4.method4539();
if (local92 != null && local92.primary.method4543()) {
Static69.method1544(local92.primary, local1, local6, local11, local92.anInt1713 + 1 - local92.anInt1701, local92.anInt1698 - local92.anInt1696 + 1);
local92.primary = local92.primary.method4539();
}
}
@Pc(131) GroundDecor local131 = local22.aClass15_1;
if (local131 != null && local131.aClass8_1.method4543()) {
Static264.method3574(local131.aClass8_1, local1, local6, local11);
local131.aClass8_1 = local131.aClass8_1.method4539();
if (local131 != null && local131.primary.method4543()) {
Static264.method3574(local131.primary, local1, local6, local11);
local131.primary = local131.primary.method4539();
}
}
}

4
client/src/main/java/rt4/Static221.java
View file

@ -134,7 +134,7 @@ public final class Static221 {
local135 = true;
}
}
@Pc(275) Scenery local275 = Static133.method4008(arg4, local114, local72);
@Pc(275) Scenery local275 = SceneGraph.getScenery(arg4, local114, local72);
if (local275 != null) {
@Pc(287) int local287 = (int) (local275.aLong56 >> 14) & 0x3F;
if (local287 == 9) {
@ -254,7 +254,7 @@ public final class Static221 {
local791 = true;
}
}
@Pc(899) Scenery local899 = Static133.method4008(arg4, local114, local72);
@Pc(899) Scenery local899 = SceneGraph.getScenery(arg4, local114, local72);
if (local899 != null) {
@Pc(911) int local911 = (int) (local899.aLong56 >> 14) & 0x3F;
if (local911 == 9) {

30
client/src/main/java/rt4/Static23.java
View file

@ -26,21 +26,21 @@ public final class Static23 {
for (local3 = arg1; local3 < arg3 + arg1; local3++) {
for (local10 = arg2; local10 < arg2 + arg4; local10++) {
if (local10 >= 0 && local10 < 104 && local3 >= 0 && local3 < 104) {
Static83.activeTileHeightMap[arg0][local10][local3] = arg0 <= 0 ? 0 : Static83.activeTileHeightMap[arg0 - 1][local10][local3];
SceneGraph.activeTileHeightMap[arg0][local10][local3] = arg0 <= 0 ? 0 : SceneGraph.activeTileHeightMap[arg0 - 1][local10][local3];
}
}
}
if (arg2 > 0 && arg2 < 104) {
for (local3 = arg1 + 1; local3 < arg1 + arg3; local3++) {
if (local3 >= 0 && local3 < 104) {
Static83.activeTileHeightMap[arg0][arg2][local3] = Static83.activeTileHeightMap[arg0][arg2 - 1][local3];
SceneGraph.activeTileHeightMap[arg0][arg2][local3] = SceneGraph.activeTileHeightMap[arg0][arg2 - 1][local3];
}
}
}
if (arg1 > 0 && arg1 < 104) {
for (local3 = arg2 + 1; local3 < arg2 + arg4; local3++) {
if (local3 >= 0 && local3 < 104) {
Static83.activeTileHeightMap[arg0][local3][arg1] = Static83.activeTileHeightMap[arg0][local3][arg1 - 1];
SceneGraph.activeTileHeightMap[arg0][local3][arg1] = SceneGraph.activeTileHeightMap[arg0][local3][arg1 - 1];
}
}
}
@ -48,19 +48,19 @@ public final class Static23 {
return;
}
if (arg0 == 0) {
if (arg2 > 0 && Static83.activeTileHeightMap[arg0][arg2 - 1][arg1] != 0) {
Static83.activeTileHeightMap[arg0][arg2][arg1] = Static83.activeTileHeightMap[arg0][arg2 - 1][arg1];
} else if (arg1 > 0 && Static83.activeTileHeightMap[arg0][arg2][arg1 - 1] != 0) {
Static83.activeTileHeightMap[arg0][arg2][arg1] = Static83.activeTileHeightMap[arg0][arg2][arg1 - 1];
} else if (arg2 > 0 && arg1 > 0 && Static83.activeTileHeightMap[arg0][arg2 - 1][arg1 - 1] != 0) {
Static83.activeTileHeightMap[arg0][arg2][arg1] = Static83.activeTileHeightMap[arg0][arg2 - 1][arg1 - 1];
if (arg2 > 0 && SceneGraph.activeTileHeightMap[arg0][arg2 - 1][arg1] != 0) {
SceneGraph.activeTileHeightMap[arg0][arg2][arg1] = SceneGraph.activeTileHeightMap[arg0][arg2 - 1][arg1];
} else if (arg1 > 0 && SceneGraph.activeTileHeightMap[arg0][arg2][arg1 - 1] != 0) {
SceneGraph.activeTileHeightMap[arg0][arg2][arg1] = SceneGraph.activeTileHeightMap[arg0][arg2][arg1 - 1];
} else if (arg2 > 0 && arg1 > 0 && SceneGraph.activeTileHeightMap[arg0][arg2 - 1][arg1 - 1] != 0) {
SceneGraph.activeTileHeightMap[arg0][arg2][arg1] = SceneGraph.activeTileHeightMap[arg0][arg2 - 1][arg1 - 1];
}
} else if (arg2 > 0 && Static83.activeTileHeightMap[arg0 - 1][arg2 - 1][arg1] != Static83.activeTileHeightMap[arg0][arg2 - 1][arg1]) {
Static83.activeTileHeightMap[arg0][arg2][arg1] = Static83.activeTileHeightMap[arg0][arg2 - 1][arg1];
} else if (arg1 > 0 && Static83.activeTileHeightMap[arg0][arg2][arg1 - 1] != Static83.activeTileHeightMap[arg0 - 1][arg2][arg1 - 1]) {
Static83.activeTileHeightMap[arg0][arg2][arg1] = Static83.activeTileHeightMap[arg0][arg2][arg1 - 1];
} else if (arg2 > 0 && arg1 > 0 && Static83.activeTileHeightMap[arg0][arg2 - 1][arg1 - 1] != Static83.activeTileHeightMap[arg0 - 1][arg2 - 1][arg1 - 1]) {
Static83.activeTileHeightMap[arg0][arg2][arg1] = Static83.activeTileHeightMap[arg0][arg2 - 1][arg1 - 1];
} else if (arg2 > 0 && SceneGraph.activeTileHeightMap[arg0 - 1][arg2 - 1][arg1] != SceneGraph.activeTileHeightMap[arg0][arg2 - 1][arg1]) {
SceneGraph.activeTileHeightMap[arg0][arg2][arg1] = SceneGraph.activeTileHeightMap[arg0][arg2 - 1][arg1];
} else if (arg1 > 0 && SceneGraph.activeTileHeightMap[arg0][arg2][arg1 - 1] != SceneGraph.activeTileHeightMap[arg0 - 1][arg2][arg1 - 1]) {
SceneGraph.activeTileHeightMap[arg0][arg2][arg1] = SceneGraph.activeTileHeightMap[arg0][arg2][arg1 - 1];
} else if (arg2 > 0 && arg1 > 0 && SceneGraph.activeTileHeightMap[arg0][arg2 - 1][arg1 - 1] != SceneGraph.activeTileHeightMap[arg0 - 1][arg2 - 1][arg1 - 1]) {
SceneGraph.activeTileHeightMap[arg0][arg2][arg1] = SceneGraph.activeTileHeightMap[arg0][arg2 - 1][arg1 - 1];
}
}

2
client/src/main/java/rt4/Static232.java
View file

@ -68,7 +68,7 @@ public final class Static232 {
}
}
}
for (@Pc(285) MapElement local285 = (MapElement) Static172.aClass69_97.start(); local285 != null; local285 = (MapElement) Static172.aClass69_97.next()) {
for (@Pc(285) MapElement local285 = (MapElement) Static172.aClass69_97.head(); local285 != null; local285 = (MapElement) Static172.aClass69_97.next()) {
SoftwareRaster.method2502(local285.anInt4307, local285.anInt4314, 15, local11);
SoftwareRaster.method2502(local285.anInt4307, local285.anInt4314, 13, local11);
SoftwareRaster.method2502(local285.anInt4307, local285.anInt4314, 11, local11);

2
client/src/main/java/rt4/Static245.java
View file

@ -160,7 +160,7 @@ public final class Static245 {
local255 = local517.anInt2245 >> 7;
if (local417 >= 0 && local255 >= 0 && local417 < 104 && local255 < 104) {
local517.aBoolean125 = (Static12.tileSettings[1][local417][local255] & 0x2) != 0;
local517.anInt2235 = Static83.activeTileHeightMap[local517.anInt2241][local417][local255] - local517.anInt2235;
local517.anInt2235 = SceneGraph.activeTileHeightMap[local517.anInt2241][local417][local255] - local517.anInt2235;
Static120.method2389(local517);
}
}

2
client/src/main/java/rt4/Static246.java
View file

@ -14,7 +14,7 @@ public final class Static246 {
@OriginalMember(owner = "client!u", name = "a", descriptor = "(Z)V")
public static void method4239() {
for (@Pc(9) SpotAnimNode local9 = (SpotAnimNode) Static99.aClass69_64.start(); local9 != null; local9 = (SpotAnimNode) Static99.aClass69_64.next()) {
for (@Pc(9) SpotAnimNode local9 = (SpotAnimNode) Static99.aClass69_64.head(); local9 != null; local9 = (SpotAnimNode) Static99.aClass69_64.next()) {
@Pc(15) SpotAnim local15 = local9.aClass8_Sub2_1;
if (local15.anInt606 != Player.level || local15.aBoolean41) {
local9.unlink();

32
client/src/main/java/rt4/Static247.java
View file

@ -73,7 +73,7 @@ public final class Static247 {
local31 = SceneGraph.tiles[local24];
@Pc(33) float local33 = 0.0F;
if (GlRenderer.enabled) {
if (Static80.underWaterTileHeightMap == Static83.activeTileHeightMap) {
if (Static80.underWaterTileHeightMap == SceneGraph.activeTileHeightMap) {
var9 = Static62.anIntArrayArray11[local18][local21];
var10 = var9 & 0xFFFFFF;
if (var10 != Static152.anInt3604) {
@ -160,7 +160,7 @@ public final class Static247 {
Static120.method2388(var22.anInt3049, Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local27, local18, local21);
}
}
var22.aClass8_5.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, var22.anInt3048 - Static149.anInt3555, var22.anInt3051 - Static123.anInt3947, var22.anInt3044 - Static217.anInt4903, var22.key, local24, null);
var22.primary.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, var22.anInt3048 - Static149.anInt3555, var22.anInt3051 - Static123.anInt3947, var22.anInt3044 - Static217.anInt4903, var22.key, local24, null);
}
for (local65 = 0; local65 < local153.anInt662; local65++) {
var25 = local153.aClass31Array1[local65];
@ -168,7 +168,7 @@ public final class Static247 {
if (GlRenderer.enabled) {
Static120.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21);
}
var25.aClass8_4.render(var25.anInt1714, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, var25.anInt1699 - Static149.anInt3555, var25.anInt1706 - Static123.anInt3947, var25.anInt1703 - Static217.anInt4903, var25.aLong56, local24, null);
var25.primary.render(var25.anInt1714, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, var25.anInt1699 - Static149.anInt3555, var25.anInt1706 - Static123.anInt3947, var25.anInt1703 - Static217.anInt4903, var25.aLong56, local24, null);
}
}
if (GlRenderer.enabled) {
@ -202,7 +202,7 @@ public final class Static247 {
if (GlRenderer.enabled) {
Static120.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21);
}
local549.aClass8_1.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local549.anInt732 - Static149.anInt3555, local549.anInt733 - Static123.anInt3947, local549.anInt736 - Static217.anInt4903, local549.aLong26, local24, null);
local549.primary.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local549.anInt732 - Static149.anInt3555, local549.anInt733 - Static123.anInt3947, local549.anInt736 - Static217.anInt4903, local549.aLong26, local24, null);
if (GlRenderer.enabled && local549.aBoolean49) {
GlRenderer.method4159(local33);
}
@ -250,7 +250,7 @@ public final class Static247 {
if (GlRenderer.enabled) {
Static120.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21);
}
local616.aClass8_5.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local616.anInt3048 - Static149.anInt3555, local616.anInt3051 - Static123.anInt3947, local616.anInt3044 - Static217.anInt4903, local616.key, local24, null);
local616.primary.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local616.anInt3048 - Static149.anInt3555, local616.anInt3051 - Static123.anInt3947, local616.anInt3044 - Static217.anInt4903, local616.key, local24, null);
}
if ((local616.anInt3052 & local65) != 0 && !Static260.method3850(local27, local18, local21, local616.anInt3052)) {
if (GlRenderer.enabled) {
@ -259,7 +259,7 @@ public final class Static247 {
local616.aClass8_6.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local616.anInt3048 - Static149.anInt3555, local616.anInt3051 - Static123.anInt3947, local616.anInt3044 - Static217.anInt4903, local616.key, local24, null);
}
}
if (local619 != null && !Static276.method4611(local27, local18, local21, local619.aClass8_3.getMaxY())) {
if (local619 != null && !Static276.method4611(local27, local18, local21, local619.primary.getMaxY())) {
if (GlRenderer.enabled) {
GlRenderer.method4159(local33 - 0.5F);
}
@ -267,7 +267,7 @@ public final class Static247 {
if (GlRenderer.enabled) {
Static120.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21);
}
local619.aClass8_3.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local619.anInt1390 + local619.anInt1394 - Static149.anInt3555, local619.anInt1391 - Static123.anInt3947, local619.anInt1393 + local619.anInt1392 - Static217.anInt4903, local619.key, local24, null);
local619.primary.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local619.anInt1390 + local619.anInt1394 - Static149.anInt3555, local619.anInt1391 - Static123.anInt3947, local619.anInt1393 + local619.anInt1392 - Static217.anInt4903, local619.key, local24, null);
} else if (local619.anInt1395 == 256) {
local894 = local619.anInt1390 - Static149.anInt3555;
local899 = local619.anInt1391 - Static123.anInt3947;
@ -288,7 +288,7 @@ public final class Static247 {
if (GlRenderer.enabled) {
Static120.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21);
}
local619.aClass8_3.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local894 + local619.anInt1394, local899, local904 + local619.anInt1392, local619.key, local24, null);
local619.primary.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local894 + local619.anInt1394, local899, local904 + local619.anInt1392, local619.key, local24, null);
} else if (local619.aClass8_2 != null) {
if (GlRenderer.enabled) {
Static120.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21);
@ -309,7 +309,7 @@ public final class Static247 {
if (GlRenderer.enabled) {
Static120.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21);
}
local1001.aClass8_1.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local1001.anInt732 - Static149.anInt3555, local1001.anInt733 - Static123.anInt3947, local1001.anInt736 - Static217.anInt4903, local1001.aLong26, local24, null);
local1001.primary.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local1001.anInt732 - Static149.anInt3555, local1001.anInt733 - Static123.anInt3947, local1001.anInt736 - Static217.anInt4903, local1001.aLong26, local24, null);
if (GlRenderer.enabled && local1001.aBoolean49) {
GlRenderer.method4159(local33);
}
@ -409,7 +409,7 @@ public final class Static247 {
Static120.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21);
}
}
var22.aClass8_5.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, var22.anInt3048 - Static149.anInt3555, var22.anInt3051 - Static123.anInt3947, var22.anInt3044 - Static217.anInt4903, var22.key, local24, null);
var22.primary.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, var22.anInt3048 - Static149.anInt3555, var22.anInt3051 - Static123.anInt3947, var22.anInt3044 - Static217.anInt4903, var22.key, local24, null);
}
local8.anInt663 = 0;
}
@ -492,7 +492,7 @@ public final class Static247 {
}
@Pc(1697) Scenery local1697 = Static25.aClass31Array2[local115];
local1697.anInt1707 = Static13.anInt437;
if (!Static73.method1599(local27, local1697.anInt1701, local1697.anInt1713, local1697.anInt1696, local1697.anInt1698, local1697.aClass8_4.getMaxY())) {
if (!Static73.method1599(local27, local1697.anInt1701, local1697.anInt1713, local1697.anInt1696, local1697.anInt1698, local1697.primary.getMaxY())) {
if (GlRenderer.enabled) {
if ((local1697.aLong56 & 0xFC000L) == 147456L) {
Static120.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21);
@ -514,7 +514,7 @@ public final class Static247 {
Static120.method2391(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local1697.anInt1701, local1697.anInt1696, local1697.anInt1713, local1697.anInt1698);
}
}
local1697.aClass8_4.render(local1697.anInt1714, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local1697.anInt1699 - Static149.anInt3555, local1697.anInt1706 - Static123.anInt3947, local1697.anInt1703 - Static217.anInt4903, local1697.aLong56, local24, null);
local1697.primary.render(local1697.anInt1714, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local1697.anInt1699 - Static149.anInt3555, local1697.anInt1706 - Static123.anInt3947, local1697.anInt1703 - Static217.anInt4903, local1697.aLong56, local24, null);
}
for (local894 = local1697.anInt1701; local894 <= local1697.anInt1713; local894++) {
for (local899 = local1697.anInt1696; local899 <= local1697.anInt1698; local899++) {
@ -576,12 +576,12 @@ public final class Static247 {
}
if (local8.anInt670 != 0) {
@Pc(2109) WallDecor local2109 = local8.aClass24_1;
if (local2109 != null && !Static276.method4611(local27, local18, local21, local2109.aClass8_3.getMaxY())) {
if (local2109 != null && !Static276.method4611(local27, local18, local21, local2109.primary.getMaxY())) {
if ((local2109.anInt1395 & local8.anInt670) != 0) {
if (GlRenderer.enabled) {
Static120.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21);
}
local2109.aClass8_3.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local2109.anInt1390 + local2109.anInt1394 - Static149.anInt3555, local2109.anInt1391 - Static123.anInt3947, local2109.anInt1393 + local2109.anInt1392 - Static217.anInt4903, local2109.key, local24, null);
local2109.primary.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local2109.anInt1390 + local2109.anInt1394 - Static149.anInt3555, local2109.anInt1391 - Static123.anInt3947, local2109.anInt1393 + local2109.anInt1392 - Static217.anInt4903, local2109.key, local24, null);
} else if (local2109.anInt1395 == 256) {
local65 = local2109.anInt1390 - Static149.anInt3555;
local115 = local2109.anInt1391 - Static123.anInt3947;
@ -601,7 +601,7 @@ public final class Static247 {
if (GlRenderer.enabled) {
Static120.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21);
}
local2109.aClass8_3.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local65 + local2109.anInt1394, local115, local1332 + local2109.anInt1392, local2109.key, local24, null);
local2109.primary.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local65 + local2109.anInt1394, local115, local1332 + local2109.anInt1392, local2109.key, local24, null);
} else if (local2109.aClass8_2 != null) {
if (GlRenderer.enabled) {
Static120.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21);
@ -622,7 +622,7 @@ public final class Static247 {
if (GlRenderer.enabled) {
Static120.method2388(local2275.anInt3049, Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local27, local18, local21);
}
local2275.aClass8_5.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local2275.anInt3048 - Static149.anInt3555, local2275.anInt3051 - Static123.anInt3947, local2275.anInt3044 - Static217.anInt4903, local2275.key, local24, null);
local2275.primary.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local2275.anInt3048 - Static149.anInt3555, local2275.anInt3051 - Static123.anInt3947, local2275.anInt3044 - Static217.anInt4903, local2275.key, local24, null);
}
}
}

12
client/src/main/java/rt4/Static248.java
View file

@ -56,26 +56,26 @@ public final class Static248 {
if (local32 >= local9 && local32 <= local13 && local37 >= local17 && local37 <= local21) {
if (local46.aClass77_1 != null) {
@Pc(103) Wall local103 = local46.aClass77_1;
local103.aClass8_5.method4545(0, local23, local103.anInt3051, local103.anInt3048, local103.anInt3044);
local103.primary.method4545(0, local23, local103.anInt3051, local103.anInt3048, local103.anInt3044);
if (local103.aClass8_6 != null) {
local103.aClass8_6.method4545(0, local23, local103.anInt3051, local103.anInt3048, local103.anInt3044);
}
}
if (local46.aClass24_1 != null) {
@Pc(134) WallDecor local134 = local46.aClass24_1;
local134.aClass8_3.method4545(local134.anInt1388, local23, local134.anInt1391, local134.anInt1390, local134.anInt1393);
local134.primary.method4545(local134.anInt1388, local23, local134.anInt1391, local134.anInt1390, local134.anInt1393);
if (local134.aClass8_2 != null) {
local134.aClass8_2.method4545(local134.anInt1388, local23, local134.anInt1391, local134.anInt1390, local134.anInt1393);
}
}
if (local46.aClass15_1 != null) {
@Pc(167) GroundDecor local167 = local46.aClass15_1;
local167.aClass8_1.method4545(0, local23, local167.anInt733, local167.anInt732, local167.anInt736);
local167.primary.method4545(0, local23, local167.anInt733, local167.anInt732, local167.anInt736);
}
if (local46.aClass31Array1 != null) {
for (local183 = 0; local183 < local46.anInt662; local183++) {
@Pc(192) Scenery local192 = local46.aClass31Array1[local183];
local192.aClass8_4.method4545(local192.anInt1714, local23, local192.anInt1706, local192.anInt1699, local192.anInt1703);
local192.primary.method4545(local192.anInt1714, local23, local192.anInt1706, local192.anInt1699, local192.anInt1703);
}
}
}
@ -84,7 +84,7 @@ public final class Static248 {
}
}
}
@Pc(240) boolean local240 = Static83.activeTileHeightMap == Static80.underWaterTileHeightMap;
@Pc(240) boolean local240 = SceneGraph.activeTileHeightMap == Static80.underWaterTileHeightMap;
if (GlRenderer.enabled) {
@Pc(244) GL2 local244 = GlRenderer.gl;
local244.glPushMatrix();
@ -124,7 +124,7 @@ public final class Static248 {
}
if (local32 == 0 && Preferences.sceneryShadowsType > 0) {
GlRenderer.method4159(101.5F);
Static242.method4198(Static167.anInt4069, Static193.anInt4539, Static277.tileVisibilityDistance, arg1, Static48.aBooleanArrayArray1, Static83.activeTileHeightMap[0]);
Static242.method4198(Static167.anInt4069, Static193.anInt4539, Static277.tileVisibilityDistance, arg1, Static48.aBooleanArrayArray1, SceneGraph.activeTileHeightMap[0]);
}
local32++;
}

4
client/src/main/java/rt4/Static254.java
View file

@ -104,8 +104,8 @@ public final class Static254 {
}
}
if (local132) {
if (Static83.activeTileHeightMap[Player.level + 1][local108][local122] > Static79.anIntArray205[arg4]) {
Static79.anIntArray205[arg4] = Static83.activeTileHeightMap[Player.level + 1][local108][local122];
if (SceneGraph.activeTileHeightMap[Player.level + 1][local108][local122] > Static79.anIntArray205[arg4]) {
Static79.anIntArray205[arg4] = SceneGraph.activeTileHeightMap[Player.level + 1][local108][local122];
}
local150 = local108 << 7;
if (local150 < Static149.anIntArray338[arg4]) {

34
client/src/main/java/rt4/Static260.java
View file

@ -46,7 +46,7 @@ public final class Static260 {
}
@Pc(10) int local10 = arg1 << 7;
@Pc(14) int local14 = arg2 << 7;
@Pc(24) int local24 = Static83.activeTileHeightMap[arg0][arg1][arg2] - 1;
@Pc(24) int local24 = SceneGraph.activeTileHeightMap[arg0][arg1][arg2] - 1;
@Pc(28) int local28 = local24 - 120;
@Pc(32) int local32 = local24 - 230;
@Pc(36) int local36 = local24 - 238;
@ -167,36 +167,4 @@ public final class Static260 {
}
}
@OriginalMember(owner = "client!vd", name = "a", descriptor = "(BZ)V")
public static void clearAmbientSounds(@OriginalArg(1) boolean arg0) {
@Pc(14) AreaSound local14;
for (local14 = (AreaSound) Static3.aClass69_135.start(); local14 != null; local14 = (AreaSound) Static3.aClass69_135.next()) {
if (local14.primaryStream != null) {
client.soundStream.removeSubStream(local14.primaryStream);
local14.primaryStream = null;
}
if (local14.secondaryStream != null) {
client.soundStream.removeSubStream(local14.secondaryStream);
local14.secondaryStream = null;
}
local14.unlink();
}
if (!arg0) {
return;
}
for (local14 = (AreaSound) Static152.aClass69_87.start(); local14 != null; local14 = (AreaSound) Static152.aClass69_87.next()) {
if (local14.primaryStream != null) {
client.soundStream.removeSubStream(local14.primaryStream);
local14.primaryStream = null;
}
local14.unlink();
}
for (local14 = (AreaSound) AreaSoundManager.aClass133_7.head(); local14 != null; local14 = (AreaSound) AreaSoundManager.aClass133_7.next()) {
if (local14.primaryStream != null) {
client.soundStream.removeSubStream(local14.primaryStream);
local14.primaryStream = null;
}
local14.unlink();
}
}
}

8
client/src/main/java/rt4/Static262.java
View file

@ -25,7 +25,7 @@ public final class Static262 {
local8.anInt3048 = arg1 * 128 + 64;
local8.anInt3044 = arg2 * 128 + 64;
local8.anInt3051 = arg3;
local8.aClass8_5 = arg4;
local8.primary = arg4;
local8.aClass8_6 = arg5;
local8.anInt3049 = arg6;
local8.anInt3052 = arg7;
@ -37,12 +37,6 @@ public final class Static262 {
SceneGraph.tiles[arg0][arg1][arg2].aClass77_1 = local8;
}
@OriginalMember(owner = "client!vf", name = "a", descriptor = "(III)Lclient!jh;")
public static Wall method4509(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
@Pc(7) Tile local7 = SceneGraph.tiles[arg0][arg1][arg2];
return local7 == null ? null : local7.aClass77_1;
}
@OriginalMember(owner = "client!vf", name = "a", descriptor = "(IB)Lclient!na;")
public static JagString method4510(@OriginalArg(0) int arg0) {
return arg0 >= 999999999 ? Static220.aClass100_930 : Static123.parseInt(arg0);

16
client/src/main/java/rt4/Static264.java
View file

@ -34,26 +34,26 @@ public final class Static264 {
@Pc(12) Tile local12;
if (arg2 < Static152.mapSizeX) {
local12 = SceneGraph.tiles[arg1][arg2 + 1][arg3];
if (local12 != null && local12.aClass15_1 != null && local12.aClass15_1.aClass8_1.method4543()) {
arg0.method4544(local12.aClass15_1.aClass8_1, 128, 0, 0, true);
if (local12 != null && local12.aClass15_1 != null && local12.aClass15_1.primary.method4543()) {
arg0.method4544(local12.aClass15_1.primary, 128, 0, 0, true);
}
}
if (arg3 < Static152.mapSizeX) {
local12 = SceneGraph.tiles[arg1][arg2][arg3 + 1];
if (local12 != null && local12.aClass15_1 != null && local12.aClass15_1.aClass8_1.method4543()) {
arg0.method4544(local12.aClass15_1.aClass8_1, 0, 0, 128, true);
if (local12 != null && local12.aClass15_1 != null && local12.aClass15_1.primary.method4543()) {
arg0.method4544(local12.aClass15_1.primary, 0, 0, 128, true);
}
}
if (arg2 < Static152.mapSizeX && arg3 < Static99.mapSizeZ) {
local12 = SceneGraph.tiles[arg1][arg2 + 1][arg3 + 1];
if (local12 != null && local12.aClass15_1 != null && local12.aClass15_1.aClass8_1.method4543()) {
arg0.method4544(local12.aClass15_1.aClass8_1, 128, 0, 128, true);
if (local12 != null && local12.aClass15_1 != null && local12.aClass15_1.primary.method4543()) {
arg0.method4544(local12.aClass15_1.primary, 128, 0, 128, true);
}
}
if (arg2 < Static152.mapSizeX && arg3 > 0) {
local12 = SceneGraph.tiles[arg1][arg2 + 1][arg3 - 1];
if (local12 != null && local12.aClass15_1 != null && local12.aClass15_1.aClass8_1.method4543()) {
arg0.method4544(local12.aClass15_1.aClass8_1, 128, 0, -128, true);
if (local12 != null && local12.aClass15_1 != null && local12.aClass15_1.primary.method4543()) {
arg0.method4544(local12.aClass15_1.primary, 128, 0, -128, true);
}
}
}

8
client/src/main/java/rt4/Static269.java
View file

@ -180,7 +180,7 @@ public final class Static269 {
local190 = local529.anInt2240 >> 7;
if (local190 >= 0 && local194 >= 0 && local190 < 104 && local194 < 104) {
local529.aBoolean125 = (Static12.tileSettings[1][local190][local194] & 0x2) != 0;
local529.anInt2235 = Static83.activeTileHeightMap[local529.anInt2241][local190][local194] - local529.anInt2235;
local529.anInt2235 = SceneGraph.activeTileHeightMap[local529.anInt2241][local190][local194] - local529.anInt2235;
Static120.method2389(local529);
}
}
@ -202,12 +202,6 @@ public final class Static269 {
}
}
@OriginalMember(owner = "client!wa", name = "a", descriptor = "(III)Lclient!bm;")
public static GroundDecor method2210(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
@Pc(7) Tile local7 = SceneGraph.tiles[arg0][arg1][arg2];
return local7 == null || local7.aClass15_1 == null ? null : local7.aClass15_1;
}
@OriginalMember(owner = "client!wa", name = "o", descriptor = "(I)V")
public static void method2218() {
@Pc(8) int local8 = Static236.method4047();

2
client/src/main/java/rt4/Static276.java
View file

@ -23,7 +23,7 @@ public final class Static276 {
if (Static9.method187(arg0, arg1, arg2)) {
@Pc(10) int local10 = arg1 << 7;
@Pc(14) int local14 = arg2 << 7;
return Static256.method4394(local10 + 1, Static83.activeTileHeightMap[arg0][arg1][arg2] + arg3, local14 + 1) && Static256.method4394(local10 + 128 - 1, Static83.activeTileHeightMap[arg0][arg1 + 1][arg2] + arg3, local14 + 1) && Static256.method4394(local10 + 128 - 1, Static83.activeTileHeightMap[arg0][arg1 + 1][arg2 + 1] + arg3, local14 + 128 - 1) && Static256.method4394(local10 + 1, Static83.activeTileHeightMap[arg0][arg1][arg2 + 1] + arg3, local14 + 128 - 1);
return Static256.method4394(local10 + 1, SceneGraph.activeTileHeightMap[arg0][arg1][arg2] + arg3, local14 + 1) && Static256.method4394(local10 + 128 - 1, SceneGraph.activeTileHeightMap[arg0][arg1 + 1][arg2] + arg3, local14 + 1) && Static256.method4394(local10 + 128 - 1, SceneGraph.activeTileHeightMap[arg0][arg1 + 1][arg2 + 1] + arg3, local14 + 128 - 1) && Static256.method4394(local10 + 1, SceneGraph.activeTileHeightMap[arg0][arg1][arg2 + 1] + arg3, local14 + 128 - 1);
} else {
return false;
}

18
client/src/main/java/rt4/Static278.java
View file

@ -36,11 +36,11 @@ public final class Static278 {
public static void setRenderTiles(@OriginalArg(0) boolean arg0) {
if (arg0) {
SceneGraph.tiles = Static276.underWaterGroundTiles;
Static83.activeTileHeightMap = Static80.underWaterTileHeightMap;
SceneGraph.activeTileHeightMap = Static80.underWaterTileHeightMap;
Static182.aClass3_Sub14ArrayArray2 = Static195.underWaterHdTiles;
} else {
SceneGraph.tiles = Static197.surfaceGroundTiles;
Static83.activeTileHeightMap = Static107.surfaceTileHeightMap;
SceneGraph.activeTileHeightMap = Static107.surfaceTileHeightMap;
Static182.aClass3_Sub14ArrayArray2 = Static36.surfaceHdTiles;
}
Static126.anInt3114 = SceneGraph.tiles.length;
@ -77,26 +77,26 @@ public final class Static278 {
local32 = arg3.g1();
if (local32 == 0) {
if (arg2) {
Static83.activeTileHeightMap[0][arg5][arg4] = Static107.surfaceTileHeightMap[0][arg5][arg4];
SceneGraph.activeTileHeightMap[0][arg5][arg4] = Static107.surfaceTileHeightMap[0][arg5][arg4];
} else if (arg7 == 0) {
Static83.activeTileHeightMap[0][arg5][arg4] = -Static65.method1498(arg4 + arg1 + 556238, arg0 + arg5 + 932731) * 8;
SceneGraph.activeTileHeightMap[0][arg5][arg4] = -Static65.method1498(arg4 + arg1 + 556238, arg0 + arg5 + 932731) * 8;
} else {
Static83.activeTileHeightMap[arg7][arg5][arg4] = Static83.activeTileHeightMap[arg7 - 1][arg5][arg4] - 240;
SceneGraph.activeTileHeightMap[arg7][arg5][arg4] = SceneGraph.activeTileHeightMap[arg7 - 1][arg5][arg4] - 240;
}
break;
}
if (local32 == 1) {
@Pc(111) int local111 = arg3.g1();
if (arg2) {
Static83.activeTileHeightMap[0][arg5][arg4] = Static107.surfaceTileHeightMap[0][arg5][arg4] + local111 * 8;
SceneGraph.activeTileHeightMap[0][arg5][arg4] = Static107.surfaceTileHeightMap[0][arg5][arg4] + local111 * 8;
} else {
if (local111 == 1) {
local111 = 0;
}
if (arg7 == 0) {
Static83.activeTileHeightMap[0][arg5][arg4] = -local111 * 8;
SceneGraph.activeTileHeightMap[0][arg5][arg4] = -local111 * 8;
} else {
Static83.activeTileHeightMap[arg7][arg5][arg4] = Static83.activeTileHeightMap[arg7 - 1][arg5][arg4] - local111 * 8;
SceneGraph.activeTileHeightMap[arg7][arg5][arg4] = SceneGraph.activeTileHeightMap[arg7 - 1][arg5][arg4] - local111 * 8;
}
}
break;
@ -130,7 +130,7 @@ public final class Static278 {
MidiPlayer.method801();
MidiPlayer.jingle = false;
MusicPlayer.groupId = -1;
Static260.clearAmbientSounds(true);
AreaSoundManager.clear(true);
Static230.dynamicMapRegion = false;
Static142.originZ = 0;
Static80.centralZoneX = 0;

5
client/src/main/java/rt4/Static284.java
View file

@ -488,11 +488,6 @@ public final class Static284 {
return arg3 >> 1;
}
@OriginalMember(owner = "client!b", name = "a", descriptor = "(Lclient!kj;II)Lclient!b;")
public static SoundPcmStream method404(@OriginalArg(0) PcmSound arg0, @OriginalArg(2) int arg1) {
return arg0.aByteArray47 == null || arg0.aByteArray47.length == 0 ? null : new SoundPcmStream(arg0, (int) ((long) arg0.anInt3316 * 256L * (long) 100 / (long) (Static44.sampleRate * 100)), arg1 << 6);
}
@OriginalMember(owner = "client!b", name = "b", descriptor = "(II[B[IIIIIIIIIILclient!b;II)I")
public static int method407(@OriginalArg(2) byte[] arg0, @OriginalArg(3) int[] arg1, @OriginalArg(4) int arg2, @OriginalArg(5) int arg3, @OriginalArg(6) int arg4, @OriginalArg(7) int arg5, @OriginalArg(8) int arg6, @OriginalArg(9) int arg7, @OriginalArg(11) int arg8, @OriginalArg(12) int arg9, @OriginalArg(13) SoundPcmStream arg10, @OriginalArg(14) int arg11, @OriginalArg(15) int arg12) {
arg10.anInt348 -= arg10.anInt344 * arg3;

25
client/src/main/java/rt4/Static29.java
View file

@ -21,29 +21,4 @@ public final class Static29 {
return local27;
}
@OriginalMember(owner = "client!ce", name = "a", descriptor = "(IIIIIIIIII)V")
public static void method800(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5, @OriginalArg(7) int arg6, @OriginalArg(8) int arg7, @OriginalArg(9) int arg8) {
@Pc(9) SceneryStack local9 = null;
for (@Pc(14) SceneryStack local14 = (SceneryStack) Static26.sceneryList.start(); local14 != null; local14 = (SceneryStack) Static26.sceneryList.next()) {
if (local14.level == arg0 && arg3 == local14.x && local14.z == arg1 && arg6 == local14.anInt927) {
local9 = local14;
break;
}
}
if (local9 == null) {
local9 = new SceneryStack();
local9.x = arg3;
local9.z = arg1;
local9.level = arg0;
local9.anInt927 = arg6;
Static226.method3898(local9);
Static26.sceneryList.addTail(local9);
}
local9.anInt926 = arg7;
local9.anInt925 = arg8;
local9.anInt924 = arg4;
local9.anInt929 = arg5;
local9.anInt922 = arg2;
}
}

3
client/src/main/java/rt4/Static3.java
View file

@ -12,9 +12,6 @@ public final class Static3 {
@OriginalMember(owner = "client!ab", name = "c", descriptor = "[Z")
public static final boolean[] aBooleanArray135 = new boolean[200];
@OriginalMember(owner = "client!ab", name = "n", descriptor = "Lclient!ih;")
public static final LinkedList aClass69_135 = new LinkedList();
@OriginalMember(owner = "client!ab", name = "a", descriptor = "(Lclient!na;I)V")
public static void method4656(@OriginalArg(0) JagString arg0) {
@Pc(9) int local9 = Static171.method3218(arg0);

6
client/src/main/java/rt4/Static34.java
View file

@ -67,10 +67,10 @@ public final class Static34 {
public static void method879(@OriginalArg(0) PathingEntity arg0) {
arg0.aBoolean171 = false;
@Pc(18) SeqType local18;
if (arg0.anInt3366 != -1) {
local18 = SeqTypeList.get(arg0.anInt3366);
if (arg0.movementSeqId != -1) {
local18 = SeqTypeList.get(arg0.movementSeqId);
if (local18 == null || local18.frames == null) {
arg0.anInt3366 = -1;
arg0.movementSeqId = -1;
} else {
arg0.anInt3396++;
if (local18.frames.length > arg0.anInt3407 && arg0.anInt3396 > local18.anIntArray474[arg0.anInt3407]) {

2
client/src/main/java/rt4/Static36.java
View file

@ -66,7 +66,7 @@ public final class Static36 {
continue;
}
if (component.noClickThrough && Mouse.anInt4873 >= local61 && Mouse.anInt5032 >= local63 && Mouse.anInt4873 < local65 && Mouse.anInt5032 < local67) {
for (@Pc(164) HookRequest local164 = (HookRequest) InterfaceList.lowPriorityRequests.start(); local164 != null; local164 = (HookRequest) InterfaceList.lowPriorityRequests.next()) {
for (@Pc(164) HookRequest local164 = (HookRequest) InterfaceList.lowPriorityRequests.head(); local164 != null; local164 = (HookRequest) InterfaceList.lowPriorityRequests.next()) {
if (local164.aBoolean158) {
local164.unlink();
local164.source.aBoolean19 = false;

20
client/src/main/java/rt4/Static37.java
View file

@ -17,7 +17,7 @@ public final class Static37 {
if (arg0.anInt3376 == 0) {
return;
}
@Pc(13) BasType local13 = arg0.method2681();
@Pc(13) BasType local13 = arg0.getBasType();
@Pc(43) int local43;
@Pc(36) int local36;
if (arg0.faceEntity != -1 && arg0.faceEntity < 32768) {
@ -69,11 +69,11 @@ public final class Static37 {
arg0.anInt3381 = arg0.anInt3400;
local226 = false;
}
if (local13.idleAnimationId == arg0.anInt3366 && (arg0.anInt3385 > 25 || local226)) {
if (local13.idleAnimationId == arg0.movementSeqId && (arg0.anInt3385 > 25 || local226)) {
if (local13.anInt1036 == -1) {
arg0.anInt3366 = local13.walkAnimation;
arg0.movementSeqId = local13.walkAnimation;
} else {
arg0.anInt3366 = local13.anInt1036;
arg0.movementSeqId = local13.anInt1036;
}
}
} else {
@ -83,21 +83,21 @@ public final class Static37 {
local226 = false;
arg0.anInt3381 = arg0.anInt3400;
}
if (local13.idleAnimationId == arg0.anInt3366 && (arg0.anInt3385 > 25 || local226)) {
if (local13.idleAnimationId == arg0.movementSeqId && (arg0.anInt3385 > 25 || local226)) {
if (local13.anInt1067 == -1) {
arg0.anInt3366 = local13.walkAnimation;
arg0.movementSeqId = local13.walkAnimation;
} else {
arg0.anInt3366 = local13.anInt1067;
arg0.movementSeqId = local13.anInt1067;
}
}
}
arg0.anInt3381 &= 0x7FF;
} else {
if (local13.idleAnimationId == arg0.anInt3366 && arg0.anInt3385 > 25) {
if (local13.idleAnimationId == arg0.movementSeqId && arg0.anInt3385 > 25) {
if (local13.anInt1067 == -1) {
arg0.anInt3366 = local13.walkAnimation;
arg0.movementSeqId = local13.walkAnimation;
} else {
arg0.anInt3366 = local13.anInt1067;
arg0.movementSeqId = local13.anInt1067;
}
}
local43 = arg0.anInt3400 << 5;

4
client/src/main/java/rt4/Static38.java
View file

@ -224,7 +224,7 @@ public final class Static38 {
}
if (local39 != null && local39.method2682()) {
local39.aBoolean98 = false;
if ((Preferences.manyIdleAnimations && PlayerList.size > 200 || PlayerList.size > 50) && !arg0 && local39.anInt3366 == local39.method2681().idleAnimationId) {
if ((Preferences.manyIdleAnimations && PlayerList.size > 200 || PlayerList.size > 50) && !arg0 && local39.movementSeqId == local39.getBasType().idleAnimationId) {
local39.aBoolean98 = true;
}
local82 = local39.getSize();
@ -287,7 +287,7 @@ public final class Static38 {
} else {
local39.aBoolean98 = false;
local39.anInt3424 = SceneGraph.getTileHeight(Player.level, local39.xFine, local39.zFine);
Static184.method3387(Player.level, local39.xFine, local39.zFine, local39.anInt3424, local39, local39.anInt3381, local272, local39.anInt3384, local39.anInt3374, local39.anInt3411, local39.anInt3410);
Static184.method3387(Player.level, local39.xFine, local39.zFine, local39.anInt3424, local39, local39.anInt3381, local272, local39.atachmentX0, local39.attachmentZ0, local39.attachmentX1, local39.attachmentZ1);
}
}
}

10
client/src/main/java/rt4/Static43.java
View file

@ -55,7 +55,7 @@ public final class Static43 {
@Pc(70) int local70 = (int) (local9 >>> 32) & Integer.MAX_VALUE;
@Pc(74) LocType local74 = LocTypeList.get(local70);
if (local74.hasAreaSound()) {
Static209.method3701(arg1, local74, arg0, arg2);
AreaSoundManager.remove(arg1, local74, arg0, arg2);
}
@Pc(92) int local92 = (int) local9 >> 20 & 0x3;
if (local9 == 0L) {
@ -66,7 +66,7 @@ public final class Static43 {
if (arg3 == 0) {
@Pc(110) Wall local110 = SceneGraph.removeWall(arg2, arg1, arg0);
if (local110 != null) {
local100 = local110.aClass8_5;
local100 = local110.primary;
local102 = local110.aClass8_6;
}
if (local74.anInt4435 != 0) {
@ -75,13 +75,13 @@ public final class Static43 {
} else if (arg3 == 1) {
@Pc(233) WallDecor local233 = Static75.method1633(arg2, arg1, arg0);
if (local233 != null) {
local100 = local233.aClass8_3;
local100 = local233.primary;
local102 = local233.aClass8_2;
}
} else if (arg3 == 2) {
@Pc(148) Scenery local148 = Static47.method3996(arg2, arg1, arg0);
if (local148 != null) {
local100 = local148.aClass8_4;
local100 = local148.primary;
}
if (local74.anInt4435 != 0 && local74.width + arg1 < 104 && local74.width + arg0 < 104 && arg1 + local74.length < 104 && arg0 + local74.length < 104) {
arg5.unflagScenery(arg1, local74.width, local74.aBoolean207, local92, local74.length, arg0);
@ -89,7 +89,7 @@ public final class Static43 {
} else if (arg3 == 3) {
@Pc(211) GroundDecor local211 = Static267.method4526(arg2, arg1, arg0);
if (local211 != null) {
local100 = local211.aClass8_1;
local100 = local211.primary;
}
if (local74.anInt4435 == 1) {
arg5.method3053(arg0, arg1);

3
client/src/main/java/rt4/Static44.java
View file

@ -6,9 +6,6 @@ import org.openrs2.deob.annotation.Pc;
public final class Static44 {
@OriginalMember(owner = "client!dh", name = "h", descriptor = "I")
public static int sampleRate;
@OriginalMember(owner = "client!dh", name = "a", descriptor = "Z")
public static boolean aBoolean83 = false;

40
client/src/main/java/rt4/Static45.java
View file

@ -83,8 +83,8 @@ public final class Static45 {
local173 = local168 * 768 >> 8;
for (local178 = 1; local178 < 103; local178++) {
for (local194 = 1; local194 < 103; local194++) {
local209 = Static83.activeTileHeightMap[local152][local194][local178 + 1] - Static83.activeTileHeightMap[local152][local194][local178 - 1];
local202 = Static83.activeTileHeightMap[local152][local194 + 1][local178] - Static83.activeTileHeightMap[local152][local194 - 1][local178];
local209 = SceneGraph.activeTileHeightMap[local152][local194][local178 + 1] - SceneGraph.activeTileHeightMap[local152][local194][local178 - 1];
local202 = SceneGraph.activeTileHeightMap[local152][local194 + 1][local178] - SceneGraph.activeTileHeightMap[local152][local194 - 1][local178];
local349 = (int) Math.sqrt((double) (local202 * local202 + local209 * local209 + 65536));
local267 = (local209 << 8) / local349;
local254 = -65536 / local349;
@ -109,8 +109,8 @@ public final class Static45 {
local200 = local194 * 1024 >> 8;
for (local202 = 1; local202 < 103; local202++) {
for (local209 = 1; local209 < 103; local209++) {
local234 = Static83.activeTileHeightMap[local152][local209 + 1][local202] - Static83.activeTileHeightMap[local152][local209 - 1][local202];
local254 = Static83.activeTileHeightMap[local152][local209][local202 + 1] - Static83.activeTileHeightMap[local152][local209][local202 - 1];
local234 = SceneGraph.activeTileHeightMap[local152][local209 + 1][local202] - SceneGraph.activeTileHeightMap[local152][local209 - 1][local202];
local254 = SceneGraph.activeTileHeightMap[local152][local209][local202 + 1] - SceneGraph.activeTileHeightMap[local152][local209][local202 - 1];
local267 = (int) Math.sqrt((double) (local234 * local234 + local254 * local254 + 65536));
local273 = (local234 << 8) / local267;
local322 = (local159[local209][local202 + 1] >> 3) + (local159[local209][local202 - 1] >> 2) + (local159[local209 - 1][local202] >> 2) + (local159[local209 + 1][local202] >> 3) + (local159[local209][local202] >> 1);
@ -194,10 +194,10 @@ public final class Static45 {
local178 = Static253.aByteArrayArrayArray16[local152][local168][local173] & 0xFF;
local194 = Static240.aByteArrayArrayArray14[local152][local168][local173] & 0xFF;
if (local178 > 0 || local194 > 0) {
local202 = Static83.activeTileHeightMap[local152][local168 + 1][local173];
local200 = Static83.activeTileHeightMap[local152][local168][local173];
local349 = Static83.activeTileHeightMap[local152][local168][local173 + 1];
local209 = Static83.activeTileHeightMap[local152][local168 + 1][local173 + 1];
local202 = SceneGraph.activeTileHeightMap[local152][local168 + 1][local173];
local200 = SceneGraph.activeTileHeightMap[local152][local168][local173];
local349 = SceneGraph.activeTileHeightMap[local152][local168][local173 + 1];
local209 = SceneGraph.activeTileHeightMap[local152][local168 + 1][local173 + 1];
if (local152 > 0) {
@Pc(1067) boolean local1067 = true;
if (local178 == 0 && Static163.aByteArrayArrayArray11[local152][local168][local173] != 0) {
@ -231,7 +231,7 @@ public final class Static45 {
if (local194 == 0) {
Static176.method3305(local152, local168, local173, 0, 0, -1, local200, local202, local209, local349, Static87.method1814(local267, local234), Static87.method1814(local273, local234), Static87.method1814(local326, local234), Static87.method1814(local332, local234), 0, 0, 0, 0, local254, 0);
if (GlRenderer.enabled && local152 > 0 && local234 != -1 && FluTypeList.get(local178 - 1).aBoolean198) {
Static242.method4197(0, 0, true, false, local168, local173, local200 - Static83.activeTileHeightMap[0][local168][local173], -Static83.activeTileHeightMap[0][local168 + 1][local173] + local202, local209 - Static83.activeTileHeightMap[0][local168 + 1][local173 + 1], local349 - Static83.activeTileHeightMap[0][local168][local173 + 1]);
Static242.method4197(0, 0, true, false, local168, local173, local200 - SceneGraph.activeTileHeightMap[0][local168][local173], -SceneGraph.activeTileHeightMap[0][local168 + 1][local173] + local202, local209 - SceneGraph.activeTileHeightMap[0][local168 + 1][local173 + 1], local349 - SceneGraph.activeTileHeightMap[0][local168][local173 + 1]);
}
if (GlRenderer.enabled && !underwater && Static62.anIntArrayArray11 != null && local152 == 0) {
for (local322 = local168 - 1; local322 <= local168 + 1; local322++) {
@ -312,7 +312,7 @@ public final class Static45 {
}
Static176.method3305(local152, local168, local173, local322, local1242, local1288, local200, local202, local209, local349, Static87.method1814(local267, local234), Static87.method1814(local273, local234), Static87.method1814(local326, local234), Static87.method1814(local332, local234), Static230.method3949(local1301, local267), Static230.method3949(local1301, local273), Static230.method3949(local1301, local326), Static230.method3949(local1301, local332), local254, local1353);
if (GlRenderer.enabled && local152 > 0) {
Static242.method4197(local322, local1242, local1301 == -2 || !local1248.aBoolean311, local234 == -1 || !FluTypeList.get(local178 - 1).aBoolean198, local168, local173, local200 - Static83.activeTileHeightMap[0][local168][local173], local202 - Static83.activeTileHeightMap[0][local168 + 1][local173], local209 - Static83.activeTileHeightMap[0][local168 + 1][local173 + 1], -Static83.activeTileHeightMap[0][local168][local173 + 1] + local349);
Static242.method4197(local322, local1242, local1301 == -2 || !local1248.aBoolean311, local234 == -1 || !FluTypeList.get(local178 - 1).aBoolean198, local168, local173, local200 - SceneGraph.activeTileHeightMap[0][local168][local173], local202 - SceneGraph.activeTileHeightMap[0][local168 + 1][local173], local209 - SceneGraph.activeTileHeightMap[0][local168 + 1][local173 + 1], -SceneGraph.activeTileHeightMap[0][local168][local173 + 1] + local349);
}
}
}
@ -321,7 +321,7 @@ public final class Static45 {
}
if (GlRenderer.enabled) {
@Pc(1888) float[][] local1888 = new float[105][105];
@Pc(1892) int[][] local1892 = Static83.activeTileHeightMap[local152];
@Pc(1892) int[][] local1892 = SceneGraph.activeTileHeightMap[local152];
@Pc(1896) float[][] local1896 = new float[105][105];
@Pc(1900) float[][] local1900 = new float[105][105];
local200 = 1;
@ -329,12 +329,12 @@ public final class Static45 {
if (local200 > 103) {
@Pc(2025) GlTile[] local2025;
if (underwater) {
local2025 = Static193.method3501(Static12.tileSettings, Static163.aByteArrayArrayArray11[local152], Static253.aByteArrayArrayArray16[local152], local146, local1896, Static62.anIntArrayArray11, Static240.aByteArrayArrayArray14[local152], Static4.aByteArrayArrayArray1[local152], local1888, local152, local1900, local142, Static83.activeTileHeightMap[local152], Static107.surfaceTileHeightMap[0]);
local2025 = Static193.method3501(Static12.tileSettings, Static163.aByteArrayArrayArray11[local152], Static253.aByteArrayArrayArray16[local152], local146, local1896, Static62.anIntArrayArray11, Static240.aByteArrayArrayArray14[local152], Static4.aByteArrayArrayArray1[local152], local1888, local152, local1900, local142, SceneGraph.activeTileHeightMap[local152], Static107.surfaceTileHeightMap[0]);
Static110.method2280(local152, local2025);
break;
}
local2025 = Static193.method3501(Static12.tileSettings, Static163.aByteArrayArrayArray11[local152], Static253.aByteArrayArrayArray16[local152], local146, local1896, null, Static240.aByteArrayArrayArray14[local152], Static4.aByteArrayArrayArray1[local152], local1888, local152, local1900, local142, Static83.activeTileHeightMap[local152], null);
@Pc(2049) GlTile[] local2049 = Static1.method2(local1896, local1888, Static83.activeTileHeightMap[local152], local152, local1900, Static4.aByteArrayArrayArray1[local152], local146, Static163.aByteArrayArrayArray11[local152], Static253.aByteArrayArrayArray16[local152], Static240.aByteArrayArrayArray14[local152], Static12.tileSettings);
local2025 = Static193.method3501(Static12.tileSettings, Static163.aByteArrayArrayArray11[local152], Static253.aByteArrayArrayArray16[local152], local146, local1896, null, Static240.aByteArrayArrayArray14[local152], Static4.aByteArrayArrayArray1[local152], local1888, local152, local1900, local142, SceneGraph.activeTileHeightMap[local152], null);
@Pc(2049) GlTile[] local2049 = Static1.method2(local1896, local1888, SceneGraph.activeTileHeightMap[local152], local152, local1900, Static4.aByteArrayArrayArray1[local152], local146, Static163.aByteArrayArrayArray11[local152], Static253.aByteArrayArrayArray16[local152], Static240.aByteArrayArrayArray14[local152], Static12.tileSettings);
@Pc(2057) GlTile[] local2057 = new GlTile[local2025.length + local2049.length];
for (local349 = 0; local349 < local2025.length; local349++) {
local2057[local349] = local2025[local349];
@ -343,7 +343,7 @@ public final class Static45 {
local2057[local2025.length + local349] = local2049[local349];
}
Static110.method2280(local152, local2057);
Static221.method3393(local1900, Static253.aByteArrayArrayArray16[local152], Static4.aByteArrayArrayArray1[local152], LightingManager.lights, local152, LightingManager.lightCount, local1896, Static163.aByteArrayArrayArray11[local152], Static240.aByteArrayArrayArray14[local152], Static83.activeTileHeightMap[local152], local1888);
Static221.method3393(local1900, Static253.aByteArrayArrayArray16[local152], Static4.aByteArrayArrayArray1[local152], LightingManager.lights, local152, LightingManager.lightCount, local1896, Static163.aByteArrayArrayArray11[local152], Static240.aByteArrayArrayArray14[local152], SceneGraph.activeTileHeightMap[local152], local1888);
break;
}
for (local202 = 1; local202 <= 103; local202++) {
@ -403,8 +403,8 @@ public final class Static45 {
}
local202 = (local200 + 1 - local194) * (-local173 + (local178 - -1));
if (local202 >= 8) {
local349 = Static83.activeTileHeightMap[local200][local168][local173] - 240;
local234 = Static83.activeTileHeightMap[local194][local168][local173];
local349 = SceneGraph.activeTileHeightMap[local200][local168][local173] - 240;
local234 = SceneGraph.activeTileHeightMap[local194][local168][local173];
Static278.method4647(1, local168 * 128, local168 * 128, local173 * 128, local178 * 128 + 128, local349, local234);
for (local254 = local194; local254 <= local200; local254++) {
for (local267 = local173; local267 <= local178; local267++) {
@ -438,8 +438,8 @@ public final class Static45 {
}
local202 = (local178 + 1 - local173) * (-local194 + local200 - -1);
if (local202 >= 8) {
local349 = Static83.activeTileHeightMap[local200][local173][local2204] - 240;
local234 = Static83.activeTileHeightMap[local194][local173][local2204];
local349 = SceneGraph.activeTileHeightMap[local200][local173][local2204] - 240;
local234 = SceneGraph.activeTileHeightMap[local194][local173][local2204];
Static278.method4647(2, local173 * 128, local178 * 128 + 128, local2204 * 128, local2204 * 128, local349, local234);
for (local254 = local194; local254 <= local200; local254++) {
for (local267 = local173; local267 <= local178; local267++) {
@ -472,7 +472,7 @@ public final class Static45 {
local178++;
}
if ((local178 + 1 - local173) * (local200 - (local194 - 1)) >= 4) {
local202 = Static83.activeTileHeightMap[local152][local173][local194];
local202 = SceneGraph.activeTileHeightMap[local152][local173][local194];
Static278.method4647(4, local173 * 128, local178 * 128 + 128, local194 * 128, local200 * 128 + 128, local202, local202);
for (local209 = local173; local209 <= local178; local209++) {
for (local349 = local194; local349 <= local200; local349++) {

12
client/src/main/java/rt4/Static69.java
View file

@ -40,7 +40,7 @@ public final class Static69 {
for (@Pc(46) int local46 = 0; local46 < local42.anInt662; local46++) {
@Pc(55) Scenery local55 = local42.aClass31Array1[local46];
if ((local55.aLong56 & 0x400000L) == 4194304L) {
@Pc(66) int local66 = local55.aClass8_4.getMaxY();
@Pc(66) int local66 = local55.primary.getMaxY();
if (local66 != -32768 && local66 < local34) {
local34 = local66;
}
@ -69,11 +69,11 @@ public final class Static69 {
if (local39 >= 0 && local39 < Static99.mapSizeZ && (!local1 || local28 >= local7 || local39 >= local15 || local39 < arg3 && local28 != arg2)) {
@Pc(71) Tile local71 = SceneGraph.tiles[local17][local28][local39];
if (local71 != null) {
@Pc(158) int local158 = (Static83.activeTileHeightMap[local17][local28][local39] + Static83.activeTileHeightMap[local17][local28 + 1][local39] + Static83.activeTileHeightMap[local17][local28][local39 + 1] + Static83.activeTileHeightMap[local17][local28 + 1][local39 + 1]) / 4 - (Static83.activeTileHeightMap[arg1][arg2][arg3] + Static83.activeTileHeightMap[arg1][arg2 + 1][arg3] + Static83.activeTileHeightMap[arg1][arg2][arg3 + 1] + Static83.activeTileHeightMap[arg1][arg2 + 1][arg3 + 1]) / 4;
@Pc(158) int local158 = (SceneGraph.activeTileHeightMap[local17][local28][local39] + SceneGraph.activeTileHeightMap[local17][local28 + 1][local39] + SceneGraph.activeTileHeightMap[local17][local28][local39 + 1] + SceneGraph.activeTileHeightMap[local17][local28 + 1][local39 + 1]) / 4 - (SceneGraph.activeTileHeightMap[arg1][arg2][arg3] + SceneGraph.activeTileHeightMap[arg1][arg2 + 1][arg3] + SceneGraph.activeTileHeightMap[arg1][arg2][arg3 + 1] + SceneGraph.activeTileHeightMap[arg1][arg2 + 1][arg3 + 1]) / 4;
@Pc(161) Wall local161 = local71.aClass77_1;
if (local161 != null) {
if (local161.aClass8_5.method4543()) {
arg0.method4544(local161.aClass8_5, (local28 - arg2) * 128 + (1 - arg4) * 64, local158, (local39 - arg3) * 128 + (1 - arg5) * 64, local1);
if (local161.primary.method4543()) {
arg0.method4544(local161.primary, (local28 - arg2) * 128 + (1 - arg4) * 64, local158, (local39 - arg3) * 128 + (1 - arg5) * 64, local1);
}
if (local161.aClass8_6 != null && local161.aClass8_6.method4543()) {
arg0.method4544(local161.aClass8_6, (local28 - arg2) * 128 + (1 - arg4) * 64, local158, (local39 - arg3) * 128 + (1 - arg5) * 64, local1);
@ -81,10 +81,10 @@ public final class Static69 {
}
for (@Pc(232) int local232 = 0; local232 < local71.anInt662; local232++) {
@Pc(241) Scenery local241 = local71.aClass31Array1[local232];
if (local241 != null && local241.aClass8_4.method4543() && (local28 == local241.anInt1701 || local28 == local3) && (local39 == local241.anInt1696 || local39 == local11)) {
if (local241 != null && local241.primary.method4543() && (local28 == local241.anInt1701 || local28 == local3) && (local39 == local241.anInt1696 || local39 == local11)) {
@Pc(270) int local270 = local241.anInt1713 + 1 - local241.anInt1701;
@Pc(278) int local278 = local241.anInt1698 + 1 - local241.anInt1696;
arg0.method4544(local241.aClass8_4, (local241.anInt1701 - arg2) * 128 + (local270 - arg4) * 64, local158, (local241.anInt1696 - arg3) * 128 + (local278 - arg5) * 64, local1);
arg0.method4544(local241.primary, (local241.anInt1701 - arg2) * 128 + (local270 - arg4) * 64, local158, (local241.anInt1696 - arg3) * 128 + (local278 - arg5) * 64, local1);
}
}
}

15
client/src/main/java/rt4/Static72.java
View file

@ -21,20 +21,7 @@ public final class Static72 {
@OriginalMember(owner = "client!fl", name = "V", descriptor = "Lclient!na;")
public static final JagString aClass100_448 = JagString.parse("(Y");
@OriginalMember(owner = "client!fl", name = "b", descriptor = "(II)Lclient!cl;")
public static AnimFrameset getAnimFrameset(@OriginalArg(0) int arg0) {
@Pc(19) AnimFrameset local19 = (AnimFrameset) SeqTypeList.aClass99_37.get((long) arg0);
if (local19 != null) {
return local19;
}
local19 = Static87.method1803(SeqTypeList.aClass153_92, SeqTypeList.aClass153_1, arg0);
if (local19 != null) {
SeqTypeList.aClass99_37.put(local19, (long) arg0);
}
return local19;
}
@OriginalMember(owner = "client!fl", name = "a", descriptor = "(IIIIII)V")
@OriginalMember(owner = "client!fl", name = "a", descriptor = "(IIIIII)V")
public static void method1568(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4) {
Static131.method2576(Static71.anIntArrayArray10[arg0], arg1 - arg2, arg2 + arg1, arg4);
@Pc(17) int local17 = 0;

4
client/src/main/java/rt4/Static73.java
View file

@ -77,7 +77,7 @@ public final class Static73 {
}
local16 = (arg1 << 7) + 1;
local20 = (arg3 << 7) + 2;
@Pc(156) int local156 = Static83.activeTileHeightMap[arg0][arg1][arg3] + arg5;
@Pc(156) int local156 = SceneGraph.activeTileHeightMap[arg0][arg1][arg3] + arg5;
if (!Static256.method4394(local16, local156, local20)) {
return false;
}
@ -96,7 +96,7 @@ public final class Static73 {
} else if (Static9.method187(arg0, arg1, arg3)) {
local16 = arg1 << 7;
local20 = arg3 << 7;
return Static256.method4394(local16 + 1, Static83.activeTileHeightMap[arg0][arg1][arg3] + arg5, local20 + 1) && Static256.method4394(local16 + 128 - 1, Static83.activeTileHeightMap[arg0][arg1 + 1][arg3] + arg5, local20 + 1) && Static256.method4394(local16 + 128 - 1, Static83.activeTileHeightMap[arg0][arg1 + 1][arg3 + 1] + arg5, local20 + 128 - 1) && Static256.method4394(local16 + 1, Static83.activeTileHeightMap[arg0][arg1][arg3 + 1] + arg5, local20 + 128 - 1);
return Static256.method4394(local16 + 1, SceneGraph.activeTileHeightMap[arg0][arg1][arg3] + arg5, local20 + 1) && Static256.method4394(local16 + 128 - 1, SceneGraph.activeTileHeightMap[arg0][arg1 + 1][arg3] + arg5, local20 + 1) && Static256.method4394(local16 + 128 - 1, SceneGraph.activeTileHeightMap[arg0][arg1 + 1][arg3 + 1] + arg5, local20 + 128 - 1) && Static256.method4394(local16 + 1, SceneGraph.activeTileHeightMap[arg0][arg1][arg3 + 1] + arg5, local20 + 128 - 1);
} else {
return false;
}

11
client/src/main/java/rt4/Static83.java
View file

@ -6,10 +6,7 @@ import org.openrs2.deob.annotation.Pc;
public final class Static83 {
@OriginalMember(owner = "client!gj", name = "m", descriptor = "[[[I")
public static int[][][] activeTileHeightMap;
@OriginalMember(owner = "client!gj", name = "a", descriptor = "(II)Z")
@OriginalMember(owner = "client!gj", name = "a", descriptor = "(II)Z")
public static boolean method433(@OriginalArg(0) int arg0) {
if (arg0 >= 97 && arg0 <= 122) {
return true;
@ -20,12 +17,6 @@ public final class Static83 {
}
}
@OriginalMember(owner = "client!gj", name = "a", descriptor = "(III)Lclient!df;")
public static WallDecor method435(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
@Pc(7) Tile local7 = SceneGraph.tiles[arg0][arg1][arg2];
return local7 == null ? null : local7.aClass24_1;
}
@OriginalMember(owner = "client!gj", name = "a", descriptor = "([JII[II)V")
public static void method436(@OriginalArg(0) long[] arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int[] arg3) {
if (arg1 >= arg2) {

2
client/src/main/java/rt4/Static85.java
View file

@ -15,7 +15,7 @@ public final class Static85 {
@OriginalMember(owner = "client!gl", name = "a", descriptor = "(II)V")
public static void refreshMagicVarp(@OriginalArg(1) int arg0) {
InterfaceList.redrawActiveInterfaces();
Static119.method2386();
AreaSoundManager.updateMulti();
@Pc(17) int local17 = VarpTypeList.get(arg0).clientCode;
if (local17 == 0) {
return;

26
client/src/main/java/rt4/Static87.java
View file

@ -24,32 +24,6 @@ public final class Static87 {
return false;
}
@OriginalMember(owner = "client!gn", name = "a", descriptor = "(Lclient!ve;ZLclient!ve;BI)Lclient!cl;")
public static AnimFrameset method1803(@OriginalArg(0) Js5 arg0, @OriginalArg(2) Js5 arg1, @OriginalArg(4) int arg2) {
@Pc(5) boolean local5 = true;
@Pc(16) int[] local16 = arg0.getFileIds(arg2);
for (@Pc(18) int local18 = 0; local18 < local16.length; local18++) {
@Pc(30) byte[] local30 = arg0.method4502(local16[local18], arg2);
if (local30 == null) {
local5 = false;
} else {
@Pc(49) int local49 = (local30[0] & 0xFF) << 8 | local30[1] & 0xFF;
@Pc(57) byte[] local57 = arg1.method4502(0, local49);
if (local57 == null) {
local5 = false;
}
}
}
if (!local5) {
return null;
}
try {
return new AnimFrameset(arg0, arg1, arg2, false);
} catch (@Pc(84) Exception local84) {
return null;
}
}
@OriginalMember(owner = "client!gn", name = "a", descriptor = "(BI)Lclient!na;")
public static JagString allocate(@OriginalArg(1) int arg0) {
@Pc(13) JagString local13 = new JagString();

2
client/src/main/java/rt4/Static89.java
View file

@ -193,7 +193,7 @@ public final class Static89 {
}
}
}
Static110.method2281(Static178.anInt4247, PlayerList.self.xFine, PlayerList.self.zFine, Player.level);
AreaSoundManager.redraw(Static178.anInt4247, PlayerList.self.xFine, PlayerList.self.zFine, Player.level);
Static178.anInt4247 = 0;
}

Some files were not shown because too many files have changed in this diff Show more