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

Loads of refactoring, renamed Class3_Sub13 to EnumStringEntry too

Browse source
This commit is contained in:
Pazaz 2022-04-23 16:25:30 -04:00
parent e11ef7d372
commit d2c6c19cb8
263 changed files with 2432 additions and 2436 deletions
Download patch file Download diff file Expand all files Collapse all files

22
client/src/main/java/AbstractWorld.java
View file

@ -5,31 +5,31 @@ import org.openrs2.deob.annotation.OriginalMember;
public abstract class AbstractWorld {
@OriginalMember(owner = "client!gj", name = "j", descriptor = "I")
public int anInt377;
public int country;
@OriginalMember(owner = "client!gj", name = "l", descriptor = "I")
public int anInt379;
public int players;
@OriginalMember(owner = "client!gj", name = "o", descriptor = "I")
public int anInt381;
public int flags;
@OriginalMember(owner = "client!gj", name = "a", descriptor = "(I)Z")
public final boolean method437() {
return (this.anInt381 & 0x1) != 0;
public final boolean isMembers() {
return (this.flags & 0x1) != 0;
}
@OriginalMember(owner = "client!gj", name = "a", descriptor = "(Z)Z")
public final boolean method439() {
return (this.anInt381 & 0x4) != 0;
public final boolean isPvp() {
return (this.flags & 0x4) != 0;
}
@OriginalMember(owner = "client!gj", name = "c", descriptor = "(I)Z")
public final boolean method441() {
return (this.anInt381 & 0x8) != 0;
public final boolean isLootShare() {
return (this.flags & 0x8) != 0;
}
@OriginalMember(owner = "client!gj", name = "d", descriptor = "(I)Z")
public final boolean method442() {
return (this.anInt381 & 0x2) != 0;
public final boolean isQuickChat() {
return (this.flags & 0x2) != 0;
}
}

48
client/src/main/java/AnimBase.java
View file

@ -7,48 +7,48 @@ import org.openrs2.deob.annotation.Pc;
public final class AnimBase extends Node {
@OriginalMember(owner = "client!jm", name = "p", descriptor = "I")
public final int anInt3113;
public final int id;
@OriginalMember(owner = "client!jm", name = "x", descriptor = "I")
public final int anInt3116;
public final int transforms;
@OriginalMember(owner = "client!jm", name = "v", descriptor = "[[I")
public final int[][] anIntArrayArray23;
public final int[][] bones;
@OriginalMember(owner = "client!jm", name = "B", descriptor = "[I")
public final int[] anIntArray291;
public final int[] types;
@OriginalMember(owner = "client!jm", name = "y", descriptor = "[Z")
public final boolean[] aBooleanArray70;
public final boolean[] shadow;
@OriginalMember(owner = "client!jm", name = "q", descriptor = "[I")
public final int[] anIntArray290;
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.anInt3113 = arg0;
@Pc(9) Buffer local9 = new Buffer(arg1);
this.anInt3116 = local9.g1();
this.anIntArrayArray23 = new int[this.anInt3116][];
this.anIntArray291 = new int[this.anInt3116];
this.aBooleanArray70 = new boolean[this.anInt3116];
this.anIntArray290 = new int[this.anInt3116];
this.id = arg0;
@Pc(9) Buffer buffer = new Buffer(arg1);
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.anInt3116; local36++) {
this.anIntArray291[local36] = local9.g1();
for (local36 = 0; local36 < this.transforms; local36++) {
this.types[local36] = buffer.g1();
}
for (local36 = 0; local36 < this.anInt3116; local36++) {
this.aBooleanArray70[local36] = local9.g1() == 1;
for (local36 = 0; local36 < this.transforms; local36++) {
this.shadow[local36] = buffer.g1() == 1;
}
for (local36 = 0; local36 < this.anInt3116; local36++) {
this.anIntArray290[local36] = local9.g2();
for (local36 = 0; local36 < this.transforms; local36++) {
this.parts[local36] = buffer.g2();
}
for (local36 = 0; local36 < this.anInt3116; local36++) {
this.anIntArrayArray23[local36] = new int[local9.g1()];
for (local36 = 0; local36 < this.transforms; local36++) {
this.bones[local36] = new int[buffer.g1()];
}
for (local36 = 0; local36 < this.anInt3116; local36++) {
for (@Pc(118) int local118 = 0; local118 < this.anIntArrayArray23[local36].length; local118++) {
this.anIntArrayArray23[local36][local118] = local9.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();
}
}
}

80
client/src/main/java/AnimFrame.java
View file

@ -7,19 +7,19 @@ import org.openrs2.deob.annotation.Pc;
public final class AnimFrame {
@OriginalMember(owner = "client!ne", name = "c", descriptor = "Lclient!jm;")
public AnimBase aClass3_Sub20_1 = null;
public AnimBase base = null;
@OriginalMember(owner = "client!ne", name = "b", descriptor = "I")
public int anInt4070 = -1;
public int length = -1;
@OriginalMember(owner = "client!ne", name = "e", descriptor = "Z")
public boolean aBoolean197 = false;
public boolean transformsAlpha = false;
@OriginalMember(owner = "client!ne", name = "a", descriptor = "Z")
public boolean aBoolean196 = false;
public boolean transformsColor = false;
@OriginalMember(owner = "client!ne", name = "d", descriptor = "[S")
public final short[] aShortArray42;
public final short[] indices;
@OriginalMember(owner = "client!ne", name = "g", descriptor = "[S")
public final short[] aShortArray44;
@ -31,25 +31,25 @@ public final class AnimFrame {
public final short[] aShortArray49;
@OriginalMember(owner = "client!ne", name = "f", descriptor = "[S")
public final short[] aShortArray43;
public final short[] prevOriginIndices;
@OriginalMember(owner = "client!ne", name = "l", descriptor = "[B")
public final byte[] aByteArray55;
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.aClass3_Sub20_1 = 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();
@Pc(35) int local35 = 0;
@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.aClass3_Sub20_1.anIntArray291[local47];
@Pc(56) int local56 = this.base.types[local47];
if (local56 == 0) {
local37 = local47;
}
@ -58,63 +58,63 @@ public final class AnimFrame {
if (local56 == 0) {
local39 = local47;
}
Static168.aShortArray51[local35] = (short) local47;
Static168.tempIndices[len] = (short) local47;
@Pc(77) short local77 = 0;
if (local56 == 3) {
local77 = 128;
}
if ((local64 & 0x1) == 0) {
Static168.aShortArray48[local35] = local77;
Static168.tempX[len] = local77;
} else {
Static168.aShortArray48[local35] = (short) local26.gSmart1or2s();
Static168.tempX[len] = (short) local26.gSmart1or2s();
}
if ((local64 & 0x2) == 0) {
Static168.aShortArray46[local35] = local77;
Static168.tempY[len] = local77;
} else {
Static168.aShortArray46[local35] = (short) local26.gSmart1or2s();
Static168.tempY[len] = (short) local26.gSmart1or2s();
}
if ((local64 & 0x4) == 0) {
Static168.aShortArray45[local35] = local77;
Static168.tempZ[len] = local77;
} else {
Static168.aShortArray45[local35] = (short) local26.gSmart1or2s();
Static168.tempZ[len] = (short) local26.gSmart1or2s();
}
Static168.aByteArray54[local35] = (byte) (local64 >>> 3 & 0x3);
Static168.tempFlags[len] = (byte) (local64 >>> 3 & 0x3);
if (local56 == 2) {
Static168.aShortArray48[local35] = (short) (((Static168.aShortArray48[local35] & 0xFF) << 3) + (Static168.aShortArray48[local35] >> 8 & 0x7));
Static168.aShortArray46[local35] = (short) (((Static168.aShortArray46[local35] & 0xFF) << 3) + (Static168.aShortArray46[local35] >> 8 & 0x7));
Static168.aShortArray45[local35] = (short) (((Static168.aShortArray45[local35] & 0xFF) << 3) + (Static168.aShortArray45[local35] >> 8 & 0x7));
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));
}
Static168.aShortArray47[local35] = -1;
Static168.tempPrevOriginIndices[len] = -1;
if (local56 == 1 || local56 == 2 || local56 == 3) {
if (local37 > local39) {
Static168.aShortArray47[local35] = (short) local37;
Static168.tempPrevOriginIndices[len] = (short) local37;
local39 = local37;
}
} else if (local56 == 5) {
this.aBoolean197 = true;
this.transformsAlpha = true;
} else if (local56 == 7) {
this.aBoolean196 = true;
this.transformsColor = true;
}
local35++;
len++;
}
}
if (local26.offset != arg0.length) {
throw new RuntimeException();
}
this.anInt4070 = local35;
this.aShortArray42 = new short[local35];
this.aShortArray44 = new short[local35];
this.aShortArray50 = new short[local35];
this.aShortArray49 = new short[local35];
this.aShortArray43 = new short[local35];
this.aByteArray55 = new byte[local35];
for (local47 = 0; local47 < local35; local47++) {
this.aShortArray42[local47] = Static168.aShortArray51[local47];
this.aShortArray44[local47] = Static168.aShortArray48[local47];
this.aShortArray50[local47] = Static168.aShortArray46[local47];
this.aShortArray49[local47] = Static168.aShortArray45[local47];
this.aShortArray43[local47] = Static168.aShortArray47[local47];
this.aByteArray55[local47] = Static168.aByteArray54[local47];
this.length = len;
this.indices = new short[len];
this.aShortArray44 = new short[len];
this.aShortArray50 = new short[len];
this.aShortArray49 = 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];
}
}
}

16
client/src/main/java/AnimFrameset.java
View file

@ -7,13 +7,13 @@ import org.openrs2.deob.annotation.Pc;
public final class AnimFrameset extends SecondaryNode {
@OriginalMember(owner = "client!cl", name = "W", descriptor = "[Lclient!ne;")
public final AnimFrame[] aClass104Array1;
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.method4504(arg2);
this.aClass104Array1 = new AnimFrame[local10];
this.frames = new AnimFrame[local10];
@Pc(19) int[] local19 = arg0.method4503(arg2);
for (@Pc(21) int local21 = 0; local21 < local19.length; local21++) {
@Pc(37) byte[] local37 = arg0.getFile(arg2, local19[local21]);
@ -21,7 +21,7 @@ public final class AnimFrameset extends SecondaryNode {
@Pc(56) AnimBase local56 = (AnimBase) local5.method2289();
@Pc(58) AnimBase local58 = null;
while (local56 != null) {
if (local56.anInt3113 == local51) {
if (local56.id == local51) {
local58 = local56;
break;
}
@ -32,17 +32,17 @@ public final class AnimFrameset extends SecondaryNode {
local58 = new AnimBase(local51, local85);
local5.method2282(local58);
}
this.aClass104Array1[local19[local21]] = new AnimFrame(local37, local58);
this.frames[local19[local21]] = new AnimFrame(local37, local58);
}
}
@OriginalMember(owner = "client!cl", name = "c", descriptor = "(II)Z")
public final boolean method901(@OriginalArg(1) int arg0) {
return this.aClass104Array1[arg0].aBoolean197;
public final boolean isAlphaTransformed(@OriginalArg(1) int arg0) {
return this.frames[arg0].transformsAlpha;
}
@OriginalMember(owner = "client!cl", name = "a", descriptor = "(IB)Z")
public final boolean method903(@OriginalArg(0) int arg0) {
return this.aClass104Array1[arg0].aBoolean196;
public final boolean isColorTransformed(@OriginalArg(0) int arg0) {
return this.frames[arg0].transformsColor;
}
}

64
client/src/main/java/AreaSound.java
View file

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

196
client/src/main/java/AudioChannel.java
View file

@ -11,56 +11,56 @@ public class AudioChannel {
public static boolean stereo;
@OriginalMember(owner = "client!vh", name = "h", descriptor = "Lclient!qb;")
private PcmStream aClass3_Sub3_6;
private PcmStream stream;
@OriginalMember(owner = "client!vh", name = "n", descriptor = "[I")
public int[] anIntArray411;
public int[] samples;
@OriginalMember(owner = "client!vh", name = "D", descriptor = "I")
private int anInt4637;
@OriginalMember(owner = "client!vh", name = "H", descriptor = "I")
public int anInt4641;
public int sampleRate;
@OriginalMember(owner = "client!vh", name = "K", descriptor = "I")
public int anInt4644;
public int bufferCapacity;
@OriginalMember(owner = "client!vh", name = "a", descriptor = "I")
private final int anInt4621 = 32;
@OriginalMember(owner = "client!vh", name = "f", descriptor = "J")
private long aLong151 = MonotonicClock.currentTimeMillis();
private long time = MonotonicClock.currentTimeMillis();
@OriginalMember(owner = "client!vh", name = "w", descriptor = "[Lclient!qb;")
private final PcmStream[] aClass3_Sub3Array5 = new PcmStream[8];
@OriginalMember(owner = "client!vh", name = "x", descriptor = "I")
private int anInt4634 = 0;
private int consumedSamples = 0;
@OriginalMember(owner = "client!vh", name = "v", descriptor = "J")
private long aLong152 = 0L;
private long calculateConsumptionAt = 0L;
@OriginalMember(owner = "client!vh", name = "E", descriptor = "I")
private int anInt4638 = 0;
@OriginalMember(owner = "client!vh", name = "A", descriptor = "Z")
private boolean aBoolean229 = true;
private boolean skipConsumptionCheck = true;
@OriginalMember(owner = "client!vh", name = "z", descriptor = "[Lclient!qb;")
private final PcmStream[] aClass3_Sub3Array6 = new PcmStream[8];
@OriginalMember(owner = "client!vh", name = "y", descriptor = "J")
private long aLong153 = 0L;
private long closeUntil = 0L;
@OriginalMember(owner = "client!vh", name = "G", descriptor = "I")
private int anInt4640 = 0;
private int prevConsumedSamples = 0;
@OriginalMember(owner = "client!vh", name = "C", descriptor = "I")
private int anInt4636 = 0;
private int prevBufferSize = 0;
@OriginalMember(owner = "client!dc", name = "a", descriptor = "(IIIZ)V")
public static void init(@OriginalArg(3) boolean arg0) {
Static258.anInt5637 = 2;
Static258.threadPriority = 2;
stereo = arg0;
Static44.sampleRate = 22050;
}
@ -72,44 +72,44 @@ public class AudioChannel {
}
try {
@Pc(33) AudioChannel local33 = (AudioChannel) Class.forName("JavaAudioChannel").getDeclaredConstructor().newInstance();
local33.anInt4641 = arg0;
local33.anIntArray411 = new int[(stereo ? 2 : 1) * 256];
local33.sampleRate = arg0;
local33.samples = new int[(stereo ? 2 : 1) * 256];
local33.init(arg2);
local33.anInt4644 = (arg0 & -1024) + 1024;
if (local33.anInt4644 > 16384) {
local33.anInt4644 = 16384;
local33.bufferCapacity = (arg0 & -1024) + 1024;
if (local33.bufferCapacity > 16384) {
local33.bufferCapacity = 16384;
}
local33.open(local33.anInt4644);
if (Static258.anInt5637 > 0 && Static60.aClass19_1 == null) {
Static60.aClass19_1 = new AudioThread();
Static60.aClass19_1.signLink = arg1;
arg1.startThread(Static258.anInt5637, Static60.aClass19_1);
local33.open(local33.bufferCapacity);
if (Static258.threadPriority > 0 && Static60.thread == null) {
Static60.thread = new AudioThread();
Static60.thread.signLink = arg1;
arg1.startThread(Static258.threadPriority, Static60.thread);
}
if (Static60.aClass19_1 != null) {
if (Static60.aClass19_1.channels[arg3] != null) {
if (Static60.thread != null) {
if (Static60.thread.channels[arg3] != null) {
throw new IllegalArgumentException();
}
Static60.aClass19_1.channels[arg3] = local33;
Static60.thread.channels[arg3] = local33;
}
return local33;
} catch (@Pc(109) Throwable local109) {
try {
@Pc(120) SignLinkAudioChannel local120 = new SignLinkAudioChannel(arg1, arg3);
local120.anIntArray411 = new int[(stereo ? 2 : 1) * 256];
local120.anInt4641 = arg0;
local120.samples = new int[(stereo ? 2 : 1) * 256];
local120.sampleRate = arg0;
local120.init(arg2);
local120.anInt4644 = 16384;
local120.open(local120.anInt4644);
if (Static258.anInt5637 > 0 && Static60.aClass19_1 == null) {
Static60.aClass19_1 = new AudioThread();
Static60.aClass19_1.signLink = arg1;
arg1.startThread(Static258.anInt5637, Static60.aClass19_1);
local120.bufferCapacity = 16384;
local120.open(local120.bufferCapacity);
if (Static258.threadPriority > 0 && Static60.thread == null) {
Static60.thread = new AudioThread();
Static60.thread.signLink = arg1;
arg1.startThread(Static258.threadPriority, Static60.thread);
}
if (Static60.aClass19_1 != null) {
if (Static60.aClass19_1.channels[arg3] != null) {
if (Static60.thread != null) {
if (Static60.thread.channels[arg3] != null) {
throw new IllegalArgumentException();
}
Static60.aClass19_1.channels[arg3] = local120;
Static60.thread.channels[arg3] = local120;
}
return local120;
} catch (@Pc(186) Throwable local186) {
@ -131,17 +131,17 @@ public class AudioChannel {
}
@OriginalMember(owner = "client!vh", name = "a", descriptor = "([II)V")
private void method3564(@OriginalArg(0) int[] arg0) {
private void read(@OriginalArg(0) int[] arg0) {
@Pc(1) short local1 = 256;
if (stereo) {
local1 = 512;
}
Static289.method2618(arg0, 0, local1);
Static289.clear(arg0, 0, local1);
this.anInt4638 -= 256;
if (this.aClass3_Sub3_6 != null && this.anInt4638 <= 0) {
if (this.stream != null && this.anInt4638 <= 0) {
this.anInt4638 += Static44.sampleRate >> 4;
Static167.method3170(this.aClass3_Sub3_6);
this.method3567(this.aClass3_Sub3_6, this.aClass3_Sub3_6.method4407());
Static167.setInactive(this.stream);
this.method3567(this.stream, this.stream.method4407());
@Pc(45) int local45 = 0;
@Pc(47) int local47 = 255;
@Pc(49) int local49 = 7;
@ -221,89 +221,89 @@ public class AudioChannel {
if (this.anInt4638 < 0) {
this.anInt4638 = 0;
}
if (this.aClass3_Sub3_6 != null) {
this.aClass3_Sub3_6.method4408(arg0, 0, 256);
if (this.stream != null) {
this.stream.read(arg0, 0, 256);
}
this.aLong151 = MonotonicClock.currentTimeMillis();
this.time = MonotonicClock.currentTimeMillis();
}
@OriginalMember(owner = "client!vh", name = "a", descriptor = "(B)V")
public final synchronized void loop() {
if (this.anIntArray411 == null) {
if (this.samples == null) {
return;
}
@Pc(14) long local14 = MonotonicClock.currentTimeMillis();
@Pc(14) long now = MonotonicClock.currentTimeMillis();
try {
if (this.aLong153 != 0L) {
if (local14 < this.aLong153) {
if (this.closeUntil != 0L) {
if (now < this.closeUntil) {
return;
}
this.open(this.anInt4644);
this.aBoolean229 = true;
this.aLong153 = 0L;
this.open(this.bufferCapacity);
this.skipConsumptionCheck = true;
this.closeUntil = 0L;
}
@Pc(38) int local38 = this.getBufferSize();
if (this.anInt4634 < this.anInt4636 - local38) {
this.anInt4634 = this.anInt4636 - local38;
if (this.consumedSamples < this.prevBufferSize - local38) {
this.consumedSamples = this.prevBufferSize - local38;
}
@Pc(65) int local65 = this.anInt4641 + this.anInt4637;
@Pc(65) int local65 = this.sampleRate + this.anInt4637;
if (local65 + 256 > 16384) {
local65 = 16128;
}
if (this.anInt4644 < local65 + 256) {
this.anInt4644 += 1024;
if (this.anInt4644 > 16384) {
this.anInt4644 = 16384;
if (this.bufferCapacity < local65 + 256) {
this.bufferCapacity += 1024;
if (this.bufferCapacity > 16384) {
this.bufferCapacity = 16384;
}
this.flush();
local38 = 0;
this.open(this.anInt4644);
if (this.anInt4644 < local65 + 256) {
local65 = this.anInt4644 - 256;
this.anInt4637 = local65 - this.anInt4641;
this.open(this.bufferCapacity);
if (this.bufferCapacity < local65 + 256) {
local65 = this.bufferCapacity - 256;
this.anInt4637 = local65 - this.sampleRate;
}
this.aBoolean229 = true;
this.skipConsumptionCheck = true;
}
while (local65 > local38) {
local38 += 256;
this.method3564(this.anIntArray411);
this.read(this.samples);
this.write();
}
if (local14 > this.aLong152) {
if (this.aBoolean229) {
this.aBoolean229 = false;
} else if (this.anInt4634 == 0 && this.anInt4640 == 0) {
if (now > this.calculateConsumptionAt) {
if (this.skipConsumptionCheck) {
this.skipConsumptionCheck = false;
} else if (this.consumedSamples == 0 && this.prevConsumedSamples == 0) {
this.flush();
this.aLong153 = local14 + 2000L;
this.closeUntil = now + 2000L;
return;
} else {
this.anInt4637 = Math.min(this.anInt4640, this.anInt4634);
this.anInt4640 = this.anInt4634;
this.anInt4637 = Math.min(this.prevConsumedSamples, this.consumedSamples);
this.prevConsumedSamples = this.consumedSamples;
}
this.aLong152 = local14 + 2000L;
this.anInt4634 = 0;
this.calculateConsumptionAt = now + 2000L;
this.consumedSamples = 0;
}
this.anInt4636 = local38;
this.prevBufferSize = local38;
} catch (@Pc(202) Exception local202) {
this.flush();
this.aLong153 = local14 + 2000L;
this.closeUntil = now + 2000L;
}
try {
if (local14 > this.aLong151 + 500000L) {
local14 = this.aLong151;
if (now > this.time + 500000L) {
now = this.time;
}
while (local14 > this.aLong151 + 5000L) {
this.method3573();
this.aLong151 += 256000 / Static44.sampleRate;
while (now > this.time + 5000L) {
this.skip();
this.time += 256000 / Static44.sampleRate;
}
} catch (@Pc(247) Exception local247) {
this.aLong151 = local14;
this.time = now;
}
}
@OriginalMember(owner = "client!vh", name = "a", descriptor = "(ILclient!qb;)V")
public final synchronized void setStream(@OriginalArg(1) PcmStream arg0) {
this.aClass3_Sub3_6 = arg0;
this.stream = arg0;
}
@OriginalMember(owner = "client!vh", name = "a", descriptor = "(Lclient!qb;IB)V")
@ -321,23 +321,23 @@ public class AudioChannel {
@OriginalMember(owner = "client!vh", name = "c", descriptor = "()I")
protected int getBufferSize() throws Exception {
return this.anInt4644;
return this.bufferCapacity;
}
@OriginalMember(owner = "client!vh", name = "b", descriptor = "(B)V")
public final synchronized void method3570() {
this.aBoolean229 = true;
this.skipConsumptionCheck = true;
try {
this.close();
} catch (@Pc(10) Exception local10) {
this.flush();
this.aLong153 = MonotonicClock.currentTimeMillis() + 2000L;
this.closeUntil = MonotonicClock.currentTimeMillis() + 2000L;
}
}
@OriginalMember(owner = "client!vh", name = "b", descriptor = "(I)V")
public final void method3571() {
this.aBoolean229 = true;
this.skipConsumptionCheck = true;
}
@OriginalMember(owner = "client!vh", name = "d", descriptor = "()V")
@ -345,38 +345,38 @@ public class AudioChannel {
}
@OriginalMember(owner = "client!vh", name = "a", descriptor = "(II)V")
private void method3573() {
private void skip() {
this.anInt4638 -= 256;
if (this.anInt4638 < 0) {
this.anInt4638 = 0;
}
if (this.aClass3_Sub3_6 != null) {
this.aClass3_Sub3_6.method4410(256);
if (this.stream != null) {
this.stream.skip(256);
}
}
@OriginalMember(owner = "client!vh", name = "a", descriptor = "(Z)V")
public final synchronized void method3575() {
if (Static60.aClass19_1 != null) {
public final synchronized void quit() {
if (Static60.thread != null) {
@Pc(6) boolean local6 = true;
for (@Pc(8) int local8 = 0; local8 < 2; local8++) {
if (Static60.aClass19_1.channels[local8] == this) {
Static60.aClass19_1.channels[local8] = null;
if (Static60.thread.channels[local8] == this) {
Static60.thread.channels[local8] = null;
}
if (Static60.aClass19_1.channels[local8] != null) {
if (Static60.thread.channels[local8] != null) {
local6 = false;
}
}
if (local6) {
Static60.aClass19_1.stop = true;
while (Static60.aClass19_1.running) {
Static60.thread.stop = true;
while (Static60.thread.running) {
Static231.sleep(50L);
}
Static60.aClass19_1 = null;
Static60.thread = null;
}
}
this.flush();
this.anIntArray411 = null;
this.samples = null;
}
@OriginalMember(owner = "client!vh", name = "a", descriptor = "(Ljava/awt/Component;)V")

58
client/src/main/java/BasType.java
View file

@ -7,16 +7,16 @@ import org.openrs2.deob.annotation.Pc;
public final class BasType {
@OriginalMember(owner = "client!ck", name = "g", descriptor = "[[I")
public int[][] anIntArrayArray7;
public int[][] modelRotateTranslate;
@OriginalMember(owner = "client!ck", name = "p", descriptor = "I")
public int anInt1036 = -1;
@OriginalMember(owner = "client!ck", name = "q", descriptor = "I")
public int anInt1037 = -1;
public int idleAnimationId = -1;
@OriginalMember(owner = "client!ck", name = "w", descriptor = "I")
public int anInt1043 = -1;
public int runAnimationId3 = -1;
@OriginalMember(owner = "client!ck", name = "u", descriptor = "I")
public int anInt1041 = 0;
@ -34,28 +34,28 @@ public final class BasType {
public int anInt1048 = -1;
@OriginalMember(owner = "client!ck", name = "M", descriptor = "I")
public int anInt1054 = -1;
public int runAnimationId2 = -1;
@OriginalMember(owner = "client!ck", name = "N", descriptor = "I")
public int anInt1055 = 0;
@OriginalMember(owner = "client!ck", name = "m", descriptor = "I")
public int anInt1035 = -1;
public int turnAnimation3 = -1;
@OriginalMember(owner = "client!ck", name = "P", descriptor = "I")
public int anInt1056 = -1;
public int turnAnimation1 = -1;
@OriginalMember(owner = "client!ck", name = "h", descriptor = "I")
public int anInt1032 = -1;
@OriginalMember(owner = "client!ck", name = "H", descriptor = "I")
public int anInt1051 = -1;
public int walkAnimation = -1;
@OriginalMember(owner = "client!ck", name = "W", descriptor = "I")
public int anInt1059 = 0;
@OriginalMember(owner = "client!ck", name = "z", descriptor = "I")
public int anInt1045 = -1;
public int runAnimationId4 = -1;
@OriginalMember(owner = "client!ck", name = "r", descriptor = "I")
public int anInt1038 = 0;
@ -70,7 +70,7 @@ public final class BasType {
public int anInt1040 = 0;
@OriginalMember(owner = "client!ck", name = "U", descriptor = "I")
public int anInt1058 = -1;
public int runAnimationId = -1;
@OriginalMember(owner = "client!ck", name = "ib", descriptor = "I")
public int anInt1066 = -1;
@ -79,7 +79,7 @@ public final class BasType {
public int anInt1063 = 0;
@OriginalMember(owner = "client!ck", name = "R", descriptor = "I")
public int anInt1057 = -1;
public int turnAnimation2 = -1;
@OriginalMember(owner = "client!ck", name = "jb", descriptor = "I")
public int anInt1067 = -1;
@ -105,13 +105,13 @@ public final class BasType {
@OriginalMember(owner = "client!ck", name = "a", descriptor = "(IBLclient!wa;)V")
private void method881(@OriginalArg(0) int arg0, @OriginalArg(2) Buffer arg1) {
if (arg0 == 1) {
this.anInt1037 = arg1.g2();
this.anInt1051 = arg1.g2();
if (this.anInt1051 == 65535) {
this.anInt1051 = -1;
this.idleAnimationId = arg1.g2();
this.walkAnimation = arg1.g2();
if (this.walkAnimation == 65535) {
this.walkAnimation = -1;
}
if (this.anInt1037 == 65535) {
this.anInt1037 = -1;
if (this.idleAnimationId == 65535) {
this.idleAnimationId = -1;
}
} else if (arg0 == 2) {
this.anInt1062 = arg1.g2();
@ -122,24 +122,24 @@ public final class BasType {
} else if (arg0 == 5) {
this.anInt1048 = arg1.g2();
} else if (arg0 == 6) {
this.anInt1058 = arg1.g2();
this.runAnimationId = arg1.g2();
} else if (arg0 == 7) {
this.anInt1054 = arg1.g2();
this.runAnimationId2 = arg1.g2();
} else if (arg0 == 8) {
this.anInt1043 = arg1.g2();
this.runAnimationId3 = arg1.g2();
} else if (arg0 == 9) {
this.anInt1045 = arg1.g2();
this.runAnimationId4 = arg1.g2();
} else if (arg0 == 26) {
this.anInt1059 = (short) (arg1.g1() * 4);
this.anInt1050 = (short) (arg1.g1() * 4);
} else if (arg0 == 27) {
if (this.anIntArrayArray7 == null) {
this.anIntArrayArray7 = new int[12][];
if (this.modelRotateTranslate == null) {
this.modelRotateTranslate = new int[12][];
}
@Pc(306) int local306 = arg1.g1();
this.anIntArrayArray7[local306] = new int[6];
for (@Pc(314) int local314 = 0; local314 < 6; local314++) {
this.anIntArrayArray7[local306][local314] = arg1.g2s();
@Pc(306) int bodyId = arg1.g1();
this.modelRotateTranslate[bodyId] = new int[6];
for (@Pc(314) int type = 0; type < 6; type++) {
this.modelRotateTranslate[bodyId][type] = arg1.g2s();
}
} else if (arg0 == 29) {
this.anInt1038 = arg1.g1();
@ -164,11 +164,11 @@ public final class BasType {
} else if (arg0 == 39) {
this.anInt1067 = arg1.g2();
} else if (arg0 == 40) {
this.anInt1056 = arg1.g2();
this.turnAnimation1 = arg1.g2();
} else if (arg0 == 41) {
this.anInt1057 = arg1.g2();
this.turnAnimation2 = arg1.g2();
} else if (arg0 == 42) {
this.anInt1035 = arg1.g2();
this.turnAnimation3 = arg1.g2();
} else if (arg0 == 43) {
arg1.g2();
} else if (arg0 == 44) {

145
client/src/main/java/Cache.java
View file

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

4
client/src/main/java/Class45.java
View file

@ -63,7 +63,7 @@ public final class Class45 {
local1 = arg1 + (arg3 << 16);
@Pc(23) IntNode local23 = (IntNode) this.aClass133_4.get(local1);
if (local23 != null) {
return local23.anInt3141;
return local23.value;
}
}
@Pc(31) int local31 = arg0.anInt2247;
@ -106,7 +106,7 @@ public final class Class45 {
this.anIntArray178[this.anInt2017] = arg1;
this.anIntArray180[this.anInt2017] = arg2;
this.anIntArray179[this.anInt2017] = arg3;
this.aClass133_4.method3862(new IntNode(this.anInt2017), local1);
this.aClass133_4.put(new IntNode(this.anInt2017), local1);
return this.anInt2017++;
}

4
client/src/main/java/CollisionMap.java
View file

@ -538,7 +538,7 @@ public final class CollisionMap {
}
@OriginalMember(owner = "client!mj", name = "a", descriptor = "(IZBIII)V")
public final void method3043(@OriginalArg(0) int arg0, @OriginalArg(1) boolean arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4) {
public final void flagScenery(@OriginalArg(0) int arg0, @OriginalArg(1) boolean arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4) {
@Pc(6) int local6 = arg2 - this.anInt3907;
@Pc(11) int local11 = arg0 - this.anInt3912;
@Pc(17) int local17 = 256;
@ -903,7 +903,7 @@ public final class CollisionMap {
}
@OriginalMember(owner = "client!mj", name = "a", descriptor = "(IIIZIII)V")
public final void method3056(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) boolean arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5) {
public final void unflagScenery(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) boolean arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5) {
@Pc(6) int local6 = arg0 - this.anInt3912;
@Pc(11) int local11 = arg5 - this.anInt3907;
@Pc(13) int local13 = 256;

92
client/src/main/java/ColorImageCache.java
View file

@ -7,88 +7,88 @@ import org.openrs2.deob.annotation.Pc;
public final class ColorImageCache {
@OriginalMember(owner = "client!pf", name = "d", descriptor = "I")
private int anInt4467 = 0;
private int size = 0;
@OriginalMember(owner = "client!pf", name = "m", descriptor = "I")
private int anInt4471 = -1;
private int singleRow = -1;
@OriginalMember(owner = "client!pf", name = "p", descriptor = "Lclient!ih;")
private LinkedList aClass69_103 = new LinkedList();
private LinkedList recentlyUsed = new LinkedList();
@OriginalMember(owner = "client!pf", name = "t", descriptor = "Z")
public boolean aBoolean221 = false;
public boolean invalid = false;
@OriginalMember(owner = "client!pf", name = "a", descriptor = "I")
private final int anInt4465;
private final int height;
@OriginalMember(owner = "client!pf", name = "e", descriptor = "[Lclient!qi;")
private ColorImageCacheEntry[] aClass3_Sub28Array1;
private ColorImageCacheEntry[] entries;
@OriginalMember(owner = "client!pf", name = "s", descriptor = "I")
private final int anInt4475;
private final int capacity;
@OriginalMember(owner = "client!pf", name = "g", descriptor = "[[I")
private int[][] anIntArrayArray34;
private int[][] pixels;
@OriginalMember(owner = "client!pf", name = "<init>", descriptor = "(III)V")
public ColorImageCache(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
this.anInt4465 = arg1;
this.aClass3_Sub28Array1 = new ColorImageCacheEntry[this.anInt4465];
this.anInt4475 = arg0;
this.anIntArrayArray34 = new int[this.anInt4475][arg2];
public ColorImageCache(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int width) {
this.height = arg1;
this.entries = new ColorImageCacheEntry[this.height];
this.capacity = arg0;
this.pixels = new int[this.capacity][width];
}
@OriginalMember(owner = "client!pf", name = "b", descriptor = "(I)V")
public final void method3442() {
for (@Pc(3) int local3 = 0; local3 < this.anInt4475; local3++) {
this.anIntArrayArray34[local3] = null;
public final void clear() {
for (@Pc(3) int i = 0; i < this.capacity; i++) {
this.pixels[i] = null;
}
this.anIntArrayArray34 = null;
this.aClass3_Sub28Array1 = null;
this.aClass69_103.method2278();
this.aClass69_103 = null;
this.pixels = null;
this.entries = null;
this.recentlyUsed.clear();
this.recentlyUsed = null;
}
@OriginalMember(owner = "client!pf", name = "b", descriptor = "(II)[I")
public final int[] method3445(@OriginalArg(1) int arg0) {
if (this.anInt4465 == this.anInt4475) {
this.aBoolean221 = this.aClass3_Sub28Array1[arg0] == null;
this.aClass3_Sub28Array1[arg0] = Static105.aClass3_Sub28_1;
return this.anIntArrayArray34[arg0];
} else if (this.anInt4475 == 1) {
this.aBoolean221 = this.anInt4471 != arg0;
this.anInt4471 = arg0;
return this.anIntArrayArray34[0];
public final int[] method3445(@OriginalArg(1) int row) {
if (this.height == this.capacity) {
this.invalid = this.entries[row] == null;
this.entries[row] = Static105.VALID;
return this.pixels[row];
} else if (this.capacity == 1) {
this.invalid = this.singleRow != row;
this.singleRow = row;
return this.pixels[0];
} else {
@Pc(29) ColorImageCacheEntry local29 = this.aClass3_Sub28Array1[arg0];
@Pc(29) ColorImageCacheEntry local29 = this.entries[row];
if (local29 == null) {
this.aBoolean221 = true;
if (this.anInt4467 < this.anInt4475) {
local29 = new ColorImageCacheEntry(arg0, this.anInt4467);
this.anInt4467++;
this.invalid = true;
if (this.size < this.capacity) {
local29 = new ColorImageCacheEntry(row, this.size);
this.size++;
} else {
@Pc(66) ColorImageCacheEntry local66 = (ColorImageCacheEntry) this.aClass69_103.method2279();
local29 = new ColorImageCacheEntry(arg0, local66.anInt4761);
this.aClass3_Sub28Array1[local66.anInt4759] = null;
local66.method4658();
@Pc(66) ColorImageCacheEntry local66 = (ColorImageCacheEntry) this.recentlyUsed.method2279();
local29 = new ColorImageCacheEntry(row, local66.index);
this.entries[local66.row] = null;
local66.unlink();
}
this.aClass3_Sub28Array1[arg0] = local29;
this.entries[row] = local29;
} else {
this.aBoolean221 = false;
this.invalid = false;
}
this.aClass69_103.method2283(local29);
return this.anIntArrayArray34[local29.anInt4761];
this.recentlyUsed.addHead(local29);
return this.pixels[local29.index];
}
}
@OriginalMember(owner = "client!pf", name = "a", descriptor = "(B)[[I")
public final int[][] method3446() {
if (this.anInt4475 != this.anInt4465) {
if (this.capacity != this.height) {
throw new RuntimeException("Can only retrieve a full image cache");
}
for (@Pc(24) int local24 = 0; local24 < this.anInt4475; local24++) {
this.aClass3_Sub28Array1[local24] = Static105.aClass3_Sub28_1;
for (@Pc(24) int local24 = 0; local24 < this.capacity; local24++) {
this.entries[local24] = Static105.VALID;
}
return this.anIntArrayArray34;
return this.pixels;
}
}

8
client/src/main/java/ColorImageCacheEntry.java
View file

@ -6,14 +6,14 @@ import org.openrs2.deob.annotation.OriginalMember;
public final class ColorImageCacheEntry extends Node {
@OriginalMember(owner = "client!qi", name = "s", descriptor = "I")
public final int anInt4761;
public final int index;
@OriginalMember(owner = "client!qi", name = "q", descriptor = "I")
public final int anInt4759;
public final int row;
@OriginalMember(owner = "client!qi", name = "<init>", descriptor = "(II)V")
public ColorImageCacheEntry(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
this.anInt4761 = arg1;
this.anInt4759 = arg0;
this.index = arg1;
this.row = arg0;
}
}

20
client/src/main/java/Component.java
View file

@ -774,7 +774,7 @@ public final class Component {
if (local29 == -1) {
return null;
}
@Pc(43) Sprite local43 = (Sprite) Static190.aClass99_26.method3106((long) local29);
@Pc(43) Sprite local43 = (Sprite) Static190.aClass99_26.get((long) local29);
if (local43 != null) {
return local43;
}
@ -782,7 +782,7 @@ public final class Component {
if (local43 == null) {
Static211.aBoolean72 = true;
} else {
Static190.aClass99_26.method3095(local43, (long) local29);
Static190.aClass99_26.put(local43, (long) local29);
}
return local43;
}
@ -848,7 +848,7 @@ public final class Component {
} else {
@Pc(61) Model local61;
if (local10 == 1) {
local61 = (Model) Static124.aClass99_17.method3106((long) ((local10 << 16) + local13));
local61 = (Model) Static124.aClass99_17.get((long) ((local10 << 16) + local13));
if (local61 == null) {
@Pc(69) RawModel local69 = Static77.method1686(Static203.aClass153_85, local13);
if (local69 == null) {
@ -856,7 +856,7 @@ public final class Component {
return null;
}
local61 = local69.method1679(64, 768, -50, -10, -50);
Static124.aClass99_17.method3095(local61, (long) (local13 + (local10 << 16)));
Static124.aClass99_17.put(local61, (long) (local13 + (local10 << 16)));
}
if (arg1 != null) {
local61 = arg1.method4215(local61, arg0, arg3, arg2);
@ -930,13 +930,13 @@ public final class Component {
return null;
}
@Pc(66) long local66 = ((this.aBoolean21 ? 1L : 0L) << 38) + ((this.aBoolean18 ? 1L : 0L) << 35) + (long) local12 + ((long) this.anInt514 << 36) + ((this.aBoolean26 ? 1L : 0L) << 39) + ((long) this.anInt513 << 40);
@Pc(72) Sprite local72 = (Sprite) Static190.aClass99_26.method3106(local66);
@Pc(72) Sprite local72 = (Sprite) Static190.aClass99_26.get(local66);
if (local72 != null) {
return local72;
}
@Pc(85) SoftwareSprite local85;
if (this.aBoolean18) {
local85 = Static80.method3613(Static23.aClass153_12, local12);
local85 = Static80.loadSoftwareAlphaSprite(Static23.aClass153_12, local12);
} else {
local85 = Static78.method1693(0, Static23.aClass153_12, local12);
}
@ -969,7 +969,7 @@ public final class Component {
} else {
local72 = new GlSprite(local85);
}
Static190.aClass99_26.method3095(local72, local66);
Static190.aClass99_26.put(local72, local66);
return local72;
}
@ -1162,7 +1162,7 @@ public final class Component {
if (this.anInt502 == -1) {
return null;
}
@Pc(21) Font local21 = (Font) Static87.aClass99_12.method3106((long) this.anInt502);
@Pc(21) Font local21 = (Font) Static87.aClass99_12.get((long) this.anInt502);
if (local21 != null) {
return local21;
}
@ -1170,8 +1170,8 @@ public final class Component {
if (local21 == null) {
Static211.aBoolean72 = true;
} else {
local21.method2873(arg0, null);
Static87.aClass99_12.method3095(local21, (long) this.anInt502);
local21.setNameIcons(arg0, null);
Static87.aClass99_12.put(local21, (long) this.anInt502);
}
return local21;
}

26
client/src/main/java/CursorType.java
View file

@ -7,45 +7,45 @@ import org.openrs2.deob.annotation.Pc;
public final class CursorType {
@OriginalMember(owner = "client!ia", name = "a", descriptor = "I")
public int anInt2850;
public int hotSpotY;
@OriginalMember(owner = "client!ia", name = "c", descriptor = "I")
public int anInt2852;
public int hotSpotX;
@OriginalMember(owner = "client!ia", name = "i", descriptor = "I")
private int anInt2857;
private int spriteId;
@OriginalMember(owner = "client!ia", name = "a", descriptor = "(B)Lclient!mm;")
public final SoftwareSprite method2246() {
@Pc(7) SoftwareSprite local7 = (SoftwareSprite) Static7.aClass99_5.method3106((long) this.anInt2857);
public final SoftwareSprite getSprite() {
@Pc(7) SoftwareSprite local7 = (SoftwareSprite) Static7.sprites.get((long) this.spriteId);
if (local7 != null) {
return local7;
}
local7 = Static80.method3613(Static243.aClass153_97, this.anInt2857);
local7 = Static80.loadSoftwareAlphaSprite(Static243.spritesArchive, this.spriteId);
if (local7 != null) {
Static7.aClass99_5.method3095(local7, (long) this.anInt2857);
Static7.sprites.put(local7, (long) this.spriteId);
}
return local7;
}
@OriginalMember(owner = "client!ia", name = "a", descriptor = "(Lclient!wa;IB)V")
public final void method2249(@OriginalArg(0) Buffer arg0, @OriginalArg(1) int arg1) {
public final void decode(@OriginalArg(0) Buffer arg0, @OriginalArg(1) int arg1) {
while (true) {
@Pc(18) int local18 = arg0.g1();
if (local18 == 0) {
return;
}
this.method2250(arg1, local18, arg0);
this.decode(arg1, local18, arg0);
}
}
@OriginalMember(owner = "client!ia", name = "a", descriptor = "(IIILclient!wa;)V")
private void method2250(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) Buffer arg2) {
private void decode(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) Buffer arg2) {
if (arg1 == 1) {
this.anInt2857 = arg2.g2();
this.spriteId = arg2.g2();
} else if (arg1 == 2) {
this.anInt2852 = arg2.g1();
this.anInt2850 = arg2.g1();
this.hotSpotX = arg2.g1();
this.hotSpotY = arg2.g1();
}
}
}

28
client/src/main/java/DelayedStateChange.java
View file

@ -19,35 +19,35 @@ public final class DelayedStateChange extends SecondaryNode {
@OriginalMember(owner = "client!da", name = "<init>", descriptor = "(II)V")
public DelayedStateChange(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
this.uid = (long) arg0 << 32 | (long) arg1;
this.key = (long) arg0 << 32 | (long) arg1;
}
@OriginalMember(owner = "client!da", name = "a", descriptor = "(Z)V")
public final void method1007() {
this.aLong185 = MonotonicClock.currentTimeMillis() + 500L | Long.MIN_VALUE & this.aLong185;
Static140.aClass16_7.method798(this);
public final void pushClient() {
this.secondaryKey = MonotonicClock.currentTimeMillis() + 500L | Long.MIN_VALUE & this.secondaryKey;
Static140.clientQueue.addTail(this);
}
@OriginalMember(owner = "client!da", name = "b", descriptor = "(Z)J")
public final long method1009() {
return this.aLong185 & Long.MAX_VALUE;
public final long getTime() {
return this.secondaryKey & Long.MAX_VALUE;
}
@OriginalMember(owner = "client!da", name = "e", descriptor = "(I)I")
public final int method1011() {
return (int) (this.uid >>> 32 & 0xFFL);
public final int getType() {
return (int) (this.key >>> 32 & 0xFFL);
}
@OriginalMember(owner = "client!da", name = "f", descriptor = "(B)I")
public final int method1012() {
return (int) this.uid;
public final int getId() {
return (int) this.key;
}
@OriginalMember(owner = "client!da", name = "g", descriptor = "(B)V")
public final void method1017() {
this.aLong185 |= Long.MIN_VALUE;
if (this.method1009() == 0L) {
Static215.aClass16_9.method798(this);
public final void pushServer() {
this.secondaryKey |= Long.MIN_VALUE;
if (this.getTime() == 0L) {
Static215.serverQueue.addTail(this);
}
}
}

8
client/src/main/java/Class3_Sub13.java → client/src/main/java/EnumStringEntry.java
View file

@ -3,13 +3,13 @@ import org.openrs2.deob.annotation.OriginalClass;
import org.openrs2.deob.annotation.OriginalMember;
@OriginalClass("client!hb")
public final class Class3_Sub13 extends Node {
public final class EnumStringEntry extends Node {
@OriginalMember(owner = "client!hb", name = "y", descriptor = "Lclient!na;")
public final JagString aClass100_503;
public final JagString value;
@OriginalMember(owner = "client!hb", name = "<init>", descriptor = "(Lclient!na;I)V")
public Class3_Sub13(@OriginalArg(0) JagString arg0, @OriginalArg(1) int arg1) {
this.aClass100_503 = arg0;
public EnumStringEntry(@OriginalArg(0) JagString arg0, @OriginalArg(1) int arg1) {
this.value = arg0;
}
}

98
client/src/main/java/EnumType.java
View file

@ -7,37 +7,37 @@ import org.openrs2.deob.annotation.Pc;
public final class EnumType extends SecondaryNode {
@OriginalMember(owner = "client!ml", name = "N", descriptor = "I")
public int anInt3950;
public int valueType;
@OriginalMember(owner = "client!ml", name = "V", descriptor = "I")
public int anInt3957;
public int keyType;
@OriginalMember(owner = "client!ml", name = "X", descriptor = "Lclient!sc;")
public HashTable aClass133_16;
public HashTable table;
@OriginalMember(owner = "client!ml", name = "bb", descriptor = "Lclient!sc;")
private HashTable aClass133_17;
private HashTable inverseTable;
@OriginalMember(owner = "client!ml", name = "cb", descriptor = "I")
private int anInt3960;
private int defaultInt;
@OriginalMember(owner = "client!ml", name = "Z", descriptor = "Lclient!na;")
private JagString aClass100_766 = Static87.aClass100_494;
private JagString defaultString = Static87.NULL;
@OriginalMember(owner = "client!ml", name = "a", descriptor = "(ILclient!wa;B)V")
private void method3084(@OriginalArg(0) int arg0, @OriginalArg(1) Buffer arg1) {
private void decode(@OriginalArg(0) int arg0, @OriginalArg(1) Buffer arg1) {
if (arg0 == 1) {
this.anInt3957 = arg1.g1();
this.keyType = arg1.g1();
} else if (arg0 == 2) {
this.anInt3950 = arg1.g1();
this.valueType = arg1.g1();
} else if (arg0 == 3) {
this.aClass100_766 = arg1.gjstr();
this.defaultString = arg1.gjstr();
} else if (arg0 == 4) {
this.anInt3960 = arg1.g4();
this.defaultInt = arg1.g4();
} else if (arg0 == 5 || arg0 == 6) {
@Pc(41) int local41 = arg1.g2();
this.aClass133_16 = new HashTable(Static165.clp2(local41));
for (@Pc(51) int local51 = 0; local51 < local41; local51++) {
@Pc(41) int size = arg1.g2();
this.table = new HashTable(Static165.clp2(size));
for (@Pc(51) int local51 = 0; local51 < size; local51++) {
@Pc(58) int local58 = arg1.g4();
@Pc(70) Node local70;
if (arg0 == 5) {
@ -45,31 +45,31 @@ public final class EnumType extends SecondaryNode {
} else {
local70 = new IntNode(arg1.g4());
}
this.aClass133_16.method3862(local70, (long) local58);
this.table.put(local70, (long) local58);
}
}
}
@OriginalMember(owner = "client!ml", name = "a", descriptor = "(IB)Lclient!na;")
public final JagString method3085(@OriginalArg(0) int arg0) {
if (this.aClass133_16 == null) {
return this.aClass100_766;
public final JagString getString(@OriginalArg(0) int arg0) {
if (this.table == null) {
return this.defaultString;
} else {
@Pc(26) StringNode local26 = (StringNode) this.aClass133_16.get((long) arg0);
return local26 == null ? this.aClass100_766 : local26.aClass100_980;
@Pc(26) StringNode local26 = (StringNode) this.table.get((long) arg0);
return local26 == null ? this.defaultString : local26.value;
}
}
@OriginalMember(owner = "client!ml", name = "b", descriptor = "(Lclient!na;I)Z")
public final boolean method3086(@OriginalArg(0) JagString arg0) {
if (this.aClass133_16 == null) {
public final boolean containsValue(@OriginalArg(0) JagString arg0) {
if (this.table == null) {
return false;
}
if (this.aClass133_17 == null) {
this.method3087();
if (this.inverseTable == null) {
this.inverseStrings();
}
for (@Pc(38) Class3_Sub13 local38 = (Class3_Sub13) this.aClass133_17.get(arg0.method3118()); local38 != null; local38 = (Class3_Sub13) this.aClass133_17.method3867()) {
if (local38.aClass100_503.strEquals(arg0)) {
for (@Pc(38) EnumStringEntry node = (EnumStringEntry) this.inverseTable.get(arg0.longHashCode()); node != null; node = (EnumStringEntry) this.inverseTable.nextWithKey()) {
if (node.value.strEquals(arg0)) {
return true;
}
}
@ -77,53 +77,53 @@ public final class EnumType extends SecondaryNode {
}
@OriginalMember(owner = "client!ml", name = "d", descriptor = "(I)V")
private void method3087() {
this.aClass133_17 = new HashTable(this.aClass133_16.method3868());
for (@Pc(22) StringNode local22 = (StringNode) this.aClass133_16.method3859(); local22 != null; local22 = (StringNode) this.aClass133_16.method3861()) {
@Pc(36) Class3_Sub13 local36 = new Class3_Sub13(local22.aClass100_980, (int) local22.uid);
this.aClass133_17.method3862(local36, local22.aClass100_980.method3118());
private void inverseStrings() {
this.inverseTable = new HashTable(this.table.getBucketCount());
for (@Pc(22) StringNode node = (StringNode) this.table.head(); node != null; node = (StringNode) this.table.next()) {
@Pc(36) EnumStringEntry entry = new EnumStringEntry(node.value, (int) node.key);
this.inverseTable.put(entry, node.value.longHashCode());
}
}
@OriginalMember(owner = "client!ml", name = "c", descriptor = "(II)I")
public final int method3089(@OriginalArg(1) int arg0) {
if (this.aClass133_16 == null) {
return this.anInt3960;
public final int getInt(@OriginalArg(1) int arg0) {
if (this.table == null) {
return this.defaultInt;
} else {
@Pc(18) IntNode local18 = (IntNode) this.aClass133_16.get((long) arg0);
return local18 == null ? this.anInt3960 : local18.anInt3141;
@Pc(18) IntNode local18 = (IntNode) this.table.get((long) arg0);
return local18 == null ? this.defaultInt : local18.value;
}
}
@OriginalMember(owner = "client!ml", name = "d", descriptor = "(II)Z")
public final boolean method3090(@OriginalArg(1) int arg0) {
if (this.aClass133_16 == null) {
public final boolean containsValue(@OriginalArg(1) int arg0) {
if (this.table == null) {
return false;
}
if (this.aClass133_17 == null) {
this.method3091();
if (this.inverseTable == null) {
this.inverseInts();
}
@Pc(34) IntNode local34 = (IntNode) this.aClass133_17.get((long) arg0);
return local34 != null;
@Pc(34) IntNode node = (IntNode) this.inverseTable.get((long) arg0);
return node != null;
}
@OriginalMember(owner = "client!ml", name = "e", descriptor = "(I)V")
private void method3091() {
this.aClass133_17 = new HashTable(this.aClass133_16.method3868());
for (@Pc(24) IntNode local24 = (IntNode) this.aClass133_16.method3859(); local24 != null; local24 = (IntNode) this.aClass133_16.method3861()) {
@Pc(34) IntNode local34 = new IntNode((int) local24.uid);
this.aClass133_17.method3862(local34, (long) local24.anInt3141);
private void inverseInts() {
this.inverseTable = new HashTable(this.table.getBucketCount());
for (@Pc(24) IntNode node = (IntNode) this.table.head(); node != null; node = (IntNode) this.table.next()) {
@Pc(34) IntNode inverseNode = new IntNode((int) node.key);
this.inverseTable.put(inverseNode, (long) node.value);
}
}
@OriginalMember(owner = "client!ml", name = "a", descriptor = "(Lclient!wa;I)V")
public final void method3094(@OriginalArg(0) Buffer arg0) {
public final void decode(@OriginalArg(0) Buffer arg0) {
while (true) {
@Pc(9) int local9 = arg0.g1();
if (local9 == 0) {
return;
}
this.method3084(local9, arg0);
this.decode(local9, arg0);
}
}
}

10
client/src/main/java/FloType.java
View file

@ -13,7 +13,7 @@ public final class FloType {
public boolean aBoolean311 = true;
@OriginalMember(owner = "client!wl", name = "p", descriptor = "I")
public int anInt5892 = -1;
public int texture = -1;
@OriginalMember(owner = "client!wl", name = "f", descriptor = "I")
public int anInt5885 = 128;
@ -52,11 +52,11 @@ public final class FloType {
if (arg0 == 1) {
this.anInt5899 = Static15.method492(arg1.g3());
} else if (arg0 == 2) {
this.anInt5892 = arg1.g1();
this.texture = arg1.g1();
} else if (arg0 == 3) {
this.anInt5892 = arg1.g2();
if (this.anInt5892 == 65535) {
this.anInt5892 = -1;
this.texture = arg1.g2();
if (this.texture == 65535) {
this.texture = -1;
}
} else if (arg0 == 5) {
this.aBoolean312 = false;

46
client/src/main/java/FluType.java
View file

@ -7,19 +7,19 @@ import org.openrs2.deob.annotation.Pc;
public final class FluType {
@OriginalMember(owner = "client!ni", name = "d", descriptor = "I")
public int anInt4149;
public int saturation;
@OriginalMember(owner = "client!ni", name = "i", descriptor = "I")
public int anInt4154;
public int weightedHue;
@OriginalMember(owner = "client!ni", name = "r", descriptor = "I")
public int anInt4158;
public int lightness;
@OriginalMember(owner = "client!ni", name = "u", descriptor = "I")
public int anInt4161;
public int chroma;
@OriginalMember(owner = "client!ni", name = "b", descriptor = "I")
private int anInt4147 = 0;
private int color = 0;
@OriginalMember(owner = "client!ni", name = "m", descriptor = "I")
public int anInt4155 = -1;
@ -31,7 +31,7 @@ public final class FluType {
public boolean aBoolean198 = true;
@OriginalMember(owner = "client!ni", name = "a", descriptor = "(IB)V")
private void method3216(@OriginalArg(0) int arg0) {
private void rgbToHsl(@OriginalArg(0) int arg0) {
@Pc(8) double local8 = (double) (arg0 >> 16 & 0xFF) / 256.0D;
@Pc(21) double local21 = (double) (arg0 >> 8 & 0xFF) / 256.0D;
@Pc(23) double local23 = local8;
@ -68,26 +68,26 @@ public final class FluType {
}
}
if (local74 > 0.5D) {
this.anInt4161 = (int) (local68 * (1.0D - local74) * 512.0D);
this.chroma = (int) (local68 * (1.0D - local74) * 512.0D);
} else {
this.anInt4161 = (int) (local68 * local74 * 512.0D);
this.chroma = (int) (local68 * local74 * 512.0D);
}
if (this.anInt4161 < 1) {
this.anInt4161 = 1;
if (this.chroma < 1) {
this.chroma = 1;
}
this.anInt4149 = (int) (local68 * 256.0D);
this.anInt4158 = (int) (local74 * 256.0D);
if (this.anInt4158 < 0) {
this.anInt4158 = 0;
} else if (this.anInt4158 > 255) {
this.anInt4158 = 255;
this.saturation = (int) (local68 * 256.0D);
this.lightness = (int) (local74 * 256.0D);
if (this.lightness < 0) {
this.lightness = 0;
} else if (this.lightness > 255) {
this.lightness = 255;
}
local54 /= 6.0D;
this.anInt4154 = (int) ((double) this.anInt4161 * local54);
if (this.anInt4149 < 0) {
this.anInt4149 = 0;
} else if (this.anInt4149 > 255) {
this.anInt4149 = 255;
this.weightedHue = (int) ((double) this.chroma * local54);
if (this.saturation < 0) {
this.saturation = 0;
} else if (this.saturation > 255) {
this.saturation = 255;
}
}
@ -105,8 +105,8 @@ public final class FluType {
@OriginalMember(owner = "client!ni", name = "a", descriptor = "(BILclient!wa;I)V")
private void method3220(@OriginalArg(1) int arg0, @OriginalArg(2) Buffer arg1, @OriginalArg(3) int arg2) {
if (arg0 == 1) {
this.anInt4147 = arg1.g3();
this.method3216(this.anInt4147);
this.color = arg1.g3();
this.rgbToHsl(this.color);
} else if (arg0 == 2) {
this.anInt4155 = arg1.g2();
if (this.anInt4155 == 65535) {

558
client/src/main/java/Font.java
View file

@ -8,25 +8,25 @@ import org.openrs2.deob.annotation.Pc;
public abstract class Font extends SecondaryNode {
@OriginalMember(owner = "client!rk", name = "W", descriptor = "[I")
private int[] anIntArray346;
private int[] nameIconHeights;
@OriginalMember(owner = "client!rk", name = "gb", descriptor = "[B")
private byte[] aByteArray50;
private byte[] kerning;
@OriginalMember(owner = "client!rk", name = "jb", descriptor = "[I")
private int[] anIntArray348;
private int[] glyphWidths;
@OriginalMember(owner = "client!rk", name = "nb", descriptor = "[Lclient!ok;")
private IndexedSprite[] aClass36Array11;
private IndexedSprite[] nameIcons;
@OriginalMember(owner = "client!rk", name = "ab", descriptor = "I")
public int anInt3626 = 0;
public int lineHeight = 0;
@OriginalMember(owner = "client!rk", name = "S", descriptor = "[I")
private int[] anIntArray344;
private int[] spriteXOffsets;
@OriginalMember(owner = "client!rk", name = "db", descriptor = "[I")
private int[] anIntArray347;
private int[] spriteYOffsets;
@OriginalMember(owner = "client!rk", name = "I", descriptor = "[I")
protected int[] spriteInnerWidths;
@ -35,45 +35,45 @@ public abstract class Font extends SecondaryNode {
protected int[] spriteInnerHeights;
@OriginalMember(owner = "client!rk", name = "V", descriptor = "I")
private int anInt3625;
private int paragraphTopPadding;
@OriginalMember(owner = "client!rk", name = "J", descriptor = "I")
private int anInt3624;
private int paragraphBottomPadding;
@OriginalMember(owner = "client!rk", name = "<init>", descriptor = "([B[I[I[I[I)V")
protected Font(@OriginalArg(0) byte[] arg0, @OriginalArg(1) int[] arg1, @OriginalArg(2) int[] arg2, @OriginalArg(3) int[] arg3, @OriginalArg(4) int[] arg4) {
this.anIntArray344 = arg1;
this.anIntArray347 = arg2;
this.spriteXOffsets = arg1;
this.spriteYOffsets = arg2;
this.spriteInnerWidths = arg3;
this.spriteInnerHeights = arg4;
this.method2876(arg0);
this.decode(arg0);
@Pc(21) int local21 = Integer.MAX_VALUE;
@Pc(23) int local23 = Integer.MIN_VALUE;
for (@Pc(25) int local25 = 0; local25 < 256; local25++) {
if (this.anIntArray347[local25] < local21 && this.spriteInnerHeights[local25] != 0) {
local21 = this.anIntArray347[local25];
if (this.spriteYOffsets[local25] < local21 && this.spriteInnerHeights[local25] != 0) {
local21 = this.spriteYOffsets[local25];
}
if (this.anIntArray347[local25] + this.spriteInnerHeights[local25] > local23) {
local23 = this.anIntArray347[local25] + this.spriteInnerHeights[local25];
if (this.spriteYOffsets[local25] + this.spriteInnerHeights[local25] > local23) {
local23 = this.spriteYOffsets[local25] + this.spriteInnerHeights[local25];
}
}
this.anInt3625 = this.anInt3626 - local21;
this.anInt3624 = local23 - this.anInt3626;
this.paragraphTopPadding = this.lineHeight - local21;
this.paragraphBottomPadding = local23 - this.lineHeight;
}
@OriginalMember(owner = "client!rk", name = "<init>", descriptor = "([B)V")
public Font(@OriginalArg(0) byte[] arg0) {
this.method2876(arg0);
this.decode(arg0);
}
@OriginalMember(owner = "client!rk", name = "a", descriptor = "(Lclient!na;IIIIIIIII)I")
public final int method2852(@OriginalArg(0) JagString 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) {
return this.method2869(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
return this.renderParagraphAlpha(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
}
@OriginalMember(owner = "client!rk", name = "a", descriptor = "(Lclient!na;II)V")
private void method2853(@OriginalArg(0) JagString arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
@Pc(4) int local4 = arg2 - this.anInt3626;
private void render(@OriginalArg(0) JagString arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
@Pc(4) int local4 = arg2 - this.lineHeight;
@Pc(6) int local6 = -1;
@Pc(8) int local8 = 0;
@Pc(12) int local12 = arg0.length();
@ -86,38 +86,38 @@ public abstract class Font extends SecondaryNode {
if (local22 == 62 && local6 != -1) {
@Pc(42) JagString local42 = arg0.substring(local14, local6 + 1);
local6 = -1;
if (local42.strEquals(Static218.aClass100_696)) {
if (local42.strEquals(Static218.TAG_LT)) {
local22 = 60;
} else if (local42.strEquals(Static218.aClass100_695)) {
} else if (local42.strEquals(Static218.TAG_GT)) {
local22 = 62;
} else if (local42.strEquals(Static218.aClass100_710)) {
} else if (local42.strEquals(Static218.TAG_NBSP)) {
local22 = 160;
} else if (local42.strEquals(Static218.aClass100_698)) {
} else if (local42.strEquals(Static218.TAB_SHY)) {
local22 = 173;
} else if (local42.strEquals(Static218.aClass100_708)) {
} else if (local42.strEquals(Static218.TAB_TIMES)) {
local22 = 215;
} else if (local42.strEquals(Static218.aClass100_702)) {
} else if (local42.strEquals(Static218.TAB_EURO)) {
local22 = 128;
} else if (local42.strEquals(Static218.aClass100_716)) {
} else if (local42.strEquals(Static218.TAB_COPY)) {
local22 = 169;
} else {
if (!local42.strEquals(Static218.aClass100_718)) {
if (local42.method3138(Static218.aClass100_715)) {
if (!local42.strEquals(Static218.TAG_REG)) {
if (local42.startsWith(Static218.TAG_IMG)) {
try {
local120 = local42.method3136(4).parseInt();
@Pc(125) IndexedSprite local125 = this.aClass36Array11[local120];
@Pc(136) int local136 = this.anIntArray346 == null ? local125.anInt4276 : this.anIntArray346[local120];
if (Static218.anInt3631 == 256) {
local125.renderTransparent(arg1, local4 + this.anInt3626 - local136);
local120 = local42.substring(4).parseInt();
@Pc(125) IndexedSprite local125 = this.nameIcons[local120];
@Pc(136) int local136 = this.nameIconHeights == null ? local125.anInt4276 : this.nameIconHeights[local120];
if (Static218.alphaOverride == 256) {
local125.renderTransparent(arg1, local4 + this.lineHeight - local136);
} else {
local125.method3335(arg1, local4 + this.anInt3626 - local136, Static218.anInt3631);
local125.method3335(arg1, local4 + this.lineHeight - local136, Static218.alphaOverride);
}
arg1 += local125.anInt4279;
arg1 += local125.innerWidth;
local8 = 0;
} catch (@Pc(168) Exception local168) {
}
} else {
this.method2861(local42);
this.parseTag(local42);
}
continue;
}
@ -125,41 +125,41 @@ public abstract class Font extends SecondaryNode {
}
}
if (local6 == -1) {
if (this.aByteArray50 != null && local8 != 0) {
arg1 += this.aByteArray50[(local8 << 8) + local22];
if (this.kerning != null && local8 != 0) {
arg1 += this.kerning[(local8 << 8) + local22];
}
@Pc(197) int local197 = this.spriteInnerWidths[local22];
local120 = this.spriteInnerHeights[local22];
if (local22 == 32) {
if (Static218.anInt3636 > 0) {
Static218.anInt3629 += Static218.anInt3636;
if (Static218.spaceWidth > 0) {
Static218.anInt3629 += Static218.spaceWidth;
arg1 += Static218.anInt3629 >> 8;
Static218.anInt3629 &= 0xFF;
}
} else if (Static218.anInt3631 == 256) {
if (Static218.anInt3634 != -1) {
this.renderGlyph(local22, arg1 + this.anIntArray344[local22] + 1, local4 + this.anIntArray347[local22] + 1, local197, local120, Static218.anInt3634);
} else if (Static218.alphaOverride == 256) {
if (Static218.shadowColorOverride != -1) {
this.renderGlyph(local22, arg1 + this.spriteXOffsets[local22] + 1, local4 + this.spriteYOffsets[local22] + 1, local197, local120, Static218.shadowColorOverride);
}
this.renderGlyph(local22, arg1 + this.anIntArray344[local22], local4 + this.anIntArray347[local22], local197, local120, Static218.anInt3635);
this.renderGlyph(local22, arg1 + this.spriteXOffsets[local22], local4 + this.spriteYOffsets[local22], local197, local120, Static218.colorOverride);
} else {
if (Static218.anInt3634 != -1) {
this.renderGlyphTransparent(local22, arg1 + this.anIntArray344[local22] + 1, local4 + this.anIntArray347[local22] + 1, local197, local120, Static218.anInt3634, Static218.anInt3631);
if (Static218.shadowColorOverride != -1) {
this.renderGlyphTransparent(local22, arg1 + this.spriteXOffsets[local22] + 1, local4 + this.spriteYOffsets[local22] + 1, local197, local120, Static218.shadowColorOverride, Static218.alphaOverride);
}
this.renderGlyphTransparent(local22, arg1 + this.anIntArray344[local22], local4 + this.anIntArray347[local22], local197, local120, Static218.anInt3635, Static218.anInt3631);
this.renderGlyphTransparent(local22, arg1 + this.spriteXOffsets[local22], local4 + this.spriteYOffsets[local22], local197, local120, Static218.colorOverride, Static218.alphaOverride);
}
@Pc(323) int local323 = this.anIntArray348[local22];
if (Static218.anInt3627 != -1) {
@Pc(323) int local323 = this.glyphWidths[local22];
if (Static218.strikethroughColor != -1) {
if (GlRenderer.enabled) {
Static46.method1174(arg1, local4 + (int) ((double) this.anInt3626 * 0.7D), local323, Static218.anInt3627);
Static46.method1174(arg1, local4 + (int) ((double) this.lineHeight * 0.7D), local323, Static218.strikethroughColor);
} else {
Static129.method2489(arg1, local4 + (int) ((double) this.anInt3626 * 0.7D), local323, Static218.anInt3627);
Static129.method2489(arg1, local4 + (int) ((double) this.lineHeight * 0.7D), local323, Static218.strikethroughColor);
}
}
if (Static218.anInt3628 != -1) {
if (Static218.underlineColor != -1) {
if (GlRenderer.enabled) {
Static46.method1174(arg1, local4 + this.anInt3626 + 1, local323, Static218.anInt3628);
Static46.method1174(arg1, local4 + this.lineHeight + 1, local323, Static218.underlineColor);
} else {
Static129.method2489(arg1, local4 + this.anInt3626 + 1, local323, Static218.anInt3628);
Static129.method2489(arg1, local4 + this.lineHeight + 1, local323, Static218.underlineColor);
}
}
arg1 += local323;
@ -177,10 +177,10 @@ public abstract class Font extends SecondaryNode {
@OriginalMember(owner = "client!rk", name = "b", descriptor = "(Lclient!na;I)I")
public final int method2856(@OriginalArg(0) JagString arg0, @OriginalArg(1) int arg1) {
@Pc(10) int local10 = this.method2867(arg0, new int[] { arg1 }, Static218.aClass100Array110);
@Pc(10) int local10 = this.splitParagraph(arg0, new int[] { arg1 }, Static218.lines);
@Pc(12) int local12 = 0;
for (@Pc(14) int local14 = 0; local14 < local10; local14++) {
@Pc(23) int local23 = this.method2858(Static218.aClass100Array110[local14]);
@Pc(23) int local23 = this.getStringWidth(Static218.lines[local14]);
if (local23 > local12) {
local12 = local23;
}
@ -191,13 +191,13 @@ public abstract class Font extends SecondaryNode {
@OriginalMember(owner = "client!rk", name = "a", descriptor = "(Lclient!na;IIII)V")
public final void method2857(@OriginalArg(0) JagString arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4) {
if (arg0 != null) {
this.method2874(arg3, arg4);
this.method2853(arg0, arg1, arg2);
this.setColors(arg3, arg4);
this.render(arg0, arg1, arg2);
}
}
@OriginalMember(owner = "client!rk", name = "a", descriptor = "(Lclient!na;)I")
public final int method2858(@OriginalArg(0) JagString arg0) {
public final int getStringWidth(@OriginalArg(0) JagString arg0) {
if (arg0 == null) {
return 0;
}
@ -213,26 +213,26 @@ public abstract class Font extends SecondaryNode {
if (local23 == 62 && local5 != -1) {
@Pc(43) JagString local43 = arg0.substring(local15, local5 + 1);
local5 = -1;
if (local43.strEquals(Static218.aClass100_696)) {
if (local43.strEquals(Static218.TAG_LT)) {
local23 = 60;
} else if (local43.strEquals(Static218.aClass100_695)) {
} else if (local43.strEquals(Static218.TAG_GT)) {
local23 = 62;
} else if (local43.strEquals(Static218.aClass100_710)) {
} else if (local43.strEquals(Static218.TAG_NBSP)) {
local23 = 160;
} else if (local43.strEquals(Static218.aClass100_698)) {
} else if (local43.strEquals(Static218.TAB_SHY)) {
local23 = 173;
} else if (local43.strEquals(Static218.aClass100_708)) {
} else if (local43.strEquals(Static218.TAB_TIMES)) {
local23 = 215;
} else if (local43.strEquals(Static218.aClass100_702)) {
} else if (local43.strEquals(Static218.TAB_EURO)) {
local23 = 128;
} else if (local43.strEquals(Static218.aClass100_716)) {
} else if (local43.strEquals(Static218.TAB_COPY)) {
local23 = 169;
} else {
if (!local43.strEquals(Static218.aClass100_718)) {
if (local43.method3138(Static218.aClass100_715)) {
if (!local43.strEquals(Static218.TAG_REG)) {
if (local43.startsWith(Static218.TAG_IMG)) {
try {
@Pc(121) int local121 = local43.method3136(4).parseInt();
local9 += this.aClass36Array11[local121].anInt4279;
@Pc(121) int local121 = local43.substring(4).parseInt();
local9 += this.nameIcons[local121].innerWidth;
local7 = 0;
} catch (@Pc(133) Exception local133) {
}
@ -243,9 +243,9 @@ public abstract class Font extends SecondaryNode {
}
}
if (local5 == -1) {
local9 += this.anIntArray348[local23];
if (this.aByteArray50 != null && local7 != 0) {
local9 += this.aByteArray50[(local7 << 8) + local23];
local9 += this.glyphWidths[local23];
if (this.kerning != null && local7 != 0) {
local9 += this.kerning[(local7 << 8) + local23];
}
local7 = local23;
}
@ -260,7 +260,7 @@ public abstract class Font extends SecondaryNode {
return 0;
}
arg3.setSeed((long) arg4);
this.method2877(16777215, 0, (arg3.nextInt() & 0x1F) + 192);
this.setColors(16777215, 0, (arg3.nextInt() & 0x1F) + 192);
@Pc(21) int local21 = arg0.length();
@Pc(24) int[] local24 = new int[local21];
@Pc(26) int local26 = 0;
@ -270,66 +270,66 @@ public abstract class Font extends SecondaryNode {
local26++;
}
}
this.method2879(arg0, arg1, arg2, local24, null);
this.renderOffset(arg0, arg1, arg2, local24, null);
return local26;
}
@OriginalMember(owner = "client!rk", name = "c", descriptor = "(Lclient!na;I)I")
public final int method2860(@OriginalArg(0) JagString arg0, @OriginalArg(1) int arg1) {
return this.method2867(arg0, new int[] { arg1 }, Static218.aClass100Array110);
public final int getParagraphLineCount(@OriginalArg(0) JagString arg0, @OriginalArg(1) int arg1) {
return this.splitParagraph(arg0, new int[] { arg1 }, Static218.lines);
}
@OriginalMember(owner = "client!rk", name = "b", descriptor = "(Lclient!na;)V")
private void method2861(@OriginalArg(0) JagString arg0) {
private void parseTag(@OriginalArg(0) JagString arg0) {
try {
if (arg0.method3138(Static218.aClass100_705)) {
Static218.anInt3635 = arg0.method3136(4).method3110(16);
} else if (arg0.strEquals(Static218.aClass100_703)) {
Static218.anInt3635 = Static218.anInt3630;
} else if (arg0.method3138(Static218.aClass100_699)) {
Static218.anInt3631 = arg0.method3136(6).parseInt();
} else if (arg0.strEquals(Static218.aClass100_709)) {
Static218.anInt3631 = Static218.anInt3632;
} else if (arg0.method3138(Static218.aClass100_701)) {
Static218.anInt3627 = arg0.method3136(4).method3110(16);
} else if (arg0.strEquals(Static218.aClass100_719)) {
Static218.anInt3627 = 8388608;
} else if (arg0.strEquals(Static218.aClass100_717)) {
Static218.anInt3627 = -1;
} else if (arg0.method3138(Static218.aClass100_700)) {
Static218.anInt3628 = arg0.method3136(2).method3110(16);
} else if (arg0.strEquals(Static218.aClass100_707)) {
Static218.anInt3628 = 0;
} else if (arg0.strEquals(Static218.aClass100_712)) {
Static218.anInt3628 = -1;
} else if (arg0.method3138(Static218.aClass100_697)) {
Static218.anInt3634 = arg0.method3136(5).method3110(16);
} else if (arg0.strEquals(Static218.aClass100_714)) {
Static218.anInt3634 = 0;
} else if (arg0.strEquals(Static218.aClass100_704)) {
Static218.anInt3634 = Static218.anInt3633;
} else if (arg0.strEquals(Static218.aClass100_713)) {
this.method2877(Static218.anInt3630, Static218.anInt3633, Static218.anInt3632);
if (arg0.startsWith(Static218.TAG_COL1)) {
Static218.colorOverride = arg0.substring(4).parseHexString(16);
} else if (arg0.strEquals(Static218.TAG_COL2)) {
Static218.colorOverride = Static218.color;
} else if (arg0.startsWith(Static218.TAG_TRANS1)) {
Static218.alphaOverride = arg0.substring(6).parseInt();
} else if (arg0.strEquals(Static218.TAG_TRANS2)) {
Static218.alphaOverride = Static218.alpha;
} else if (arg0.startsWith(Static218.TAG_STR1)) {
Static218.strikethroughColor = arg0.substring(4).parseHexString(16);
} else if (arg0.strEquals(Static218.TAG_STR2)) {
Static218.strikethroughColor = 0x800000;
} else if (arg0.strEquals(Static218.TAG_STR3)) {
Static218.strikethroughColor = -1;
} else if (arg0.startsWith(Static218.TAG_U1)) {
Static218.underlineColor = arg0.substring(2).parseHexString(16);
} else if (arg0.strEquals(Static218.TAG_U2)) {
Static218.underlineColor = 0;
} else if (arg0.strEquals(Static218.TAG_U3)) {
Static218.underlineColor = -1;
} else if (arg0.startsWith(Static218.TAG_SHAD1)) {
Static218.shadowColorOverride = arg0.substring(5).parseHexString(16);
} else if (arg0.strEquals(Static218.TAG_SHAD2)) {
Static218.shadowColorOverride = 0;
} else if (arg0.strEquals(Static218.TAG_SHAD3)) {
Static218.shadowColorOverride = Static218.shadowColor;
} else if (arg0.strEquals(Static218.TAG_BR)) {
this.setColors(Static218.color, Static218.shadowColor, Static218.alpha);
}
} catch (@Pc(144) Exception local144) {
}
}
@OriginalMember(owner = "client!rk", name = "d", descriptor = "(I)I")
private int method2863(@OriginalArg(0) int arg0) {
return this.anIntArray348[arg0 & 0xFF];
private int getGlyphWidth(@OriginalArg(0) int arg0) {
return this.glyphWidths[arg0 & 0xFF];
}
@OriginalMember(owner = "client!rk", name = "b", descriptor = "(Lclient!na;IIII)V")
public final void method2864(@OriginalArg(0) JagString arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4) {
public final void renderRight(@OriginalArg(0) JagString arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4) {
if (arg0 != null) {
this.method2874(arg3, arg4);
this.method2853(arg0, arg1 - this.method2858(arg0), arg2);
this.setColors(arg3, arg4);
this.render(arg0, arg1 - this.getStringWidth(arg0), arg2);
}
}
@OriginalMember(owner = "client!rk", name = "d", descriptor = "(Lclient!na;I)V")
private void method2866(@OriginalArg(0) JagString arg0, @OriginalArg(1) int arg1) {
private void justify(@OriginalArg(0) JagString arg0, @OriginalArg(1) int arg1) {
@Pc(1) int local1 = 0;
@Pc(3) boolean local3 = false;
@Pc(7) int local7 = arg0.length();
@ -344,16 +344,16 @@ public abstract class Font extends SecondaryNode {
}
}
if (local1 > 0) {
Static218.anInt3636 = (arg1 - this.method2858(arg0) << 8) / local1;
Static218.spaceWidth = (arg1 - this.getStringWidth(arg0) << 8) / local1;
}
}
@OriginalMember(owner = "client!rk", name = "a", descriptor = "(Lclient!na;[I[Lclient!na;)I")
public final int method2867(@OriginalArg(0) JagString arg0, @OriginalArg(1) int[] arg1, @OriginalArg(2) JagString[] arg2) {
public final int splitParagraph(@OriginalArg(0) JagString arg0, @OriginalArg(1) int[] arg1, @OriginalArg(2) JagString[] arg2) {
if (arg0 == null) {
return 0;
}
Static218.aClass100_720.method3133(0);
Static218.buffer.method3133(0);
@Pc(9) int local9 = 0;
@Pc(11) int local11 = 0;
@Pc(13) int local13 = -1;
@ -371,73 +371,73 @@ public abstract class Font extends SecondaryNode {
if (local37 == 62 && local19 != -1) {
@Pc(57) JagString local57 = arg0.substring(local29, local19 + 1);
local19 = -1;
Static218.aClass100_720.append(60);
Static218.aClass100_720.method3113(local57);
Static218.aClass100_720.append(62);
if (local57.strEquals(Static218.aClass100_713)) {
Static218.buffer.append(60);
Static218.buffer.method3113(local57);
Static218.buffer.append(62);
if (local57.strEquals(Static218.TAG_BR)) {
if (arg2[local23] == null) {
arg2[local23] = Static218.aClass100_720.method3143().substring(Static218.aClass100_720.length(), local11);
arg2[local23] = Static218.buffer.asString().substring(Static218.buffer.length(), local11);
} else {
arg2[local23].method3133(0);
arg2[local23].method3122(Static218.aClass100_720, local11, Static218.aClass100_720.length());
arg2[local23].method3122(Static218.buffer, local11, Static218.buffer.length());
}
local23++;
local11 = Static218.aClass100_720.length();
local11 = Static218.buffer.length();
local9 = 0;
local13 = -1;
local21 = 0;
} else if (local57.strEquals(Static218.aClass100_696)) {
local9 += this.method2863(60);
if (this.aByteArray50 != null && local21 != 0) {
local9 += this.aByteArray50[(local21 << 8) + 60];
} else if (local57.strEquals(Static218.TAG_LT)) {
local9 += this.getGlyphWidth(60);
if (this.kerning != null && local21 != 0) {
local9 += this.kerning[(local21 << 8) + 60];
}
local21 = 60;
} else if (local57.strEquals(Static218.aClass100_695)) {
local9 += this.method2863(62);
if (this.aByteArray50 != null && local21 != 0) {
local9 += this.aByteArray50[(local21 << 8) + 62];
} else if (local57.strEquals(Static218.TAG_GT)) {
local9 += this.getGlyphWidth(62);
if (this.kerning != null && local21 != 0) {
local9 += this.kerning[(local21 << 8) + 62];
}
local21 = 62;
} else if (local57.strEquals(Static218.aClass100_710)) {
local9 += this.method2863(160);
if (this.aByteArray50 != null && local21 != 0) {
local9 += this.aByteArray50[(local21 << 8) + 160];
} else if (local57.strEquals(Static218.TAG_NBSP)) {
local9 += this.getGlyphWidth(160);
if (this.kerning != null && local21 != 0) {
local9 += this.kerning[(local21 << 8) + 160];
}
local21 = 160;
} else if (local57.strEquals(Static218.aClass100_698)) {
local9 += this.method2863(173);
if (this.aByteArray50 != null && local21 != 0) {
local9 += this.aByteArray50[(local21 << 8) + 173];
} else if (local57.strEquals(Static218.TAB_SHY)) {
local9 += this.getGlyphWidth(173);
if (this.kerning != null && local21 != 0) {
local9 += this.kerning[(local21 << 8) + 173];
}
local21 = 173;
} else if (local57.strEquals(Static218.aClass100_708)) {
local9 += this.method2863(215);
if (this.aByteArray50 != null && local21 != 0) {
local9 += this.aByteArray50[(local21 << 8) + 215];
} else if (local57.strEquals(Static218.TAB_TIMES)) {
local9 += this.getGlyphWidth(215);
if (this.kerning != null && local21 != 0) {
local9 += this.kerning[(local21 << 8) + 215];
}
local21 = 215;
} else if (local57.strEquals(Static218.aClass100_702)) {
local9 += this.method2863(128);
if (this.aByteArray50 != null && local21 != 0) {
local9 += this.aByteArray50[(local21 << 8) + 128];
} else if (local57.strEquals(Static218.TAB_EURO)) {
local9 += this.getGlyphWidth(128);
if (this.kerning != null && local21 != 0) {
local9 += this.kerning[(local21 << 8) + 128];
}
local21 = 128;
} else if (local57.strEquals(Static218.aClass100_716)) {
local9 += this.method2863(169);
if (this.aByteArray50 != null && local21 != 0) {
local9 += this.aByteArray50[(local21 << 8) + 169];
} else if (local57.strEquals(Static218.TAB_COPY)) {
local9 += this.getGlyphWidth(169);
if (this.kerning != null && local21 != 0) {
local9 += this.kerning[(local21 << 8) + 169];
}
local21 = 169;
} else if (local57.strEquals(Static218.aClass100_718)) {
local9 += this.method2863(174);
if (this.aByteArray50 != null && local21 != 0) {
local9 += this.aByteArray50[(local21 << 8) + 174];
} else if (local57.strEquals(Static218.TAG_REG)) {
local9 += this.getGlyphWidth(174);
if (this.kerning != null && local21 != 0) {
local9 += this.kerning[(local21 << 8) + 174];
}
local21 = 174;
} else if (local57.method3138(Static218.aClass100_715)) {
} else if (local57.startsWith(Static218.TAG_IMG)) {
try {
@Pc(377) int local377 = local57.method3136(4).parseInt();
local9 += this.aClass36Array11[local377].anInt4279;
@Pc(377) int local377 = local57.substring(4).parseInt();
local9 += this.nameIcons[local377].innerWidth;
local21 = 0;
} catch (@Pc(389) Exception local389) {
}
@ -446,24 +446,24 @@ public abstract class Font extends SecondaryNode {
}
if (local19 == -1) {
if (local37 != 0) {
Static218.aClass100_720.append(local37);
local9 += this.anIntArray348[local37];
if (this.aByteArray50 != null && local21 != 0) {
local9 += this.aByteArray50[(local21 << 8) + local37];
Static218.buffer.append(local37);
local9 += this.glyphWidths[local37];
if (this.kerning != null && local21 != 0) {
local9 += this.kerning[(local21 << 8) + local37];
}
local21 = local37;
}
if (local37 == 32) {
local13 = Static218.aClass100_720.length();
local13 = Static218.buffer.length();
local15 = local9;
local17 = 1;
}
if (arg1 != null && local9 > arg1[local23 < arg1.length ? local23 : arg1.length - 1] && local13 >= 0) {
if (arg2[local23] == null) {
arg2[local23] = Static218.aClass100_720.method3143().substring(local13 - local17, local11);
arg2[local23] = Static218.buffer.asString().substring(local13 - local17, local11);
} else {
arg2[local23].method3133(0);
arg2[local23] = arg2[local23].method3122(Static218.aClass100_720, local11, local13 - local17);
arg2[local23] = arg2[local23].method3122(Static218.buffer, local11, local13 - local17);
}
local23++;
local11 = local13;
@ -472,19 +472,19 @@ public abstract class Font extends SecondaryNode {
local21 = 0;
}
if (local37 == 45) {
local13 = Static218.aClass100_720.length();
local13 = Static218.buffer.length();
local15 = local9;
local17 = 0;
}
}
}
}
if (Static218.aClass100_720.length() > local11) {
if (Static218.buffer.length() > local11) {
if (arg2[local23] == null) {
arg2[local23] = Static218.aClass100_720.method3143().substring(Static218.aClass100_720.length(), local11);
arg2[local23] = Static218.buffer.asString().substring(Static218.buffer.length(), local11);
} else {
arg2[local23].method3133(0);
arg2[local23] = arg2[local23].method3122(Static218.aClass100_720, local11, Static218.aClass100_720.length());
arg2[local23] = arg2[local23].method3122(Static218.buffer, local11, Static218.buffer.length());
}
local23++;
}
@ -492,11 +492,11 @@ public abstract class Font extends SecondaryNode {
}
@OriginalMember(owner = "client!rk", name = "a", descriptor = "(Lclient!na;IIIIII)V")
public final void method2868(@OriginalArg(0) JagString arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5) {
public final void renderShake(@OriginalArg(0) JagString arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5) {
if (arg0 == null) {
return;
}
this.method2874(arg3, 0);
this.setColors(arg3, 0);
@Pc(13) double local13 = 7.0D - (double) arg5 / 8.0D;
if (local13 < 0.0D) {
local13 = 0.0D;
@ -506,55 +506,55 @@ public abstract class Font extends SecondaryNode {
for (@Pc(28) int local28 = 0; local28 < local23; local28++) {
local26[local28] = (int) (Math.sin((double) local28 / 1.5D + (double) arg4 / 1.0D) * local13);
}
this.method2879(arg0, arg1 - this.method2858(arg0) / 2, arg2, null, local26);
this.renderOffset(arg0, arg1 - this.getStringWidth(arg0) / 2, arg2, null, local26);
}
@OriginalMember(owner = "client!rk", name = "a", descriptor = "(Lclient!na;IIIIIIIIII)I")
public final int method2869(@OriginalArg(0) JagString 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(8) int arg7, @OriginalArg(9) int arg8, @OriginalArg(10) int arg9) {
public final int renderParagraphAlpha(@OriginalArg(0) JagString 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(8) int arg7, @OriginalArg(9) int arg8, @OriginalArg(10) int arg9) {
if (arg0 == null) {
return 0;
}
this.method2877(arg5, arg6, 256);
this.setColors(arg5, arg6, 256);
if (arg9 == 0) {
arg9 = this.anInt3626;
arg9 = this.lineHeight;
}
@Pc(20) int[] local20 = new int[] { arg3 };
if (arg4 < this.anInt3625 + this.anInt3624 + arg9 && arg4 < arg9 + arg9) {
if (arg4 < this.paragraphTopPadding + this.paragraphBottomPadding + arg9 && arg4 < arg9 + arg9) {
local20 = null;
}
@Pc(42) int local42 = this.method2867(arg0, local20, Static218.aClass100Array110);
@Pc(42) int local42 = this.splitParagraph(arg0, local20, Static218.lines);
if (arg8 == 3 && local42 == 1) {
arg8 = 1;
}
@Pc(57) int local57;
@Pc(118) int local118;
if (arg8 == 0) {
local57 = arg2 + this.anInt3625;
local57 = arg2 + this.paragraphTopPadding;
} else if (arg8 == 1) {
local57 = arg2 + this.anInt3625 + (arg4 - this.anInt3625 - this.anInt3624 - (local42 - 1) * arg9) / 2;
local57 = arg2 + this.paragraphTopPadding + (arg4 - this.paragraphTopPadding - this.paragraphBottomPadding - (local42 - 1) * arg9) / 2;
} else if (arg8 == 2) {
local57 = arg2 + arg4 - this.anInt3624 - (local42 - 1) * arg9;
local57 = arg2 + arg4 - this.paragraphBottomPadding - (local42 - 1) * arg9;
} else {
local118 = (arg4 - this.anInt3625 - this.anInt3624 - (local42 - 1) * arg9) / (local42 + 1);
local118 = (arg4 - this.paragraphTopPadding - this.paragraphBottomPadding - (local42 - 1) * arg9) / (local42 + 1);
if (local118 < 0) {
local118 = 0;
}
local57 = arg2 + this.anInt3625 + local118;
local57 = arg2 + this.paragraphTopPadding + local118;
arg9 += local118;
}
for (local118 = 0; local118 < local42; local118++) {
if (arg7 == 0) {
this.method2853(Static218.aClass100Array110[local118], arg1, local57);
this.render(Static218.lines[local118], arg1, local57);
} else if (arg7 == 1) {
this.method2853(Static218.aClass100Array110[local118], arg1 + (arg3 - this.method2858(Static218.aClass100Array110[local118])) / 2, local57);
this.render(Static218.lines[local118], arg1 + (arg3 - this.getStringWidth(Static218.lines[local118])) / 2, local57);
} else if (arg7 == 2) {
this.method2853(Static218.aClass100Array110[local118], arg1 + arg3 - this.method2858(Static218.aClass100Array110[local118]), local57);
this.render(Static218.lines[local118], arg1 + arg3 - this.getStringWidth(Static218.lines[local118]), local57);
} else if (local118 == local42 - 1) {
this.method2853(Static218.aClass100Array110[local118], arg1, local57);
this.render(Static218.lines[local118], arg1, local57);
} else {
this.method2866(Static218.aClass100Array110[local118], arg3);
this.method2853(Static218.aClass100Array110[local118], arg1, local57);
Static218.anInt3636 = 0;
this.justify(Static218.lines[local118], arg3);
this.render(Static218.lines[local118], arg1, local57);
Static218.spaceWidth = 0;
}
local57 += arg9;
}
@ -562,11 +562,11 @@ public abstract class Font extends SecondaryNode {
}
@OriginalMember(owner = "client!rk", name = "a", descriptor = "(Lclient!na;IIIII)V")
public final void method2871(@OriginalArg(0) JagString arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(5) int arg4) {
public final void renderWave2(@OriginalArg(0) JagString arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(5) int arg4) {
if (arg0 == null) {
return;
}
this.method2874(arg3, 0);
this.setColors(arg3, 0);
@Pc(10) int local10 = arg0.length();
@Pc(13) int[] local13 = new int[local10];
@Pc(16) int[] local16 = new int[local10];
@ -574,68 +574,68 @@ public abstract class Font extends SecondaryNode {
local13[local18] = (int) (Math.sin((double) local18 / 5.0D + (double) arg4 / 5.0D) * 5.0D);
local16[local18] = (int) (Math.sin((double) local18 / 3.0D + (double) arg4 / 5.0D) * 5.0D);
}
this.method2879(arg0, arg1 - this.method2858(arg0) / 2, arg2, local13, local16);
this.renderOffset(arg0, arg1 - this.getStringWidth(arg0) / 2, arg2, local13, local16);
}
@OriginalMember(owner = "client!rk", name = "b", descriptor = "(Lclient!na;IIIII)V")
public final void method2872(@OriginalArg(0) JagString arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(5) int arg4) {
public final void renderWave(@OriginalArg(0) JagString arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(5) int arg4) {
if (arg0 == null) {
return;
}
this.method2874(arg3, 0);
this.setColors(arg3, 0);
@Pc(10) int local10 = arg0.length();
@Pc(13) int[] local13 = new int[local10];
for (@Pc(15) int local15 = 0; local15 < local10; local15++) {
local13[local15] = (int) (Math.sin((double) local15 / 2.0D + (double) arg4 / 5.0D) * 5.0D);
}
this.method2879(arg0, arg1 - this.method2858(arg0) / 2, arg2, null, local13);
this.renderOffset(arg0, arg1 - this.getStringWidth(arg0) / 2, arg2, null, local13);
}
@OriginalMember(owner = "client!rk", name = "a", descriptor = "([Lclient!ok;[I)V")
public final void method2873(@OriginalArg(0) IndexedSprite[] arg0, @OriginalArg(1) int[] arg1) {
public final void setNameIcons(@OriginalArg(0) IndexedSprite[] arg0, @OriginalArg(1) int[] arg1) {
if (arg1 != null && arg1.length != arg0.length) {
throw new IllegalArgumentException();
}
this.aClass36Array11 = arg0;
this.anIntArray346 = arg1;
this.nameIcons = arg0;
this.nameIconHeights = arg1;
}
@OriginalMember(owner = "client!rk", name = "c", descriptor = "(II)V")
private void method2874(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
Static218.anInt3627 = -1;
Static218.anInt3628 = -1;
Static218.anInt3633 = arg1;
Static218.anInt3634 = arg1;
Static218.anInt3630 = arg0;
Static218.anInt3635 = arg0;
Static218.anInt3632 = 256;
Static218.anInt3631 = 256;
Static218.anInt3636 = 0;
private void setColors(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
Static218.strikethroughColor = -1;
Static218.underlineColor = -1;
Static218.shadowColor = arg1;
Static218.shadowColorOverride = arg1;
Static218.color = arg0;
Static218.colorOverride = arg0;
Static218.alpha = 256;
Static218.alphaOverride = 256;
Static218.spaceWidth = 0;
Static218.anInt3629 = 0;
}
@OriginalMember(owner = "client!rk", name = "c", descriptor = "(Lclient!na;IIII)V")
public final void method2875(@OriginalArg(0) JagString arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4) {
public final void renderCenter(@OriginalArg(0) JagString arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4) {
if (arg0 != null) {
this.method2874(arg3, arg4);
this.method2853(arg0, arg1 - this.method2858(arg0) / 2, arg2);
this.setColors(arg3, arg4);
this.render(arg0, arg1 - this.getStringWidth(arg0) / 2, arg2);
}
}
@OriginalMember(owner = "client!rk", name = "a", descriptor = "([B)V")
private void method2876(@OriginalArg(0) byte[] arg0) {
this.anIntArray348 = new int[256];
private void decode(@OriginalArg(0) byte[] arg0) {
this.glyphWidths = new int[256];
@Pc(9) int local9;
if (arg0.length == 257) {
for (local9 = 0; local9 < this.anIntArray348.length; local9++) {
this.anIntArray348[local9] = arg0[local9] & 0xFF;
for (local9 = 0; local9 < this.glyphWidths.length; local9++) {
this.glyphWidths[local9] = arg0[local9] & 0xFF;
}
this.anInt3626 = arg0[256] & 0xFF;
this.lineHeight = arg0[256] & 0xFF;
return;
}
local9 = 0;
for (@Pc(37) int local37 = 0; local37 < 256; local37++) {
this.anIntArray348[local37] = arg0[local9++] & 0xFF;
this.glyphWidths[local37] = arg0[local9++] & 0xFF;
}
@Pc(55) int[] local55 = new int[256];
@Pc(58) int[] local58 = new int[256];
@ -666,30 +666,30 @@ public abstract class Font extends SecondaryNode {
local136[local138][local152] = local150;
}
}
this.aByteArray50 = new byte[65536];
this.kerning = new byte[65536];
for (local138 = 0; local138 < 256; local138++) {
if (local138 != 32 && local138 != 160) {
for (local109 = 0; local109 < 256; local109++) {
if (local109 != 32 && local109 != 160) {
this.aByteArray50[(local138 << 8) + local109] = (byte) Static218.method2870(local93, local136, local58, this.anIntArray348, local55, local138, local109);
this.kerning[(local138 << 8) + local109] = (byte) Static218.method2870(local93, local136, local58, this.glyphWidths, local55, local138, local109);
}
}
}
}
this.anInt3626 = local58[32] + local55[32];
this.lineHeight = local58[32] + local55[32];
}
@OriginalMember(owner = "client!rk", name = "a", descriptor = "(III)V")
private void method2877(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
Static218.anInt3627 = -1;
Static218.anInt3628 = -1;
Static218.anInt3633 = arg1;
Static218.anInt3634 = arg1;
Static218.anInt3630 = arg0;
Static218.anInt3635 = arg0;
Static218.anInt3632 = arg2;
Static218.anInt3631 = arg2;
Static218.anInt3636 = 0;
private void setColors(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
Static218.strikethroughColor = -1;
Static218.underlineColor = -1;
Static218.shadowColor = arg1;
Static218.shadowColorOverride = arg1;
Static218.color = arg0;
Static218.colorOverride = arg0;
Static218.alpha = arg2;
Static218.alphaOverride = arg2;
Static218.spaceWidth = 0;
Static218.anInt3629 = 0;
}
@ -699,7 +699,7 @@ public abstract class Font extends SecondaryNode {
return 0;
}
arg9.setSeed((long) arg10);
this.method2877(arg5, arg6, (arg9.nextInt() & 0x1F) + 192);
this.setColors(arg5, arg6, (arg9.nextInt() & 0x1F) + 192);
@Pc(21) int local21 = arg0.length();
@Pc(24) int[] local24 = new int[local21];
@Pc(26) int local26 = 0;
@ -711,36 +711,36 @@ public abstract class Font extends SecondaryNode {
}
}
local28 = arg1;
@Pc(50) int local50 = arg2 + this.anInt3625;
@Pc(50) int local50 = arg2 + this.paragraphTopPadding;
@Pc(52) int local52 = -1;
if (arg8 == 1) {
local50 += (arg4 - this.anInt3625 - this.anInt3624) / 2;
local50 += (arg4 - this.paragraphTopPadding - this.paragraphBottomPadding) / 2;
} else if (arg8 == 2) {
local50 = arg2 + arg4 - this.anInt3624;
local50 = arg2 + arg4 - this.paragraphBottomPadding;
}
if (arg7 == 1) {
local52 = this.method2858(arg0) + local26;
local52 = this.getStringWidth(arg0) + local26;
local28 = arg1 + (arg3 - local52) / 2;
} else if (arg7 == 2) {
local52 = this.method2858(arg0) + local26;
local52 = this.getStringWidth(arg0) + local26;
local28 = arg1 + arg3 - local52;
}
this.method2879(arg0, local28, local50, local24, null);
this.renderOffset(arg0, local28, local50, local24, null);
if (arg11 != null) {
if (local52 == -1) {
local52 = this.method2858(arg0) + local26;
local52 = this.getStringWidth(arg0) + local26;
}
arg11[0] = local28;
arg11[1] = local50 - this.anInt3625;
arg11[1] = local50 - this.paragraphTopPadding;
arg11[2] = local52;
arg11[3] = this.anInt3625 + this.anInt3624;
arg11[3] = this.paragraphTopPadding + this.paragraphBottomPadding;
}
return local26;
}
@OriginalMember(owner = "client!rk", name = "a", descriptor = "(Lclient!na;II[I[I)V")
private void method2879(@OriginalArg(0) JagString arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int[] arg3, @OriginalArg(4) int[] arg4) {
@Pc(4) int local4 = arg2 - this.anInt3626;
private void renderOffset(@OriginalArg(0) JagString arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int[] arg3, @OriginalArg(4) int[] arg4) {
@Pc(4) int local4 = arg2 - this.lineHeight;
@Pc(6) int local6 = -1;
@Pc(8) int local8 = 0;
@Pc(10) int local10 = 0;
@ -756,23 +756,23 @@ public abstract class Font extends SecondaryNode {
if (local24 == 62 && local6 != -1) {
@Pc(44) JagString local44 = arg0.substring(local16, local6 + 1);
local6 = -1;
if (local44.strEquals(Static218.aClass100_696)) {
if (local44.strEquals(Static218.TAG_LT)) {
local24 = 60;
} else if (local44.strEquals(Static218.aClass100_695)) {
} else if (local44.strEquals(Static218.TAG_GT)) {
local24 = 62;
} else if (local44.strEquals(Static218.aClass100_710)) {
} else if (local44.strEquals(Static218.TAG_NBSP)) {
local24 = 160;
} else if (local44.strEquals(Static218.aClass100_698)) {
} else if (local44.strEquals(Static218.TAB_SHY)) {
local24 = 173;
} else if (local44.strEquals(Static218.aClass100_708)) {
} else if (local44.strEquals(Static218.TAB_TIMES)) {
local24 = 215;
} else if (local44.strEquals(Static218.aClass100_702)) {
} else if (local44.strEquals(Static218.TAB_EURO)) {
local24 = 128;
} else if (local44.strEquals(Static218.aClass100_716)) {
} else if (local44.strEquals(Static218.TAB_COPY)) {
local24 = 169;
} else {
if (!local44.strEquals(Static218.aClass100_718)) {
if (local44.method3138(Static218.aClass100_715)) {
if (!local44.strEquals(Static218.TAG_REG)) {
if (local44.startsWith(Static218.TAG_IMG)) {
try {
if (arg3 == null) {
local121 = 0;
@ -785,20 +785,20 @@ public abstract class Font extends SecondaryNode {
local130 = arg4[local10];
}
local10++;
local141 = local44.method3136(4).parseInt();
@Pc(146) IndexedSprite local146 = this.aClass36Array11[local141];
@Pc(157) int local157 = this.anIntArray346 == null ? local146.anInt4276 : this.anIntArray346[local141];
if (Static218.anInt3631 == 256) {
local146.renderTransparent(arg1 + local121, local4 + this.anInt3626 - local157 + local130);
local141 = local44.substring(4).parseInt();
@Pc(146) IndexedSprite local146 = this.nameIcons[local141];
@Pc(157) int local157 = this.nameIconHeights == null ? local146.anInt4276 : this.nameIconHeights[local141];
if (Static218.alphaOverride == 256) {
local146.renderTransparent(arg1 + local121, local4 + this.lineHeight - local157 + local130);
} else {
local146.method3335(arg1 + local121, local4 + this.anInt3626 - local157 + local130, Static218.anInt3631);
local146.method3335(arg1 + local121, local4 + this.lineHeight - local157 + local130, Static218.alphaOverride);
}
arg1 += local146.anInt4279;
arg1 += local146.innerWidth;
local8 = 0;
} catch (@Pc(197) Exception local197) {
}
} else {
this.method2861(local44);
this.parseTag(local44);
}
continue;
}
@ -806,8 +806,8 @@ public abstract class Font extends SecondaryNode {
}
}
if (local6 == -1) {
if (this.aByteArray50 != null && local8 != 0) {
arg1 += this.aByteArray50[(local8 << 8) + local24];
if (this.kerning != null && local8 != 0) {
arg1 += this.kerning[(local8 << 8) + local24];
}
@Pc(226) int local226 = this.spriteInnerWidths[local24];
local121 = this.spriteInnerHeights[local24];
@ -823,35 +823,35 @@ public abstract class Font extends SecondaryNode {
}
local10++;
if (local24 == 32) {
if (Static218.anInt3636 > 0) {
Static218.anInt3629 += Static218.anInt3636;
if (Static218.spaceWidth > 0) {
Static218.anInt3629 += Static218.spaceWidth;
arg1 += Static218.anInt3629 >> 8;
Static218.anInt3629 &= 0xFF;
}
} else if (Static218.anInt3631 == 256) {
if (Static218.anInt3634 != -1) {
this.renderGlyph(local24, arg1 + this.anIntArray344[local24] + local130 + 1, local4 + this.anIntArray347[local24] + 1 + local141, local226, local121, Static218.anInt3634);
} else if (Static218.alphaOverride == 256) {
if (Static218.shadowColorOverride != -1) {
this.renderGlyph(local24, arg1 + this.spriteXOffsets[local24] + local130 + 1, local4 + this.spriteYOffsets[local24] + 1 + local141, local226, local121, Static218.shadowColorOverride);
}
this.renderGlyph(local24, arg1 + this.anIntArray344[local24] + local130, local4 + this.anIntArray347[local24] + local141, local226, local121, Static218.anInt3635);
this.renderGlyph(local24, arg1 + this.spriteXOffsets[local24] + local130, local4 + this.spriteYOffsets[local24] + local141, local226, local121, Static218.colorOverride);
} else {
if (Static218.anInt3634 != -1) {
this.renderGlyphTransparent(local24, arg1 + this.anIntArray344[local24] + local130 + 1, local4 + this.anIntArray347[local24] + 1 + local141, local226, local121, Static218.anInt3634, Static218.anInt3631);
if (Static218.shadowColorOverride != -1) {
this.renderGlyphTransparent(local24, arg1 + this.spriteXOffsets[local24] + local130 + 1, local4 + this.spriteYOffsets[local24] + 1 + local141, local226, local121, Static218.shadowColorOverride, Static218.alphaOverride);
}
this.renderGlyphTransparent(local24, arg1 + this.anIntArray344[local24] + local130, local4 + this.anIntArray347[local24] + local141, local226, local121, Static218.anInt3635, Static218.anInt3631);
this.renderGlyphTransparent(local24, arg1 + this.spriteXOffsets[local24] + local130, local4 + this.spriteYOffsets[local24] + local141, local226, local121, Static218.colorOverride, Static218.alphaOverride);
}
@Pc(387) int local387 = this.anIntArray348[local24];
if (Static218.anInt3627 != -1) {
@Pc(387) int local387 = this.glyphWidths[local24];
if (Static218.strikethroughColor != -1) {
if (GlRenderer.enabled) {
Static46.method1174(arg1, local4 + (int) ((double) this.anInt3626 * 0.7D), local387, Static218.anInt3627);
Static46.method1174(arg1, local4 + (int) ((double) this.lineHeight * 0.7D), local387, Static218.strikethroughColor);
} else {
Static129.method2489(arg1, local4 + (int) ((double) this.anInt3626 * 0.7D), local387, Static218.anInt3627);
Static129.method2489(arg1, local4 + (int) ((double) this.lineHeight * 0.7D), local387, Static218.strikethroughColor);
}
}
if (Static218.anInt3628 != -1) {
if (Static218.underlineColor != -1) {
if (GlRenderer.enabled) {
Static46.method1174(arg1, local4 + this.anInt3626, local387, Static218.anInt3628);
Static46.method1174(arg1, local4 + this.lineHeight, local387, Static218.underlineColor);
} else {
Static129.method2489(arg1, local4 + this.anInt3626, local387, Static218.anInt3628);
Static129.method2489(arg1, local4 + this.lineHeight, local387, Static218.underlineColor);
}
}
arg1 += local387;

2
client/src/main/java/GlIndexedSprite.java
View file

@ -31,7 +31,7 @@ public final class GlIndexedSprite extends IndexedSprite {
@OriginalMember(owner = "client!oh", name = "<init>", descriptor = "(IIIIII[B[I)V")
public GlIndexedSprite(@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) byte[] arg6, @OriginalArg(7) int[] arg7) {
this.anInt4279 = arg0;
this.innerWidth = arg0;
this.anInt4276 = arg1;
this.anInt4280 = arg2;
this.anInt4273 = arg3;

2
client/src/main/java/GlModel.java
View file

@ -3193,7 +3193,7 @@ public final class GlModel extends Model {
local151 = new SoftwareIndexedSprite(local134, local140, 0);
} else {
local151 = arg0;
arg0.anInt4279 = arg0.width = local134;
arg0.innerWidth = arg0.width = local134;
arg0.anInt4276 = arg0.anInt4278 = local140;
arg0.method1392();
}

2
client/src/main/java/GlRenderer.java
View file

@ -192,7 +192,7 @@ public final class GlRenderer {
}
@OriginalMember(owner = "client!tf", name = "d", descriptor = "()V")
public static void method4153() {
public static void swapBuffers() {
try {
drawable.swapBuffers();
} catch (@Pc(3) Exception local3) {

8
client/src/main/java/GlTile.java
View file

@ -132,10 +132,10 @@ public final class GlTile extends Node {
local1 = (long) (arg0 + (arg2 << 16)) + ((long) arg6 << 32);
@Pc(28) IntNode local28 = (IntNode) this.aClass133_8.get(local1);
if (local28 != null) {
if (arg1 < this.anIntArray230[local28.anInt3141]) {
this.anIntArray230[local28.anInt3141] = arg1;
if (arg1 < this.anIntArray230[local28.value]) {
this.anIntArray230[local28.value] = arg1;
}
return local28.anInt3141;
return local28.value;
}
}
this.anIntArray232[this.anInt2483] = arg0;
@ -149,7 +149,7 @@ public final class GlTile extends Node {
this.aFloatArray5[this.anInt2483] = arg5;
this.anIntArray226[this.anInt2483] = arg6;
if (local1 != 0L) {
this.aClass133_8.method3862(new IntNode(this.anInt2483), local1);
this.aClass133_8.put(new IntNode(this.anInt2483), local1);
}
return this.anInt2483++;
}

22
client/src/main/java/HashTable.java
View file

@ -44,7 +44,7 @@ public final class HashTable {
if (local14 == local17) {
break;
}
local17.method4658();
local17.unlink();
}
}
this.aClass3_193 = null;
@ -52,13 +52,13 @@ public final class HashTable {
}
@OriginalMember(owner = "client!sc", name = "c", descriptor = "(I)Lclient!ab;")
public final Node method3859() {
public final Node head() {
this.anInt5037 = 0;
return this.method3861();
return this.next();
}
@OriginalMember(owner = "client!sc", name = "d", descriptor = "(I)Lclient!ab;")
public final Node method3861() {
public final Node next() {
@Pc(24) Node local24;
if (this.anInt5037 > 0 && this.aClass3_193 != this.aClass3Array1[this.anInt5037 - 1]) {
local24 = this.aClass3_193;
@ -76,13 +76,13 @@ public final class HashTable {
}
@OriginalMember(owner = "client!sc", name = "a", descriptor = "(ILclient!ab;J)V")
public final void method3862(@OriginalArg(1) Node arg0, @OriginalArg(2) long arg1) {
public final void put(@OriginalArg(1) Node arg0, @OriginalArg(2) long arg1) {
if (arg0.aClass3_223 != null) {
arg0.method4658();
arg0.unlink();
}
@Pc(21) Node local21 = this.aClass3Array1[(int) (arg1 & (long) (this.anInt5023 - 1))];
arg0.aClass3_222 = local21;
arg0.uid = arg1;
arg0.key = arg1;
arg0.aClass3_223 = local21.aClass3_223;
arg0.aClass3_223.aClass3_222 = arg0;
arg0.aClass3_222.aClass3_223 = arg0;
@ -93,7 +93,7 @@ public final class HashTable {
this.aLong168 = arg0;
@Pc(24) Node local24 = this.aClass3Array1[(int) (arg0 & (long) (this.anInt5023 - 1))];
for (this.aClass3_192 = local24.aClass3_222; this.aClass3_192 != local24; this.aClass3_192 = this.aClass3_192.aClass3_222) {
if (arg0 == this.aClass3_192.uid) {
if (arg0 == this.aClass3_192.key) {
@Pc(46) Node local46 = this.aClass3_192;
this.aClass3_192 = this.aClass3_192.aClass3_222;
return local46;
@ -130,13 +130,13 @@ public final class HashTable {
}
@OriginalMember(owner = "client!sc", name = "f", descriptor = "(I)Lclient!ab;")
public final Node method3867() {
public final Node nextWithKey() {
if (this.aClass3_192 == null) {
return null;
}
@Pc(23) Node local23 = this.aClass3Array1[(int) (this.aLong168 & (long) (this.anInt5023 - 1))];
while (local23 != this.aClass3_192) {
if (this.aClass3_192.uid == this.aLong168) {
if (this.aClass3_192.key == this.aLong168) {
@Pc(45) Node local45 = this.aClass3_192;
this.aClass3_192 = this.aClass3_192.aClass3_222;
return local45;
@ -148,7 +148,7 @@ public final class HashTable {
}
@OriginalMember(owner = "client!sc", name = "g", descriptor = "(I)I")
public final int method3868() {
public final int getBucketCount() {
return this.anInt5023;
}
}

2
client/src/main/java/IndexedSprite.java
View file

@ -18,7 +18,7 @@ public abstract class IndexedSprite {
public int anInt4278;
@OriginalMember(owner = "client!ok", name = "l", descriptor = "I")
public int anInt4279;
public int innerWidth;
@OriginalMember(owner = "client!ok", name = "m", descriptor = "I")
public int anInt4280;

4
client/src/main/java/IntNode.java
View file

@ -6,7 +6,7 @@ import org.openrs2.deob.annotation.OriginalMember;
public final class IntNode extends Node {
@OriginalMember(owner = "client!ka", name = "p", descriptor = "I")
public int anInt3141;
public int value;
@OriginalMember(owner = "client!ka", name = "<init>", descriptor = "()V")
public IntNode() {
@ -14,6 +14,6 @@ public final class IntNode extends Node {
@OriginalMember(owner = "client!ka", name = "<init>", descriptor = "(I)V")
public IntNode(@OriginalArg(0) int arg0) {
this.anInt3141 = arg0;
this.value = arg0;
}
}

26
client/src/main/java/JagString.java
View file

@ -47,7 +47,7 @@ public final class JagString implements StringInterface {
}
@OriginalMember(owner = "client!na", name = "a", descriptor = "(BI)I")
public final int method3110(@OriginalArg(1) int arg0) {
public final int parseHexString(@OriginalArg(1) int arg0) {
@Pc(14) boolean local14 = false;
@Pc(20) boolean local20 = false;
@Pc(22) int local22 = 0;
@ -189,7 +189,7 @@ public final class JagString implements StringInterface {
}
@OriginalMember(owner = "client!na", name = "c", descriptor = "(I)J")
public final long method3118() {
public final long longHashCode() {
@Pc(1) long local1 = 0L;
for (@Pc(9) int local9 = 0; local9 < this.length; local9++) {
local1 = (long) (this.chars[local9] & 0xFF) + (local1 << 5) - local1;
@ -366,7 +366,7 @@ public final class JagString implements StringInterface {
@OriginalMember(owner = "client!na", name = "b", descriptor = "(B)I")
public final int parseInt() {
return this.method3110(10);
return this.parseHexString(10);
}
@OriginalMember(owner = "client!na", name = "a", descriptor = "(IZ)V")
@ -415,7 +415,7 @@ public final class JagString implements StringInterface {
}
@OriginalMember(owner = "client!na", name = "a", descriptor = "(IB)Lclient!na;")
public final JagString method3136(@OriginalArg(0) int arg0) {
public final JagString substring(@OriginalArg(0) int arg0) {
return this.substring(this.length, arg0);
}
@ -429,7 +429,7 @@ public final class JagString implements StringInterface {
}
@OriginalMember(owner = "client!na", name = "b", descriptor = "(Lclient!na;I)Z")
public final boolean method3138(@OriginalArg(0) JagString arg0) {
public final boolean startsWith(@OriginalArg(0) JagString arg0) {
if (this.length < arg0.length) {
return false;
}
@ -574,7 +574,7 @@ public final class JagString implements StringInterface {
}
@OriginalMember(owner = "client!na", name = "g", descriptor = "(I)Lclient!na;")
public final JagString method3143() {
public final JagString asString() {
return this;
}
@ -694,23 +694,23 @@ public final class JagString implements StringInterface {
@OriginalMember(owner = "client!na", name = "c", descriptor = "(B)Lclient!na;")
public final JagString method3151() {
@Pc(9) long local9 = this.method3118();
@Pc(9) long local9 = this.longHashCode();
@Pc(19) Class local19 = JagString.class;
synchronized (local19) {
@Pc(30) StringNode local30;
if (Static148.aClass133_13 == null) {
Static148.aClass133_13 = new HashTable(4096);
} else {
for (local30 = (StringNode) Static148.aClass133_13.get(local9); local30 != null; local30 = (StringNode) Static148.aClass133_13.method3867()) {
if (this.strEquals(local30.aClass100_980)) {
return local30.aClass100_980;
for (local30 = (StringNode) Static148.aClass133_13.get(local9); local30 != null; local30 = (StringNode) Static148.aClass133_13.nextWithKey()) {
if (this.strEquals(local30.value)) {
return local30.value;
}
}
}
local30 = new StringNode();
local30.aClass100_980 = this;
local30.value = this;
this.aBoolean193 = false;
Static148.aClass133_13.method3862(local30, local9);
Static148.aClass133_13.put(local30, local9);
return this;
}
}
@ -736,7 +736,7 @@ public final class JagString implements StringInterface {
}
@OriginalMember(owner = "client!na", name = "a", descriptor = "(BLjava/applet/Applet;)Lclient!na;")
public final JagString method3153(@OriginalArg(1) Applet arg0) {
public final JagString fromParameters(@OriginalArg(1) Applet arg0) {
@Pc(19) String local19 = new String(this.chars, 0, this.length);
@Pc(23) String local23 = arg0.getParameter(local19);
return local23 == null ? null : Static230.method3952(local23);

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

@ -103,7 +103,7 @@ public final class JavaAudioChannel extends AudioChannel {
local1 = 512;
}
for (@Pc(9) int local9 = 0; local9 < local1; local9++) {
@Pc(17) int local17 = this.anIntArray411[local9];
@Pc(17) int local17 = this.samples[local9];
if ((local17 + 8388608 & 0xFF000000) != 0) {
local17 = local17 >> 31 ^ 0x7FFFFF;
}

2
client/src/main/java/JavaMouseWheel.java
View file

@ -14,7 +14,7 @@ public final class JavaMouseWheel extends MouseWheel implements MouseWheelListen
@OriginalMember(owner = "client!o", name = "a", descriptor = "(ZLjava/awt/Component;)V")
@Override
public final void method3291(@OriginalArg(1) Component arg0) {
public final void stop(@OriginalArg(1) Component arg0) {
arg0.removeMouseWheelListener(this);
}

16
client/src/main/java/Js5CacheQueue.java
View file

@ -34,14 +34,14 @@ public final class Js5CacheQueue implements Runnable {
private void method2461(@OriginalArg(0) Js5CacheRequest arg0) {
@Pc(7) SecondaryLinkedList local7 = this.aClass16_6;
synchronized (this.aClass16_6) {
this.aClass16_6.method798(arg0);
this.aClass16_6.addTail(arg0);
this.anInt3131++;
this.aClass16_6.notifyAll();
}
}
@OriginalMember(owner = "client!k", name = "a", descriptor = "(I)V")
public final void method2466() {
public final void quit() {
this.aBoolean161 = true;
@Pc(6) SecondaryLinkedList local6 = this.aClass16_6;
synchronized (this.aClass16_6) {
@ -59,7 +59,7 @@ public final class Js5CacheQueue implements Runnable {
@Pc(7) Js5CacheRequest local7 = new Js5CacheRequest();
local7.aByteArray11 = arg1;
local7.aBoolean225 = false;
local7.aLong185 = arg2;
local7.secondaryKey = arg2;
local7.aClass49_3 = arg0;
local7.anInt824 = 2;
this.method2461(local7);
@ -72,7 +72,7 @@ public final class Js5CacheQueue implements Runnable {
local7.aClass49_3 = arg1;
local7.anInt824 = 3;
local7.aBoolean225 = false;
local7.aLong185 = arg0;
local7.secondaryKey = arg0;
this.method2461(local7);
return local7;
}
@ -88,7 +88,7 @@ public final class Js5CacheQueue implements Runnable {
if (local31 == null) {
break;
}
if (local31.aLong185 == (long) arg1 && local31.aClass49_3 == arg0 && local31.anInt824 == 2) {
if (local31.secondaryKey == (long) arg1 && local31.aClass49_3 == arg0 && local31.anInt824 == 2) {
local9.aByteArray11 = local31.aByteArray11;
local9.aBoolean226 = false;
return local9;
@ -96,7 +96,7 @@ public final class Js5CacheQueue implements Runnable {
local31 = (Js5CacheRequest) this.aClass16_6.method797();
}
}
local9.aByteArray11 = arg0.method1701(arg1);
local9.aByteArray11 = arg0.read(arg1);
local9.aBoolean226 = false;
local9.aBoolean225 = true;
return local9;
@ -121,9 +121,9 @@ public final class Js5CacheQueue implements Runnable {
}
try {
if (local19.anInt824 == 2) {
local19.aClass49_3.method1700((int) local19.aLong185, local19.aByteArray11.length, local19.aByteArray11);
local19.aClass49_3.write((int) local19.secondaryKey, local19.aByteArray11.length, local19.aByteArray11);
} else if (local19.anInt824 == 3) {
local19.aByteArray11 = local19.aClass49_3.method1701((int) local19.aLong185);
local19.aByteArray11 = local19.aClass49_3.read((int) local19.secondaryKey);
}
} catch (@Pc(83) Exception local83) {
Static89.report(null, local83);

46
client/src/main/java/Js5CachedResourceProvider.java
View file

@ -92,12 +92,12 @@ public final class Js5CachedResourceProvider extends Js5ResourceProvider {
}
@Pc(15) Node local15;
for (local15 = this.aClass69_16.method2289(); local15 != null; local15 = this.aClass69_16.method2288()) {
if (local15.uid == (long) arg0) {
if (local15.key == (long) arg0) {
return;
}
}
local15 = new Node();
local15.uid = arg0;
local15.key = arg0;
this.aClass69_16.method2282(local15);
}
@ -184,7 +184,7 @@ public final class Js5CachedResourceProvider extends Js5ResourceProvider {
return 0;
} else if (this.aBoolean35) {
@Pc(25) Node local25 = this.aClass69_17.method2289();
return local25 == null ? 0 : (int) local25.uid;
return local25 == null ? 0 : (int) local25.key;
} else {
return this.aClass70_1.anInt2902;
}
@ -202,14 +202,14 @@ public final class Js5CachedResourceProvider extends Js5ResourceProvider {
if (this.aBoolean35) {
local32 = true;
for (local37 = this.aClass69_17.method2289(); local37 != null; local37 = this.aClass69_17.method2288()) {
local43 = (int) local37.uid;
local43 = (int) local37.key;
if (this.aByteArray9[local43] == 0) {
this.method536(1, local43);
}
if (this.aByteArray9[local43] == 0) {
local32 = false;
} else {
local37.method4658();
local37.unlink();
}
}
while (this.aClass70_1.anIntArray272.length > this.anInt578) {
@ -226,7 +226,7 @@ public final class Js5CachedResourceProvider extends Js5ResourceProvider {
if (this.aByteArray9[this.anInt578] == 0) {
local32 = false;
local37 = new Node();
local37.uid = this.anInt578;
local37.key = this.anInt578;
this.aClass69_17.method2282(local37);
}
this.anInt578++;
@ -239,12 +239,12 @@ public final class Js5CachedResourceProvider extends Js5ResourceProvider {
} else if (this.aBoolean36) {
local32 = true;
for (local37 = this.aClass69_17.method2289(); local37 != null; local37 = this.aClass69_17.method2288()) {
local43 = (int) local37.uid;
local43 = (int) local37.key;
if (this.aByteArray9[local43] != 1) {
this.method536(2, local43);
}
if (this.aByteArray9[local43] == 1) {
local37.method4658();
local37.unlink();
} else {
local32 = false;
}
@ -262,7 +262,7 @@ public final class Js5CachedResourceProvider extends Js5ResourceProvider {
}
if (this.aByteArray9[this.anInt578] != 1) {
local37 = new Node();
local37.uid = this.anInt578;
local37.key = this.anInt578;
this.aClass69_17.method2282(local37);
local32 = false;
}
@ -280,13 +280,13 @@ public final class Js5CachedResourceProvider extends Js5ResourceProvider {
if (!this.aBoolean37 || this.aLong20 > MonotonicClock.currentTimeMillis()) {
return;
}
for (@Pc(331) Js5Request local331 = (Js5Request) this.aClass133_1.method3859(); local331 != null; local331 = (Js5Request) this.aClass133_1.method3861()) {
for (@Pc(331) Js5Request local331 = (Js5Request) this.aClass133_1.head(); local331 != null; local331 = (Js5Request) this.aClass133_1.next()) {
if (!local331.aBoolean226) {
if (local331.aBoolean227) {
if (!local331.aBoolean225) {
throw new RuntimeException();
}
local331.method4658();
local331.unlink();
} else {
local331.aBoolean227 = true;
}
@ -311,7 +311,7 @@ public final class Js5CachedResourceProvider extends Js5ResourceProvider {
private Js5Request method536(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
@Pc(13) Js5Request local13 = (Js5Request) this.aClass133_1.get((long) arg1);
if (local13 != null && arg0 == 0 && !local13.aBoolean225 && local13.aBoolean226) {
local13.method4658();
local13.unlink();
local13 = null;
}
if (local13 == null) {
@ -343,7 +343,7 @@ public final class Js5CachedResourceProvider extends Js5ResourceProvider {
} else {
throw new RuntimeException();
}
this.aClass133_1.method3862(local13, (long) arg1);
this.aClass133_1.put(local13, (long) arg1);
}
if (local13.aBoolean226) {
return null;
@ -366,10 +366,10 @@ public final class Js5CachedResourceProvider extends Js5ResourceProvider {
this.aClass73_2.response = 0;
} catch (@Pc(225) RuntimeException local225) {
this.aClass73_2.method2327();
local13.method4658();
local13.unlink();
if (local13.aBoolean225 && !this.aClass73_2.method2326()) {
local252 = this.aClass73_2.method2330(this.anInt576, (byte) 2, arg1, true);
this.aClass133_1.method3862(local252, (long) arg1);
this.aClass133_1.put(local252, (long) arg1);
}
return null;
}
@ -383,7 +383,7 @@ public final class Js5CachedResourceProvider extends Js5ResourceProvider {
}
}
if (!local13.aBoolean225) {
local13.method4658();
local13.unlink();
}
return local13;
}
@ -408,15 +408,15 @@ public final class Js5CachedResourceProvider extends Js5ResourceProvider {
this.aByteArray9[arg1] = 1;
}
if (!local13.aBoolean225) {
local13.method4658();
local13.unlink();
}
return local13;
} catch (@Pc(437) Exception local437) {
this.aByteArray9[arg1] = -1;
local13.method4658();
local13.unlink();
if (local13.aBoolean225 && !this.aClass73_2.method2326()) {
local252 = this.aClass73_2.method2330(this.anInt576, (byte) 2, arg1, true);
this.aClass133_1.method3862(local252, (long) arg1);
this.aClass133_1.put(local252, (long) arg1);
}
return null;
}
@ -428,9 +428,9 @@ public final class Js5CachedResourceProvider extends Js5ResourceProvider {
return;
}
for (@Pc(21) Node local21 = this.aClass69_16.method2289(); local21 != null; local21 = this.aClass69_16.method2288()) {
@Pc(28) int local28 = (int) local21.uid;
@Pc(28) int local28 = (int) local21.key;
if (local28 < 0 || this.aClass70_1.anInt2907 <= local28 || this.aClass70_1.anIntArray272[local28] == 0) {
local21.method4658();
local21.unlink();
} else {
if (this.aByteArray9[local28] == 0) {
this.method536(1, local28);
@ -439,7 +439,7 @@ public final class Js5CachedResourceProvider extends Js5ResourceProvider {
this.method536(2, local28);
}
if (this.aByteArray9[local28] == 1) {
local21.method4658();
local21.unlink();
}
}
}
@ -462,7 +462,7 @@ public final class Js5CachedResourceProvider extends Js5ResourceProvider {
return null;
} else {
@Pc(17) byte[] local17 = local9.method3554();
local9.method4658();
local9.unlink();
return local17;
}
}

24
client/src/main/java/Js5NetQueue.java
View file

@ -79,16 +79,16 @@ public final class Js5NetQueue {
for (local75 = (Js5NetRequest) this.aClass16_2.method795(); local75 != null; local75 = (Js5NetRequest) this.aClass16_2.method797()) {
this.aClass3_Sub15_4.offset = 0;
this.aClass3_Sub15_4.p1(1);
this.aClass3_Sub15_4.p3((int) local75.aLong185);
this.aClass3_Sub15_4.p3((int) local75.secondaryKey);
this.aClass95_1.write(this.aClass3_Sub15_4.data, 4);
this.aClass16_3.method798(local75);
this.aClass16_3.addTail(local75);
}
for (local75 = (Js5NetRequest) this.aClass16_4.method795(); local75 != null; local75 = (Js5NetRequest) this.aClass16_4.method797()) {
this.aClass3_Sub15_4.offset = 0;
this.aClass3_Sub15_4.p1(0);
this.aClass3_Sub15_4.p3((int) local75.aLong185);
this.aClass3_Sub15_4.p3((int) local75.secondaryKey);
this.aClass95_1.write(this.aClass3_Sub15_4.data, 4);
this.aClass16_5.method798(local75);
this.aClass16_5.addTail(local75);
}
for (@Pc(172) int local172 = 0; local172 < 100; local172++) {
local19 = this.aClass95_1.available();
@ -156,10 +156,10 @@ public final class Js5NetQueue {
@Pc(501) long local501 = (long) ((local235 << 16) + local283);
@Pc(509) Js5NetRequest local509;
if (local491) {
for (local509 = (Js5NetRequest) this.aClass16_5.method795(); local509 != null && local509.aLong185 != local501; local509 = (Js5NetRequest) this.aClass16_5.method797()) {
for (local509 = (Js5NetRequest) this.aClass16_5.method795(); local509 != null && local509.secondaryKey != local501; local509 = (Js5NetRequest) this.aClass16_5.method797()) {
}
} else {
for (local509 = (Js5NetRequest) this.aClass16_3.method795(); local509 != null && local501 != local509.aLong185; local509 = (Js5NetRequest) this.aClass16_3.method797()) {
for (local509 = (Js5NetRequest) this.aClass16_3.method795(); local509 != null && local501 != local509.secondaryKey; local509 = (Js5NetRequest) this.aClass16_3.method797()) {
}
}
if (local509 == null) {
@ -291,10 +291,10 @@ public final class Js5NetQueue {
this.aLong104 = MonotonicClock.currentTimeMillis();
return;
}
this.aClass16_4.method798(local44);
this.aClass16_4.addTail(local44);
}
}
this.aClass16_2.method798(local44);
this.aClass16_2.addTail(local44);
}
}
@ -321,7 +321,7 @@ public final class Js5NetQueue {
}
@OriginalMember(owner = "client!jb", name = "b", descriptor = "(Z)V")
public final void method2329() {
public final void quit() {
if (this.aClass95_1 != null) {
this.aClass95_1.close();
}
@ -332,15 +332,15 @@ public final class Js5NetQueue {
@Pc(7) Js5NetRequest local7 = new Js5NetRequest();
@Pc(14) long local14 = (long) (arg2 + (arg0 << 16));
local7.aBoolean225 = arg3;
local7.aLong185 = local14;
local7.secondaryKey = local14;
local7.aByte16 = arg1;
if (arg3) {
if (this.method2328() >= 20) {
throw new RuntimeException();
}
this.aClass16_2.method798(local7);
this.aClass16_2.addTail(local7);
} else if (this.method2321() < 20) {
this.aClass16_4.method798(local7);
this.aClass16_4.addTail(local7);
} else {
throw new RuntimeException();
}

4
client/src/main/java/Js5QuickChatCommandDecoder.java
View file

@ -11,12 +11,12 @@ public final class Js5QuickChatCommandDecoder implements QuickChatCommandDecoder
public final JagString method30(@OriginalArg(0) int arg0, @OriginalArg(1) int[] arg1, @OriginalArg(3) long arg2) {
if (arg0 == 0) {
@Pc(12) EnumType local12 = Static253.method4330(arg1[0]);
return local12.method3085((int) arg2);
return local12.getString((int) arg2);
} else if (arg0 == 1 || arg0 == 10) {
@Pc(31) ObjType local31 = Static71.method1439((int) arg2);
return local31.aClass100_495;
} else if (arg0 == 6 || arg0 == 7 || arg0 == 11) {
return Static253.method4330(arg1[0]).method3085((int) arg2);
return Static253.method4330(arg1[0]).getString((int) arg2);
} else {
return null;
}

12
client/src/main/java/LinkedList.java
View file

@ -19,14 +19,14 @@ public final class LinkedList {
}
@OriginalMember(owner = "client!ih", name = "a", descriptor = "(I)V")
public final void method2278() {
public final void clear() {
while (true) {
@Pc(5) Node local5 = this.aClass3_109.aClass3_222;
if (local5 == this.aClass3_109) {
this.aClass3_110 = null;
return;
}
local5.method4658();
local5.unlink();
}
}
@ -45,7 +45,7 @@ public final class LinkedList {
@OriginalMember(owner = "client!ih", name = "a", descriptor = "(ZLclient!ab;)V")
public final void method2282(@OriginalArg(1) Node arg0) {
if (arg0.aClass3_223 != null) {
arg0.method4658();
arg0.unlink();
}
arg0.aClass3_222 = this.aClass3_109;
arg0.aClass3_223 = this.aClass3_109.aClass3_223;
@ -54,9 +54,9 @@ public final class LinkedList {
}
@OriginalMember(owner = "client!ih", name = "a", descriptor = "(ILclient!ab;)V")
public final void method2283(@OriginalArg(1) Node arg0) {
public final void addHead(@OriginalArg(1) Node arg0) {
if (arg0.aClass3_223 != null) {
arg0.method4658();
arg0.unlink();
}
arg0.aClass3_222 = this.aClass3_109.aClass3_222;
arg0.aClass3_223 = this.aClass3_109;
@ -82,7 +82,7 @@ public final class LinkedList {
if (this.aClass3_109 == local3) {
return null;
} else {
local3.method4658();
local3.unlink();
return local3;
}
}

4
client/src/main/java/Loc.java
View file

@ -84,7 +84,7 @@ public final class Loc extends Entity {
} else {
local67 = Static271.method4601(this.anInt1299);
if (local67.anIntArray380 != null) {
local67 = local67.method3417();
local67 = local67.getMultiLoc();
}
if (local67 != null) {
Static9.method181(local67, 0, this.anInt1295, 0, this.anInt1307, this.anInt1308, this.anInt1300, this.anInt1303);
@ -225,7 +225,7 @@ public final class Loc extends Entity {
@Pc(19) LocType local19 = Static271.method4601(this.anInt1299);
@Pc(22) int local22 = local19.anInt4430;
if (local19.anIntArray380 != null) {
local19 = local19.method3417();
local19 = local19.getMultiLoc();
}
if (local19 == null) {
if (GlRenderer.enabled && !local12) {

54
client/src/main/java/LocType.java
View file

@ -151,7 +151,7 @@ public final class LocType {
private int anInt4411 = 0;
@OriginalMember(owner = "client!pb", name = "k", descriptor = "I")
public int anInt4402 = 0;
public int soundRadius = 0;
@OriginalMember(owner = "client!pb", name = "p", descriptor = "I")
private int anInt4405 = 0;
@ -163,7 +163,7 @@ public final class LocType {
public boolean aBoolean213 = false;
@OriginalMember(owner = "client!pb", name = "O", descriptor = "I")
public int anInt4412 = -1;
public int sound = -1;
@OriginalMember(owner = "client!pb", name = "ub", descriptor = "I")
public int anInt4435 = 2;
@ -206,7 +206,7 @@ public final class LocType {
}
@OriginalMember(owner = "client!pb", name = "a", descriptor = "(I)Lclient!pb;")
public final LocType method3417() {
public final LocType getMultiLoc() {
@Pc(26) int local26 = -1;
if (this.anInt4425 != -1) {
local26 = Static155.getVarbit(this.anInt4425);
@ -243,7 +243,7 @@ public final class LocType {
if (local10) {
local60 += 65536;
}
local7 = (RawModel) Static169.aClass99_24.method3106((long) local60);
local7 = (RawModel) Static169.aClass99_24.get((long) local60);
if (local7 == null) {
local7 = Static77.method1686(Static121.aClass153_45, local60 & 0xFFFF);
if (local7 == null) {
@ -252,7 +252,7 @@ public final class LocType {
if (local10) {
local7.method1673();
}
Static169.aClass99_24.method3095(local7, (long) local60);
Static169.aClass99_24.put(local7, (long) local60);
}
if (local46 > 1) {
Static274.aClass8_Sub5Array5[local48] = local7;
@ -276,7 +276,7 @@ public final class LocType {
if (local10) {
local48 += 65536;
}
local7 = (RawModel) Static169.aClass99_24.method3106((long) local48);
local7 = (RawModel) Static169.aClass99_24.get((long) local48);
if (local7 == null) {
local7 = Static77.method1686(Static121.aClass153_45, local48 & 0xFFFF);
if (local7 == null) {
@ -285,7 +285,7 @@ public final class LocType {
if (local10) {
local7.method1673();
}
Static169.aClass99_24.method3095(local7, (long) local48);
Static169.aClass99_24.put(local7, (long) local48);
}
}
@Pc(211) boolean local211;
@ -359,12 +359,12 @@ public final class LocType {
@OriginalMember(owner = "client!pb", name = "d", descriptor = "(I)Z")
public final boolean method3422() {
if (this.anIntArray380 == null) {
return this.anInt4412 != -1 || this.anIntArray381 != null;
return this.sound != -1 || this.anIntArray381 != null;
}
for (@Pc(44) int local44 = 0; local44 < this.anIntArray380.length; local44++) {
if (this.anIntArray380[local44] != -1) {
@Pc(70) LocType local70 = Static271.method4601(this.anIntArray380[local44]);
if (local70.anInt4412 != -1 || local70.anIntArray381 != null) {
if (local70.sound != -1 || local70.anIntArray381 != null) {
return true;
}
}
@ -378,7 +378,7 @@ public final class LocType {
return arg0;
} else {
@Pc(21) IntNode local21 = (IntNode) this.aClass133_19.get((long) arg1);
return local21 == null ? arg0 : local21.anInt3141;
return local21 == null ? arg0 : local21.value;
}
}
@ -535,12 +535,12 @@ public final class LocType {
}
this.anIntArray380[local38 + 1] = local18;
} else if (arg1 == 78) {
this.anInt4412 = arg0.g2();
this.anInt4402 = arg0.g1();
this.sound = arg0.g2();
this.soundRadius = arg0.g1();
} else if (arg1 == 79) {
this.anInt4419 = arg0.g2();
this.anInt4414 = arg0.g2();
this.anInt4402 = arg0.g1();
this.soundRadius = arg0.g1();
local18 = arg0.g1();
this.anIntArray381 = new int[local18];
for (local38 = 0; local38 < local18; local38++) {
@ -597,7 +597,7 @@ public final class LocType {
} else {
local589 = new IntNode(arg0.g4());
}
this.aClass133_19.method3862(local589, (long) local580);
this.aClass133_19.put(local589, (long) local580);
}
}
}
@ -639,7 +639,7 @@ public final class LocType {
if (arg1) {
local135 = ~local135;
}
local79 = (GlModel) Static169.aClass99_24.method3106(local135);
local79 = (GlModel) Static169.aClass99_24.get(local135);
if (local79 == null) {
@Pc(175) RawModel local175 = null;
for (local177 = 0; local177 < local24; local177++) {
@ -655,7 +655,7 @@ public final class LocType {
local175 = new RawModel(Static274.aClass8_Sub5Array5, local24);
}
local79 = new GlModel(local175, local10, local17, arg1);
Static169.aClass99_24.method3095(local79, local135);
Static169.aClass99_24.put(local79, local135);
}
} else {
local24 = -1;
@ -673,14 +673,14 @@ public final class LocType {
if (arg1) {
local26 += 65536;
}
local79 = (GlModel) Static169.aClass99_24.method3106((long) local26);
local79 = (GlModel) Static169.aClass99_24.get((long) local26);
if (local79 == null) {
@Pc(90) RawModel local90 = Static77.method1686(Static121.aClass153_45, local26 & 0xFFFF);
if (local90 == null) {
return null;
}
local79 = new GlModel(local90, local10, local17, arg1);
Static169.aClass99_24.method3095(local79, (long) local26);
Static169.aClass99_24.put(local79, (long) local26);
}
}
@Pc(236) boolean local236 = this.aBoolean217;
@ -739,7 +739,7 @@ public final class LocType {
} else {
local29 = arg0 + (this.anInt4426 << 10) + (arg3 << 3);
}
@Pc(225) Class139 local225 = (Class139) Static93.aClass99_14.method3106(local29);
@Pc(225) Class139 local225 = (Class139) Static93.aClass99_14.get(local29);
@Pc(235) GlModel local235;
@Pc(265) SoftwareIndexedSprite local265;
if (local225 == null) {
@ -760,7 +760,7 @@ public final class LocType {
local225 = new Class139();
local225.aClass8_10 = local235;
local225.aClass36_Sub1_3 = local265;
Static93.aClass99_14.method3095(local225, local29);
Static93.aClass99_14.put(local225, local29);
} else {
local235 = (GlModel) local225.aClass8_10;
local265 = local225.aClass36_Sub1_3;
@ -788,7 +788,7 @@ public final class LocType {
} else {
local50 = false;
}
@Pc(60) Entity local60 = (Entity) Static93.aClass99_14.method3106(local29);
@Pc(60) Entity local60 = (Entity) Static93.aClass99_14.get(local29);
if (local60 == null) {
@Pc(69) RawModel local69 = this.method3418(arg0, arg3);
if (local69 == null) {
@ -807,7 +807,7 @@ public final class LocType {
} else {
local60 = new SoftwareModel(local69, this.anInt4407 + 64, this.anInt4405 * 5 + 768, -50, -10, -50);
}
Static93.aClass99_14.method3095(local60, local29);
Static93.aClass99_14.put(local60, local29);
}
if (local50) {
local60 = ((RawModel) local60).method1675();
@ -832,14 +832,14 @@ public final class LocType {
} else {
local30 = arg5 + (this.anInt4426 << 10) + (arg11 << 3);
}
@Pc(195) SoftwareModel local195 = (SoftwareModel) Static262.aClass99_36.method3106(local30);
@Pc(195) SoftwareModel local195 = (SoftwareModel) Static262.aClass99_36.get(local30);
if (local195 == null) {
@Pc(204) RawModel local204 = this.method3418(arg5, arg11);
if (local204 == null) {
return null;
}
local195 = new SoftwareModel(local204, this.anInt4407 + 64, this.anInt4405 * 5 + 768, -50, -10, -50);
Static262.aClass99_36.method3095(local195, local30);
Static262.aClass99_36.put(local195, local30);
}
@Pc(234) boolean local234 = false;
if (arg4 != null) {
@ -867,7 +867,7 @@ public final class LocType {
} else {
local30 = (arg11 << 3) + ((this.anInt4426 << 10) + arg5);
}
@Pc(46) GlModel local46 = (GlModel) Static262.aClass99_36.method3106(local30);
@Pc(46) GlModel local46 = (GlModel) Static262.aClass99_36.get(local30);
if (local46 == null) {
local46 = this.method3427(arg5, true, arg11);
if (local46 == null) {
@ -875,7 +875,7 @@ public final class LocType {
}
local46.method4099();
local46.method4111(false, false, false, false, false, true);
Static262.aClass99_36.method3095(local46, local30);
Static262.aClass99_36.put(local46, local30);
}
@Pc(80) boolean local80 = false;
@Pc(82) GlModel local82 = local46;
@ -911,7 +911,7 @@ public final class LocType {
return arg0;
} else {
@Pc(26) StringNode local26 = (StringNode) this.aClass133_19.get((long) arg1);
return local26 == null ? arg0 : local26.aClass100_980;
return local26 == null ? arg0 : local26.value;
}
}
}

14
client/src/main/java/LruHashTable.java
View file

@ -36,37 +36,37 @@ public final class LruHashTable {
public final SecondaryNode get(@OriginalArg(0) long arg0) {
@Pc(16) SecondaryNode local16 = (SecondaryNode) this.aClass133_5.get(arg0);
if (local16 != null) {
this.aClass16_1.method798(local16);
this.aClass16_1.addTail(local16);
}
return local16;
}
@OriginalMember(owner = "client!gn", name = "a", descriptor = "(I)Lclient!ab;")
public final Node method1808() {
return this.aClass133_5.method3859();
return this.aClass133_5.head();
}
@OriginalMember(owner = "client!gn", name = "a", descriptor = "(Lclient!rg;JB)V")
public final void put(@OriginalArg(0) SecondaryNode arg0, @OriginalArg(1) long arg1) {
if (this.anInt2314 == 0) {
@Pc(14) SecondaryNode local14 = this.aClass16_1.method796();
local14.method4658();
local14.unlink();
local14.method4365();
if (this.aClass3_Sub2_37 == local14) {
local14 = this.aClass16_1.method796();
local14.method4658();
local14.unlink();
local14.method4365();
}
} else {
this.anInt2314--;
}
this.aClass133_5.method3862(arg0, arg1);
this.aClass16_1.method798(arg0);
this.aClass133_5.put(arg0, arg1);
this.aClass16_1.addTail(arg0);
}
@OriginalMember(owner = "client!gn", name = "b", descriptor = "(I)Lclient!ab;")
public final Node method1813() {
return this.aClass133_5.method3861();
return this.aClass133_5.next();
}
@OriginalMember(owner = "client!gn", name = "c", descriptor = "(I)V")

16
client/src/main/java/MidiNoteStream.java
View file

@ -65,7 +65,7 @@ public final class MidiNoteStream extends PcmStream {
arg1 = arg0.anInt3775 / local27;
}
}
arg0.aClass3_Sub3_Sub1_3.method4410(arg1);
arg0.aClass3_Sub3_Sub1_3.skip(arg1);
}
@OriginalMember(owner = "client!te", name = "a", descriptor = "()I")
@ -76,8 +76,8 @@ public final class MidiNoteStream extends PcmStream {
@OriginalMember(owner = "client!te", name = "c", descriptor = "(I)V")
@Override
public final void method4410(@OriginalArg(0) int arg0) {
this.aClass3_Sub3_Sub2_2.method4410(arg0);
public final void skip(@OriginalArg(0) int arg0) {
this.aClass3_Sub3_Sub2_2.skip(arg0);
for (@Pc(15) MidiNote local15 = (MidiNote) this.aClass69_126.method2289(); local15 != null; local15 = (MidiNote) this.aClass69_126.method2288()) {
if (!this.aClass3_Sub3_Sub4_3.method4445(local15)) {
@Pc(27) int local27 = arg0;
@ -96,8 +96,8 @@ public final class MidiNoteStream extends PcmStream {
@OriginalMember(owner = "client!te", name = "b", descriptor = "([III)V")
@Override
public final void method4408(@OriginalArg(0) int[] arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
this.aClass3_Sub3_Sub2_2.method4408(arg0, arg1, arg2);
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.method2289(); local17 != null; local17 = (MidiNote) this.aClass69_126.method2288()) {
if (!this.aClass3_Sub3_Sub4_3.method4445(local17)) {
@Pc(29) int local29 = arg2;
@ -127,7 +127,7 @@ public final class MidiNoteStream extends PcmStream {
break;
}
arg3 -= local36;
arg1.aClass3_Sub3_Sub1_3.method4408(arg0, arg2, local36);
arg1.aClass3_Sub3_Sub1_3.read(arg0, arg2, local36);
@Pc(55) int local55 = Static44.sampleRate / 100;
@Pc(58) SoundPcmStream local58 = arg1.aClass3_Sub3_Sub1_3;
@Pc(62) int local62 = 262144 / local26;
@ -147,12 +147,12 @@ public final class MidiNoteStream extends PcmStream {
}
arg2 += local36;
local58.method384(local55);
local58.method4408(arg0, arg2, arg4 - arg2);
local58.read(arg0, arg2, arg4 - arg2);
if (local58.method412()) {
this.aClass3_Sub3_Sub2_2.method1343(local58);
}
}
}
arg1.aClass3_Sub3_Sub1_3.method4408(arg0, arg2, arg3);
arg1.aClass3_Sub3_Sub1_3.read(arg0, arg2, arg3);
}
}

36
client/src/main/java/MidiPcmStream.java
View file

@ -110,8 +110,8 @@ public final class MidiPcmStream extends PcmStream {
arg0.method3741();
@Pc(5) boolean local5 = true;
@Pc(20) int[] local20 = new int[] { 22050 };
for (@Pc(34) Class3_Sub9 local34 = (Class3_Sub9) arg0.aClass133_22.method3859(); local34 != null; local34 = (Class3_Sub9) arg0.aClass133_22.method3861()) {
@Pc(40) int local40 = (int) local34.uid;
for (@Pc(34) Class3_Sub9 local34 = (Class3_Sub9) arg0.aClass133_22.head(); local34 != null; local34 = (Class3_Sub9) arg0.aClass133_22.next()) {
@Pc(40) int local40 = (int) local34.key;
@Pc(48) MidiInstrument local48 = (MidiInstrument) this.aClass133_23.get((long) local40);
if (local48 == null) {
local48 = Static116.method2320(arg1, local40);
@ -119,7 +119,7 @@ public final class MidiPcmStream extends PcmStream {
local5 = false;
continue;
}
this.aClass133_23.method3862(local48, (long) local40);
this.aClass133_23.put(local48, (long) local40);
}
if (!local48.method2436(local20, arg2, local34.aByteArray17)) {
local5 = false;
@ -133,7 +133,7 @@ public final class MidiPcmStream extends PcmStream {
@OriginalMember(owner = "client!va", name = "d", descriptor = "(B)V")
public final synchronized void method4412() {
for (@Pc(15) MidiInstrument local15 = (MidiInstrument) this.aClass133_23.method3859(); local15 != null; local15 = (MidiInstrument) this.aClass133_23.method3861()) {
for (@Pc(15) MidiInstrument local15 = (MidiInstrument) this.aClass133_23.head(); local15 != null; local15 = (MidiInstrument) this.aClass133_23.next()) {
local15.method2432();
}
}
@ -224,7 +224,7 @@ public final class MidiPcmStream extends PcmStream {
if (local20.anInt3767 < 0) {
this.aClass3_Sub25ArrayArray1[local20.anInt3773][local20.anInt3779] = null;
}
local20.method4658();
local20.unlink();
}
}
}
@ -254,8 +254,8 @@ public final class MidiPcmStream extends PcmStream {
@OriginalMember(owner = "client!va", name = "e", descriptor = "(I)V")
public final synchronized void method4426() {
for (@Pc(7) MidiInstrument local7 = (MidiInstrument) this.aClass133_23.method3859(); local7 != null; local7 = (MidiInstrument) this.aClass133_23.method3861()) {
local7.method4658();
for (@Pc(7) MidiInstrument local7 = (MidiInstrument) this.aClass133_23.head(); local7 != null; local7 = (MidiInstrument) this.aClass133_23.next()) {
local7.unlink();
}
}
@ -491,7 +491,7 @@ public final class MidiPcmStream extends PcmStream {
@OriginalMember(owner = "client!va", name = "b", descriptor = "([III)V")
@Override
public final synchronized void method4408(@OriginalArg(0) int[] arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
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;
do {
@ -502,13 +502,13 @@ public final class MidiPcmStream extends PcmStream {
}
@Pc(59) int local59 = (int) ((this.aLong188 + (long) local18 - this.aLong189 - 1L) / (long) local18);
this.aLong189 += (long) local18 * (long) local59;
this.aClass3_Sub3_Sub3_1.method4408(arg0, arg1, local59);
this.aClass3_Sub3_Sub3_1.read(arg0, arg1, local59);
arg2 -= local59;
arg1 += local59;
this.method4435();
} while (this.aClass84_1.method2628());
}
this.aClass3_Sub3_Sub3_1.method4408(arg0, arg1, arg2);
this.aClass3_Sub3_Sub3_1.read(arg0, arg1, arg2);
}
@OriginalMember(owner = "client!va", name = "a", descriptor = "(IILclient!mf;B[I)Z")
@ -516,7 +516,7 @@ public final class MidiPcmStream extends PcmStream {
arg2.anInt3771 = Static44.sampleRate / 100;
if (arg2.anInt3767 >= 0 && (arg2.aClass3_Sub3_Sub1_3 == null || arg2.aClass3_Sub3_Sub1_3.method411())) {
arg2.method2957();
arg2.method4658();
arg2.unlink();
if (arg2.anInt3776 > 0 && arg2 == this.aClass3_Sub25ArrayArray2[arg2.anInt3773][arg2.anInt3776]) {
this.aClass3_Sub25ArrayArray2[arg2.anInt3773][arg2.anInt3776] = null;
}
@ -578,16 +578,16 @@ public final class MidiPcmStream extends PcmStream {
}
arg2.aClass3_Sub3_Sub1_3.method384(arg2.anInt3771);
if (arg3 == null) {
arg2.aClass3_Sub3_Sub1_3.method4410(arg0);
arg2.aClass3_Sub3_Sub1_3.skip(arg0);
} else {
arg2.aClass3_Sub3_Sub1_3.method4408(arg3, arg1, arg0);
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);
}
arg2.method2957();
if (arg2.anInt3767 >= 0) {
arg2.method4658();
arg2.unlink();
if (arg2.anInt3776 > 0 && this.aClass3_Sub25ArrayArray2[arg2.anInt3773][arg2.anInt3776] == arg2) {
this.aClass3_Sub25ArrayArray2[arg2.anInt3773][arg2.anInt3776] = null;
}
@ -684,7 +684,7 @@ public final class MidiPcmStream extends PcmStream {
@OriginalMember(owner = "client!va", name = "c", descriptor = "(I)V")
@Override
public final synchronized void method4410(@OriginalArg(0) int arg0) {
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;
do {
@ -696,11 +696,11 @@ public final class MidiPcmStream extends PcmStream {
@Pc(57) int local57 = (int) (((long) local15 + this.aLong188 - this.aLong189 - 1L) / (long) local15);
arg0 -= local57;
this.aLong189 += (long) local57 * (long) local15;
this.aClass3_Sub3_Sub3_1.method4410(local57);
this.aClass3_Sub3_Sub3_1.skip(local57);
this.method4435();
} while (this.aClass84_1.method2628());
}
this.aClass3_Sub3_Sub3_1.method4410(arg0);
this.aClass3_Sub3_Sub3_1.skip(arg0);
}
@OriginalMember(owner = "client!va", name = "e", descriptor = "(II)V")
@ -793,7 +793,7 @@ public final class MidiPcmStream extends PcmStream {
return false;
}
if (arg0.anInt3767 >= 0) {
arg0.method4658();
arg0.unlink();
if (arg0.anInt3776 > 0 && this.aClass3_Sub25ArrayArray2[arg0.anInt3773][arg0.anInt3776] == arg0) {
this.aClass3_Sub25ArrayArray2[arg0.anInt3773][arg0.anInt3776] = null;
}

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

@ -20,7 +20,7 @@ public final class MixerPcmStream extends PcmStream {
@OriginalMember(owner = "client!ei", name = "a", descriptor = "(Lclient!cc;)V")
private void method1342(@OriginalArg(0) MixerListener arg0) {
arg0.method4658();
arg0.unlink();
arg0.method780();
@Pc(9) Node local9 = this.aClass69_44.aClass3_109.aClass3_222;
if (local9 == this.aClass69_44.aClass3_109) {
@ -32,12 +32,12 @@ 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) {
this.aClass69_43.method2283(arg0);
this.aClass69_43.addHead(arg0);
}
@OriginalMember(owner = "client!ei", name = "b", descriptor = "([III)V")
@Override
public final synchronized void method4408(@OriginalArg(0) int[] arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
public final synchronized void read(@OriginalArg(0) int[] arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
do {
if (this.anInt1781 < 0) {
this.method1346(arg0, arg1, arg2);
@ -89,7 +89,7 @@ public final class MixerPcmStream extends PcmStream {
@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.method2289(); local5 != null; local5 = (PcmStream) this.aClass69_43.method2288()) {
local5.method4410(arg0);
local5.skip(arg0);
}
}
@ -101,8 +101,8 @@ public final class MixerPcmStream extends PcmStream {
}
@OriginalMember(owner = "client!ei", name = "b", descriptor = "(Lclient!qb;)V")
public final synchronized void method1347(@OriginalArg(0) PcmStream arg0) {
arg0.method4658();
public final synchronized void removeSubStream(@OriginalArg(0) PcmStream arg0) {
arg0.unlink();
}
@OriginalMember(owner = "client!ei", name = "a", descriptor = "()I")
@ -113,7 +113,7 @@ public final class MixerPcmStream extends PcmStream {
@OriginalMember(owner = "client!ei", name = "c", descriptor = "(I)V")
@Override
public final synchronized void method4410(@OriginalArg(0) int arg0) {
public final synchronized void skip(@OriginalArg(0) int arg0) {
do {
if (this.anInt1781 < 0) {
this.method1345(arg0);

100
client/src/main/java/Model.java
View file

@ -25,24 +25,24 @@ public abstract class Model extends Entity {
private void method4553(@OriginalArg(0) AnimBase arg0, @OriginalArg(1) AnimFrame arg1, @OriginalArg(2) AnimFrame arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) boolean[] arg5, @OriginalArg(6) boolean arg6, @OriginalArg(7) boolean arg7, @OriginalArg(8) int arg8, @OriginalArg(9) int[] arg9) {
@Pc(5) int local5;
if (arg2 == null || arg3 == 0) {
for (local5 = 0; local5 < arg1.anInt4070; local5++) {
@Pc(14) short local14 = arg1.aShortArray42[local5];
if (arg5 == null || arg5[local14] == arg6 || arg0.anIntArray291[local14] == 0) {
@Pc(32) short local32 = arg1.aShortArray43[local5];
for (local5 = 0; local5 < arg1.length; local5++) {
@Pc(14) short local14 = arg1.indices[local5];
if (arg5 == null || arg5[local14] == arg6 || arg0.types[local14] == 0) {
@Pc(32) short local32 = arg1.prevOriginIndices[local5];
@Pc(42) int local42;
if (local32 != -1) {
local42 = arg8 & arg0.anIntArray290[local32];
local42 = arg8 & arg0.parts[local32];
if (local42 == 65535) {
this.method4569(0, arg0.anIntArrayArray23[local32], 0, 0, 0, arg7);
this.method4569(0, arg0.bones[local32], 0, 0, 0, arg7);
} else {
this.method4577(0, arg0.anIntArrayArray23[local32], 0, 0, 0, arg7, local42, arg9);
this.method4577(0, arg0.bones[local32], 0, 0, 0, arg7, local42, arg9);
}
}
local42 = arg8 & arg0.anIntArray290[local14];
local42 = arg8 & arg0.parts[local14];
if (local42 == 65535) {
this.method4569(arg0.anIntArray291[local14], arg0.anIntArrayArray23[local14], arg1.aShortArray44[local5], arg1.aShortArray50[local5], arg1.aShortArray49[local5], arg7);
this.method4569(arg0.types[local14], arg0.bones[local14], arg1.aShortArray44[local5], arg1.aShortArray50[local5], arg1.aShortArray49[local5], arg7);
} else {
this.method4577(arg0.anIntArray291[local14], arg0.anIntArrayArray23[local14], arg1.aShortArray44[local5], arg1.aShortArray50[local5], arg1.aShortArray49[local5], arg7, local42, arg9);
this.method4577(arg0.types[local14], arg0.bones[local14], arg1.aShortArray44[local5], arg1.aShortArray50[local5], arg1.aShortArray49[local5], arg7, local42, arg9);
}
}
}
@ -50,19 +50,19 @@ public abstract class Model extends Entity {
}
local5 = 0;
@Pc(136) int local136 = 0;
for (@Pc(138) int local138 = 0; local138 < arg0.anInt3116; local138++) {
for (@Pc(138) int local138 = 0; local138 < arg0.transforms; local138++) {
@Pc(144) boolean local144 = false;
if (local5 < arg1.anInt4070 && arg1.aShortArray42[local5] == local138) {
if (local5 < arg1.length && arg1.indices[local5] == local138) {
local144 = true;
}
@Pc(158) boolean local158 = false;
if (local136 < arg2.anInt4070 && arg2.aShortArray42[local136] == local138) {
if (local136 < arg2.length && arg2.indices[local136] == local138) {
local158 = true;
}
if (local144 || local158) {
if (arg5 == null || arg5[local138] == arg6 || arg0.anIntArray291[local138] == 0) {
if (arg5 == null || arg5[local138] == arg6 || arg0.types[local138] == 0) {
@Pc(196) short local196 = 0;
@Pc(201) int local201 = arg0.anIntArray291[local138];
@Pc(201) int local201 = arg0.types[local138];
if (local201 == 3) {
local196 = 128;
}
@ -75,8 +75,8 @@ public abstract class Model extends Entity {
local213 = arg1.aShortArray44[local5];
local218 = arg1.aShortArray50[local5];
local223 = arg1.aShortArray49[local5];
local228 = arg1.aShortArray43[local5];
local233 = arg1.aByteArray55[local5];
local228 = arg1.prevOriginIndices[local5];
local233 = arg1.flags[local5];
local5++;
} else {
local213 = local196;
@ -94,8 +94,8 @@ public abstract class Model extends Entity {
local252 = arg2.aShortArray44[local136];
local257 = arg2.aShortArray50[local136];
local262 = arg2.aShortArray49[local136];
local267 = arg2.aShortArray43[local136];
local272 = arg2.aByteArray55[local136];
local267 = arg2.prevOriginIndices[local136];
local272 = arg2.flags[local136];
local136++;
} else {
local252 = local196;
@ -142,25 +142,25 @@ public abstract class Model extends Entity {
local298 = local223 + (local262 - local223) * arg3 / arg4;
}
if (local228 != -1) {
local308 = arg8 & arg0.anIntArray290[local228];
local308 = arg8 & arg0.parts[local228];
if (local308 == 65535) {
this.method4569(0, arg0.anIntArrayArray23[local228], 0, 0, 0, arg7);
this.method4569(0, arg0.bones[local228], 0, 0, 0, arg7);
} else {
this.method4577(0, arg0.anIntArrayArray23[local228], 0, 0, 0, arg7, local308, arg9);
this.method4577(0, arg0.bones[local228], 0, 0, 0, arg7, local308, arg9);
}
} else if (local267 != -1) {
local308 = arg8 & arg0.anIntArray290[local267];
local308 = arg8 & arg0.parts[local267];
if (local308 == 65535) {
this.method4569(0, arg0.anIntArrayArray23[local267], 0, 0, 0, arg7);
this.method4569(0, arg0.bones[local267], 0, 0, 0, arg7);
} else {
this.method4577(0, arg0.anIntArrayArray23[local267], 0, 0, 0, arg7, local308, arg9);
this.method4577(0, arg0.bones[local267], 0, 0, 0, arg7, local308, arg9);
}
}
local308 = arg8 & arg0.anIntArray290[local138];
local308 = arg8 & arg0.parts[local138];
if (local308 == 65535) {
this.method4569(local201, arg0.anIntArrayArray23[local138], local294, local296, local298, arg7);
this.method4569(local201, arg0.bones[local138], local294, local296, local298, arg7);
} else {
this.method4577(local201, arg0.anIntArrayArray23[local138], local294, local296, local298, arg7, local308, arg9);
this.method4577(local201, arg0.bones[local138], local294, local296, local298, arg7, local308, arg9);
}
} else {
if (local144) {
@ -182,15 +182,15 @@ public abstract class Model extends Entity {
if (arg1 == -1 || !this.method4551()) {
return;
}
@Pc(12) AnimFrame local12 = arg0.aClass104Array1[arg1];
@Pc(15) AnimBase local15 = local12.aClass3_Sub20_1;
for (@Pc(17) int local17 = 0; local17 < local12.anInt4070; local17++) {
@Pc(26) short local26 = local12.aShortArray42[local17];
if (local15.aBooleanArray70[local26]) {
if (local12.aShortArray43[local17] != -1) {
@Pc(12) AnimFrame local12 = arg0.frames[arg1];
@Pc(15) AnimBase local15 = local12.base;
for (@Pc(17) int local17 = 0; local17 < local12.length; local17++) {
@Pc(26) short local26 = local12.indices[local17];
if (local15.shadow[local26]) {
if (local12.prevOriginIndices[local17] != -1) {
this.method4567(0, 0, 0, 0);
}
this.method4567(local15.anIntArray291[local26], local12.aShortArray44[local17], local12.aShortArray50[local17], local12.aShortArray49[local17]);
this.method4567(local15.types[local26], local12.aShortArray44[local17], local12.aShortArray50[local17], local12.aShortArray49[local17]);
}
}
this.method4557();
@ -204,12 +204,12 @@ public abstract class Model extends Entity {
if (arg1 == -1 || !this.method4551()) {
return;
}
@Pc(12) AnimFrame local12 = arg0.aClass104Array1[arg1];
@Pc(15) AnimBase local15 = local12.aClass3_Sub20_1;
@Pc(12) AnimFrame local12 = arg0.frames[arg1];
@Pc(15) AnimBase local15 = local12.base;
@Pc(17) AnimFrame local17 = null;
if (arg2 != null) {
local17 = arg2.aClass104Array1[arg3];
if (local17.aClass3_Sub20_1 != local15) {
local17 = arg2.frames[arg3];
if (local17.base != local15) {
local17 = null;
}
}
@ -240,12 +240,12 @@ public abstract class Model extends Entity {
if (arg1 == -1 || !this.method4551()) {
return;
}
@Pc(12) AnimFrame local12 = arg0.aClass104Array1[arg1];
@Pc(15) AnimBase local15 = local12.aClass3_Sub20_1;
@Pc(12) AnimFrame local12 = arg0.frames[arg1];
@Pc(15) AnimBase local15 = local12.base;
@Pc(17) AnimFrame local17 = null;
if (arg2 != null) {
local17 = arg2.aClass104Array1[arg3];
if (local17.aClass3_Sub20_1 != local15) {
local17 = arg2.frames[arg3];
if (local17.base != local15) {
local17 = null;
}
}
@ -273,20 +273,20 @@ public abstract class Model extends Entity {
if (arg12 == null || arg7 == -1) {
this.method4558(arg0, arg1, arg2, arg3, arg4, arg5, arg13);
} else if (this.method4551()) {
@Pc(27) AnimFrame local27 = arg0.aClass104Array1[arg1];
@Pc(30) AnimBase local30 = local27.aClass3_Sub20_1;
@Pc(27) AnimFrame local27 = arg0.frames[arg1];
@Pc(30) AnimBase local30 = local27.base;
@Pc(32) AnimFrame local32 = null;
if (arg2 != null) {
local32 = arg2.aClass104Array1[arg3];
if (local32.aClass3_Sub20_1 != local30) {
local32 = arg2.frames[arg3];
if (local32.base != local30) {
local32 = null;
}
}
@Pc(50) AnimFrame local50 = arg6.aClass104Array1[arg7];
@Pc(50) AnimFrame local50 = arg6.frames[arg7];
@Pc(52) AnimFrame local52 = null;
if (arg8 != null) {
local52 = arg8.aClass104Array1[arg9];
if (local52.aClass3_Sub20_1 != local30) {
local52 = arg8.frames[arg9];
if (local52.base != local30) {
local52 = null;
}
}

6
client/src/main/java/MonochromeImageCache.java
View file

@ -71,7 +71,7 @@ public final class MonochromeImageCache {
}
this.aClass3_Sub23Array1 = null;
this.anIntArrayArrayArray13 = null;
this.aClass69_96.method2278();
this.aClass69_96.clear();
this.aClass69_96 = null;
}
@ -96,13 +96,13 @@ public final class MonochromeImageCache {
@Pc(80) Class3_Sub23 local80 = (Class3_Sub23) this.aClass69_96.method2279();
local44 = new Class3_Sub23(arg0, local80.anInt3468);
this.aClass3_Sub23Array1[local80.anInt3476] = null;
local80.method4658();
local80.unlink();
}
this.aClass3_Sub23Array1[arg0] = local44;
} else {
this.aBoolean195 = false;
}
this.aClass69_96.method2283(local44);
this.aClass69_96.addHead(local44);
return this.anIntArrayArrayArray13[local44.anInt3468];
}
}

4
client/src/main/java/MouseRecorder.java
View file

@ -6,7 +6,7 @@ import org.openrs2.deob.annotation.Pc;
public final class MouseRecorder implements Runnable {
@OriginalMember(owner = "client!jd", name = "e", descriptor = "Z")
public boolean aBoolean151 = true;
public boolean running = true;
@OriginalMember(owner = "client!jd", name = "f", descriptor = "Ljava/lang/Object;")
public final Object lock = new Object();
@ -23,7 +23,7 @@ public final class MouseRecorder implements Runnable {
@OriginalMember(owner = "client!jd", name = "run", descriptor = "()V")
@Override
public final void run() {
while (this.aBoolean151) {
while (this.running) {
@Pc(12) Object local12 = this.lock;
synchronized (this.lock) {
if (this.samples < 500) {

2
client/src/main/java/MouseWheel.java
View file

@ -10,7 +10,7 @@ public abstract class MouseWheel {
public abstract int getRotation();
@OriginalMember(owner = "client!uc", name = "a", descriptor = "(ZLjava/awt/Component;)V")
public abstract void method3291(@OriginalArg(1) Component arg0);
public abstract void stop(@OriginalArg(1) Component arg0);
@OriginalMember(owner = "client!uc", name = "a", descriptor = "(Ljava/awt/Component;I)V")
public abstract void start(@OriginalArg(0) Component arg0);

6
client/src/main/java/MsiType.java
View file

@ -28,7 +28,7 @@ public final class MsiType {
@OriginalMember(owner = "client!aa", name = "a", descriptor = "(IB)Lclient!ek;")
public final SoftwareIndexedSprite method9(@OriginalArg(0) int arg0) {
@Pc(17) SoftwareIndexedSprite local17 = (SoftwareIndexedSprite) Static219.aClass99_27.method3106((long) (arg0 << 16 | this.anInt12));
@Pc(17) SoftwareIndexedSprite local17 = (SoftwareIndexedSprite) Static219.aClass99_27.get((long) (arg0 << 16 | this.anInt12));
if (local17 != null) {
return local17;
}
@ -36,12 +36,12 @@ public final class MsiType {
local17 = Static164.method3119(this.anInt12, Static250.aClass153_101);
if (local17 != null) {
local17.method1389(Static173.anInt4183, Static85.anInt2262, Static266.anInt5344);
local17.anInt4279 = local17.width;
local17.innerWidth = local17.width;
local17.anInt4276 = local17.anInt4278;
for (@Pc(59) int local59 = 0; local59 < arg0; local59++) {
local17.method1395();
}
Static219.aClass99_27.method3095(local17, (long) (arg0 << 16 | this.anInt12));
Static219.aClass99_27.put(local17, (long) (arg0 << 16 | this.anInt12));
}
return local17;
}

4
client/src/main/java/Node.java
View file

@ -5,7 +5,7 @@ import org.openrs2.deob.annotation.OriginalMember;
public class Node {
@OriginalMember(owner = "client!ab", name = "a", descriptor = "J")
public long uid;
public long key;
@OriginalMember(owner = "client!ab", name = "d", descriptor = "Lclient!ab;")
public Node aClass3_222;
@ -19,7 +19,7 @@ public class Node {
}
@OriginalMember(owner = "client!ab", name = "b", descriptor = "(I)V")
public final void method4658() {
public final void unlink() {
if (this.aClass3_223 != null) {
this.aClass3_223.aClass3_222 = this.aClass3_222;
this.aClass3_222.aClass3_223 = this.aClass3_223;

30
client/src/main/java/Npc.java
View file

@ -7,7 +7,7 @@ import org.openrs2.deob.annotation.Pc;
public final class Npc extends PathingEntity {
@OriginalMember(owner = "client!km", name = "rc", descriptor = "Lclient!me;")
public NpcType aClass96_1;
public NpcType type;
@OriginalMember(owner = "client!km", name = "finalize", descriptor = "()V")
@Override
@ -23,23 +23,23 @@ public final class Npc extends PathingEntity {
@OriginalMember(owner = "client!km", name = "a", descriptor = "(IIIIIIIIJILclient!ga;)V")
@Override
public final void method4546(@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) long arg8, @OriginalArg(9) int arg9, @OriginalArg(10) ParticleSystem arg10) {
if (this.aClass96_1 == null) {
if (this.type == null) {
return;
}
@Pc(29) SeqType local29 = this.anInt3369 != -1 && this.anInt3420 == 0 ? Static36.method941(this.anInt3369) : null;
@Pc(53) SeqType local53 = this.anInt3366 == -1 || this.anInt3366 == this.method2681().anInt1037 && local29 != null ? null : Static36.method941(this.anInt3366);
@Pc(74) Model local74 = this.aClass96_1.method2937(this.aClass147Array3, this.anInt3388, this.anInt3407, this.anInt3373, this.anInt3360, this.anInt3425, local53, this.anInt3396, local29);
@Pc(53) SeqType local53 = this.anInt3366 == -1 || this.anInt3366 == this.method2681().idleAnimationId && local29 != null ? null : Static36.method941(this.anInt3366);
@Pc(74) Model local74 = this.type.method2937(this.aClass147Array3, this.anInt3388, this.anInt3407, this.anInt3373, this.anInt3360, this.anInt3425, local53, this.anInt3396, local29);
if (local74 == null) {
return;
}
this.anInt3413 = local74.method4549();
@Pc(84) NpcType local84 = this.aClass96_1;
@Pc(84) NpcType local84 = this.type;
if (local84.anIntArray357 != null) {
local84 = local84.method2932();
local84 = local84.getMultiNpc();
}
@Pc(140) Model local140;
if (Static209.characterShadowsOn && local84.aBoolean180) {
local140 = Static41.method1043(this.aClass96_1.aByte13, this.aBoolean171, local53 == null ? local29 : local53, this.anInt3412, this.aClass96_1.aShort23, this.anInt3421, this.aClass96_1.aShort24, this.aClass96_1.anInt3713, local74, arg0, local53 == null ? this.anInt3425 : this.anInt3407, this.anInt3424, this.aClass96_1.aByte12);
local140 = Static41.method1043(this.type.aByte13, this.aBoolean171, local53 == null ? local29 : local53, this.xFine, this.type.aShort23, this.zFine, this.type.aShort24, this.type.anInt3713, local74, arg0, local53 == null ? this.anInt3425 : this.anInt3407, this.anInt3424, this.type.aByte12);
if (GlRenderer.enabled) {
@Pc(144) float local144 = GlRenderer.method4179();
@Pc(146) float local146 = GlRenderer.method4166();
@ -77,18 +77,18 @@ public final class Npc extends PathingEntity {
if (local140 != null) {
local74 = ((SoftwareModel) local74).method4588(local140);
}
if (this.aClass96_1.anInt3713 == 1) {
if (this.type.anInt3713 == 1) {
local74.aBoolean303 = true;
}
local74.method4546(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, this.aClass47_Sub1_5);
return;
}
if (this.aClass96_1.anInt3713 == 1) {
if (this.type.anInt3713 == 1) {
local74.aBoolean303 = true;
}
local74.method4546(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, this.aClass47_Sub1_5);
if (local140 != null) {
if (this.aClass96_1.anInt3713 == 1) {
if (this.type.anInt3713 == 1) {
local140.aBoolean303 = true;
}
local140.method4546(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, this.aClass47_Sub1_5);
@ -98,8 +98,8 @@ public final class Npc extends PathingEntity {
@OriginalMember(owner = "client!km", name = "b", descriptor = "(I)I")
@Override
protected final int method2688() {
if (Static266.game != 0 && this.aClass96_1.anIntArray357 != null) {
@Pc(17) NpcType local17 = this.aClass96_1.method2932();
if (Static266.game != 0 && this.type.anIntArray357 != null) {
@Pc(17) NpcType local17 = this.type.getMultiNpc();
if (local17 != null && local17.anInt3737 != -1) {
return local17.anInt3737;
}
@ -110,7 +110,7 @@ public final class Npc extends PathingEntity {
@OriginalMember(owner = "client!km", name = "a", descriptor = "(IIIII)V")
@Override
public final void method4545(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4) {
if (this.aClass96_1 == null) {
if (this.type == null) {
;
}
}
@ -118,12 +118,12 @@ public final class Npc extends PathingEntity {
@OriginalMember(owner = "client!km", name = "a", descriptor = "(B)Z")
@Override
public final boolean method2682() {
return this.aClass96_1 != null;
return this.type != null;
}
@OriginalMember(owner = "client!km", name = "a", descriptor = "(ILclient!me;)V")
public final void method2698(@OriginalArg(1) NpcType arg0) {
this.aClass96_1 = arg0;
this.type = arg0;
if (this.aClass47_Sub1_5 != null) {
this.aClass47_Sub1_5.method1646();
}

68
client/src/main/java/NpcType.java
View file

@ -130,7 +130,7 @@ public final class NpcType {
public int anInt3750 = -1;
@OriginalMember(owner = "client!me", name = "gb", descriptor = "I")
public int anInt3746 = 0;
public int soundRadius = 0;
@OriginalMember(owner = "client!me", name = "E", descriptor = "I")
private int anInt3731 = 128;
@ -154,7 +154,7 @@ public final class NpcType {
public int anInt3752 = -1;
@OriginalMember(owner = "client!me", name = "a", descriptor = "(B)Lclient!me;")
public final NpcType method2932() {
public final NpcType getMultiNpc() {
@Pc(5) int local5 = -1;
if (this.anInt3723 != -1) {
local5 = Static155.getVarbit(this.anInt3723);
@ -210,17 +210,17 @@ public final class NpcType {
return arg1;
} else {
@Pc(18) IntNode local18 = (IntNode) this.aClass133_15.get((long) arg0);
return local18 == null ? arg1 : local18.anInt3141;
return local18 == null ? arg1 : local18.value;
}
}
@OriginalMember(owner = "client!me", name = "a", descriptor = "([Lclient!ub;IBIIIILclient!tk;ILclient!tk;)Lclient!ak;")
public final Model method2937(@OriginalArg(0) Class147[] arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5, @OriginalArg(7) SeqType arg6, @OriginalArg(8) int arg7, @OriginalArg(9) SeqType arg8) {
if (this.anIntArray357 != null) {
@Pc(13) NpcType local13 = this.method2932();
@Pc(13) NpcType local13 = this.getMultiNpc();
return local13 == null ? null : local13.method2937(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
}
@Pc(40) Model local40 = (Model) Static125.aClass99_18.method3106((long) this.anInt3741);
@Pc(40) Model local40 = (Model) Static125.aClass99_18.get((long) this.anInt3741);
@Pc(46) boolean local46;
@Pc(173) int local173;
@Pc(235) int local235;
@ -256,17 +256,17 @@ public final class NpcType {
if (this.anInt3737 != -1) {
local156 = Static90.method1856(this.anInt3737);
}
if (local156 != null && local156.anIntArrayArray7 != null) {
for (local173 = 0; local173 < local156.anIntArrayArray7.length; local173++) {
if (local156.anIntArrayArray7[local173] != null && local84.length > local173 && local84[local173] != null) {
local200 = local156.anIntArrayArray7[local173][2];
local207 = local156.anIntArrayArray7[local173][3];
local214 = local156.anIntArrayArray7[local173][4];
local221 = local156.anIntArrayArray7[local173][1];
local228 = local156.anIntArrayArray7[local173][5];
local235 = local156.anIntArrayArray7[local173][0];
if (local156 != null && local156.modelRotateTranslate != null) {
for (local173 = 0; local173 < local156.modelRotateTranslate.length; local173++) {
if (local156.modelRotateTranslate[local173] != null && local84.length > local173 && local84[local173] != null) {
local200 = local156.modelRotateTranslate[local173][2];
local207 = local156.modelRotateTranslate[local173][3];
local214 = local156.modelRotateTranslate[local173][4];
local221 = local156.modelRotateTranslate[local173][1];
local228 = local156.modelRotateTranslate[local173][5];
local235 = local156.modelRotateTranslate[local173][0];
if (this.anIntArrayArray28 == null) {
this.anIntArrayArray28 = new int[local156.anIntArrayArray7.length][];
this.anIntArrayArray28 = new int[local156.modelRotateTranslate.length][];
}
if (this.anIntArrayArray28[local173] == null) {
@Pc(259) int[] local259 = this.anIntArrayArray28[local173] = new int[15];
@ -334,7 +334,7 @@ public final class NpcType {
if (GlRenderer.enabled) {
((GlModel) local40).method4111(false, false, false, false, false, true);
}
Static125.aClass99_18.method3095(local40, (long) this.anInt3741);
Static125.aClass99_18.put(local40, (long) this.anInt3741);
}
local46 = false;
@Pc(721) boolean local721 = false;
@ -354,8 +354,8 @@ public final class NpcType {
local214 &= 0xFFFF;
Static107.anIntArray259[local235] = local214;
if (Static6.aClass3_Sub2_Sub7Array1[local235] != null) {
local723 |= Static6.aClass3_Sub2_Sub7Array1[local235].method903(local214);
local721 |= Static6.aClass3_Sub2_Sub7Array1[local235].method901(local214);
local723 |= Static6.aClass3_Sub2_Sub7Array1[local235].isColorTransformed(local214);
local721 |= Static6.aClass3_Sub2_Sub7Array1[local235].isAlphaTransformed(local214);
local725 |= local753.aBoolean278;
}
if ((local753.aBoolean277 || Static204.applyTweening) && local207 != -1 && local753.anIntArray473.length > local207) {
@ -366,8 +366,8 @@ public final class NpcType {
local228 &= 0xFFFF;
Static61.anIntArray148[local235] = local228;
if (Static131.aClass3_Sub2_Sub7Array5[local235] != null) {
local723 |= Static131.aClass3_Sub2_Sub7Array5[local235].method903(local228);
local721 |= Static131.aClass3_Sub2_Sub7Array5[local235].method901(local228);
local723 |= Static131.aClass3_Sub2_Sub7Array5[local235].isColorTransformed(local228);
local721 |= Static131.aClass3_Sub2_Sub7Array5[local235].isAlphaTransformed(local228);
}
} else {
Static71.anIntArray147[local235] = 0;
@ -397,8 +397,8 @@ public final class NpcType {
local235 &= 0xFFFF;
local962 = Static72.method1566(local228);
if (local962 != null) {
local723 |= local962.method903(local235);
local721 |= local962.method901(local235);
local723 |= local962.isColorTransformed(local235);
local721 |= local962.isAlphaTransformed(local235);
local725 |= arg8.aBoolean278;
}
if ((arg8.aBoolean277 || Static204.applyTweening) && arg3 != -1 && arg8.anIntArray473.length > arg3) {
@ -412,8 +412,8 @@ public final class NpcType {
local964 = Static72.method1566(local221 >>> 16);
}
if (local964 != null) {
local723 |= local964.method903(local221);
local721 |= local964.method901(local221);
local723 |= local964.isColorTransformed(local221);
local721 |= local964.isAlphaTransformed(local221);
}
}
}
@ -428,8 +428,8 @@ public final class NpcType {
local228 &= 0xFFFF;
local1088 = Static72.method1566(local324);
if (local1088 != null) {
local723 |= local1088.method903(local228);
local721 |= local1088.method901(local228);
local723 |= local1088.isColorTransformed(local228);
local721 |= local1088.isAlphaTransformed(local228);
local725 |= arg6.aBoolean278;
}
if ((arg6.aBoolean277 || Static204.applyTweening) && arg1 != -1 && arg1 < arg6.anIntArray473.length) {
@ -443,8 +443,8 @@ public final class NpcType {
local1092 = Static72.method1566(local1040 >>> 16);
}
if (local1092 != null) {
local723 |= local1092.method903(local1040);
local721 |= local1092.method901(local1040);
local723 |= local1092.isColorTransformed(local1040);
local721 |= local1092.isAlphaTransformed(local1040);
}
}
}
@ -480,7 +480,7 @@ public final class NpcType {
return arg1;
} else {
@Pc(18) StringNode local18 = (StringNode) this.aClass133_15.get((long) arg0);
return local18 == null ? arg1 : local18.aClass100_980;
return local18 == null ? arg1 : local18.value;
}
}
@ -502,12 +502,12 @@ public final class NpcType {
@OriginalMember(owner = "client!me", name = "a", descriptor = "(Lclient!tk;IIII)Lclient!ak;")
public final Model method2943(@OriginalArg(0) SeqType arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(4) int arg3) {
if (this.anIntArray357 != null) {
@Pc(13) NpcType local13 = this.method2932();
@Pc(13) NpcType local13 = this.getMultiNpc();
return local13 == null ? null : local13.method2943(arg0, arg1, arg2, arg3);
} else if (this.anIntArray354 == null) {
return null;
} else {
@Pc(41) Model local41 = (Model) Static262.aClass99_35.method3106((long) this.anInt3741);
@Pc(41) Model local41 = (Model) Static262.aClass99_35.get((long) this.anInt3741);
if (local41 == null) {
@Pc(46) boolean local46 = false;
for (@Pc(48) int local48 = 0; local48 < this.anIntArray354.length; local48++) {
@ -544,7 +544,7 @@ public final class NpcType {
}
}
local41 = local119.method1679(64, 768, -50, -10, -50);
Static262.aClass99_35.method3095(local41, (long) this.anInt3741);
Static262.aClass99_35.put(local41, (long) this.anInt3741);
}
if (arg0 != null) {
local41 = arg0.method4215(local41, arg2, arg1, arg3);
@ -704,7 +704,7 @@ public final class NpcType {
if (this.anInt3734 == 65535) {
this.anInt3734 = -1;
}
this.anInt3746 = arg1.g1();
this.soundRadius = arg1.g1();
} else if (arg0 == 135) {
this.anInt3750 = arg1.g1();
this.anInt3719 = arg1.g2();
@ -728,7 +728,7 @@ public final class NpcType {
} else {
local605 = new IntNode(arg1.g4());
}
this.aClass133_15.method3862(local605, (long) local596);
this.aClass133_15.put(local605, (long) local596);
}
}
}

10
client/src/main/java/ObjType.java
View file

@ -208,7 +208,7 @@ public final class ObjType {
return arg0;
} else {
@Pc(21) StringNode local21 = (StringNode) this.aClass133_6.get((long) arg1);
return local21 == null ? arg0 : local21.aClass100_980;
return local21 == null ? arg0 : local21.value;
}
}
@ -312,7 +312,7 @@ public final class ObjType {
return Static71.method1439(local22).method1824(arg0, arg1, arg2, 1, arg4);
}
}
@Pc(76) Model local76 = (Model) Static244.aClass99_32.method3106((long) this.anInt2354);
@Pc(76) Model local76 = (Model) Static244.aClass99_32.get((long) this.anInt2354);
if (local76 == null) {
@Pc(85) RawModel local85 = Static77.method1686(Static230.aClass153_95, this.anInt2320);
if (local85 == null) {
@ -341,7 +341,7 @@ public final class ObjType {
if (GlRenderer.enabled) {
((GlModel) local76).method4111(false, false, false, false, false, true);
}
Static244.aClass99_32.method3095(local76, (long) this.anInt2354);
Static244.aClass99_32.put(local76, (long) this.anInt2354);
}
if (arg2 != null) {
local76 = arg2.method4215(local76, arg0, arg1, arg4);
@ -512,7 +512,7 @@ public final class ObjType {
} else {
local523 = new IntNode(arg0.g4());
}
this.aClass133_6.method3862(local523, (long) local514);
this.aClass133_6.put(local523, (long) local514);
}
}
}
@ -524,7 +524,7 @@ public final class ObjType {
return arg0;
} else {
@Pc(25) IntNode local25 = (IntNode) this.aClass133_6.get((long) arg1);
return local25 == null ? arg0 : local25.anInt3141;
return local25 == null ? arg0 : local25.value;
}
}

46
client/src/main/java/PathingEntity.java
View file

@ -58,13 +58,13 @@ public abstract class PathingEntity extends Entity {
public int anInt3411;
@OriginalMember(owner = "client!fe", name = "Qb", descriptor = "I")
public int anInt3412;
public int xFine;
@OriginalMember(owner = "client!fe", name = "Ub", descriptor = "I")
public int anInt3416;
@OriginalMember(owner = "client!fe", name = "ac", descriptor = "I")
public int anInt3421;
public int zFine;
@OriginalMember(owner = "client!fe", name = "dc", descriptor = "I")
public int anInt3424;
@ -127,7 +127,7 @@ public abstract class PathingEntity extends Entity {
public int anInt3390 = 0;
@OriginalMember(owner = "client!fe", name = "mb", descriptor = "[B")
public final byte[] aByteArray48 = new byte[10];
public final byte[] movementQueueSpeed = new byte[10];
@OriginalMember(owner = "client!fe", name = "W", descriptor = "I")
public int anInt3376 = 32;
@ -163,7 +163,7 @@ public abstract class PathingEntity extends Entity {
protected int anInt3413 = -32768;
@OriginalMember(owner = "client!fe", name = "Nb", descriptor = "I")
public int anInt3409 = 0;
public int movementQueueSize = 0;
@OriginalMember(owner = "client!fe", name = "Zb", descriptor = "I")
public int anInt3420 = 0;
@ -272,15 +272,15 @@ public abstract class PathingEntity extends Entity {
@Pc(32) int local32 = arg1 - this.movementQueueX[0];
@Pc(40) int local40 = arg2 - this.movementQueueZ[0];
if (local32 >= -8 && local32 <= 8 && local40 >= -8 && local40 <= 8) {
if (this.anInt3409 < 9) {
this.anInt3409++;
if (this.movementQueueSize < 9) {
this.movementQueueSize++;
}
for (@Pc(72) int local72 = this.anInt3409; local72 > 0; local72--) {
for (@Pc(72) int local72 = this.movementQueueSize; local72 > 0; local72--) {
this.movementQueueX[local72] = this.movementQueueX[local72 - 1];
this.movementQueueZ[local72] = this.movementQueueZ[local72 - 1];
this.aByteArray48[local72] = this.aByteArray48[local72 - 1];
this.movementQueueSpeed[local72] = this.movementQueueSpeed[local72 - 1];
}
this.aByteArray48[0] = 1;
this.movementQueueSpeed[0] = 1;
this.movementQueueX[0] = arg1;
this.movementQueueZ[0] = arg2;
return;
@ -289,10 +289,10 @@ public abstract class PathingEntity extends Entity {
this.anInt3417 = 0;
this.movementQueueX[0] = arg1;
this.movementQueueZ[0] = arg2;
this.anInt3409 = 0;
this.movementQueueSize = 0;
this.anInt3405 = 0;
this.anInt3421 = arg0 * 64 + this.movementQueueZ[0] * 128;
this.anInt3412 = arg0 * 64 + this.movementQueueX[0] * 128;
this.zFine = arg0 * 64 + this.movementQueueZ[0] * 128;
this.xFine = arg0 * 64 + this.movementQueueX[0] * 128;
if (GlRenderer.enabled && Static173.self == this) {
Static86.setInstantFade();
}
@ -309,18 +309,18 @@ public abstract class PathingEntity extends Entity {
if (this.anInt3369 != -1 && Static36.method941(this.anInt3369).anInt5349 == 1) {
this.anInt3369 = -1;
}
if (this.anInt3409 < 9) {
this.anInt3409++;
if (this.movementQueueSize < 9) {
this.movementQueueSize++;
}
for (@Pc(50) int local50 = this.anInt3409; local50 > 0; local50--) {
for (@Pc(50) int local50 = this.movementQueueSize; local50 > 0; local50--) {
this.movementQueueX[local50] = this.movementQueueX[local50 - 1];
this.movementQueueZ[local50] = this.movementQueueZ[local50 - 1];
this.aByteArray48[local50] = this.aByteArray48[local50 - 1];
this.movementQueueSpeed[local50] = this.movementQueueSpeed[local50 - 1];
}
if (arg1 == 1) {
local15++;
}
this.aByteArray48[0] = (byte) arg0;
this.movementQueueSpeed[0] = (byte) arg0;
if (arg1 == 2) {
local15++;
local10++;
@ -363,13 +363,13 @@ public abstract class PathingEntity extends Entity {
@Pc(53) int local53 = -local27 / 2;
@Pc(64) int local64 = local53 * local43 - local48 * local39 >> 16;
@Pc(75) int local75 = local39 * local53 + local43 * local48 >> 16;
@Pc(87) int local87 = Static207.method3685(Static55.level, local75 + this.anInt3412, this.anInt3421 + local64);
@Pc(87) int local87 = Static207.method3685(Static55.level, local75 + this.xFine, this.zFine + local64);
@Pc(91) int local91 = local24 / 2;
@Pc(96) int local96 = -local27 / 2;
@Pc(106) int local106 = local91 * local43 + local96 * local39 >> 16;
@Pc(110) int local110 = local27 / 2;
@Pc(121) int local121 = local96 * local43 - local91 * local39 >> 16;
@Pc(134) int local134 = Static207.method3685(Static55.level, local106 + this.anInt3412, this.anInt3421 - -local121);
@Pc(134) int local134 = Static207.method3685(Static55.level, local106 + this.xFine, this.zFine - -local121);
@Pc(139) int local139 = -local24 / 2;
@Pc(150) int local150 = local110 * local43 - local39 * local139 >> 16;
@Pc(154) int local154 = local27 / 2;
@ -377,9 +377,9 @@ public abstract class PathingEntity extends Entity {
@Pc(169) int local169 = local39 * local110 + local43 * local139 >> 16;
@Pc(179) int local179 = local154 * local43 - local39 * local158 >> 16;
@Pc(189) int local189 = local39 * local154 + local43 * local158 >> 16;
@Pc(201) int local201 = Static207.method3685(Static55.level, this.anInt3412 + local169, local150 + this.anInt3421);
@Pc(201) int local201 = Static207.method3685(Static55.level, this.xFine + local169, local150 + this.zFine);
@Pc(212) int local212 = local134 > local87 ? local87 : local134;
@Pc(224) int local224 = Static207.method3685(Static55.level, local189 + this.anInt3412, local179 + this.anInt3421);
@Pc(224) int local224 = Static207.method3685(Static55.level, local189 + this.xFine, local179 + this.zFine);
@Pc(231) int local231 = local224 > local201 ? local201 : local224;
@Pc(238) int local238 = local224 > local134 ? local134 : local224;
@Pc(245) int local245 = local201 <= local87 ? local201 : local87;
@ -619,7 +619,7 @@ public abstract class PathingEntity extends Entity {
@OriginalMember(owner = "client!fe", name = "c", descriptor = "(I)V")
public final void method2689() {
this.anInt3409 = 0;
this.movementQueueSize = 0;
this.anInt3405 = 0;
}
@ -634,7 +634,7 @@ public abstract class PathingEntity extends Entity {
}
@OriginalMember(owner = "client!fe", name = "c", descriptor = "(B)I")
public int method2693() {
public int getSize() {
return this.anInt3415;
}
}

8
client/src/main/java/PcmStream.java
View file

@ -23,9 +23,9 @@ public abstract class PcmStream extends Node {
@OriginalMember(owner = "client!qb", name = "a", descriptor = "([III)V")
protected final void method4405(@OriginalArg(0) int[] arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
if (this.aBoolean292) {
this.method4408(arg0, arg1, arg2);
this.read(arg0, arg1, arg2);
} else {
this.method4410(arg2);
this.skip(arg2);
}
}
@ -38,11 +38,11 @@ public abstract class PcmStream extends Node {
}
@OriginalMember(owner = "client!qb", name = "b", descriptor = "([III)V")
public abstract void method4408(@OriginalArg(0) int[] arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2);
public abstract void read(@OriginalArg(0) int[] arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2);
@OriginalMember(owner = "client!qb", name = "d", descriptor = "()Lclient!qb;")
public abstract PcmStream method4409();
@OriginalMember(owner = "client!qb", name = "c", descriptor = "(I)V")
public abstract void method4410(@OriginalArg(0) int arg0);
public abstract void skip(@OriginalArg(0) int arg0);
}

52
client/src/main/java/Player.java
View file

@ -34,7 +34,7 @@ public final class Player extends PathingEntity {
public int anInt1648 = -1;
@OriginalMember(owner = "client!e", name = "Pc", descriptor = "I")
public int anInt1664 = 0;
public int soundRadius = 0;
@OriginalMember(owner = "client!e", name = "Hc", descriptor = "I")
public int anInt1658 = -1;
@ -56,8 +56,8 @@ public final class Player extends PathingEntity {
@OriginalMember(owner = "client!e", name = "c", descriptor = "(B)I")
@Override
public final int method2693() {
return this.aClass59_1 == null || this.aClass59_1.anInt2492 == -1 ? super.method2693() : Static214.method4363(this.aClass59_1.anInt2492).anInt3713;
public final int getSize() {
return this.aClass59_1 == null || this.aClass59_1.anInt2492 == -1 ? super.getSize() : Static214.method4363(this.aClass59_1.anInt2492).anInt3713;
}
@OriginalMember(owner = "client!e", name = "b", descriptor = "(I)I")
@ -73,12 +73,12 @@ public final class Player extends PathingEntity {
@Pc(22) int local22 = -1;
@Pc(26) int local26 = local20 & 0x1;
@Pc(37) boolean local37 = (local20 & 0x4) != 0;
@Pc(41) int local41 = super.method2693();
@Pc(41) int local41 = super.getSize();
@Pc(44) int[] local44 = new int[12];
this.method2692((local20 >> 3 & 0x7) + 1);
this.anInt1651 = local20 >> 6 & 0x3;
this.anInt3412 += (this.method2693() - local41) * 64;
this.anInt3421 += (this.method2693() - local41) * 64;
this.xFine += (this.getSize() - local41) * 64;
this.zFine += (this.getSize() - local41) * 64;
this.anInt1669 = arg0.g1s();
this.anInt1649 = arg0.g1s();
this.anInt1650 = 0;
@ -134,9 +134,9 @@ public final class Player extends PathingEntity {
this.anInt1667 = -1;
}
}
local134 = this.anInt1664;
this.anInt1664 = arg0.g1();
if (this.anInt1664 == 0) {
local134 = this.soundRadius;
this.soundRadius = arg0.g1();
if (this.soundRadius == 0) {
Static271.method4597(this);
} else {
@Pc(309) int local309 = this.anInt1658;
@ -147,7 +147,7 @@ public final class Player extends PathingEntity {
this.anInt1658 = arg0.g2();
this.anInt1654 = arg0.g2();
this.anInt1670 = arg0.g2();
if (this.anInt1664 != local134 || this.anInt1648 != local175 || this.anInt1658 != local309 || local312 != this.anInt1654 || this.anInt1670 != local315) {
if (this.soundRadius != local134 || this.anInt1648 != local175 || this.anInt1658 != local309 || local312 != this.anInt1654 || this.anInt1670 != local315) {
Static214.method4359(this);
}
}
@ -157,8 +157,8 @@ public final class Player extends PathingEntity {
local175 = this.aClass59_1.anInt2492;
this.aClass59_1.method1950(local197, local22, local26 == 1, local44, this.anInt3365);
if (local175 != local22) {
this.anInt3412 = this.movementQueueX[0] * 128 + this.method2693() * 64;
this.anInt3421 = this.movementQueueZ[0] * 128 + this.method2693() * 64;
this.xFine = this.movementQueueX[0] * 128 + this.getSize() * 64;
this.zFine = this.movementQueueZ[0] * 128 + this.getSize() * 64;
}
if (this.aClass47_Sub1_5 != null) {
this.aClass47_Sub1_5.method1646();
@ -172,7 +172,7 @@ public final class Player extends PathingEntity {
return;
}
@Pc(25) SeqType local25 = this.anInt3369 != -1 && this.anInt3420 == 0 ? Static36.method941(this.anInt3369) : null;
@Pc(54) SeqType local54 = this.anInt3366 == -1 || this.aBoolean98 || this.anInt3366 == this.method2681().anInt1037 && local25 != null ? null : Static36.method941(this.anInt3366);
@Pc(54) SeqType local54 = this.anInt3366 == -1 || this.aBoolean98 || this.anInt3366 == this.method2681().idleAnimationId && local25 != null ? null : Static36.method941(this.anInt3366);
@Pc(76) Model local76 = this.aClass59_1.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) {
@ -196,7 +196,7 @@ public final class Player extends PathingEntity {
this.anInt3413 = local76.method4549();
@Pc(184) Model local184;
if (Static209.characterShadowsOn && (this.aClass59_1.anInt2492 == -1 || Static214.method4363(this.aClass59_1.anInt2492).aBoolean180)) {
local184 = Static41.method1043(160, this.aBoolean171, local54 == null ? local25 : local54, this.anInt3412, 0, this.anInt3421, 0, 1, local76, arg0, local54 == null ? this.anInt3425 : this.anInt3407, this.anInt3424, 240);
local184 = Static41.method1043(160, this.aBoolean171, local54 == null ? local25 : local54, this.xFine, 0, this.zFine, 0, 1, local76, arg0, local54 == null ? this.anInt3425 : this.anInt3407, this.anInt3424, 240);
if (GlRenderer.enabled) {
@Pc(188) float local188 = GlRenderer.method4179();
@Pc(190) float local190 = GlRenderer.method4166();
@ -215,24 +215,24 @@ public final class Player extends PathingEntity {
if (local245 != null && local245.anInt4052 != -1) {
@Pc(291) int local291;
@Pc(302) int local302;
if (local245.anInt4058 == 1 && local245.anInt4057 >= 0 && Static175.aClass8_Sub4_Sub2Array1.length > local245.anInt4057) {
@Pc(278) Npc local278 = Static175.aClass8_Sub4_Sub2Array1[local245.anInt4057];
if (local245.anInt4058 == 1 && local245.anInt4057 >= 0 && Static175.npcs.length > local245.anInt4057) {
@Pc(278) Npc local278 = Static175.npcs[local245.anInt4057];
if (local278 != null) {
local291 = local278.anInt3412 / 32 - Static173.self.anInt3412 / 32;
local302 = local278.anInt3421 / 32 - Static173.self.anInt3421 / 32;
local291 = local278.xFine / 32 - Static173.self.xFine / 32;
local302 = local278.zFine / 32 - Static173.self.zFine / 32;
this.method1263(null, local302, local76, local291, arg5, arg9, arg0, arg7, arg4, arg3, arg1, local245.anInt4052, arg2, arg6);
}
}
if (local245.anInt4058 == 2) {
@Pc(340) int local340 = (local245.anInt4053 - Static225.originX) * 4 + 2 - Static173.self.anInt3412 / 32;
local291 = (local245.anInt4046 - Static142.originZ) * 4 + 2 - Static173.self.anInt3421 / 32;
@Pc(340) int local340 = (local245.anInt4053 - Static225.originX) * 4 + 2 - Static173.self.xFine / 32;
local291 = (local245.anInt4046 - Static142.originZ) * 4 + 2 - Static173.self.zFine / 32;
this.method1263(null, local291, local76, local340, arg5, arg9, arg0, arg7, arg4, arg3, arg1, local245.anInt4052, arg2, arg6);
}
if (local245.anInt4058 == 10 && local245.anInt4057 >= 0 && Static159.players.length > local245.anInt4057) {
@Pc(395) Player local395 = Static159.players[local245.anInt4057];
if (local395 != null) {
local291 = local395.anInt3412 / 32 - Static173.self.anInt3412 / 32;
local302 = local395.anInt3421 / 32 - Static173.self.anInt3421 / 32;
local291 = local395.xFine / 32 - Static173.self.xFine / 32;
local302 = local395.zFine / 32 - Static173.self.zFine / 32;
this.method1263(null, local302, local76, local291, arg5, arg9, arg0, arg7, arg4, arg3, arg1, local245.anInt4052, arg2, arg6);
}
}
@ -271,7 +271,7 @@ public final class Player extends PathingEntity {
} else {
local515 = (Model) this.attachment;
}
local515.method4575(this.anInt3379 - this.anInt3412, this.anInt3406 + -this.anInt3424, this.anInt3426 - this.anInt3421);
local515.method4575(this.anInt3379 - this.xFine, this.anInt3406 + -this.anInt3424, this.anInt3426 - this.zFine);
if (this.anInt3400 == 512) {
local515.method4578();
} else if (this.anInt3400 == 1024) {
@ -308,7 +308,7 @@ public final class Player extends PathingEntity {
} else if (this.anInt3400 == 1536) {
local515.method4578();
}
local515.method4575(this.anInt3412 - this.anInt3379, -this.anInt3406 + this.anInt3424, this.anInt3421 - this.anInt3426);
local515.method4575(this.xFine - this.anInt3379, -this.anInt3406 + this.anInt3424, this.zFine - this.anInt3426);
}
@OriginalMember(owner = "client!e", name = "a", descriptor = "(Lclient!ga;ILclient!ak;IIIIIIIIIIII)V")
@ -318,7 +318,7 @@ public final class Player extends PathingEntity {
return;
}
@Pc(34) int local34 = (int) (Math.atan2((double) arg3, (double) arg1) * 325.949D) & 0x7FF;
@Pc(46) Model local46 = Static220.method3800(local34, this.anInt3421, arg11, this.anInt3412, arg2, this.anInt3424);
@Pc(46) Model local46 = Static220.method3800(local34, this.zFine, arg11, this.xFine, arg2, this.anInt3424);
if (local46 == null) {
return;
}
@ -360,7 +360,7 @@ public final class Player extends PathingEntity {
@OriginalMember(owner = "client!e", name = "a", descriptor = "(BIZI)V")
public final void method1265(@OriginalArg(1) int arg0, @OriginalArg(2) boolean arg1, @OriginalArg(3) int arg2) {
super.method2683(this.method2693(), arg0, arg2, arg1);
super.method2683(this.getSize(), arg0, arg2, arg1);
}
@OriginalMember(owner = "client!e", name = "finalize", descriptor = "()V")

58
client/src/main/java/PlayerAppearance.java
View file

@ -33,7 +33,7 @@ public final class PlayerAppearance {
@OriginalMember(owner = "client!hh", name = "a", descriptor = "(IIIILclient!tk;III)Lclient!ak;")
public final Model method1946(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) SeqType arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6) {
@Pc(24) long local24 = (long) arg2 | (long) (arg6 << 16) | (long) arg1 << 32;
@Pc(30) Model local30 = (Model) Static139.aClass99_21.method3106(local24);
@Pc(30) Model local30 = (Model) Static139.aClass99_21.get(local24);
if (local30 == null) {
@Pc(36) RawModel[] local36 = new RawModel[3];
@Pc(38) int local38 = 0;
@ -63,7 +63,7 @@ public final class PlayerAppearance {
}
}
local30 = local66.method1679(64, 768, -50, -10, -50);
Static139.aClass99_21.method3095(local30, local24);
Static139.aClass99_21.put(local30, local24);
}
if (arg4 != null) {
local30 = arg4.method4215(local30, arg0, arg3, arg5);
@ -176,7 +176,7 @@ public final class PlayerAppearance {
}
}
}
@Pc(154) Model local154 = (Model) Static250.aClass99_33.method3106(local41);
@Pc(154) Model local154 = (Model) Static250.aClass99_33.get(local41);
@Pc(158) boolean local158;
@Pc(353) int local353;
@Pc(360) int local360;
@ -204,7 +204,7 @@ public final class PlayerAppearance {
}
if (local158) {
if (this.aLong87 != -1L) {
local154 = (Model) Static250.aClass99_33.method3106(this.aLong87);
local154 = (Model) Static250.aClass99_33.get(this.aLong87);
}
if (local154 == null) {
return null;
@ -232,17 +232,17 @@ public final class PlayerAppearance {
if (this.anInt2497 != -1) {
local303 = Static90.method1856(this.anInt2497);
}
if (local303 != null && local303.anIntArrayArray7 != null) {
for (local250 = 0; local250 < local303.anIntArrayArray7.length; local250++) {
if (local303.anIntArrayArray7[local250] != null && local239[local250] != null) {
local346 = local303.anIntArrayArray7[local250][0];
local353 = local303.anIntArrayArray7[local250][1];
local360 = local303.anIntArrayArray7[local250][2];
local367 = local303.anIntArrayArray7[local250][4];
local374 = local303.anIntArrayArray7[local250][3];
local381 = local303.anIntArrayArray7[local250][5];
if (local303 != null && local303.modelRotateTranslate != null) {
for (local250 = 0; local250 < local303.modelRotateTranslate.length; local250++) {
if (local303.modelRotateTranslate[local250] != null && local239[local250] != null) {
local346 = local303.modelRotateTranslate[local250][0];
local353 = local303.modelRotateTranslate[local250][1];
local360 = local303.modelRotateTranslate[local250][2];
local367 = local303.modelRotateTranslate[local250][4];
local374 = local303.modelRotateTranslate[local250][3];
local381 = local303.modelRotateTranslate[local250][5];
if (this.anIntArrayArray19 == null) {
this.anIntArrayArray19 = new int[local303.anIntArrayArray7.length][];
this.anIntArrayArray19 = new int[local303.modelRotateTranslate.length][];
}
if (this.anIntArrayArray19[local250] == null) {
@Pc(404) int[] local404 = this.anIntArrayArray19[local250] = new int[15];
@ -299,7 +299,7 @@ public final class PlayerAppearance {
if (GlRenderer.enabled) {
((GlModel) local154).method4111(false, false, true, false, false, true);
}
Static250.aClass99_33.method3095(local154, local41);
Static250.aClass99_33.put(local154, local41);
this.aLong87 = local41;
}
}
@ -322,8 +322,8 @@ public final class PlayerAppearance {
local381 &= 0xFFFF;
Static241.anIntArray520[local353] = local381;
if (Static276.aClass3_Sub2_Sub7Array8[local353] != null) {
local836 |= Static276.aClass3_Sub2_Sub7Array8[local353].method903(local381);
local827 |= Static276.aClass3_Sub2_Sub7Array8[local353].method901(local381);
local836 |= Static276.aClass3_Sub2_Sub7Array8[local353].isColorTransformed(local381);
local827 |= Static276.aClass3_Sub2_Sub7Array8[local353].isAlphaTransformed(local381);
local838 |= local858.aBoolean278;
}
if ((local858.aBoolean277 || Static204.applyTweening) && local367 != -1 && local367 < local858.anIntArray473.length) {
@ -334,8 +334,8 @@ public final class PlayerAppearance {
@Pc(991) int local991 = local979 & 0xFFFF;
Static216.anIntArray187[local353] = local991;
if (Static133.aClass3_Sub2_Sub7Array7[local353] != null) {
local836 |= Static133.aClass3_Sub2_Sub7Array7[local353].method903(local991);
local827 |= Static133.aClass3_Sub2_Sub7Array7[local353].method901(local991);
local836 |= Static133.aClass3_Sub2_Sub7Array7[local353].isColorTransformed(local991);
local827 |= Static133.aClass3_Sub2_Sub7Array7[local353].isAlphaTransformed(local991);
}
} else {
Static262.anIntArray515[local353] = 0;
@ -360,8 +360,8 @@ public final class PlayerAppearance {
local1042 = Static72.method1566(local979);
local353 &= 0xFFFF;
if (local1042 != null) {
local836 |= local1042.method903(local353);
local827 |= local1042.method901(local353);
local836 |= local1042.isColorTransformed(local353);
local827 |= local1042.isAlphaTransformed(local353);
local838 |= arg3.aBoolean278;
}
if ((arg3.aBoolean277 || Static204.applyTweening) && arg1 != -1 && arg3.anIntArray473.length > arg1) {
@ -375,8 +375,8 @@ public final class PlayerAppearance {
local1040 = Static72.method1566(local360 >>> 16);
}
if (local1040 != null) {
local836 |= local1040.method903(local360);
local827 |= local1040.method901(local360);
local836 |= local1040.isColorTransformed(local360);
local827 |= local1040.isAlphaTransformed(local360);
}
}
}
@ -391,8 +391,8 @@ public final class PlayerAppearance {
local979 &= 0xFFFF;
local1154 = Static72.method1566(local475);
if (local1154 != null) {
local836 |= local1154.method903(local979);
local827 |= local1154.method901(local979);
local836 |= local1154.isColorTransformed(local979);
local827 |= local1154.isAlphaTransformed(local979);
local838 |= arg2.aBoolean278;
}
if ((arg2.aBoolean277 || Static204.applyTweening) && arg5 != -1 && arg2.anIntArray473.length > arg5) {
@ -406,8 +406,8 @@ public final class PlayerAppearance {
local1156 = Static72.method1566(local451 >>> 16);
}
if (local1156 != null) {
local836 |= local1156.method903(local451);
local827 |= local1156.method901(local451);
local836 |= local1156.isColorTransformed(local451);
local827 |= local1156.isAlphaTransformed(local451);
}
}
}
@ -441,7 +441,7 @@ public final class PlayerAppearance {
if (this.anInt2492 != -1) {
return Static214.method4363(this.anInt2492).method2943(arg1, arg0, arg3, arg2);
}
@Pc(30) Model local30 = (Model) Static139.aClass99_21.method3106(this.aLong88);
@Pc(30) Model local30 = (Model) Static139.aClass99_21.get(this.aLong88);
if (local30 == null) {
@Pc(42) boolean local42 = false;
@Pc(52) int local52;
@ -486,7 +486,7 @@ public final class PlayerAppearance {
}
}
local30 = local171.method1679(64, 768, -50, -10, -50);
Static139.aClass99_21.method3095(local30, this.aLong88);
Static139.aClass99_21.put(local30, this.aLong88);
}
if (arg1 != null) {
local30 = arg1.method4215(local30, arg3, arg0, arg2);

2
client/src/main/java/SecondaryLinkedList.java
View file

@ -65,7 +65,7 @@ public final class SecondaryLinkedList {
}
@OriginalMember(owner = "client!ce", name = "a", descriptor = "(Lclient!rg;B)V")
public final void method798(@OriginalArg(0) SecondaryNode arg0) {
public final void addTail(@OriginalArg(0) SecondaryNode arg0) {
if (arg0.aClass3_Sub2_66 != null) {
arg0.method4365();
}

2
client/src/main/java/SecondaryNode.java
View file

@ -5,7 +5,7 @@ import org.openrs2.deob.annotation.OriginalMember;
public class SecondaryNode extends Node {
@OriginalMember(owner = "client!rg", name = "v", descriptor = "J")
public long aLong185;
public long secondaryKey;
@OriginalMember(owner = "client!rg", name = "w", descriptor = "Lclient!rg;")
public SecondaryNode aClass3_Sub2_66;

28
client/src/main/java/SeqType.java
View file

@ -89,9 +89,9 @@ public final class SeqType {
}
@Pc(124) Model local124;
if (local41 == null) {
local124 = arg2.method4568(!local23.method901(local27), !local23.method903(local27), !this.aBoolean278);
local124 = arg2.method4568(!local23.isAlphaTransformed(local27), !local23.isColorTransformed(local27), !this.aBoolean278);
} else {
local124 = arg2.method4568(!local23.method901(local27) & !local41.method901(arg1), !local23.method903(local27) & !local41.method903(arg1), !this.aBoolean278);
local124 = arg2.method4568(!local23.isAlphaTransformed(local27) & !local41.isAlphaTransformed(arg1), !local23.isColorTransformed(local27) & !local41.isColorTransformed(arg1), !this.aBoolean278);
}
if (GlRenderer.enabled && this.aBoolean278) {
if (local39 == 1) {
@ -162,19 +162,19 @@ public final class SeqType {
}
}
}
@Pc(163) boolean local163 = !local19.method901(local23);
@Pc(172) boolean local172 = !local19.method903(local23);
@Pc(163) boolean local163 = !local19.isAlphaTransformed(local23);
@Pc(172) boolean local172 = !local19.isColorTransformed(local23);
if (local71 != null) {
local163 &= !local71.method901(local83);
local172 &= !local71.method903(local83);
local163 &= !local71.isAlphaTransformed(local83);
local172 &= !local71.isColorTransformed(local83);
}
if (local34 != null) {
local163 &= !local34.method901(arg1);
local172 &= !local34.method903(arg1);
local163 &= !local34.isAlphaTransformed(arg1);
local172 &= !local34.isColorTransformed(arg1);
}
if (local81 != null) {
local163 &= !local81.method901(local85);
local172 &= !local81.method903(local85);
local163 &= !local81.isAlphaTransformed(local85);
local172 &= !local81.isColorTransformed(local85);
}
@Pc(258) Model local258 = arg0.method4572(local163, local172, !this.aBoolean278);
local258.method4558(local19, local23, local34, arg1, arg2 - 1, local13, this.aBoolean278);
@ -202,9 +202,9 @@ public final class SeqType {
}
@Pc(106) Model local106;
if (local42 == null) {
local106 = arg4.method4572(!local19.method901(local27), !local19.method903(local27), !this.aBoolean278);
local106 = arg4.method4572(!local19.isAlphaTransformed(local27), !local19.isColorTransformed(local27), !this.aBoolean278);
} else {
local106 = arg4.method4572(!local19.method901(local27) & !local42.method901(arg0), !local19.method903(local27) & !local42.method903(arg0), !this.aBoolean278);
local106 = arg4.method4572(!local19.isAlphaTransformed(local27) & !local42.isAlphaTransformed(arg0), !local19.isColorTransformed(local27) & !local42.isColorTransformed(arg0), !this.aBoolean278);
}
if (this.aBoolean278 && GlRenderer.enabled) {
if (local40 == 1) {
@ -276,9 +276,9 @@ public final class SeqType {
}
@Pc(103) Model local103;
if (local42 == null) {
local103 = arg3.method4560(!local27.method901(local31), !local27.method903(local31), !this.aBoolean278);
local103 = arg3.method4560(!local27.isAlphaTransformed(local31), !local27.isColorTransformed(local31), !this.aBoolean278);
} else {
local103 = arg3.method4560(!local27.method901(local31) & !local42.method901(arg0), !local27.method903(local31) & !local42.method903(arg0), !this.aBoolean278);
local103 = arg3.method4560(!local27.isAlphaTransformed(local31) & !local42.isAlphaTransformed(arg0), !local27.isColorTransformed(local31) & !local42.isColorTransformed(arg0), !this.aBoolean278);
}
local103.method4558(local27, local31, local42, arg0, arg1 - 1, local16, this.aBoolean278);
return local103;

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

@ -27,7 +27,7 @@ public final class SignLinkAudioChannel extends AudioChannel {
@OriginalMember(owner = "client!hl", name = "a", descriptor = "()V")
@Override
protected final void write() {
audioSource.write(this.channel, this.anIntArray411);
audioSource.write(this.channel, this.samples);
}
@OriginalMember(owner = "client!hl", name = "a", descriptor = "(Ljava/awt/Component;)V")

38
client/src/main/java/SoftLruHashTable.java
View file

@ -29,26 +29,26 @@ public final class SoftLruHashTable {
}
@OriginalMember(owner = "client!n", name = "a", descriptor = "(BLjava/lang/Object;J)V")
public final void method3095(@OriginalArg(1) Object arg0, @OriginalArg(2) long arg1) {
public final void put(@OriginalArg(1) Object arg0, @OriginalArg(2) long arg1) {
this.method3098(arg1);
if (this.anInt3966 == 0) {
@Pc(26) ReferenceNode local26 = (ReferenceNode) this.aClass16_8.method796();
local26.method4658();
local26.unlink();
local26.method4365();
} else {
this.anInt3966--;
}
@Pc(44) HardReferenceNode local44 = new HardReferenceNode(arg0);
this.aClass133_18.method3862(local44, arg1);
this.aClass16_8.method798(local44);
local44.aLong185 = 0L;
this.aClass133_18.put(local44, arg1);
this.aClass16_8.addTail(local44);
local44.secondaryKey = 0L;
}
@OriginalMember(owner = "client!n", name = "a", descriptor = "(JB)V")
public final void method3098(@OriginalArg(0) long arg0) {
@Pc(6) ReferenceNode local6 = (ReferenceNode) this.aClass133_18.get(arg0);
if (local6 != null) {
local6.method4658();
local6.unlink();
local6.method4365();
this.anInt3966++;
}
@ -73,15 +73,15 @@ public final class SoftLruHashTable {
for (@Pc(9) ReferenceNode local9 = (ReferenceNode) this.aClass16_8.method795(); local9 != null; local9 = (ReferenceNode) this.aClass16_8.method797()) {
if (local9.method3619()) {
if (local9.method3618() == null) {
local9.method4658();
local9.unlink();
local9.method4365();
this.anInt3966++;
}
} else if (++local9.aLong185 > (long) arg0) {
} else if (++local9.secondaryKey > (long) arg0) {
@Pc(33) ReferenceNode local33 = Static252.aClass22_1.method1027(local9);
this.aClass133_18.method3862(local33, local9.uid);
this.aClass133_18.put(local33, local9.key);
Static84.method1772(local9, local33);
local9.method4658();
local9.unlink();
local9.method4365();
}
}
@ -91,7 +91,7 @@ public final class SoftLruHashTable {
public final void method3103() {
for (@Pc(7) ReferenceNode local7 = (ReferenceNode) this.aClass16_8.method795(); local7 != null; local7 = (ReferenceNode) this.aClass16_8.method797()) {
if (local7.method3619()) {
local7.method4658();
local7.unlink();
local7.method4365();
this.anInt3966++;
}
@ -106,28 +106,28 @@ public final class SoftLruHashTable {
}
@OriginalMember(owner = "client!n", name = "b", descriptor = "(JB)Ljava/lang/Object;")
public final Object method3106(@OriginalArg(0) long arg0) {
public final Object get(@OriginalArg(0) long arg0) {
@Pc(12) ReferenceNode local12 = (ReferenceNode) this.aClass133_18.get(arg0);
if (local12 == null) {
return null;
}
@Pc(27) Object local27 = local12.method3618();
if (local27 == null) {
local12.method4658();
local12.unlink();
local12.method4365();
this.anInt3966++;
return null;
}
if (local12.method3619()) {
@Pc(53) HardReferenceNode local53 = new HardReferenceNode(local27);
this.aClass133_18.method3862(local53, local12.uid);
this.aClass16_8.method798(local53);
local53.aLong185 = 0L;
local12.method4658();
this.aClass133_18.put(local53, local12.key);
this.aClass16_8.addTail(local53);
local53.secondaryKey = 0L;
local12.unlink();
local12.method4365();
} else {
this.aClass16_8.method798(local12);
local12.aLong185 = 0L;
this.aClass16_8.addTail(local12);
local12.secondaryKey = 0L;
}
return local27;
}

20
client/src/main/java/SoftwareIndexedSprite.java
View file

@ -14,7 +14,7 @@ public final class SoftwareIndexedSprite extends IndexedSprite {
@OriginalMember(owner = "client!ek", name = "<init>", descriptor = "(IIIIII[B[I)V")
public SoftwareIndexedSprite(@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) byte[] arg6, @OriginalArg(7) int[] arg7) {
this.anInt4279 = arg0;
this.innerWidth = arg0;
this.anInt4276 = arg1;
this.anInt4280 = arg2;
this.anInt4273 = arg3;
@ -26,7 +26,7 @@ public final class SoftwareIndexedSprite extends IndexedSprite {
@OriginalMember(owner = "client!ek", name = "<init>", descriptor = "(III)V")
public SoftwareIndexedSprite(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
this.anInt4279 = this.width = arg0;
this.innerWidth = this.width = arg0;
this.anInt4276 = this.anInt4278 = arg1;
this.anInt4280 = this.anInt4273 = 0;
this.aByteArray18 = new byte[arg0 * arg1];
@ -67,7 +67,7 @@ public final class SoftwareIndexedSprite extends IndexedSprite {
@Pc(5) int local5 = this.anInt4278;
@Pc(7) int local7 = 0;
@Pc(9) int local9 = 0;
@Pc(12) int local12 = this.anInt4279;
@Pc(12) int local12 = this.innerWidth;
@Pc(15) int local15 = this.anInt4276;
@Pc(21) int local21 = (local12 << 16) / arg2;
@Pc(27) int local27 = (local15 << 16) / arg3;
@ -153,8 +153,8 @@ public final class SoftwareIndexedSprite extends IndexedSprite {
this.anInt4278 = this.width;
this.width = local10;
local10 = this.anInt4276;
this.anInt4276 = this.anInt4279;
this.anInt4279 = local10;
this.anInt4276 = this.innerWidth;
this.innerWidth = local10;
}
@OriginalMember(owner = "client!ek", name = "a", descriptor = "(III)V")
@ -201,18 +201,18 @@ public final class SoftwareIndexedSprite extends IndexedSprite {
@OriginalMember(owner = "client!ek", name = "c", descriptor = "()V")
public final void method1396() {
if (this.width == this.anInt4279 && this.anInt4278 == this.anInt4276) {
if (this.width == this.innerWidth && this.anInt4278 == this.anInt4276) {
return;
}
@Pc(17) byte[] local17 = new byte[this.anInt4279 * this.anInt4276];
@Pc(17) byte[] local17 = new byte[this.innerWidth * this.anInt4276];
@Pc(19) int local19 = 0;
for (@Pc(21) int local21 = 0; local21 < this.anInt4278; local21++) {
for (@Pc(27) int local27 = 0; local27 < this.width; local27++) {
local17[local27 + this.anInt4280 + (local21 + this.anInt4273) * this.anInt4279] = this.aByteArray18[local19++];
local17[local27 + this.anInt4280 + (local21 + this.anInt4273) * this.innerWidth] = this.aByteArray18[local19++];
}
}
this.aByteArray18 = local17;
this.width = this.anInt4279;
this.width = this.innerWidth;
this.anInt4278 = this.anInt4276;
this.anInt4280 = 0;
this.anInt4273 = 0;
@ -224,7 +224,7 @@ public final class SoftwareIndexedSprite extends IndexedSprite {
@Pc(5) int local5 = this.anInt4278;
@Pc(7) int local7 = 0;
@Pc(9) int local9 = 0;
@Pc(12) int local12 = this.anInt4279;
@Pc(12) int local12 = this.innerWidth;
@Pc(15) int local15 = this.anInt4276;
@Pc(21) int local21 = (local12 << 16) / arg2;
@Pc(27) int local27 = (local15 << 16) / arg3;

2
client/src/main/java/Song.java
View file

@ -360,7 +360,7 @@ public final class Song extends Node {
@Pc(187) Class3_Sub9 local187 = (Class3_Sub9) this.aClass133_22.get((long) local179);
if (local187 == null) {
local187 = new Class3_Sub9(new byte[128]);
this.aClass133_22.method3862(local187, (long) local179);
this.aClass133_22.put(local187, (long) local179);
}
local187.aByteArray17[local98] = 1;
}

8
client/src/main/java/SoundBank.java
View file

@ -38,7 +38,7 @@ public final class SoundBank {
return null;
}
local37 = local59.method3989();
this.aClass133_12.method3862(local37, local30);
this.aClass133_12.put(local37, local30);
if (arg0 != null) {
arg0[0] -= local37.aByteArray47.length;
}
@ -74,14 +74,14 @@ public final class SoundBank {
if (local53 == null) {
return null;
}
this.aClass133_11.method3862(local53, local26);
this.aClass133_11.put(local53, local26);
}
local33 = local53.method2341(arg1);
if (local33 == null) {
return null;
} else {
local53.method4658();
this.aClass133_12.method3862(local33, local26);
local53.unlink();
this.aClass133_12.put(local33, local26);
return local33;
}
} else {

30
client/src/main/java/SoundPcmStream.java
View file

@ -79,9 +79,9 @@ public final class SoundPcmStream extends PcmStream {
@OriginalMember(owner = "client!b", name = "b", descriptor = "([III)V")
@Override
public final synchronized void method4408(@OriginalArg(0) int[] arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
public final synchronized void read(@OriginalArg(0) int[] arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
if (this.anInt343 == 0 && this.anInt351 == 0) {
this.method4410(arg2);
this.skip(arg2);
return;
}
@Pc(13) PcmSound local13 = (PcmSound) this.aClass3_Sub16_5;
@ -97,7 +97,7 @@ public final class SoundPcmStream extends PcmStream {
if (this.anInt346 < 0) {
if (this.anInt342 <= 0) {
this.method406();
this.method4658();
this.unlink();
return;
}
this.anInt346 = 0;
@ -105,7 +105,7 @@ public final class SoundPcmStream extends PcmStream {
if (this.anInt346 >= local29) {
if (this.anInt342 >= 0) {
this.method406();
this.method4658();
this.unlink();
return;
}
this.anInt346 = local29 - 1;
@ -183,14 +183,14 @@ public final class SoundPcmStream extends PcmStream {
if (this.anInt346 < 0) {
this.anInt346 = -1;
this.method406();
this.method4658();
this.unlink();
}
} else {
this.method385(arg0, local40, local29, local44, 0);
if (this.anInt346 >= local29) {
this.anInt346 = local29;
this.method406();
this.method4658();
this.unlink();
}
}
} else if (this.aBoolean14) {
@ -288,7 +288,7 @@ public final class SoundPcmStream extends PcmStream {
} else if (this.anInt343 == Integer.MIN_VALUE) {
this.anInt343 = 0;
this.anInt348 = this.anInt355 = this.anInt352 = 0;
this.method4658();
this.unlink();
return true;
} else {
this.method416();
@ -300,12 +300,12 @@ public final class SoundPcmStream extends PcmStream {
public final synchronized void method384(@OriginalArg(0) int arg0) {
if (arg0 == 0) {
this.method397();
this.method4658();
this.unlink();
} else if (this.anInt355 == 0 && this.anInt352 == 0) {
this.anInt351 = 0;
this.anInt343 = 0;
this.anInt348 = 0;
this.method4658();
this.unlink();
} else {
@Pc(31) int local31 = -this.anInt348;
if (this.anInt348 > local31) {
@ -407,13 +407,13 @@ public final class SoundPcmStream extends PcmStream {
@OriginalMember(owner = "client!b", name = "c", descriptor = "(I)V")
@Override
public final synchronized void method4410(@OriginalArg(0) int arg0) {
public final synchronized void skip(@OriginalArg(0) int arg0) {
if (this.anInt351 > 0) {
if (arg0 >= this.anInt351) {
if (this.anInt343 == Integer.MIN_VALUE) {
this.anInt343 = 0;
this.anInt348 = this.anInt355 = this.anInt352 = 0;
this.method4658();
this.unlink();
arg0 = this.anInt351;
}
this.anInt351 = 0;
@ -436,7 +436,7 @@ public final class SoundPcmStream extends PcmStream {
if (this.anInt346 < 0) {
if (this.anInt342 <= 0) {
this.method406();
this.method4658();
this.unlink();
return;
}
this.anInt346 = 0;
@ -444,7 +444,7 @@ public final class SoundPcmStream extends PcmStream {
if (this.anInt346 >= local87) {
if (this.anInt342 >= 0) {
this.method406();
this.method4658();
this.unlink();
return;
}
this.anInt346 = local87 - 1;
@ -515,12 +515,12 @@ public final class SoundPcmStream extends PcmStream {
if (this.anInt346 < 0) {
this.anInt346 = -1;
this.method406();
this.method4658();
this.unlink();
}
} else if (this.anInt346 >= local87) {
this.anInt346 = local87;
this.method406();
this.method4658();
this.unlink();
}
} else if (this.aBoolean14) {
if (this.anInt342 < 0) {

4
client/src/main/java/SpotAnimType.java
View file

@ -99,7 +99,7 @@ public final class SpotAnimType {
@OriginalMember(owner = "client!eg", name = "a", descriptor = "(IBII)Lclient!ak;")
public final Model method1319(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2) {
@Pc(13) Model local13 = (Model) Static56.aClass99_9.method3106((long) this.anInt1751);
@Pc(13) Model local13 = (Model) Static56.aClass99_9.get((long) this.anInt1751);
if (local13 == null) {
@Pc(28) RawModel local28 = Static77.method1686(Static93.aClass153_41, this.anInt1753);
if (local28 == null) {
@ -117,7 +117,7 @@ public final class SpotAnimType {
}
}
local13 = local28.method1679(this.anInt1749 + 64, this.anInt1748 + 850, -30, -50, -30);
Static56.aClass99_9.method3095(local13, (long) this.anInt1751);
Static56.aClass99_9.put(local13, (long) this.anInt1751);
}
@Pc(118) Model local118;
if (this.anInt1754 == -1 || arg1 == -1) {

24
client/src/main/java/Static1.java
View file

@ -250,7 +250,7 @@ public final class Static1 {
}
}
@Pc(1161) GlTile local1161;
for (local1161 = (GlTile) local10.method3859(); local1161 != null; local1161 = (GlTile) local10.method3861()) {
for (local1161 = (GlTile) local10.head(); local1161 != null; local1161 = (GlTile) local10.next()) {
local1161.method1940();
}
for (local12 = 1; local12 <= 102; local12++) {
@ -272,10 +272,10 @@ public final class Static1 {
@Pc(1261) GlTile local1261 = Static243.method4212(local10, local1250);
@Pc(1267) byte local1267 = arg7[local12][local17];
@Pc(1273) byte local1273 = arg5[local12][local17];
local168 = Static19.method588(local1250.anInt5892, local1250.anInt5899, arg6[local12][local17]);
local143 = Static19.method588(local1250.anInt5892, local1250.anInt5899, arg6[local12 + 1][local17]);
local163 = Static19.method588(local1250.anInt5892, local1250.anInt5899, arg6[local12 + 1][local17 + 1]);
local153 = Static19.method588(local1250.anInt5892, local1250.anInt5899, arg6[local12][local17 + 1]);
local168 = Static19.method588(local1250.texture, local1250.anInt5899, arg6[local12][local17]);
local143 = Static19.method588(local1250.texture, local1250.anInt5899, arg6[local12 + 1][local17]);
local163 = Static19.method588(local1250.texture, local1250.anInt5899, arg6[local12 + 1][local17 + 1]);
local153 = Static19.method588(local1250.texture, local1250.anInt5899, arg6[local12][local17 + 1]);
Static58.method1324(local168, arg2, arg1, local12, arg0, local143, local1273, local30, local163, local38 != 0 && local1250.aBoolean310, local1267, local17, arg4, local153, local1261);
}
if ((arg8[local12][local17] & 0xFF) != 0 || local127 != 0 && arg7[local12][local17] == 0) {
@ -470,10 +470,10 @@ public final class Static1 {
@Pc(2318) boolean[] local2318 = Static277.aBooleanArrayArray4[local2003 == local180 ? local143 : 0];
@Pc(2324) FloType local2324 = Static256.method4395(local2003 - 1);
@Pc(2329) GlTile local2329 = Static243.method4212(local10, local2324);
@Pc(2345) int local2345 = Static19.method588(local2324.anInt5892, local2324.anInt5899, arg6[local12][local17]) << 8 | 0xFF;
@Pc(2365) int local2365 = Static19.method588(local2324.anInt5892, local2324.anInt5899, arg6[local12 + 1][local17]) << 8 | 0xFF;
@Pc(2385) int local2385 = Static19.method588(local2324.anInt5892, local2324.anInt5899, arg6[local12 + 1][local17 + 1]) << 8 | 0xFF;
@Pc(2403) int local2403 = Static19.method588(local2324.anInt5892, local2324.anInt5899, arg6[local12][local17 + 1]) << 8 | 0xFF;
@Pc(2345) int local2345 = Static19.method588(local2324.texture, local2324.anInt5899, arg6[local12][local17]) << 8 | 0xFF;
@Pc(2365) int local2365 = Static19.method588(local2324.texture, local2324.anInt5899, arg6[local12 + 1][local17]) << 8 | 0xFF;
@Pc(2385) int local2385 = Static19.method588(local2324.texture, local2324.anInt5899, arg6[local12 + 1][local17 + 1]) << 8 | 0xFF;
@Pc(2403) int local2403 = Static19.method588(local2324.texture, local2324.anInt5899, arg6[local12][local17 + 1]) << 8 | 0xFF;
@Pc(2422) boolean local2422 = local2003 != local202 && local1086[0] && local1068[1];
@Pc(2441) boolean local2441 = local2003 != local1035 && local1055[0] && local2318[1];
@Pc(2456) boolean local2456 = local214 != local2003 && local1068[0] && local1055[1];
@ -515,9 +515,9 @@ public final class Static1 {
}
}
}
for (local1161 = (GlTile) local10.method3859(); local1161 != null; local1161 = (GlTile) local10.method3861()) {
for (local1161 = (GlTile) local10.head(); local1161 != null; local1161 = (GlTile) local10.next()) {
if (local1161.anInt2483 == 0) {
local1161.method4658();
local1161.unlink();
} else {
local1161.method1943();
}
@ -527,7 +527,7 @@ public final class Static1 {
@Pc(2826) long[] local2826 = new long[local12];
local10.method3865(local2823);
for (local38 = 0; local38 < local12; local38++) {
local2826[local38] = local2823[local38].uid;
local2826[local38] = local2823[local38].key;
}
Static4.method23(local2826, local2823);
return local2823;

2
client/src/main/java/Static10.java
View file

@ -95,7 +95,7 @@ public final class Static10 {
@OriginalMember(owner = "client!an", name = "i", descriptor = "(I)V")
public static void method351() {
Static79.aClass99_11.clear();
Static7.aClass99_5.clear();
Static7.sprites.clear();
}
@OriginalMember(owner = "client!an", name = "a", descriptor = "(IIIIIII)V")

6
client/src/main/java/Static102.java
View file

@ -59,12 +59,12 @@ public final class Static102 {
@OriginalMember(owner = "client!hn", name = "a", descriptor = "(IIIZIIIIIIII)Z")
public static boolean method2075(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) boolean arg3, @OriginalArg(4) int arg4, @OriginalArg(6) int arg5, @OriginalArg(7) int arg6, @OriginalArg(8) int arg7, @OriginalArg(9) int arg8, @OriginalArg(10) int arg9, @OriginalArg(11) int arg10) {
if (Static173.self.method2693() == 2) {
if (Static173.self.getSize() == 2) {
return Static2.method8(arg6, arg7, arg4, arg0, arg9, arg3, arg2, arg1, arg5, arg8, arg10);
} else if (Static173.self.method2693() <= 2) {
} else if (Static173.self.getSize() <= 2) {
return Static45.method1171(arg5, arg4, arg10, arg9, arg8, arg2, arg1, arg3, arg7, arg0, arg6);
} else {
return Static96.method1955(arg9, arg6, arg8, arg1, Static173.self.method2693(), arg5, arg7, arg4, arg10, arg2, arg3, arg0);
return Static96.method1955(arg9, arg6, arg8, arg1, Static173.self.getSize(), arg5, arg7, arg4, arg10, arg2, arg3, arg0);
}
}
}

30
client/src/main/java/Static103.java
View file

@ -68,7 +68,7 @@ public final class Static103 {
}
@Pc(192) Npc local192;
if (local23 == 19) {
local192 = Static175.aClass8_Sub4_Sub2Array1[local36];
local192 = Static175.npcs[local36];
if (local192 != null) {
Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local192.movementQueueX[0], 1, 0, 2, local192.movementQueueZ[0], Static173.self.movementQueueX[0]);
Static122.x = Static7.clickX;
@ -80,7 +80,7 @@ public final class Static103 {
}
}
if (local23 == 17) {
local192 = Static175.aClass8_Sub4_Sub2Array1[local36];
local192 = Static175.npcs[local36];
if (local192 != null) {
Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local192.movementQueueX[0], 1, 0, 2, local192.movementQueueZ[0], Static173.self.movementQueueX[0]);
Static122.x = Static7.clickX;
@ -123,7 +123,7 @@ public final class Static103 {
Static153.method2909();
}
if (local23 == 45) {
local192 = Static175.aClass8_Sub4_Sub2Array1[local36];
local192 = Static175.npcs[local36];
if (local192 != null) {
Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local192.movementQueueX[0], 1, 0, 2, local192.movementQueueZ[0], Static173.self.movementQueueX[0]);
Static122.x = Static7.clickX;
@ -177,7 +177,7 @@ public final class Static103 {
Static6.outboundBuffer.p1isaac(92);
Static6.outboundBuffer.p2leadd(local36);
} else {
method2231(Static186.EMPTY_FILE, 0, Static34.concatenate(new JagString[] { Static123.parseInt(local693.objCounts[local15]), Static249.aClass100_1039, Static71.method1439(local36).aClass100_495 }));
method2231(Static186.EMPTY, 0, Static34.concatenate(new JagString[] { Static123.parseInt(local693.objCounts[local15]), Static249.aClass100_1039, Static71.method1439(local36).aClass100_495 }));
}
Static72.anInt2043 = 0;
Static257.aClass13_7 = Static5.getComponent(local19);
@ -197,8 +197,8 @@ public final class Static103 {
Static6.outboundBuffer.p1(Static59.anInt1814);
Static6.outboundBuffer.p1(Static273.anInt4130);
Static6.outboundBuffer.p1(89);
Static6.outboundBuffer.p2(Static173.self.anInt3412);
Static6.outboundBuffer.p2(Static173.self.anInt3421);
Static6.outboundBuffer.p2(Static173.self.xFine);
Static6.outboundBuffer.p2(Static173.self.zFine);
Static6.outboundBuffer.p1(Static221.anInt4364);
Static6.outboundBuffer.p1(63);
}
@ -209,11 +209,11 @@ public final class Static103 {
Static70.type = 2;
Static25.y = Static60.clickY;
Static122.x = Static7.clickX;
local192 = Static175.aClass8_Sub4_Sub2Array1[local36];
local192 = Static175.npcs[local36];
if (local192 != null) {
@Pc(884) NpcType local884 = local192.aClass96_1;
@Pc(884) NpcType local884 = local192.type;
if (local884.anIntArray357 != null) {
local884 = local884.method2932();
local884 = local884.getMultiNpc();
}
if (local884 != null) {
Static6.outboundBuffer.p1isaac(72);
@ -326,7 +326,7 @@ public final class Static103 {
Static6.outboundBuffer.p2leadd(Static142.originZ + local19);
}
if (local23 == 4) {
local192 = Static175.aClass8_Sub4_Sub2Array1[local36];
local192 = Static175.npcs[local36];
if (local192 != null) {
Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local192.movementQueueX[0], 1, 0, 2, local192.movementQueueZ[0], Static173.self.movementQueueX[0]);
Static70.type = 2;
@ -419,7 +419,7 @@ public final class Static103 {
Static250.anInt5444 = local15;
}
if (local23 == 2) {
local192 = Static175.aClass8_Sub4_Sub2Array1[local36];
local192 = Static175.npcs[local36];
if (local192 != null) {
Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local192.movementQueueX[0], 1, 0, 2, local192.movementQueueZ[0], Static173.self.movementQueueX[0]);
Static25.y = Static60.clickY;
@ -444,7 +444,7 @@ public final class Static103 {
}
}
if (local23 == 26) {
local192 = Static175.aClass8_Sub4_Sub2Array1[local36];
local192 = Static175.npcs[local36];
if (local192 != null) {
Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local192.movementQueueX[0], 1, 0, 2, local192.movementQueueZ[0], Static173.self.movementQueueX[0]);
Static70.type = 2;
@ -704,7 +704,7 @@ public final class Static103 {
Static6.outboundBuffer.p2le(Static142.originZ + local19);
}
if (local23 == 16) {
local192 = Static175.aClass8_Sub4_Sub2Array1[local36];
local192 = Static175.npcs[local36];
if (local192 != null) {
Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local192.movementQueueX[0], 1, 0, 2, local192.movementQueueZ[0], Static173.self.movementQueueX[0]);
Static122.x = Static7.clickX;
@ -795,7 +795,7 @@ public final class Static103 {
@OriginalMember(owner = "client!i", name = "i", descriptor = "(Z)V")
public static void method2245() {
for (@Pc(6) Class3_Sub31 local6 = (Class3_Sub31) Static119.aClass133_9.method3859(); local6 != null; local6 = (Class3_Sub31) Static119.aClass133_9.method3861()) {
for (@Pc(6) Class3_Sub31 local6 = (Class3_Sub31) Static119.aClass133_9.head(); local6 != null; local6 = (Class3_Sub31) Static119.aClass133_9.next()) {
@Pc(14) int local14 = local6.anInt5878;
if (Static245.load(local14)) {
@Pc(21) boolean local21 = true;
@ -808,7 +808,7 @@ public final class Static103 {
}
}
if (!local21) {
local27 = (int) local6.uid;
local27 = (int) local6.key;
@Pc(60) Component local60 = Static5.getComponent(local27);
if (local60 != null) {
Static43.redraw(local60);

100
client/src/main/java/Static104.java
View file

@ -10,8 +10,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.anInt1037;
if (arg0.anInt3409 == 0) {
arg0.anInt3366 = local9.idleAnimationId;
if (arg0.movementQueueSize == 0) {
arg0.anInt3417 = 0;
return;
}
@ -26,13 +26,13 @@ public final class Static104 {
return;
}
}
@Pc(79) int local79 = arg0.anInt3412;
@Pc(82) int local82 = arg0.anInt3421;
@Pc(99) int local99 = arg0.movementQueueX[arg0.anInt3409 - 1] * 128 + arg0.method2693() * 64;
@Pc(116) int local116 = arg0.movementQueueZ[arg0.anInt3409 - 1] * 128 + arg0.method2693() * 64;
@Pc(79) int local79 = arg0.xFine;
@Pc(82) int local82 = arg0.zFine;
@Pc(99) int local99 = arg0.movementQueueX[arg0.movementQueueSize - 1] * 128 + arg0.getSize() * 64;
@Pc(116) int local116 = arg0.movementQueueZ[arg0.movementQueueSize - 1] * 128 + arg0.getSize() * 64;
if (local99 - local79 > 256 || local99 - local79 < -256 || local116 - local82 > 256 || local116 - local82 < -256) {
arg0.anInt3412 = local99;
arg0.anInt3421 = local116;
arg0.xFine = local99;
arg0.zFine = local116;
return;
}
if (local99 <= local79) {
@ -57,87 +57,87 @@ public final class Static104 {
arg0.anInt3400 = 1536;
}
@Pc(224) int local224 = arg0.anInt3400 - arg0.anInt3381 & 0x7FF;
@Pc(227) int local227 = local9.anInt1056;
@Pc(227) int local227 = local9.turnAnimation1;
if (local224 > 1024) {
local224 -= 2048;
}
@Pc(233) boolean local233 = true;
@Pc(235) byte local235 = 1;
if (local224 >= -256 && local224 <= 256) {
local227 = local9.anInt1051;
local227 = local9.walkAnimation;
} else if (local224 >= 256 && local224 < 768) {
local227 = local9.anInt1035;
local227 = local9.turnAnimation3;
} else if (local224 >= -768 && local224 <= -256) {
local227 = local9.anInt1057;
local227 = local9.turnAnimation2;
}
@Pc(273) int local273 = 4;
if (local227 == -1) {
local227 = local9.anInt1051;
local227 = local9.walkAnimation;
}
arg0.anInt3366 = local227;
if (arg0 instanceof Npc) {
local233 = ((Npc) arg0).aClass96_1.aBoolean181;
local233 = ((Npc) arg0).type.aBoolean181;
}
if (local233) {
if (arg0.anInt3381 != arg0.anInt3400 && arg0.anInt3370 == -1 && arg0.anInt3376 != 0) {
local273 = 2;
}
if (arg0.anInt3409 > 2) {
if (arg0.movementQueueSize > 2) {
local273 = 6;
}
if (arg0.anInt3409 > 3) {
if (arg0.movementQueueSize > 3) {
local273 = 8;
}
if (arg0.anInt3417 > 0 && arg0.anInt3409 > 1) {
if (arg0.anInt3417 > 0 && arg0.movementQueueSize > 1) {
local273 = 8;
arg0.anInt3417--;
}
} else {
if (arg0.anInt3409 > 1) {
if (arg0.movementQueueSize > 1) {
local273 = 6;
}
if (arg0.anInt3409 > 2) {
if (arg0.movementQueueSize > 2) {
local273 = 8;
}
if (arg0.anInt3417 > 0 && arg0.anInt3409 > 1) {
if (arg0.anInt3417 > 0 && arg0.movementQueueSize > 1) {
arg0.anInt3417--;
local273 = 8;
}
}
if (arg0.aByteArray48[arg0.anInt3409 - 1] == 2) {
if (arg0.movementQueueSpeed[arg0.movementQueueSize - 1] == 2) {
local273 <<= 0x1;
local235 = 2;
} else if (arg0.aByteArray48[arg0.anInt3409 - 1] == 0) {
} else if (arg0.movementQueueSpeed[arg0.movementQueueSize - 1] == 0) {
local235 = 0;
local273 >>= 0x1;
}
if (local273 < 8 || local9.anInt1058 == -1) {
if (local273 < 8 || local9.runAnimationId == -1) {
if (local9.anInt1062 != -1 && local235 == 0) {
if (local9.anInt1056 == arg0.anInt3366 && local9.anInt1042 != -1) {
if (local9.turnAnimation1 == arg0.anInt3366 && local9.anInt1042 != -1) {
arg0.anInt3366 = local9.anInt1042;
} else if (local9.anInt1057 == arg0.anInt3366 && local9.anInt1066 != -1) {
} else if (local9.turnAnimation2 == arg0.anInt3366 && local9.anInt1066 != -1) {
arg0.anInt3366 = local9.anInt1066;
} else if (local9.anInt1035 == arg0.anInt3366 && local9.anInt1048 != -1) {
} else if (local9.turnAnimation3 == arg0.anInt3366 && local9.anInt1048 != -1) {
arg0.anInt3366 = local9.anInt1048;
} else {
arg0.anInt3366 = local9.anInt1062;
}
}
} else if (local9.anInt1056 == arg0.anInt3366 && local9.anInt1054 != -1) {
arg0.anInt3366 = local9.anInt1054;
} else if (arg0.anInt3366 == local9.anInt1057 && local9.anInt1043 != -1) {
arg0.anInt3366 = local9.anInt1043;
} else if (arg0.anInt3366 == local9.anInt1035 && local9.anInt1045 != -1) {
arg0.anInt3366 = local9.anInt1045;
} 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 {
arg0.anInt3366 = local9.anInt1058;
arg0.anInt3366 = local9.runAnimationId;
}
if (local9.anInt1032 != -1) {
local273 <<= 0x7;
if (arg0.anInt3409 == 1) {
@Pc(594) int local594 = (local99 >= arg0.anInt3412 ? local99 - arg0.anInt3412 : -local99 + arg0.anInt3412) << 7;
if (arg0.movementQueueSize == 1) {
@Pc(594) int local594 = (local99 >= arg0.xFine ? local99 - arg0.xFine : -local99 + arg0.xFine) << 7;
@Pc(600) int local600 = arg0.anInt3358 * arg0.anInt3358;
@Pc(622) int local622 = (local116 < arg0.anInt3421 ? arg0.anInt3421 - local116 : -arg0.anInt3421 + local116) << 7;
@Pc(622) int local622 = (local116 < arg0.zFine ? arg0.zFine - local116 : -arg0.zFine + local116) << 7;
@Pc(629) int local629 = local594 > local622 ? local594 : local622;
@Pc(636) int local636 = local9.anInt1032 * 2 * local629;
if (local636 < local600) {
@ -170,29 +170,29 @@ public final class Static104 {
}
}
if (local79 < local99) {
arg0.anInt3412 += local273;
if (local99 < arg0.anInt3412) {
arg0.anInt3412 = local99;
arg0.xFine += local273;
if (local99 < arg0.xFine) {
arg0.xFine = local99;
}
} else if (local79 > local99) {
arg0.anInt3412 -= local273;
if (local99 > arg0.anInt3412) {
arg0.anInt3412 = local99;
arg0.xFine -= local273;
if (local99 > arg0.xFine) {
arg0.xFine = local99;
}
}
if (local82 < local116) {
arg0.anInt3421 += local273;
if (arg0.anInt3421 > local116) {
arg0.anInt3421 = local116;
arg0.zFine += local273;
if (arg0.zFine > local116) {
arg0.zFine = local116;
}
} else if (local116 < local82) {
arg0.anInt3421 -= local273;
if (local116 > arg0.anInt3421) {
arg0.anInt3421 = local116;
arg0.zFine -= local273;
if (local116 > arg0.zFine) {
arg0.zFine = local116;
}
}
if (arg0.anInt3412 == local99 && local116 == arg0.anInt3421) {
arg0.anInt3409--;
if (arg0.xFine == local99 && local116 == arg0.zFine) {
arg0.movementQueueSize--;
if (arg0.anInt3405 > 0) {
arg0.anInt3405--;
}

2
client/src/main/java/Static105.java
View file

@ -8,7 +8,7 @@ public final class Static105 {
public static Class114[] aClass114Array1;
@OriginalMember(owner = "client!ib", name = "c", descriptor = "Lclient!qi;")
public static final ColorImageCacheEntry aClass3_Sub28_1 = new ColorImageCacheEntry(0, 0);
public static final ColorImageCacheEntry VALID = new ColorImageCacheEntry(0, 0);
@OriginalMember(owner = "client!ib", name = "d", descriptor = "Lclient!gn;")
public static final LruHashTable aClass54_9 = new LruHashTable(128);

2
client/src/main/java/Static107.java
View file

@ -31,7 +31,7 @@ public final class Static107 {
public static QuickChatCommandDecoder anInterface3_1 = null;
@OriginalMember(owner = "client!id", name = "b", descriptor = "(I)V")
public static void method2261() {
public static void loop() {
if (Static147.soundChannel != null) {
Static147.soundChannel.loop();
}

4
client/src/main/java/Static109.java
View file

@ -20,9 +20,9 @@ public final class Static109 {
public static void method2274() {
for (@Pc(7) int local7 = 0; local7 < Static272.anInt5214; local7++) {
@Pc(18) int local18 = Static33.anIntArray79[local7];
@Pc(22) Npc local22 = Static175.aClass8_Sub4_Sub2Array1[local18];
@Pc(22) Npc local22 = Static175.npcs[local18];
if (local22 != null) {
Static263.method4514(local22.aClass96_1.anInt3713, local22);
Static263.method4514(local22.type.anInt3713, local22);
}
}
}

58
client/src/main/java/Static110.java
View file

@ -50,56 +50,56 @@ public final class Static110 {
@Pc(141) int local141;
for (local6 = (AreaSound) Static152.aClass69_87.method2289(); local6 != null; local6 = (AreaSound) Static152.aClass69_87.method2288()) {
local37 = 1;
local42 = local6.aClass8_Sub4_Sub2_1.method2681();
if (local42.anInt1037 == local6.aClass8_Sub4_Sub2_1.anInt3366) {
local42 = local6.npc.method2681();
if (local42.idleAnimationId == local6.npc.anInt3366) {
local37 = 0;
} else if (local42.anInt1058 == local6.aClass8_Sub4_Sub2_1.anInt3366 || local42.anInt1054 == local6.aClass8_Sub4_Sub2_1.anInt3366 || local42.anInt1045 == local6.aClass8_Sub4_Sub2_1.anInt3366 || local42.anInt1043 == local6.aClass8_Sub4_Sub2_1.anInt3366) {
} 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.aClass8_Sub4_Sub2_1.anInt3366 || local42.anInt1042 == local6.aClass8_Sub4_Sub2_1.anInt3366 || local6.aClass8_Sub4_Sub2_1.anInt3366 == local42.anInt1048 || local42.anInt1066 == local6.aClass8_Sub4_Sub2_1.anInt3366) {
} 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.method2299(local6.aClass8_Sub4_Sub2_1);
if (local141 != local6.anInt2044) {
if (local6.aClass3_Sub3_Sub1_1 != null) {
Static204.soundStream.method1347(local6.aClass3_Sub3_Sub1_1);
local6.aClass3_Sub3_Sub1_1 = null;
local141 = Static112.getSound(local6.npc);
if (local141 != local6.sound) {
if (local6.primaryStream != null) {
Static204.soundStream.removeSubStream(local6.primaryStream);
local6.primaryStream = null;
}
local6.anInt2044 = local141;
local6.sound = local141;
}
local6.anInt2038 = local37;
}
local6.anInt2041 = local6.aClass8_Sub4_Sub2_1.anInt3412;
local6.anInt2037 = local6.aClass8_Sub4_Sub2_1.anInt3412 + local6.aClass8_Sub4_Sub2_1.method2693() * 64;
local6.anInt2029 = local6.aClass8_Sub4_Sub2_1.anInt3421;
local6.anInt2028 = local6.aClass8_Sub4_Sub2_1.anInt3421 + local6.aClass8_Sub4_Sub2_1.method2693() * 64;
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) Static93.aClass133_7.method3859(); local6 != null; local6 = (AreaSound) Static93.aClass133_7.method3861()) {
for (local6 = (AreaSound) Static93.aClass133_7.head(); local6 != null; local6 = (AreaSound) Static93.aClass133_7.next()) {
local37 = 1;
local42 = local6.aClass8_Sub4_Sub1_1.method2681();
if (local6.aClass8_Sub4_Sub1_1.anInt3366 == local42.anInt1037) {
local42 = local6.player.method2681();
if (local6.player.anInt3366 == local42.idleAnimationId) {
local37 = 0;
} else if (local6.aClass8_Sub4_Sub1_1.anInt3366 == local42.anInt1058 || local6.aClass8_Sub4_Sub1_1.anInt3366 == local42.anInt1054 || local6.aClass8_Sub4_Sub1_1.anInt3366 == local42.anInt1045 || local42.anInt1043 == local6.aClass8_Sub4_Sub1_1.anInt3366) {
} 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.aClass8_Sub4_Sub1_1.anInt3366 || local6.aClass8_Sub4_Sub1_1.anInt3366 == local42.anInt1042 || local6.aClass8_Sub4_Sub1_1.anInt3366 == local42.anInt1048 || local6.aClass8_Sub4_Sub1_1.anInt3366 == local42.anInt1066) {
} 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.method2706(local6.aClass8_Sub4_Sub1_1);
if (local6.anInt2044 != local141) {
if (local6.aClass3_Sub3_Sub1_1 != null) {
Static204.soundStream.method1347(local6.aClass3_Sub3_Sub1_1);
local6.aClass3_Sub3_Sub1_1 = null;
local141 = Static140.getSound(local6.player);
if (local6.sound != local141) {
if (local6.primaryStream != null) {
Static204.soundStream.removeSubStream(local6.primaryStream);
local6.primaryStream = null;
}
local6.anInt2044 = local141;
local6.sound = local141;
}
local6.anInt2038 = local37;
}
local6.anInt2041 = local6.aClass8_Sub4_Sub1_1.anInt3412;
local6.anInt2037 = local6.aClass8_Sub4_Sub1_1.anInt3412 + local6.aClass8_Sub4_Sub1_1.method2693() * 64;
local6.anInt2029 = local6.aClass8_Sub4_Sub1_1.anInt3421;
local6.anInt2028 = local6.aClass8_Sub4_Sub1_1.anInt3421 + local6.aClass8_Sub4_Sub1_1.method2693() * 64;
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);
}
}

2
client/src/main/java/Static111.java
View file

@ -63,7 +63,7 @@ public final class Static111 {
}
@OriginalMember(owner = "client!ii", name = "b", descriptor = "(I)V")
public static void handleMouse() {
public static void loop() {
@Pc(2) Mouse local2 = Static93.instance;
synchronized (Static93.instance) {
Static22.anInt723 = Static57.anInt1759;

20
client/src/main/java/Static112.java
View file

@ -15,8 +15,8 @@ public final class Static112 {
@Pc(13) int local13 = Static24.anInt761;
if (Static39.aClass3_Sub2_Sub1_1 == null || Static181.aClass3_Sub2_Sub1_9 == null) {
if (Static209.js5Archive8.isFileReady(Static55.anInt1736) && Static209.js5Archive8.isFileReady(Static169.anInt4073)) {
Static39.aClass3_Sub2_Sub1_1 = Static80.method3613(Static209.js5Archive8, Static55.anInt1736);
Static181.aClass3_Sub2_Sub1_9 = Static80.method3613(Static209.js5Archive8, Static169.anInt4073);
Static39.aClass3_Sub2_Sub1_1 = Static80.loadSoftwareAlphaSprite(Static209.js5Archive8, Static55.anInt1736);
Static181.aClass3_Sub2_Sub1_9 = Static80.loadSoftwareAlphaSprite(Static209.js5Archive8, Static169.anInt4073);
if (GlRenderer.enabled) {
if (Static39.aClass3_Sub2_Sub1_1 instanceof SoftwareAlphaSprite) {
Static39.aClass3_Sub2_Sub1_1 = new GlAlphaSprite((SoftwareSprite) Static39.aClass3_Sub2_Sub1_1);
@ -66,9 +66,9 @@ public final class Static112 {
}
}
if ((Static165.aClass3_Sub2_Sub1_8 == null || Static92.aClass3_Sub2_Sub1_6 == null || Static204.aClass3_Sub2_Sub1_10 == null) && Static209.js5Archive8.isFileReady(Static85.anInt2261) && Static209.js5Archive8.isFileReady(Static136.anInt3324) && Static209.js5Archive8.isFileReady(Static254.anInt5556)) {
Static165.aClass3_Sub2_Sub1_8 = Static80.method3613(Static209.js5Archive8, Static85.anInt2261);
Static92.aClass3_Sub2_Sub1_6 = Static80.method3613(Static209.js5Archive8, Static136.anInt3324);
Static204.aClass3_Sub2_Sub1_10 = Static80.method3613(Static209.js5Archive8, Static254.anInt5556);
Static165.aClass3_Sub2_Sub1_8 = Static80.loadSoftwareAlphaSprite(Static209.js5Archive8, Static85.anInt2261);
Static92.aClass3_Sub2_Sub1_6 = Static80.loadSoftwareAlphaSprite(Static209.js5Archive8, Static136.anInt3324);
Static204.aClass3_Sub2_Sub1_10 = Static80.loadSoftwareAlphaSprite(Static209.js5Archive8, Static254.anInt5556);
if (GlRenderer.enabled) {
if (Static165.aClass3_Sub2_Sub1_8 instanceof SoftwareAlphaSprite) {
Static165.aClass3_Sub2_Sub1_8 = new GlAlphaSprite((SoftwareSprite) Static165.aClass3_Sub2_Sub1_8);
@ -113,19 +113,19 @@ public final class Static112 {
}
@OriginalMember(owner = "client!ij", name = "a", descriptor = "(Lclient!km;I)I")
public static int method2299(@OriginalArg(0) Npc arg0) {
@Pc(13) NpcType local13 = arg0.aClass96_1;
public static int getSound(@OriginalArg(0) Npc arg0) {
@Pc(13) NpcType local13 = arg0.type;
if (local13.anIntArray357 != null) {
local13 = local13.method2932();
local13 = local13.getMultiNpc();
if (local13 == null) {
return -1;
}
}
@Pc(29) int local29 = local13.anInt3747;
@Pc(33) BasType local33 = arg0.method2681();
if (local33.anInt1037 == arg0.anInt3366) {
if (local33.idleAnimationId == arg0.anInt3366) {
local29 = local13.anInt3728;
} else if (arg0.anInt3366 == local33.anInt1058 || local33.anInt1054 == arg0.anInt3366 || arg0.anInt3366 == local33.anInt1045 || arg0.anInt3366 == local33.anInt1043) {
} else if (arg0.anInt3366 == local33.runAnimationId || local33.runAnimationId2 == arg0.anInt3366 || arg0.anInt3366 == local33.runAnimationId4 || arg0.anInt3366 == local33.runAnimationId3) {
local29 = local13.anInt3734;
} else if (local33.anInt1062 == arg0.anInt3366 || arg0.anInt3366 == local33.anInt1042 || arg0.anInt3366 == local33.anInt1048 || arg0.anInt3366 == local33.anInt1066) {
local29 = local13.anInt3745;

4
client/src/main/java/Static114.java
View file

@ -42,7 +42,7 @@ public final class Static114 {
@OriginalMember(owner = "client!j", name = "a", descriptor = "(BZLclient!na;)V")
public static void drawTextOnScreen(@OriginalArg(1) boolean arg0, @OriginalArg(2) JagString arg1) {
@Pc(24) int local24 = Static215.aClass3_Sub2_Sub9_32.method2856(arg1, 250);
@Pc(31) int local31 = Static215.aClass3_Sub2_Sub9_32.method2860(arg1, 250) * 13;
@Pc(31) int local31 = Static215.aClass3_Sub2_Sub9_32.getParagraphLineCount(arg1, 250) * 13;
if (GlRenderer.enabled) {
Static46.method1186(6, 6, local24 + 4 + 4, local31 + 8, 0);
Static46.method1179(6, 6, local24 + 4 + 4, local31 + 4 + 4, 16777215);
@ -55,7 +55,7 @@ public final class Static114 {
if (!arg0) {
Static121.method2407(10, 10, local31, local24);
} else if (GlRenderer.enabled) {
GlRenderer.method4153();
GlRenderer.swapBuffers();
} else {
try {
@Pc(159) Graphics local159 = GameShell.canvas.getGraphics();

2
client/src/main/java/Static116.java
View file

@ -47,7 +47,7 @@ public final class Static116 {
Static248.anIntArrayArrayArray17 = null;
Static41.anInt1309 = 0;
Static269.aClass3_Sub2_Sub4_2 = null;
Static145.aClass69_84.method2278();
Static145.aClass69_84.clear();
Static203.aClass134_1 = null;
Static217.anInt4901 = -1;
Static130.aClass41_2 = null;

2
client/src/main/java/Static118.java
View file

@ -22,7 +22,7 @@ public final class Static118 {
@OriginalMember(owner = "client!jd", name = "a", descriptor = "(IB)V")
public static void method2353(@OriginalArg(0) int arg0) {
@Pc(12) DelayedStateChange local12 = Static238.method4143(12, arg0);
local12.method1007();
local12.pushClient();
}
@OriginalMember(owner = "client!jd", name = "a", descriptor = "(II[Lclient!be;)V")

8
client/src/main/java/Static119.java
View file

@ -81,13 +81,13 @@ public final class Static119 {
public static void method2386() {
@Pc(6) AreaSound local6;
for (local6 = (AreaSound) Static3.aClass69_135.method2289(); local6 != null; local6 = (AreaSound) Static3.aClass69_135.method2288()) {
if (local6.aBoolean117) {
local6.method1567();
if (local6.multiLocOrNpc) {
local6.update();
}
}
for (local6 = (AreaSound) Static152.aClass69_87.method2289(); local6 != null; local6 = (AreaSound) Static152.aClass69_87.method2288()) {
if (local6.aBoolean117) {
local6.method1567();
if (local6.multiLocOrNpc) {
local6.update();
}
}
}

2
client/src/main/java/Static121.java
View file

@ -36,7 +36,7 @@ public final class Static121 {
public static void method2407(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3) {
for (@Pc(3) int local3 = 0; local3 < Static24.anInt766; local3++) {
if (arg0 < Static264.anIntArray410[local3] + Static224.anIntArray443[local3] && arg0 + arg3 > Static264.anIntArray410[local3] && Static50.anIntArray133[local3] + Static67.anIntArray320[local3] > arg1 && Static50.anIntArray133[local3] < arg2 + arg1) {
Static31.aBooleanArray29[local3] = true;
Static31.rectangleRedraw[local3] = true;
}
}
}

38
client/src/main/java/Static122.java
View file

@ -40,11 +40,11 @@ public final class Static122 {
local13.anInt2041 = arg4 * 128;
local13.anInt2033 = arg5;
if (arg1 != null) {
local13.anIntArray181 = arg1.anIntArray381;
local13.anInt2042 = arg1.anInt4402 * 128;
local13.sounds = arg1.anIntArray381;
local13.radius = arg1.soundRadius * 128;
local13.anInt2040 = arg1.anInt4414;
local13.aClass118_1 = arg1;
local13.anInt2044 = arg1.anInt4412;
local13.locType = arg1;
local13.sound = arg1.sound;
local13.anInt2032 = arg1.anInt4419;
@Pc(57) int local57 = arg1.anInt4397;
@Pc(60) int local60 = arg1.anInt4403;
@ -55,34 +55,34 @@ public final class Static122 {
local13.anInt2028 = (local60 + arg0) * 128;
local13.anInt2037 = (arg4 + local57) * 128;
if (arg1.anIntArray380 != null) {
local13.aBoolean117 = true;
local13.method1567();
local13.multiLocOrNpc = true;
local13.update();
}
if (local13.anIntArray181 != null) {
if (local13.sounds != null) {
local13.anInt2034 = local13.anInt2032 + (int) (Math.random() * (double) (local13.anInt2040 - local13.anInt2032));
}
Static3.aClass69_135.method2282(local13);
} else if (arg3 != null) {
local13.aClass8_Sub4_Sub2_1 = arg3;
@Pc(138) NpcType local138 = arg3.aClass96_1;
local13.npc = arg3;
@Pc(138) NpcType local138 = arg3.type;
if (local138.anIntArray357 != null) {
local13.aBoolean117 = true;
local138 = local138.method2932();
local13.multiLocOrNpc = true;
local138 = local138.getMultiNpc();
}
if (local138 != null) {
local13.anInt2028 = (local138.anInt3713 + arg0) * 128;
local13.anInt2037 = (arg4 + local138.anInt3713) * 128;
local13.anInt2044 = Static112.method2299(arg3);
local13.anInt2042 = local138.anInt3746 * 128;
local13.sound = Static112.getSound(arg3);
local13.radius = local138.soundRadius * 128;
}
Static152.aClass69_87.method2282(local13);
} else if (arg6 != null) {
local13.aClass8_Sub4_Sub1_1 = arg6;
local13.anInt2037 = (arg6.method2693() + arg4) * 128;
local13.anInt2028 = (arg6.method2693() + arg0) * 128;
local13.anInt2044 = Static140.method2706(arg6);
local13.anInt2042 = arg6.anInt1664 * 128;
Static93.aClass133_7.method3862(local13, arg6.aClass100_364.encode37());
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;
Static93.aClass133_7.put(local13, arg6.aClass100_364.encode37());
}
}

4
client/src/main/java/Static123.java
View file

@ -36,9 +36,9 @@ public final class Static123 {
@OriginalMember(owner = "client!jj", name = "a", descriptor = "(Z)V")
public static void topBannerRefresh() {
if (!Static249.aBoolean282 && Static83.modeWhere != 2) {
if (!Static249.advertSuppressed && Static83.modeWhere != 2) {
try {
Static206.aClass100_900.method3157(Static215.aClient1);
Static206.aClass100_900.method3157(Static215.instance);
} catch (@Pc(26) Throwable local26) {
}
}

4
client/src/main/java/Static125.java
View file

@ -45,7 +45,7 @@ public final class Static125 {
@OriginalMember(owner = "client!jl", name = "a", descriptor = "(IB)Lclient!kk;")
public static VarbitType method2449(@OriginalArg(0) int arg0) {
@Pc(10) VarbitType local10 = (VarbitType) aClass99_19.method3106((long) arg0);
@Pc(10) VarbitType local10 = (VarbitType) aClass99_19.get((long) arg0);
if (local10 != null) {
return local10;
}
@ -54,7 +54,7 @@ public final class Static125 {
if (local31 != null) {
local10.method2651(new Buffer(local31));
}
aClass99_19.method3095(local10, (long) arg0);
aClass99_19.put(local10, (long) arg0);
return local10;
}

2
client/src/main/java/Static126.java
View file

@ -22,7 +22,7 @@ public final class Static126 {
}
for (@Pc(15) int local15 = 0; local15 < Static24.anInt766; local15++) {
if (Static186.aBooleanArray100[local15]) {
Static31.aBooleanArray29[local15] = true;
Static31.rectangleRedraw[local15] = true;
}
Static223.aBooleanArray116[local15] = Static186.aBooleanArray100[local15];
Static186.aBooleanArray100[local15] = false;

72
client/src/main/java/Static127.java
View file

@ -59,32 +59,32 @@ public final class Static127 {
if (arg4) {
Static272.anInt5214 = 0;
for (local96 = 0; local96 < 32768; local96++) {
local103 = Static175.aClass8_Sub4_Sub2Array1[local96];
local103 = Static175.npcs[local96];
if (local103 != null) {
local103.anInt3412 -= local86 * 128;
local103.anInt3421 -= local81 * 128;
if (local103.anInt3412 >= 0 && local103.anInt3412 <= 13184 && local103.anInt3421 >= 0 && local103.anInt3421 <= 13184) {
local103.xFine -= local86 * 128;
local103.zFine -= local81 * 128;
if (local103.xFine >= 0 && local103.xFine <= 13184 && local103.zFine >= 0 && local103.zFine <= 13184) {
for (local109 = 0; local109 < 10; local109++) {
local103.movementQueueX[local109] -= local86;
local103.movementQueueZ[local109] -= local81;
}
Static33.anIntArray79[Static272.anInt5214++] = local96;
} else {
Static175.aClass8_Sub4_Sub2Array1[local96].method2698(null);
Static175.aClass8_Sub4_Sub2Array1[local96] = null;
Static175.npcs[local96].method2698(null);
Static175.npcs[local96] = null;
}
}
}
} else {
for (local96 = 0; local96 < 32768; local96++) {
local103 = Static175.aClass8_Sub4_Sub2Array1[local96];
local103 = Static175.npcs[local96];
if (local103 != null) {
for (local109 = 0; local109 < 10; local109++) {
local103.movementQueueX[local109] -= local86;
local103.movementQueueZ[local109] -= local81;
}
local103.anInt3412 -= local86 * 128;
local103.anInt3421 -= local81 * 128;
local103.xFine -= local86 * 128;
local103.zFine -= local81 * 128;
}
}
}
@ -95,8 +95,8 @@ public final class Static127 {
local265.movementQueueX[local109] -= local86;
local265.movementQueueZ[local109] -= local81;
}
local265.anInt3412 -= local86 * 128;
local265.anInt3421 -= local81 * 128;
local265.xFine -= local86 * 128;
local265.zFine -= local81 * 128;
}
}
Static55.level = arg0;
@ -134,7 +134,7 @@ public final class Static127 {
local451.anInt916 -= local81;
local451.anInt928 -= local86;
if (local451.anInt928 < 0 || local451.anInt916 < 0 || local451.anInt928 >= 104 || local451.anInt916 >= 104) {
local451.method4658();
local451.unlink();
}
}
if (arg4) {
@ -156,29 +156,29 @@ public final class Static127 {
Static86.setInstantFade();
}
Static107.anInt2875 = -1;
Static99.aClass69_64.method2278();
Static217.aClass69_116.method2278();
Static99.aClass69_64.clear();
Static217.aClass69_116.clear();
}
@OriginalMember(owner = "client!k", name = "a", descriptor = "(B)Lclient!da;")
public static DelayedStateChange poll() {
@Pc(10) DelayedStateChange local10 = (DelayedStateChange) Static215.aClass16_9.method795();
@Pc(10) DelayedStateChange local10 = (DelayedStateChange) Static215.serverQueue.method795();
if (local10 != null) {
local10.method4658();
local10.unlink();
local10.method4365();
return local10;
}
do {
local10 = (DelayedStateChange) Static140.aClass16_7.method795();
local10 = (DelayedStateChange) Static140.clientQueue.method795();
if (local10 == null) {
return null;
}
if (local10.method1009() > MonotonicClock.currentTimeMillis()) {
if (local10.getTime() > MonotonicClock.currentTimeMillis()) {
return null;
}
local10.method4658();
local10.unlink();
local10.method4365();
} while ((Long.MIN_VALUE & local10.aLong185) == 0L);
} while ((Long.MIN_VALUE & local10.secondaryKey) == 0L);
return local10;
}
@ -207,7 +207,7 @@ public final class Static127 {
if (local14 == -1) {
return arg1;
}
@Pc(246) JagString local246 = Static186.EMPTY_FILE;
@Pc(246) JagString local246 = Static186.EMPTY;
if (Static232.aClass212_5 != null) {
local246 = Static181.method3341(Static232.aClass212_5.intArg2);
try {
@ -218,22 +218,22 @@ public final class Static127 {
} catch (@Pc(274) UnsupportedEncodingException local274) {
}
}
arg1 = Static34.concatenate(new JagString[] { arg1.substring(local14, 0), local246, arg1.method3136(local14 + 4) });
arg1 = Static34.concatenate(new JagString[] { arg1.substring(local14, 0), local246, arg1.substring(local14 + 4) });
}
}
arg1 = Static34.concatenate(new JagString[] { arg1.substring(local14, 0), Static262.method4510(Static273.method3212(4, arg0)), arg1.method3136(local14 + 2) });
arg1 = Static34.concatenate(new JagString[] { arg1.substring(local14, 0), Static262.method4510(Static273.method3212(4, arg0)), arg1.substring(local14 + 2) });
}
}
arg1 = Static34.concatenate(new JagString[] { arg1.substring(local14, 0), Static262.method4510(Static273.method3212(3, arg0)), arg1.method3136(local14 + 2) });
arg1 = Static34.concatenate(new JagString[] { arg1.substring(local14, 0), Static262.method4510(Static273.method3212(3, arg0)), arg1.substring(local14 + 2) });
}
}
arg1 = Static34.concatenate(new JagString[] { arg1.substring(local14, 0), Static262.method4510(Static273.method3212(2, arg0)), arg1.method3136(local14 + 2) });
arg1 = Static34.concatenate(new JagString[] { arg1.substring(local14, 0), Static262.method4510(Static273.method3212(2, arg0)), arg1.substring(local14 + 2) });
}
}
arg1 = Static34.concatenate(new JagString[] { arg1.substring(local14, 0), Static262.method4510(Static273.method3212(1, arg0)), arg1.method3136(local14 + 2) });
arg1 = Static34.concatenate(new JagString[] { arg1.substring(local14, 0), Static262.method4510(Static273.method3212(1, arg0)), arg1.substring(local14 + 2) });
}
}
arg1 = Static34.concatenate(new JagString[] { arg1.substring(local14, 0), Static262.method4510(Static273.method3212(0, arg0)), arg1.method3136(local14 + 2) });
arg1 = Static34.concatenate(new JagString[] { arg1.substring(local14, 0), Static262.method4510(Static273.method3212(0, arg0)), arg1.substring(local14 + 2) });
}
}
@ -281,7 +281,7 @@ public final class Static127 {
Static175.method3279();
}
if (arg0.method3111(Static279.aClass100_1106)) {
Static107.js5NetQueue.method2329();
Static107.js5NetQueue.quit();
}
if (arg0.method3111(Static185.aClass100_823)) {
Static107.js5NetQueue.method2319();
@ -324,20 +324,20 @@ public final class Static127 {
}
}
}
if (arg0.method3138(Static241.aClass100_1088)) {
Static76.setParticles(arg0.method3136(15).parseInt());
if (arg0.startsWith(Static241.aClass100_1088)) {
Static76.setParticles(arg0.substring(15).parseInt());
Static203.savePreferences(GameShell.signLink);
Static18.serverUpdatedPreferences = false;
}
if (arg0.method3138(Static170.aClass100_623) && Static83.modeWhere != 0) {
Static115.method2312(arg0.method3136(6).parseInt());
if (arg0.startsWith(Static170.aClass100_623) && Static83.modeWhere != 0) {
Static115.method2312(arg0.substring(6).parseInt());
}
if (arg0.method3111(Static272.aClass100_990)) {
throw new RuntimeException();
}
if (arg0.method3138(Static211.aClass100_232)) {
Static199.anInt4672 = arg0.method3136(12).method3144().parseInt();
Static103.method2231(null, 0, Static34.concatenate(new JagString[] { Static276.aClass100_1096, Static123.parseInt(Static199.anInt4672) }));
if (arg0.startsWith(Static211.aClass100_232)) {
Static199.rectDebug = arg0.substring(12).method3144().parseInt();
Static103.method2231(null, 0, Static34.concatenate(new JagString[] { Static276.aClass100_1096, Static123.parseInt(Static199.rectDebug) }));
}
if (arg0.method3111(Static181.aClass100_810)) {
Static121.aBoolean154 = true;
@ -363,6 +363,6 @@ public final class Static127 {
}
Static6.outboundBuffer.p1isaac(44);
Static6.outboundBuffer.p1(arg0.length() - 1);
Static6.outboundBuffer.pjstr(arg0.method3136(2));
Static6.outboundBuffer.pjstr(arg0.substring(2));
}
}

4
client/src/main/java/Static13.java
View file

@ -45,12 +45,12 @@ public final class Static13 {
public static void method472(@OriginalArg(0) int arg0) {
@Pc(14) Inv local14 = (Inv) Static20.objectContainerCache.get((long) arg0);
if (local14 != null) {
local14.method4658();
local14.unlink();
}
}
@OriginalMember(owner = "client!bc", name = "a", descriptor = "(Ljava/awt/Color;ZZLclient!na;I)V")
public static void method473(@OriginalArg(0) Color arg0, @OriginalArg(2) boolean arg1, @OriginalArg(3) JagString arg2, @OriginalArg(4) int arg3) {
public static void render(@OriginalArg(0) Color arg0, @OriginalArg(2) boolean arg1, @OriginalArg(3) JagString arg2, @OriginalArg(4) int arg3) {
try {
@Pc(6) Graphics local6 = GameShell.canvas.getGraphics();
if (Static222.aFont1 == null) {

12
client/src/main/java/Static132.java
View file

@ -18,9 +18,9 @@ public final class Static132 {
@OriginalMember(owner = "client!ke", name = "a", descriptor = "(ZLclient!wk;Z)V")
public static void method2605(@OriginalArg(0) boolean arg0, @OriginalArg(1) Class3_Sub31 arg1) {
@Pc(9) int local9 = (int) arg1.uid;
@Pc(9) int local9 = (int) arg1.key;
@Pc(16) int local16 = arg1.anInt5878;
arg1.method4658();
arg1.unlink();
if (arg0) {
Static109.method2275(local16);
}
@ -41,9 +41,9 @@ public final class Static132 {
Static133.method4012(Static183.anInt4271, Static24.anInt761, Static229.anInt5138, Static13.anInt436);
} else {
Static133.method4012(Static183.anInt4271, Static24.anInt761, Static229.anInt5138, Static13.anInt436);
local43 = Static280.aClass3_Sub2_Sub9_43.method2858(LocalizedText.CHOOSE_OPTION);
local43 = Static280.aClass3_Sub2_Sub9_43.getStringWidth(LocalizedText.CHOOSE_OPTION);
for (@Pc(75) int local75 = 0; local75 < Static231.anInt5204; local75++) {
@Pc(88) int local88 = Static280.aClass3_Sub2_Sub9_43.method2858(Static269.method2228(local75));
@Pc(88) int local88 = Static280.aClass3_Sub2_Sub9_43.getStringWidth(Static269.method2228(local75));
if (local43 < local88) {
local43 = local88;
}
@ -59,14 +59,14 @@ public final class Static132 {
@OriginalMember(owner = "client!ke", name = "c", descriptor = "(III)V")
public static void method2606(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
@Pc(8) DelayedStateChange local8 = Static238.method4143(1, arg0);
local8.method1017();
local8.pushServer();
local8.intArg1 = arg1;
}
@OriginalMember(owner = "client!ke", name = "a", descriptor = "(IIIBI)V")
public static void method2607(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(4) int arg3) {
@Pc(8) DelayedStateChange local8 = Static238.method4143(4, arg2);
local8.method1017();
local8.pushServer();
local8.intArg3 = arg3;
local8.intArg2 = arg0;
local8.intArg1 = arg1;

3
client/src/main/java/Static136.java
View file

@ -1,4 +1,3 @@
import java.awt.event.KeyEvent;
import org.openrs2.deob.annotation.OriginalArg;
import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc;
@ -20,7 +19,7 @@ public final class Static136 {
@OriginalMember(owner = "client!kk", name = "a", descriptor = "(IIB)V")
public static void method2649(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
@Pc(4) DelayedStateChange local4 = Static238.method4143(6, arg1);
local4.method1017();
local4.pushServer();
local4.intArg1 = arg0;
}

2
client/src/main/java/Static139.java
View file

@ -29,7 +29,7 @@ public final class Static139 {
@OriginalMember(owner = "client!l", name = "a", descriptor = "(III)J")
public static long method2703(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
@Pc(7) Tile local7 = Static130.aClass3_Sub5ArrayArrayArray1[arg0][arg1][arg2];
return local7 == null || local7.aClass24_1 == null ? 0L : local7.aClass24_1.aLong52;
return local7 == null || local7.aClass24_1 == null ? 0L : local7.aClass24_1.key;
}
@OriginalMember(owner = "client!l", name = "b", descriptor = "(I)V")

20
client/src/main/java/Static140.java
View file

@ -9,7 +9,7 @@ public final class Static140 {
public static int[][][] anIntArrayArrayArray12;
@OriginalMember(owner = "client!la", name = "f", descriptor = "Lclient!ce;")
public static final SecondaryLinkedList aClass16_7 = new SecondaryLinkedList();
public static final SecondaryLinkedList clientQueue = new SecondaryLinkedList();
@OriginalMember(owner = "client!la", name = "a", descriptor = "(Lclient!wa;Z)V")
public static void method2705(@OriginalArg(0) Buffer arg0) {
@ -34,12 +34,12 @@ public final class Static140 {
}
@OriginalMember(owner = "client!la", name = "a", descriptor = "(ILclient!e;)I")
public static int method2706(@OriginalArg(1) Player arg0) {
public static int getSound(@OriginalArg(1) Player arg0) {
@Pc(14) int local14 = arg0.anInt1654;
@Pc(18) BasType local18 = arg0.method2681();
if (local18.anInt1037 == arg0.anInt3366) {
if (local18.idleAnimationId == arg0.anInt3366) {
local14 = arg0.anInt1648;
} else if (local18.anInt1058 == arg0.anInt3366 || arg0.anInt3366 == local18.anInt1054 || arg0.anInt3366 == local18.anInt1045 || local18.anInt1043 == arg0.anInt3366) {
} 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;
@ -53,25 +53,25 @@ public final class Static140 {
return;
}
if (Static35.anInt1093 >= 100) {
Static103.method2231(Static186.EMPTY_FILE, 0, LocalizedText.IGNORELISTFULL);
Static103.method2231(Static186.EMPTY, 0, LocalizedText.IGNORELISTFULL);
return;
}
@Pc(34) JagString local34 = Static79.decode37(arg0).method3125();
@Pc(36) int local36;
for (local36 = 0; local36 < Static35.anInt1093; local36++) {
if (Static190.aLongArray6[local36] == arg0) {
Static103.method2231(Static186.EMPTY_FILE, 0, Static34.concatenate(new JagString[] { local34, LocalizedText.IGNORELISTDUPE}));
Static103.method2231(Static186.EMPTY, 0, Static34.concatenate(new JagString[] { local34, LocalizedText.IGNORELISTDUPE}));
return;
}
}
for (local36 = 0; local36 < Static9.anInt178; local36++) {
if (Static92.aLongArray3[local36] == arg0) {
Static103.method2231(Static186.EMPTY_FILE, 0, Static34.concatenate(new JagString[] { LocalizedText.REMOVESOCIAL2, local34, LocalizedText.REMOVEFRIEND}));
Static103.method2231(Static186.EMPTY, 0, Static34.concatenate(new JagString[] { LocalizedText.REMOVESOCIAL2, local34, LocalizedText.REMOVEFRIEND}));
return;
}
}
if (local34.strEquals(Static173.self.aClass100_364)) {
Static103.method2231(Static186.EMPTY_FILE, 0, LocalizedText.IGNORECANTADDSELF);
Static103.method2231(Static186.EMPTY, 0, LocalizedText.IGNORECANTADDSELF);
return;
}
Static190.aLongArray6[Static35.anInt1093] = arg0;
@ -83,7 +83,7 @@ public final class Static140 {
@OriginalMember(owner = "client!la", name = "a", descriptor = "(II)Lclient!ic;")
public static LightType method2709(@OriginalArg(1) int arg0) {
@Pc(10) LightType local10 = (LightType) Static220.aClass99_28.method3106((long) arg0);
@Pc(10) LightType local10 = (LightType) Static220.aClass99_28.get((long) arg0);
if (local10 != null) {
return local10;
}
@ -92,7 +92,7 @@ public final class Static140 {
if (local26 != null) {
local10.method2257(new Buffer(local26), arg0);
}
Static220.aClass99_28.method3095(local10, (long) arg0);
Static220.aClass99_28.put(local10, (long) arg0);
return local10;
}

2
client/src/main/java/Static141.java
View file

@ -17,7 +17,7 @@ public final class Static141 {
public static int anInt3469 = 0;
@OriginalMember(owner = "client!lb", name = "v", descriptor = "I")
public static int anInt3470 = 0;
public static int language = 0;
@OriginalMember(owner = "client!lb", name = "A", descriptor = "I")
public static int buildArea = 0;

44
client/src/main/java/Static142.java
View file

@ -33,14 +33,14 @@ public final class Static142 {
} else if (Static267.anInt5774 > local5) {
local17 = Static159.players[Static105.anIntArray256[local5]];
} else {
local17 = Static175.aClass8_Sub4_Sub2Array1[Static33.anIntArray79[local5 - Static267.anInt5774]];
local17 = Static175.npcs[Static33.anIntArray79[local5 - Static267.anInt5774]];
}
if (local17 != null && local17.method2682()) {
@Pc(58) NpcType local58;
if (local17 instanceof Npc) {
local58 = ((Npc) local17).aClass96_1;
local58 = ((Npc) local17).type;
if (local58.anIntArray357 != null) {
local58 = local58.method2932();
local58 = local58.getMultiNpc();
}
if (local58 == null) {
continue;
@ -48,9 +48,9 @@ public final class Static142 {
}
@Pc(161) int local161;
if (local5 >= Static267.anInt5774) {
local58 = ((Npc) local17).aClass96_1;
local58 = ((Npc) local17).type;
if (local58.anIntArray357 != null) {
local58 = local58.method2932();
local58 = local58.getMultiNpc();
}
if (local58.anInt3732 >= 0 && Static138.aClass3_Sub2_Sub1Array5.length > local58.anInt3732) {
if (local58.anInt3730 == -1) {
@ -110,8 +110,8 @@ public final class Static142 {
if (local17.aClass100_640 != null && (local5 >= Static267.anInt5774 || Static59.anInt1812 == 0 || Static59.anInt1812 == 3 || Static59.anInt1812 == 1 && Static98.method1965(((Player) local17).aClass100_364))) {
Static180.method3326(arg4 >> 1, arg3, local17, arg5, local17.method2691(), arg1 >> 1);
if (Static65.anInt1951 > -1 && Static277.anInt5854 < Static191.anInt4506) {
Static191.anIntArray389[Static277.anInt5854] = Static280.aClass3_Sub2_Sub9_43.method2858(local17.aClass100_640) / 2;
Static191.anIntArray387[Static277.anInt5854] = Static280.aClass3_Sub2_Sub9_43.anInt3626;
Static191.anIntArray389[Static277.anInt5854] = Static280.aClass3_Sub2_Sub9_43.getStringWidth(local17.aClass100_640) / 2;
Static191.anIntArray387[Static277.anInt5854] = Static280.aClass3_Sub2_Sub9_43.lineHeight;
Static191.anIntArray385[Static277.anInt5854] = Static65.anInt1951;
Static191.anIntArray392[Static277.anInt5854] = Static16.anInt548;
Static191.anIntArray390[Static277.anInt5854] = local17.anInt3429;
@ -126,18 +126,18 @@ public final class Static142 {
@Pc(512) Sprite local512 = Static116.aClass3_Sub2_Sub1Array3[1];
if (local17 instanceof Npc) {
@Pc(518) Npc local518 = (Npc) local17;
@Pc(528) Sprite[] local528 = (Sprite[]) Static73.aClass99_10.method3106((long) local518.aClass96_1.anInt3736);
@Pc(528) Sprite[] local528 = (Sprite[]) Static73.aClass99_10.get((long) local518.type.anInt3736);
if (local528 == null) {
local528 = Static209.method3708(local518.aClass96_1.anInt3736, Static209.js5Archive8);
local528 = Static209.method3708(local518.type.anInt3736, Static209.js5Archive8);
if (local528 != null) {
Static73.aClass99_10.method3095(local528, (long) local518.aClass96_1.anInt3736);
Static73.aClass99_10.put(local528, (long) local518.type.anInt3736);
}
}
if (local528 != null && local528.length == 2) {
local512 = local528[1];
local508 = local528[0];
}
@Pc(571) NpcType local571 = local518.aClass96_1;
@Pc(571) NpcType local571 = local518.type;
if (local571.anInt3730 == -1) {
local310 = local17.method2691();
} else {
@ -170,7 +170,7 @@ public final class Static142 {
if (local17.anIntArray319[local74] > Static83.loop) {
if (local17 instanceof Npc) {
@Pc(725) Npc local725 = (Npc) local17;
@Pc(728) NpcType local728 = local725.aClass96_1;
@Pc(728) NpcType local728 = local725.type;
if (local728.anInt3730 == -1) {
local265 = local17.method2691() / 2;
} else {
@ -193,7 +193,7 @@ public final class Static142 {
Static65.anInt1951 += 15;
}
Static213.aClass3_Sub2_Sub1Array8[local17.anIntArray321[local74]].method1423(arg2 + Static65.anInt1951 - 12, arg0 + Static16.anInt548 - 12);
Static114.aClass3_Sub2_Sub9_42.method2875(Static123.parseInt(local17.anIntArray322[local74]), Static65.anInt1951 + arg2 - 1, Static16.anInt548 + 3 + arg0, 16777215, 0);
Static114.aClass3_Sub2_Sub9_42.renderCenter(Static123.parseInt(local17.anIntArray322[local74]), Static65.anInt1951 + arg2 - 1, Static16.anInt548 + 3 + arg0, 16777215, 0);
}
}
}
@ -262,19 +262,19 @@ public final class Static142 {
}
}
if (Static191.anIntArray391[local5] == 0) {
Static280.aClass3_Sub2_Sub9_43.method2875(local962, Static65.anInt1951 + arg2, arg0 + Static16.anInt548, local639, 0);
Static280.aClass3_Sub2_Sub9_43.renderCenter(local962, Static65.anInt1951 + arg2, arg0 + Static16.anInt548, local639, 0);
}
if (Static191.anIntArray391[local5] == 1) {
Static280.aClass3_Sub2_Sub9_43.method2872(local962, arg2 + Static65.anInt1951, Static16.anInt548 + arg0, local639, Static136.anInt3325);
Static280.aClass3_Sub2_Sub9_43.renderWave(local962, arg2 + Static65.anInt1951, Static16.anInt548 + arg0, local639, Static136.anInt3325);
}
if (Static191.anIntArray391[local5] == 2) {
Static280.aClass3_Sub2_Sub9_43.method2871(local962, arg2 + Static65.anInt1951, arg0 - -Static16.anInt548, local639, Static136.anInt3325);
Static280.aClass3_Sub2_Sub9_43.renderWave2(local962, arg2 + Static65.anInt1951, arg0 - -Static16.anInt548, local639, Static136.anInt3325);
}
if (Static191.anIntArray391[local5] == 3) {
Static280.aClass3_Sub2_Sub9_43.method2868(local962, arg2 + Static65.anInt1951, Static16.anInt548 + arg0, local639, Static136.anInt3325, 150 - Static191.anIntArray384[local5]);
Static280.aClass3_Sub2_Sub9_43.renderShake(local962, arg2 + Static65.anInt1951, Static16.anInt548 + arg0, local639, Static136.anInt3325, 150 - Static191.anIntArray384[local5]);
}
if (Static191.anIntArray391[local5] == 4) {
local642 = (150 - Static191.anIntArray384[local5]) * (Static280.aClass3_Sub2_Sub9_43.method2858(local962) + 100) / 150;
local642 = (150 - Static191.anIntArray384[local5]) * (Static280.aClass3_Sub2_Sub9_43.getStringWidth(local962) + 100) / 150;
if (GlRenderer.enabled) {
Static46.method1183(Static65.anInt1951 + arg2 - 50, arg0, Static65.anInt1951 + arg2 + 50, arg4 + arg0);
} else {
@ -291,16 +291,16 @@ public final class Static142 {
@Pc(1372) int local1372 = 0;
local642 = 150 - Static191.anIntArray384[local5];
if (GlRenderer.enabled) {
Static46.method1183(arg2, Static16.anInt548 + arg0 - Static280.aClass3_Sub2_Sub9_43.anInt3626 - 1, arg1 + arg2, arg0 + Static16.anInt548 + 5);
Static46.method1183(arg2, Static16.anInt548 + arg0 - Static280.aClass3_Sub2_Sub9_43.lineHeight - 1, arg1 + arg2, arg0 + Static16.anInt548 + 5);
} else {
Static129.method2498(arg2, Static16.anInt548 + arg0 - Static280.aClass3_Sub2_Sub9_43.anInt3626 - 1, arg2 + arg1, Static16.anInt548 + arg0 + 5);
Static129.method2498(arg2, Static16.anInt548 + arg0 - Static280.aClass3_Sub2_Sub9_43.lineHeight - 1, arg2 + arg1, Static16.anInt548 + arg0 + 5);
}
if (local642 < 25) {
local1372 = local642 - 25;
} else if (local642 > 125) {
local1372 = local642 - 125;
}
Static280.aClass3_Sub2_Sub9_43.method2875(local962, Static65.anInt1951 + arg2, local1372 + arg0 + Static16.anInt548, local639, 0);
Static280.aClass3_Sub2_Sub9_43.renderCenter(local962, Static65.anInt1951 + arg2, local1372 + arg0 + Static16.anInt548, local639, 0);
if (GlRenderer.enabled) {
Static46.method1187(arg2, arg0, arg2 + arg1, arg0 + arg4);
} else {
@ -308,7 +308,7 @@ public final class Static142 {
}
}
} else {
Static280.aClass3_Sub2_Sub9_43.method2875(local962, arg2 + Static65.anInt1951, arg0 + Static16.anInt548, 16776960, 0);
Static280.aClass3_Sub2_Sub9_43.renderCenter(local962, arg2 + Static65.anInt1951, arg0 + Static16.anInt548, 16776960, 0);
}
}
}

2
client/src/main/java/Static144.java
View file

@ -261,7 +261,7 @@ public final class Static144 {
}
@OriginalMember(owner = "client!le", name = "a", descriptor = "(I)I")
public static int method2736() {
public static int getWindowMode() {
if (GameShell.fullScreenFrame != null) {
return 3;
} else if (GlRenderer.enabled && Static124.aBoolean156) {

2
client/src/main/java/Static145.java
View file

@ -94,7 +94,7 @@ public final class Static145 {
@OriginalMember(owner = "client!lf", name = "a", descriptor = "(IIIIB)V")
public static void method2745(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) {
@Pc(8) DelayedStateChange local8 = Static238.method4143(10, arg0);
local8.method1017();
local8.pushServer();
local8.intArg3 = arg2;
local8.intArg1 = arg3;
local8.intArg2 = arg1;

8
client/src/main/java/Static148.java
View file

@ -41,7 +41,7 @@ public final class Static148 {
@Pc(21) LongNode local21 = (LongNode) Static199.aClass133_20.get((long) arg0);
if (local21 == null) {
local21 = new LongNode(MonotonicClock.currentTimeMillis() + 500L);
Static199.aClass133_20.method3862(local21, (long) arg0);
Static199.aClass133_20.put(local21, (long) arg0);
} else {
local21.aLong55 = MonotonicClock.currentTimeMillis() + 500L;
}
@ -49,14 +49,14 @@ public final class Static148 {
@OriginalMember(owner = "client!li", name = "a", descriptor = "(II)Lclient!dd;")
public static SoftwareFont method2768(@OriginalArg(1) int arg0) {
@Pc(16) SoftwareFont local16 = (SoftwareFont) Static139.aClass99_22.method3106((long) arg0);
@Pc(16) SoftwareFont local16 = (SoftwareFont) Static139.aClass99_22.get((long) arg0);
if (local16 != null) {
return local16;
}
@Pc(26) byte[] local26 = Static261.js5Archive13.getFile(arg0, 0);
local16 = new SoftwareFont(local26);
local16.method2873(Static159.aClass36Array12, null);
Static139.aClass99_22.method3095(local16, (long) arg0);
local16.setNameIcons(Static159.aClass36Array12, null);
Static139.aClass99_22.put(local16, (long) arg0);
return local16;
}
}

8
client/src/main/java/Static15.java
View file

@ -25,14 +25,14 @@ public final class Static15 {
@OriginalMember(owner = "client!be", name = "a", descriptor = "(Z)Lclient!na;")
public static JagString method479() {
@Pc(8) JagString local8 = Static93.aClass100_518;
@Pc(10) JagString local10 = Static186.EMPTY_FILE;
@Pc(10) JagString local10 = Static186.EMPTY;
if (Static83.modeWhere != 0) {
local8 = Static50.aClass100_365;
}
if (Static47.aClass100_991 != null) {
local10 = Static34.concatenate(new JagString[] { Static150.aClass100_687, Static47.aClass100_991 });
if (Static47.settings != null) {
local10 = Static34.concatenate(new JagString[] { Static150.aClass100_687, Static47.settings});
}
return Static34.concatenate(new JagString[] { Static61.aClass100_424, local8, Static80.aClass100_886, Static123.parseInt(Static141.anInt3470), Static257.aClass100_98, Static123.parseInt(Static204.anInt4760), local10, Static41.aClass100_268 });
return Static34.concatenate(new JagString[] { Static61.aClass100_424, local8, Static80.aClass100_886, Static123.parseInt(Static141.language), Static257.aClass100_98, Static123.parseInt(Static204.affiliate), local10, Static41.aClass100_268 });
}
@OriginalMember(owner = "client!be", name = "a", descriptor = "(III)I")

46
client/src/main/java/Static150.java
View file

@ -8,7 +8,7 @@ public final class Static150 {
public static final JagString aClass100_687 = Static28.parse(")4p=");
@OriginalMember(owner = "client!lk", name = "U", descriptor = "Z")
public static boolean aBoolean175 = false;
public static boolean objectTag = false;
@OriginalMember(owner = "client!lk", name = "V", descriptor = "I")
public static int anInt3582 = 0;
@ -95,7 +95,7 @@ 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.anInt2044 == -1 && arg1.anIntArray181 == null) {
if (arg1.sound == -1 && arg1.sounds == null) {
return;
}
@Pc(20) int local20 = 0;
@ -109,14 +109,14 @@ public final class Static150 {
} else if (arg4 < arg1.anInt2029) {
local20 += arg1.anInt2029 - arg4;
}
if (arg1.anInt2042 == 0 || arg1.anInt2042 < local20 - 64 || Static30.ambientSoundsVolume == 0 || arg2 != arg1.anInt2033) {
if (arg1.aClass3_Sub3_Sub1_1 != null) {
Static204.soundStream.method1347(arg1.aClass3_Sub3_Sub1_1);
arg1.aClass3_Sub3_Sub1_1 = null;
if (arg1.radius == 0 || arg1.radius < local20 - 64 || Static30.ambientSoundsVolume == 0 || arg2 != arg1.anInt2033) {
if (arg1.primaryStream != null) {
Static204.soundStream.removeSubStream(arg1.primaryStream);
arg1.primaryStream = null;
}
if (arg1.aClass3_Sub3_Sub1_2 != null) {
Static204.soundStream.method1347(arg1.aClass3_Sub3_Sub1_2);
arg1.aClass3_Sub3_Sub1_2 = null;
if (arg1.secondaryStream != null) {
Static204.soundStream.removeSubStream(arg1.secondaryStream);
arg1.secondaryStream = null;
}
return;
}
@ -124,34 +124,34 @@ public final class Static150 {
if (local20 < 0) {
local20 = 0;
}
@Pc(134) int local134 = (arg1.anInt2042 - local20) * Static30.ambientSoundsVolume / arg1.anInt2042;
if (arg1.aClass3_Sub3_Sub1_1 != null) {
arg1.aClass3_Sub3_Sub1_1.method386(local134);
} else if (arg1.anInt2044 >= 0) {
@Pc(150) SynthSound local150 = Static292.method3988(Static248.js5Archive4, arg1.anInt2044, 0);
@Pc(134) int local134 = (arg1.radius - local20) * Static30.ambientSoundsVolume / arg1.radius;
if (arg1.primaryStream != null) {
arg1.primaryStream.method386(local134);
} else if (arg1.sound >= 0) {
@Pc(150) SynthSound local150 = Static292.method3988(Static248.js5Archive4, arg1.sound, 0);
if (local150 != null) {
@Pc(158) PcmSound local158 = local150.method3989().method2648(Static56.resampler);
@Pc(163) SoundPcmStream local163 = Static284.method404(local158, local134);
local163.method396(-1);
Static204.soundStream.method1343(local163);
arg1.aClass3_Sub3_Sub1_1 = local163;
arg1.primaryStream = local163;
}
}
if (arg1.aClass3_Sub3_Sub1_2 != null) {
arg1.aClass3_Sub3_Sub1_2.method386(local134);
if (!arg1.aClass3_Sub3_Sub1_2.method4654()) {
arg1.aClass3_Sub3_Sub1_2 = null;
if (arg1.secondaryStream != null) {
arg1.secondaryStream.method386(local134);
if (!arg1.secondaryStream.method4654()) {
arg1.secondaryStream = null;
}
} else if (arg1.anIntArray181 != null && (arg1.anInt2034 -= arg3) <= 0) {
@Pc(219) int local219 = (int) ((double) arg1.anIntArray181.length * Math.random());
@Pc(227) SynthSound local227 = Static292.method3988(Static248.js5Archive4, arg1.anIntArray181[local219], 0);
} else if (arg1.sounds != null && (arg1.anInt2034 -= arg3) <= 0) {
@Pc(219) int local219 = (int) ((double) arg1.sounds.length * Math.random());
@Pc(227) SynthSound local227 = Static292.method3988(Static248.js5Archive4, arg1.sounds[local219], 0);
if (local227 != null) {
@Pc(236) PcmSound local236 = local227.method3989().method2648(Static56.resampler);
@Pc(241) SoundPcmStream local241 = Static284.method404(local236, local134);
local241.method396(0);
Static204.soundStream.method1343(local241);
arg1.anInt2034 = (int) ((double) (arg1.anInt2040 - arg1.anInt2032) * Math.random()) + arg1.anInt2032;
arg1.aClass3_Sub3_Sub1_2 = local241;
arg1.secondaryStream = local241;
}
}
}

6
client/src/main/java/Static153.java
View file

@ -40,7 +40,7 @@ public final class Static153 {
@OriginalMember(owner = "client!mc", name = "c", descriptor = "(III)V")
public static void method2905(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) {
@Pc(14) DelayedStateChange local14 = Static238.method4143(7, arg0);
local14.method1017();
local14.pushServer();
local14.intArg1 = arg1;
}
@ -68,7 +68,7 @@ public final class Static153 {
@OriginalMember(owner = "client!mc", name = "f", descriptor = "(B)V")
public static void method2909() {
Static6.outboundBuffer.p1isaac(184);
for (@Pc(18) Class3_Sub31 local18 = (Class3_Sub31) Static119.aClass133_9.method3859(); local18 != null; local18 = (Class3_Sub31) Static119.aClass133_9.method3861()) {
for (@Pc(18) Class3_Sub31 local18 = (Class3_Sub31) Static119.aClass133_9.head(); local18 != null; local18 = (Class3_Sub31) Static119.aClass133_9.next()) {
if (local18.anInt5879 == 0) {
Static132.method2605(true, local18);
}
@ -82,6 +82,6 @@ public final class Static153 {
@OriginalMember(owner = "client!mc", name = "a", descriptor = "(BI)V")
public static void method2910(@OriginalArg(1) int arg0) {
@Pc(4) DelayedStateChange local4 = Static238.method4143(8, arg0);
local4.method1007();
local4.pushClient();
}
}

18
client/src/main/java/Static158.java
View file

@ -21,7 +21,7 @@ public final class Static158 {
public static int anInt3857 = 0;
@OriginalMember(owner = "client!mh", name = "f", descriptor = "(B)V")
public static void handleAccountCreation() {
public static void loop() {
if (Static179.accountCreationStep == 0) {
return;
}
@ -157,20 +157,20 @@ public final class Static158 {
@Pc(129) int local129 = local103 & 0x3F;
@Pc(142) int local142 = local129 + (Static238.regionBitPacked[local16] & 0xFF) * 64 - Static142.originZ;
@Pc(148) NpcType local148 = Static214.method4363(local74.g2());
if (Static175.aClass8_Sub4_Sub2Array1[local97] == null && (local148.aByte10 & 0x1) > 0 && local107 == Static41.anInt1316 && local125 >= 0 && local148.anInt3713 + local125 < 104 && local142 >= 0 && local142 + local148.anInt3713 < 104) {
Static175.aClass8_Sub4_Sub2Array1[local97] = new Npc();
@Pc(198) Npc local198 = Static175.aClass8_Sub4_Sub2Array1[local97];
if (Static175.npcs[local97] == null && (local148.aByte10 & 0x1) > 0 && local107 == Static41.anInt1316 && local125 >= 0 && local148.anInt3713 + local125 < 104 && local142 >= 0 && local142 + local148.anInt3713 < 104) {
Static175.npcs[local97] = new Npc();
@Pc(198) Npc local198 = Static175.npcs[local97];
Static33.anIntArray79[Static272.anInt5214++] = local97;
local198.anInt3430 = Static83.loop;
local198.method2698(local148);
local198.method2692(local198.aClass96_1.anInt3713);
local198.anInt3400 = local198.anInt3381 = Static56.anIntArray141[local198.aClass96_1.aByte11];
local198.anInt3376 = local198.aClass96_1.anInt3733;
local198.method2692(local198.type.anInt3713);
local198.anInt3400 = local198.anInt3381 = Static56.anIntArray141[local198.type.aByte11];
local198.anInt3376 = local198.type.anInt3733;
if (local198.anInt3376 == 0) {
local198.anInt3381 = 0;
}
local198.anInt3365 = local198.aClass96_1.anInt3737;
local198.method2683(local198.method2693(), local125, local142, true);
local198.anInt3365 = local198.type.anInt3737;
local198.method2683(local198.getSize(), local125, local142, true);
}
}
}

4
client/src/main/java/Static159.java
View file

@ -52,7 +52,7 @@ public final class Static159 {
local65.anInt5398 = 1;
local65.anInt5404 = 0;
local65.anInt5408 = local23;
Static152.method2836(arg1.anInt3421, local60, arg1.anInt3412, false, 0);
Static152.method2836(arg1.zFine, local60, arg1.xFine, false, 0);
} else if (local68 == 2) {
local65.anInt5400 = 0;
}
@ -68,7 +68,7 @@ public final class Static159 {
local65.anInt5396 = local15;
local65.anInt5400 = 0;
local65.anInt5399 = 0;
Static152.method2836(arg1.anInt3421, local60, arg1.anInt3412, false, 0);
Static152.method2836(arg1.zFine, local60, arg1.xFine, false, 0);
}
}
}

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