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

Basic NPC rendering under playground project

Browse source
This commit is contained in:
Pazaz 2022-04-25 18:25:21 -04:00
parent 8fb5b3fc75
commit 3a90dfc1b3
43 changed files with 555 additions and 315 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -58,8 +58,8 @@ public class AreaSoundManager {
local138 = local138.getMultiNpc();
}
if (local138 != null) {
local13.anInt2028 = (local138.soze + arg0) * 128;
local13.anInt2037 = (arg4 + local138.soze) * 128;
local13.anInt2028 = (local138.size + arg0) * 128;
local13.anInt2037 = (arg4 + local138.size) * 128;
local13.sound = Static112.getSound(arg3);
local13.radius = local138.soundRadius * 128;
}

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

@ -25,8 +25,8 @@ public abstract class Entity {
public abstract void method4545(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4);
@OriginalMember(owner = "client!th", name = "a", descriptor = "(IIIIIIIIJILclient!ga;)V")
public abstract 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);
public abstract void render(@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);
@OriginalMember(owner = "client!th", name = "b", descriptor = "()I")
public abstract int method4549();
public abstract int getMaxY();
}

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

@ -917,7 +917,7 @@ public final class GlModel extends Model {
@OriginalMember(owner = "client!td", 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) {
public final void render(@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.anInt5296 == 0) {
return;
}
@ -1137,7 +1137,7 @@ public final class GlModel extends Model {
@OriginalMember(owner = "client!td", name = "c", descriptor = "(I)V")
@Override
public final void method4564(@OriginalArg(0) int arg0) {
public final void rotateZ(@OriginalArg(0) int arg0) {
@Pc(3) int local3 = MathUtils.sin[arg0];
@Pc(7) int local7 = MathUtils.cos[arg0];
for (@Pc(9) int local9 = 0; local9 < this.vertexCount; local9++) {
@ -1184,7 +1184,7 @@ public final class GlModel extends Model {
@OriginalMember(owner = "client!td", name = "c", descriptor = "(III)V")
@Override
public final void method4575(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
public final void translate(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
for (@Pc(1) int local1 = 0; local1 < this.vertexCount; local1++) {
this.anIntArray461[local1] += arg0;
this.anIntArray465[local1] += arg1;
@ -1844,7 +1844,7 @@ public final class GlModel extends Model {
@OriginalMember(owner = "client!td", name = "b", descriptor = "()I")
@Override
public final int method4549() {
public final int getMaxY() {
if (!this.vertexBuffer.valid) {
this.method4108();
}
@ -3412,7 +3412,7 @@ public final class GlModel extends Model {
@OriginalMember(owner = "client!td", name = "d", descriptor = "(I)V")
@Override
public final void method4574(@OriginalArg(0) int arg0) {
public final void rotateX(@OriginalArg(0) int arg0) {
@Pc(3) int local3 = MathUtils.sin[arg0];
@Pc(7) int local7 = MathUtils.cos[arg0];
for (@Pc(9) int local9 = 0; local9 < this.vertexCount; local9++) {

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

@ -17,7 +17,7 @@ public class GlobalConfig {
public static final BigInteger RSA_EXPONENT = new BigInteger("65537");
// Server IP
public static String DEFAULT_HOSTNAME = "test.2009scape.org";
public static String DEFAULT_HOSTNAME = "play.2009scape.org";
// Jagex had this at 40000+id
public static int DEFAULT_PORT = 43594;
@ -44,4 +44,6 @@ public class GlobalConfig {
public static boolean ANIMATED_SD_BACKGROUND = true;
public static boolean USE_TWEENING = true;
public static int JS5_RESPONSE_TIMEOUT = 5000;
}

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

@ -18,19 +18,19 @@ public final class Js5 {
private Js5Index aClass70_2 = null;
@OriginalMember(owner = "client!ve", name = "i", descriptor = "Lclient!v;")
private final Js5ResourceProvider aClass14_1;
private final Js5ResourceProvider provider;
@OriginalMember(owner = "client!ve", name = "c", descriptor = "Z")
private final boolean aBoolean296;
private final boolean discardPacked;
@OriginalMember(owner = "client!ve", name = "g", descriptor = "Z")
private final boolean aBoolean297;
private final boolean discardUnpacked;
@OriginalMember(owner = "client!ve", name = "<init>", descriptor = "(Lclient!v;ZZ)V")
public Js5(@OriginalArg(0) Js5ResourceProvider arg0, @OriginalArg(1) boolean arg1, @OriginalArg(2) boolean arg2) {
this.aClass14_1 = arg0;
this.aBoolean296 = arg1;
this.aBoolean297 = arg2;
public Js5(@OriginalArg(0) Js5ResourceProvider provider, @OriginalArg(1) boolean arg1, @OriginalArg(2) boolean arg2) {
this.provider = provider;
this.discardPacked = arg1;
this.discardUnpacked = arg2;
}
@OriginalMember(owner = "client!km", name = "a", descriptor = "(ILjava/lang/Object;Z)[B")
@ -69,7 +69,7 @@ public final class Js5 {
@OriginalMember(owner = "client!ve", name = "a", descriptor = "(II)I")
private int method4476(@OriginalArg(0) int arg0) {
if (this.method4492(arg0)) {
return this.anObjectArray32[arg0] == null ? this.aClass14_1.method524(arg0) : 100;
return this.anObjectArray32[arg0] == null ? this.provider.method524(arg0) : 100;
} else {
return 0;
}
@ -138,7 +138,7 @@ public final class Js5 {
@OriginalMember(owner = "client!ve", name = "c", descriptor = "(I)Z")
private boolean method4484() {
if (this.aClass70_2 == null) {
this.aClass70_2 = this.aClass14_1.method521();
this.aClass70_2 = this.provider.method521();
if (this.aClass70_2 == null) {
return false;
}
@ -205,7 +205,7 @@ public final class Js5 {
}
}
@Pc(64) byte[] local64 = method2696(this.anObjectArrayArray1[arg0][arg2], false);
if (this.aBoolean297) {
if (this.discardUnpacked) {
this.anObjectArrayArray1[arg0][arg2] = null;
if (this.aClass70_2.anIntArray270[arg0] == 1) {
this.anObjectArrayArray1[arg0] = null;
@ -261,7 +261,7 @@ public final class Js5 {
@OriginalMember(owner = "client!ve", name = "d", descriptor = "(II)V")
private void method4493(@OriginalArg(1) int arg0) {
this.aClass14_1.method522(arg0);
this.provider.method522(arg0);
}
@OriginalMember(owner = "client!ve", name = "a", descriptor = "(IZ[I)Z")
@ -308,7 +308,7 @@ public final class Js5 {
System.out.println("T3 - " + (arg1 != null) + "," + arg0 + "," + local114.length + "," + Static71.method1442(local114, local114.length) + "," + Static71.method1442(local114, local114.length - 2) + "," + this.aClass70_2.anIntArray268[arg0] + "," + this.aClass70_2.anInt2911);
local140 = new byte[] { 0 };
}
if (this.aBoolean296) {
if (this.discardPacked) {
this.anObjectArray32[arg0] = null;
}
@Pc(213) int local213;
@ -354,7 +354,7 @@ public final class Js5 {
} else {
local320 = local25[local252];
}
if (this.aBoolean297) {
if (this.discardUnpacked) {
local53[local320] = local282[local252];
} else {
local53[local320] = Static33.method869(local282[local252]);
@ -366,7 +366,7 @@ public final class Js5 {
} else {
local213 = local25[0];
}
if (this.aBoolean297) {
if (this.discardUnpacked) {
local53[local213] = local140;
} else {
local53[local213] = Static33.method869(local140);
@ -383,10 +383,10 @@ public final class Js5 {
@OriginalMember(owner = "client!ve", name = "b", descriptor = "(ZI)V")
private void method4496(@OriginalArg(1) int arg0) {
if (this.aBoolean296) {
this.anObjectArray32[arg0] = this.aClass14_1.method525(arg0);
if (this.discardPacked) {
this.anObjectArray32[arg0] = this.provider.method525(arg0);
} else {
this.anObjectArray32[arg0] = Static33.method869(this.aClass14_1.method525(arg0));
this.anObjectArray32[arg0] = Static33.method869(this.provider.method525(arg0));
}
}

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

@ -92,14 +92,14 @@ public final class Js5CacheQueue implements Runnable {
}
if (local31.secondaryKey == (long) arg1 && local31.aClass49_3 == arg0 && local31.anInt824 == 2) {
local9.aByteArray11 = local31.aByteArray11;
local9.aBoolean226 = false;
local9.incomplete = false;
return local9;
}
local31 = (Js5CacheRequest) this.aClass16_6.method797();
}
}
local9.aByteArray11 = arg0.read(arg1);
local9.aBoolean226 = false;
local9.incomplete = false;
local9.aBoolean225 = true;
return local9;
}
@ -130,7 +130,7 @@ public final class Js5CacheQueue implements Runnable {
} catch (@Pc(83) Exception local83) {
TracingException.report(null, local83);
}
local19.aBoolean226 = false;
local19.incomplete = false;
}
}
}

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

@ -17,8 +17,8 @@ public final class Js5CacheRequest extends Js5Request {
@OriginalMember(owner = "client!c", name = "b", descriptor = "(Z)[B")
@Override
public final byte[] method3554() {
if (this.aBoolean226) {
public final byte[] getData() {
if (this.incomplete) {
throw new RuntimeException();
}
return this.aByteArray11;
@ -27,6 +27,6 @@ public final class Js5CacheRequest extends Js5Request {
@OriginalMember(owner = "client!c", name = "a", descriptor = "(Z)I")
@Override
public final int method3553() {
return this.aBoolean226 ? 0 : 100;
return this.incomplete ? 0 : 100;
}
}

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

@ -115,15 +115,15 @@ public final class Js5CachedResourceProvider extends Js5ResourceProvider {
return this.aClass70_1;
}
if (this.aClass3_Sub2_Sub5_1 == null) {
if (this.aClass73_2.method2326()) {
if (this.aClass73_2.isUrgentRequestQueueFull()) {
return null;
}
this.aClass3_Sub2_Sub5_1 = this.aClass73_2.method2330(255, (byte) 0, this.anInt576, true);
this.aClass3_Sub2_Sub5_1 = this.aClass73_2.read(255, (byte) 0, this.anInt576, true);
}
if (this.aClass3_Sub2_Sub5_1.aBoolean226) {
if (this.aClass3_Sub2_Sub5_1.incomplete) {
return null;
}
@Pc(52) byte[] local52 = this.aClass3_Sub2_Sub5_1.method3554();
@Pc(52) byte[] local52 = this.aClass3_Sub2_Sub5_1.getData();
if (this.aClass3_Sub2_Sub5_1 instanceof Js5CacheRequest) {
try {
if (local52 == null) {
@ -135,10 +135,10 @@ public final class Js5CachedResourceProvider extends Js5ResourceProvider {
}
} catch (@Pc(88) RuntimeException local88) {
this.aClass70_1 = null;
if (this.aClass73_2.method2326()) {
if (this.aClass73_2.isUrgentRequestQueueFull()) {
this.aClass3_Sub2_Sub5_1 = null;
} else {
this.aClass3_Sub2_Sub5_1 = this.aClass73_2.method2330(255, (byte) 0, this.anInt576, true);
this.aClass3_Sub2_Sub5_1 = this.aClass73_2.read(255, (byte) 0, this.anInt576, true);
}
return null;
}
@ -151,10 +151,10 @@ public final class Js5CachedResourceProvider extends Js5ResourceProvider {
} catch (@Pc(131) RuntimeException local131) {
this.aClass73_2.method2327();
this.aClass70_1 = null;
if (this.aClass73_2.method2326()) {
if (this.aClass73_2.isUrgentRequestQueueFull()) {
this.aClass3_Sub2_Sub5_1 = null;
} else {
this.aClass3_Sub2_Sub5_1 = this.aClass73_2.method2330(255, (byte) 0, this.anInt576, true);
this.aClass3_Sub2_Sub5_1 = this.aClass73_2.read(255, (byte) 0, this.anInt576, true);
}
return null;
}
@ -288,7 +288,7 @@ public final class Js5CachedResourceProvider extends Js5ResourceProvider {
return;
}
for (@Pc(331) Js5Request local331 = (Js5Request) this.aClass133_1.head(); local331 != null; local331 = (Js5Request) this.aClass133_1.next()) {
if (!local331.aBoolean226) {
if (!local331.incomplete) {
if (local331.aBoolean227) {
if (!local331.aBoolean225) {
throw new RuntimeException();
@ -317,17 +317,17 @@ public final class Js5CachedResourceProvider extends Js5ResourceProvider {
@OriginalMember(owner = "client!bg", name = "a", descriptor = "(III)Lclient!il;")
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) {
if (local13 != null && arg0 == 0 && !local13.aBoolean225 && local13.incomplete) {
local13.unlink();
local13 = null;
}
if (local13 == null) {
if (arg0 == 0) {
if (this.aClass49_2 == null || this.aByteArray9[arg1] == -1) {
if (this.aClass73_2.method2326()) {
if (this.aClass73_2.isUrgentRequestQueueFull()) {
return null;
}
local13 = this.aClass73_2.method2330(this.anInt576, (byte) 2, arg1, true);
local13 = this.aClass73_2.read(this.anInt576, (byte) 2, arg1, true);
} else {
local13 = this.aClass80_2.method2471(this.aClass49_2, arg1);
}
@ -346,16 +346,16 @@ public final class Js5CachedResourceProvider extends Js5ResourceProvider {
if (this.aClass73_2.method2316()) {
return null;
}
local13 = this.aClass73_2.method2330(this.anInt576, (byte) 2, arg1, false);
local13 = this.aClass73_2.read(this.anInt576, (byte) 2, arg1, false);
} else {
throw new RuntimeException();
}
this.aClass133_1.put(local13, (long) arg1);
}
if (local13.aBoolean226) {
if (local13.incomplete) {
return null;
}
@Pc(161) byte[] local161 = local13.method3554();
@Pc(161) byte[] local161 = local13.getData();
@Pc(199) int local199;
@Pc(252) Js5NetRequest local252;
if (!(local13 instanceof Js5CacheRequest)) {
@ -374,8 +374,8 @@ public final class Js5CachedResourceProvider extends Js5ResourceProvider {
} catch (@Pc(225) RuntimeException local225) {
this.aClass73_2.method2327();
local13.unlink();
if (local13.aBoolean225 && !this.aClass73_2.method2326()) {
local252 = this.aClass73_2.method2330(this.anInt576, (byte) 2, arg1, true);
if (local13.aBoolean225 && !this.aClass73_2.isUrgentRequestQueueFull()) {
local252 = this.aClass73_2.read(this.anInt576, (byte) 2, arg1, true);
this.aClass133_1.put(local252, (long) arg1);
}
return null;
@ -421,8 +421,8 @@ public final class Js5CachedResourceProvider extends Js5ResourceProvider {
} catch (@Pc(437) Exception local437) {
this.aByteArray9[arg1] = -1;
local13.unlink();
if (local13.aBoolean225 && !this.aClass73_2.method2326()) {
local252 = this.aClass73_2.method2330(this.anInt576, (byte) 2, arg1, true);
if (local13.aBoolean225 && !this.aClass73_2.isUrgentRequestQueueFull()) {
local252 = this.aClass73_2.read(this.anInt576, (byte) 2, arg1, true);
this.aClass133_1.put(local252, (long) arg1);
}
return null;
@ -468,7 +468,7 @@ public final class Js5CachedResourceProvider extends Js5ResourceProvider {
if (local9 == null) {
return null;
} else {
@Pc(17) byte[] local17 = local9.method3554();
@Pc(17) byte[] local17 = local9.getData();
local9.unlink();
return local17;
}

64
client/src/main/java/rt4/Js5MasterIndex.java
View file

@ -9,63 +9,63 @@ import org.openrs2.deob.annotation.Pc;
public final class Js5MasterIndex {
@OriginalMember(owner = "client!al", name = "a", descriptor = "Lclient!wa;")
private Buffer aClass3_Sub15_1;
private Buffer buffer;
@OriginalMember(owner = "client!al", name = "s", descriptor = "[Lclient!bg;")
private Js5CachedResourceProvider[] aClass14_Sub1Array1;
private Js5CachedResourceProvider[] resourceProviders;
@OriginalMember(owner = "client!al", name = "j", descriptor = "Lclient!k;")
private final Js5CacheQueue aClass80_1;
private final Js5CacheQueue cacheQueue;
@OriginalMember(owner = "client!al", name = "f", descriptor = "Lclient!jb;")
private final Js5NetQueue aClass73_1;
private final Js5NetQueue netQueue;
@OriginalMember(owner = "client!al", name = "c", descriptor = "Lclient!pm;")
private Js5NetRequest aClass3_Sub2_Sub5_Sub2_1;
private Js5NetRequest request;
@OriginalMember(owner = "client!al", name = "<init>", descriptor = "(Lclient!jb;Lclient!k;)V")
public Js5MasterIndex(@OriginalArg(0) Js5NetQueue arg0, @OriginalArg(1) Js5CacheQueue arg1) {
this.aClass80_1 = arg1;
this.aClass73_1 = arg0;
if (!this.aClass73_1.method2326()) {
this.aClass3_Sub2_Sub5_Sub2_1 = this.aClass73_1.method2330(255, (byte) 0, 255, true);
this.cacheQueue = arg1;
this.netQueue = arg0;
if (!this.netQueue.isUrgentRequestQueueFull()) {
this.request = this.netQueue.read(255, (byte) 0, 255, true);
}
}
@OriginalMember(owner = "client!al", name = "b", descriptor = "(I)Z")
public final boolean isReady() {
if (this.aClass3_Sub15_1 != null) {
if (this.buffer != null) {
return true;
}
if (this.aClass3_Sub2_Sub5_Sub2_1 == null) {
if (this.aClass73_1.method2326()) {
if (this.request == null) {
if (this.netQueue.isUrgentRequestQueueFull()) {
return false;
}
this.aClass3_Sub2_Sub5_Sub2_1 = this.aClass73_1.method2330(255, (byte) 0, 255, true);
this.request = this.netQueue.read(255, (byte) 0, 255, true);
}
if (this.aClass3_Sub2_Sub5_Sub2_1.aBoolean226) {
if (this.request.incomplete) {
return false;
} else {
this.aClass3_Sub15_1 = new Buffer(this.aClass3_Sub2_Sub5_Sub2_1.method3554());
this.aClass14_Sub1Array1 = new Js5CachedResourceProvider[(this.aClass3_Sub15_1.data.length - 5) / 8];
this.buffer = new Buffer(this.request.getData());
this.resourceProviders = new Js5CachedResourceProvider[(this.buffer.data.length - 5) / 8];
return true;
}
}
@OriginalMember(owner = "client!al", name = "a", descriptor = "(B)V")
public final void method179() {
if (this.aClass14_Sub1Array1 == null) {
if (this.resourceProviders == null) {
return;
}
@Pc(13) int local13;
for (local13 = 0; local13 < this.aClass14_Sub1Array1.length; local13++) {
if (this.aClass14_Sub1Array1[local13] != null) {
this.aClass14_Sub1Array1[local13].method537();
for (local13 = 0; local13 < this.resourceProviders.length; local13++) {
if (this.resourceProviders[local13] != null) {
this.resourceProviders[local13].method537();
}
}
for (local13 = 0; local13 < this.aClass14_Sub1Array1.length; local13++) {
if (this.aClass14_Sub1Array1[local13] != null) {
this.aClass14_Sub1Array1[local13].method534();
for (local13 = 0; local13 < this.resourceProviders.length; local13++) {
if (this.resourceProviders[local13] != null) {
this.resourceProviders[local13].method534();
}
}
}
@ -77,20 +77,20 @@ public final class Js5MasterIndex {
@OriginalMember(owner = "client!al", name = "a", descriptor = "(Lclient!ge;IIZLclient!ge;)Lclient!bg;")
private Js5CachedResourceProvider method188(@OriginalArg(0) Cache arg0, @OriginalArg(2) int arg1, @OriginalArg(4) Cache arg2) {
if (this.aClass3_Sub15_1 == null) {
if (this.buffer == null) {
throw new RuntimeException();
}
this.aClass3_Sub15_1.offset = arg1 * 8 + 5;
if (this.aClass3_Sub15_1.data.length <= this.aClass3_Sub15_1.offset) {
this.buffer.offset = arg1 * 8 + 5;
if (this.buffer.data.length <= this.buffer.offset) {
throw new RuntimeException();
} else if (this.aClass14_Sub1Array1[arg1] == null) {
@Pc(56) int local56 = this.aClass3_Sub15_1.g4();
@Pc(61) int local61 = this.aClass3_Sub15_1.g4();
@Pc(75) Js5CachedResourceProvider local75 = new Js5CachedResourceProvider(arg1, arg0, arg2, this.aClass73_1, this.aClass80_1, local56, local61, true);
this.aClass14_Sub1Array1[arg1] = local75;
} else if (this.resourceProviders[arg1] == null) {
@Pc(56) int local56 = this.buffer.g4();
@Pc(61) int local61 = this.buffer.g4();
@Pc(75) Js5CachedResourceProvider local75 = new Js5CachedResourceProvider(arg1, arg0, arg2, this.netQueue, this.cacheQueue, local56, local61, true);
this.resourceProviders[arg1] = local75;
return local75;
} else {
return this.aClass14_Sub1Array1[arg1];
return this.resourceProviders[arg1];
}
}
}

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

@ -129,7 +129,7 @@ public final class Js5NetQueue {
this.aClass3_Sub2_Sub5_Sub2_2.aClass3_Sub15_7.offset += local235;
if (this.aClass3_Sub2_Sub5_Sub2_2.aClass3_Sub15_7.offset == local228) {
this.aClass3_Sub2_Sub5_Sub2_2.method4365();
this.aClass3_Sub2_Sub5_Sub2_2.aBoolean226 = false;
this.aClass3_Sub2_Sub5_Sub2_2.incomplete = false;
this.aClass3_Sub2_Sub5_Sub2_2 = null;
} else if (this.aClass3_Sub2_Sub5_Sub2_2.anInt4617 == 512) {
this.aClass3_Sub2_Sub5_Sub2_2.anInt4617 = 0;
@ -253,7 +253,7 @@ public final class Js5NetQueue {
}
@OriginalMember(owner = "client!jb", name = "a", descriptor = "(ZLclient!ma;I)V")
public final void loggedOut(@OriginalArg(0) boolean arg0, @OriginalArg(1) BufferedSocket arg1) {
public final void start(@OriginalArg(0) boolean arg0, @OriginalArg(1) BufferedSocket arg1) {
if (this.aClass95_1 != null) {
try {
this.aClass95_1.close();
@ -301,7 +301,7 @@ public final class Js5NetQueue {
}
@OriginalMember(owner = "client!jb", name = "c", descriptor = "(B)Z")
public final boolean method2326() {
public final boolean isUrgentRequestQueueFull() {
return this.method2328() >= 20;
}
@ -330,7 +330,7 @@ public final class Js5NetQueue {
}
@OriginalMember(owner = "client!jb", name = "a", descriptor = "(IIBIZ)Lclient!pm;")
public final Js5NetRequest method2330(@OriginalArg(1) int arg0, @OriginalArg(2) byte arg1, @OriginalArg(3) int arg2, @OriginalArg(4) boolean arg3) {
public final Js5NetRequest read(@OriginalArg(1) int arg0, @OriginalArg(2) byte arg1, @OriginalArg(3) int arg2, @OriginalArg(4) boolean arg3) {
@Pc(7) Js5NetRequest local7 = new Js5NetRequest();
@Pc(14) long local14 = (long) (arg2 + (arg0 << 16));
local7.aBoolean225 = arg3;

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

@ -23,8 +23,8 @@ public final class Js5NetRequest extends Js5Request {
@OriginalMember(owner = "client!pm", name = "b", descriptor = "(Z)[B")
@Override
public final byte[] method3554() {
if (this.aBoolean226 || this.aClass3_Sub15_7.offset < this.aClass3_Sub15_7.data.length - this.aByte16) {
public final byte[] getData() {
if (this.incomplete || this.aClass3_Sub15_7.offset < this.aClass3_Sub15_7.data.length - this.aByte16) {
throw new RuntimeException();
}
return this.aClass3_Sub15_7.data;

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

@ -13,11 +13,11 @@ public abstract class Js5Request extends SecondaryNode {
public boolean aBoolean227;
@OriginalMember(owner = "client!il", name = "P", descriptor = "Z")
public volatile boolean aBoolean226 = true;
public volatile boolean incomplete = true;
@OriginalMember(owner = "client!il", name = "a", descriptor = "(Z)I")
public abstract int method3553();
@OriginalMember(owner = "client!il", name = "b", descriptor = "(Z)[B")
public abstract byte[] method3554();
public abstract byte[] getData();
}

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

@ -151,10 +151,10 @@ public final class Loc extends Entity {
@OriginalMember(owner = "client!dc", 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) {
public final void render(@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) {
@Pc(3) Entity local3 = this.method1049();
if (local3 != null) {
local3.method4546(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, this.aClass47_Sub1_2);
local3.render(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, this.aClass47_Sub1_2);
}
}
@ -336,7 +336,7 @@ public final class Loc extends Entity {
@OriginalMember(owner = "client!dc", name = "b", descriptor = "()I")
@Override
public final int method4549() {
public final int getMaxY() {
return this.anInt1311;
}
}

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

@ -697,7 +697,7 @@ public final class LocType {
}
if (arg2 == 4 && arg0 > 3) {
local351.method4123();
local351.method4575(45, 0, -45);
local351.translate(45, 0, -45);
}
@Pc(374) int local374 = arg0 & 0x3;
if (local374 == 1) {
@ -721,7 +721,7 @@ public final class LocType {
local351.resize(this.resizeX, this.resizeY, this.resizeZ);
}
if (this.translateX != 0 || this.translateY != 0 || this.translateZ != 0) {
local351.method4575(this.translateX, this.translateY, this.translateZ);
local351.translate(this.translateX, this.translateY, this.translateZ);
}
if (local10 != local351.method4094()) {
local351.method4105(local10);

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

@ -29,7 +29,7 @@ public abstract class Model extends Entity {
public abstract int method4550();
@OriginalMember(owner = "client!ak", name = "b", descriptor = "()I")
public abstract int method4549();
public abstract int getMaxY();
@OriginalMember(owner = "client!ak", name = "d", descriptor = "()Z")
protected abstract boolean method4551();
@ -249,7 +249,7 @@ public abstract class Model extends Entity {
public abstract void method4563();
@OriginalMember(owner = "client!ak", name = "c", descriptor = "(I)V")
public abstract void method4564(@OriginalArg(0) int arg0);
public abstract void rotateZ(@OriginalArg(0) int arg0);
@OriginalMember(owner = "client!ak", name = "a", descriptor = "(Lclient!cl;ILclient!cl;IIIIZ[I)V")
public final void method4565(@OriginalArg(0) AnimFrameset arg0, @OriginalArg(1) int arg1, @OriginalArg(2) AnimFrameset arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) boolean arg7, @OriginalArg(8) int[] arg8) {
@ -340,13 +340,13 @@ public abstract class Model extends Entity {
if (arg5 != 0) {
@Pc(120) int local120 = (int) (Math.atan2((double) (local84 - local91), (double) arg5) * 325.95D) & 0x7FF;
if (local120 != 0) {
this.method4574(local120);
this.rotateX(local120);
}
}
if (arg4 != 0) {
@Pc(140) int local140 = (int) (Math.atan2((double) (local105 - local98), (double) arg4) * 325.95D) & 0x7FF;
if (local140 != 0) {
this.method4564(local140);
this.rotateZ(local140);
}
}
@Pc(149) int local149 = local24 + local77;
@ -355,12 +355,12 @@ public abstract class Model extends Entity {
}
local149 = (local149 >> 1) - arg2;
if (local149 != 0) {
this.method4575(0, local149, 0);
this.translate(0, local149, 0);
}
}
@OriginalMember(owner = "client!ak", name = "d", descriptor = "(I)V")
public abstract void method4574(@OriginalArg(0) int arg0);
public abstract void rotateX(@OriginalArg(0) int arg0);
@OriginalMember(owner = "client!ak", name = "a", descriptor = "(IIIII)V")
@Override
@ -368,13 +368,13 @@ public abstract class Model extends Entity {
}
@OriginalMember(owner = "client!ak", name = "c", descriptor = "(III)V")
public abstract void method4575(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2);
public abstract void translate(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2);
@OriginalMember(owner = "client!ak", name = "k", descriptor = "()I")
public abstract int method4576();
@OriginalMember(owner = "client!ak", name = "a", descriptor = "(IIIIIIIIJILclient!ga;)V")
public abstract 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);
public abstract void render(@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);
@OriginalMember(owner = "client!ak", name = "a", descriptor = "(I[IIIIZI[I)V")
protected abstract void method4577(@OriginalArg(0) int arg0, @OriginalArg(1) int[] arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) boolean arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int[] arg7);

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

@ -18,82 +18,94 @@ public final class Npc extends PathingEntity {
@OriginalMember(owner = "client!km", name = "b", descriptor = "()I")
@Override
public final int method4549() {
public final int getMaxY() {
return this.anInt3413;
}
@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) {
public final void render(@OriginalArg(0) int orientation, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int x, @OriginalArg(6) int z, @OriginalArg(7) int y, @OriginalArg(8) long arg8, @OriginalArg(9) int arg9, @OriginalArg(10) ParticleSystem arg10) {
if (this.type == null) {
return;
}
@Pc(29) SeqType local29 = this.seqId != -1 && this.anInt3420 == 0 ? SeqTypeList.get(this.seqId) : null;
@Pc(53) SeqType local53 = this.anInt3366 == -1 || this.anInt3366 == this.method2681().idleAnimationId && local29 != null ? null : SeqTypeList.get(this.anInt3366);
@Pc(74) Model local74 = this.type.getBodyModel(this.aClass147Array3, this.anInt3388, this.anInt3407, this.anInt3373, this.anInt3360, this.anInt3425, local53, this.anInt3396, local29);
if (local74 == null) {
@Pc(74) Model body = this.type.getBodyModel(this.aClass147Array3, this.anInt3388, this.anInt3407, this.anInt3373, this.anInt3360, this.anInt3425, local53, this.anInt3396, local29);
if (body == null) {
return;
}
this.anInt3413 = local74.method4549();
this.anInt3413 = body.getMaxY();
@Pc(84) NpcType local84 = this.type;
if (local84.multiNpcs != null) {
local84 = local84.getMultiNpc();
}
@Pc(140) Model local140;
@Pc(140) Model model;
if (Preferences.characterShadowsOn && local84.shadow) {
local140 = ShadowModelList.method1043(this.type.aByte13, this.aBoolean171, local53 == null ? local29 : local53, this.xFine, this.type.aShort23, this.zFine, this.type.aShort24, this.type.soze, local74, arg0, local53 == null ? this.anInt3425 : this.anInt3407, this.anInt3424, this.type.aByte12);
model = ShadowModelList.method1043(this.type.aByte13, this.aBoolean171, local53 == null ? local29 : local53, this.xFine, this.type.aShort23, this.zFine, this.type.aShort24, this.type.size, body, orientation, 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();
GlRenderer.disableDepthMask();
GlRenderer.method4152(local144, local146 - 150.0F);
local140.method4546(0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, -1L, arg9, this.aClass47_Sub1_5);
model.render(0, arg1, arg2, arg3, arg4, x, z, y, -1L, arg9, this.aClass47_Sub1_5);
GlRenderer.enableDepthMask();
GlRenderer.method4152(local144, local146);
} else {
local140.method4546(0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, -1L, arg9, this.aClass47_Sub1_5);
model.render(0, arg1, arg2, arg3, arg4, x, z, y, -1L, arg9, this.aClass47_Sub1_5);
}
}
this.method2687(local74);
this.method2685(local74, arg0);
local140 = null;
this.method2687(body);
this.method2685(body, orientation);
model = null;
if (this.spotAnimId != -1 && this.anInt3399 != -1) {
@Pc(211) SpotAnimType local211 = SpotAnimTypeList.get(this.spotAnimId);
local140 = local211.method1319(this.anInt3418, this.anInt3399, this.anInt3361);
if (local140 != null) {
local140.method4575(0, -this.spotAnimY, 0);
if (local211.aBoolean100) {
@Pc(211) SpotAnimType spotAnimType = SpotAnimTypeList.get(this.spotAnimId);
model = spotAnimType.constructModel(this.anInt3418, this.anInt3399, this.anInt3361);
if (model != null) {
model.translate(0, -this.spotAnimY, 0);
if (spotAnimType.aBoolean100) {
if (Static101.anInt2640 != 0) {
local140.method4574(Static101.anInt2640);
model.rotateX(Static101.anInt2640);
}
if (Static102.anInt2680 != 0) {
local140.method4564(Static102.anInt2680);
model.rotateZ(Static102.anInt2680);
}
if (Static62.anInt1938 != 0) {
local140.method4575(0, Static62.anInt1938, 0);
model.translate(0, Static62.anInt1938, 0);
}
}
}
}
if (!GlRenderer.enabled) {
if (local140 != null) {
local74 = ((SoftwareModel) local74).method4588(local140);
if (model != null) {
body = ((SoftwareModel) body).method4588(model);
}
if (this.type.soze == 1) {
local74.aBoolean303 = true;
if (this.type.size == 1) {
body.aBoolean303 = true;
}
local74.method4546(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, this.aClass47_Sub1_5);
body.render(orientation, arg1, arg2, arg3, arg4, x, z, y, arg8, arg9, this.aClass47_Sub1_5);
return;
}
if (this.type.soze == 1) {
local74.aBoolean303 = true;
if (this.type.size == 1) {
body.aBoolean303 = true;
}
local74.method4546(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, this.aClass47_Sub1_5);
if (local140 != null) {
if (this.type.soze == 1) {
local140.aBoolean303 = true;
body.render(orientation, arg1, arg2, arg3, arg4, x, z, y, arg8, arg9, this.aClass47_Sub1_5);
if (model != null) {
if (this.type.size == 1) {
model.aBoolean303 = true;
}
local140.method4546(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, this.aClass47_Sub1_5);
model.render(orientation, arg1, arg2, arg3, arg4, x, z, y, arg8, arg9, this.aClass47_Sub1_5);
}
}
@ -124,7 +136,7 @@ public final class Npc extends PathingEntity {
}
@OriginalMember(owner = "client!km", name = "a", descriptor = "(ILclient!me;)V")
public final void method2698(@OriginalArg(1) NpcType arg0) {
public final void setNpcType(@OriginalArg(1) NpcType arg0) {
this.type = arg0;
if (this.aClass47_Sub1_5 != null) {
this.aClass47_Sub1_5.method1646();

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

@ -51,7 +51,7 @@ public final class NpcType {
public boolean aBoolean183 = true;
@OriginalMember(owner = "client!me", name = "a", descriptor = "I")
public int soze = 1;
public int size = 1;
@OriginalMember(owner = "client!me", name = "q", descriptor = "Z")
public boolean aBoolean181 = true;
@ -217,10 +217,10 @@ public final class NpcType {
}
@OriginalMember(owner = "client!me", name = "a", descriptor = "([Lclient!ub;IBIIIILclient!tk;ILclient!tk;)Lclient!ak;")
public final Model getBodyModel(@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) {
public final Model getBodyModel(@OriginalArg(0) Class147[] seqs, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5, @OriginalArg(7) SeqType seqType1, @OriginalArg(8) int arg7, @OriginalArg(9) SeqType seqType2) {
if (this.multiNpcs != null) {
@Pc(13) NpcType local13 = this.getMultiNpc();
return local13 == null ? null : local13.getBodyModel(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
return local13 == null ? null : local13.getBodyModel(seqs, arg1, arg2, arg3, arg4, arg5, seqType1, arg7, seqType2);
}
@Pc(40) Model local40 = (Model) NpcTypeList.aClass99_18.get((long) this.id);
@Pc(46) boolean local46;
@ -342,15 +342,15 @@ public final class NpcType {
@Pc(721) boolean local721 = false;
@Pc(723) boolean local723 = false;
@Pc(725) boolean local725 = false;
local173 = arg0 == null ? 0 : arg0.length;
local173 = seqs == null ? 0 : seqs.length;
for (local235 = 0; local235 < local173; local235++) {
if (arg0[local235] != null) {
@Pc(753) SeqType local753 = SeqTypeList.get(arg0[local235].anInt5396);
if (seqs[local235] != null) {
@Pc(753) SeqType local753 = SeqTypeList.get(seqs[local235].anInt5396);
if (local753.frames != null) {
Static146.aClass144Array1[local235] = local753;
local207 = arg0[local235].anInt5398;
local207 = seqs[local235].anInt5398;
local46 = true;
local200 = arg0[local235].anInt5399;
local200 = seqs[local235].anInt5399;
local214 = local753.frames[local200];
Static6.aClass3_Sub2_Sub7Array1[local235] = Static72.getAnimFrameset(local214 >>> 16);
local214 &= 0xFFFF;
@ -362,7 +362,7 @@ public final class NpcType {
}
if ((local753.tween || client.applyTweening) && local207 != -1 && local753.frames.length > local207) {
Static71.anIntArray147[local235] = local753.anIntArray474[local200];
Static214.anIntArray492[local235] = arg0[local235].anInt5404;
Static214.anIntArray492[local235] = seqs[local235].anInt5404;
local228 = local753.frames[local207];
Static131.aClass3_Sub2_Sub7Array5[local235] = Static72.getAnimFrameset(local228 >>> 16);
local228 &= 0xFFFF;
@ -380,7 +380,7 @@ public final class NpcType {
}
}
}
if (!local46 && arg8 == null && arg6 == null) {
if (!local46 && seqType2 == null && seqType1 == null) {
@Pc(933) Model local933 = local40.method4572(true, true, true);
if (this.anInt3729 != 128 || this.anInt3731 != 128) {
local933.resize(this.anInt3729, this.anInt3731, this.anInt3729);
@ -393,19 +393,19 @@ public final class NpcType {
@Pc(962) AnimFrameset local962 = null;
@Pc(964) AnimFrameset local964 = null;
@Pc(1040) int local1040;
if (arg8 != null) {
local235 = arg8.frames[arg5];
if (seqType2 != null) {
local235 = seqType2.frames[arg5];
local228 = local235 >>> 16;
local235 &= 0xFFFF;
local962 = Static72.getAnimFrameset(local228);
if (local962 != null) {
local723 |= local962.isColorTransformed(local235);
local721 |= local962.isAlphaTransformed(local235);
local725 |= arg8.aBoolean278;
local725 |= seqType2.aBoolean278;
}
if ((arg8.tween || client.applyTweening) && arg3 != -1 && arg8.frames.length > arg3) {
local200 = arg8.anIntArray474[arg5];
local221 = arg8.frames[arg3];
if ((seqType2.tween || client.applyTweening) && arg3 != -1 && seqType2.frames.length > arg3) {
local200 = seqType2.anIntArray474[arg5];
local221 = seqType2.frames[arg3];
local1040 = local221 >>> 16;
local221 &= 0xFFFF;
if (local228 == local1040) {
@ -424,19 +424,19 @@ public final class NpcType {
@Pc(1088) AnimFrameset local1088 = null;
local300 = 0;
@Pc(1092) AnimFrameset local1092 = null;
if (arg6 != null) {
local228 = arg6.frames[arg2];
if (seqType1 != null) {
local228 = seqType1.frames[arg2];
local324 = local228 >>> 16;
local228 &= 0xFFFF;
local1088 = Static72.getAnimFrameset(local324);
if (local1088 != null) {
local723 |= local1088.isColorTransformed(local228);
local721 |= local1088.isAlphaTransformed(local228);
local725 |= arg6.aBoolean278;
local725 |= seqType1.aBoolean278;
}
if ((arg6.tween || client.applyTweening) && arg1 != -1 && arg1 < arg6.frames.length) {
local300 = arg6.anIntArray474[arg2];
local1040 = arg6.frames[arg1];
if ((seqType1.tween || client.applyTweening) && arg1 != -1 && arg1 < seqType1.frames.length) {
local300 = seqType1.anIntArray474[arg2];
local1040 = seqType1.frames[arg1];
local318 = local1040 >>> 16;
local1040 &= 0xFFFF;
if (local318 == local324) {
@ -459,11 +459,11 @@ public final class NpcType {
local330 <<= 0x1;
}
if (local962 != null && local1088 != null) {
local1218.method4570(local962, local235, local964, local221, arg4 - 1, local200, local1088, local228, local1092, local1040, arg7 - 1, local300, arg8.aBooleanArray123, arg8.aBoolean278 | arg6.aBoolean278);
local1218.method4570(local962, local235, local964, local221, arg4 - 1, local200, local1088, local228, local1092, local1040, arg7 - 1, local300, seqType2.aBooleanArray123, seqType2.aBoolean278 | seqType1.aBoolean278);
} else if (local962 != null) {
local1218.method4558(local962, local235, local964, local221, arg4 - 1, local200, arg8.aBoolean278);
local1218.method4558(local962, local235, local964, local221, arg4 - 1, local200, seqType2.aBoolean278);
} else if (local1088 != null) {
local1218.method4558(local1088, local228, local1092, local1040, arg7 - 1, local300, arg6.aBoolean278);
local1218.method4558(local1088, local228, local1092, local1040, arg7 - 1, local300, seqType1.aBoolean278);
}
for (local318 = 0; local318 < local173; local318++) {
Static6.aClass3_Sub2_Sub7Array1[local318] = null;
@ -571,7 +571,7 @@ public final class NpcType {
} else if (arg0 == 2) {
this.name = arg1.gjstr();
} else if (arg0 == 12) {
this.soze = arg1.g1();
this.size = arg1.g1();
} else if (arg0 >= 30 && arg0 < 35) {
this.ops[arg0 - 30] = arg1.gjstr();
if (this.ops[arg0 - 30].equalsIgnoreCase(LocalizedText.HIDDEN)) {

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

@ -28,7 +28,7 @@ public class NpcTypeList {
if (local10 != null) {
return local10;
}
@Pc(26) byte[] local26 = archive.getFile(Static60.method1447(arg0), Static179.method3322(arg0));
@Pc(26) byte[] local26 = archive.getFile(method1447(arg0), method3322(arg0));
local10 = new NpcType();
local10.id = arg0;
if (local26 != null) {
@ -59,4 +59,14 @@ public class NpcTypeList {
aClass99_18.clean(5);
headModels.clean(5);
}
@OriginalMember(owner = "client!em", name = "a", descriptor = "(II)I")
public static int method1447(@OriginalArg(0) int arg0) {
return arg0 >>> 7;
}
@OriginalMember(owner = "client!oe", name = "a", descriptor = "(IZ)I")
public static int method3322(@OriginalArg(0) int arg0) {
return arg0 & 0x7F;
}
}

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

@ -24,17 +24,17 @@ public final class ObjStack extends Entity {
@OriginalMember(owner = "client!uj", 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) {
public final void render(@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) {
@Pc(16) Model local16 = ObjTypeList.get(this.anInt5555).getModel(-1, 0, null, this.anInt5550, 0);
if (local16 != null) {
local16.method4546(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10);
this.anInt5553 = local16.method4549();
local16.render(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10);
this.anInt5553 = local16.getMaxY();
}
}
@OriginalMember(owner = "client!uj", name = "b", descriptor = "()I")
@Override
public final int method4549() {
public final int getMaxY() {
return this.anInt5553;
}
}

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

@ -389,11 +389,11 @@ public abstract class PathingEntity extends Entity {
@Pc(245) int local245 = local201 <= local87 ? local201 : local87;
Static101.anInt2640 = (int) (Math.atan2((double) (local212 - local231), (double) local27) * 325.95D) & 0x7FF;
if (Static101.anInt2640 != 0) {
arg0.method4574(Static101.anInt2640);
arg0.rotateX(Static101.anInt2640);
}
Static102.anInt2680 = (int) (Math.atan2((double) (local245 - local238), (double) local24) * 325.95D) & 0x7FF;
if (Static102.anInt2680 != 0) {
arg0.method4564(Static102.anInt2680);
arg0.rotateZ(Static102.anInt2680);
}
Static62.anInt1938 = local224 + local87;
if (local201 + local134 < Static62.anInt1938) {
@ -401,7 +401,7 @@ public abstract class PathingEntity extends Entity {
}
Static62.anInt1938 = (Static62.anInt1938 >> 1) - this.anInt3424;
if (Static62.anInt1938 != 0) {
arg0.method4575(0, Static62.anInt1938, 0);
arg0.translate(0, Static62.anInt1938, 0);
}
}
@ -521,10 +521,10 @@ public abstract class PathingEntity extends Entity {
this.anInt3383 += this.anInt3355;
if (this.anInt3383 != 0) {
local101 = this.anInt3383 >> 5 & 0x7FF;
local106 = arg0.method4549() / 2;
arg0.method4575(0, -local106, 0);
arg0.method4564(local101);
arg0.method4575(0, local106, 0);
local106 = arg0.getMaxY() / 2;
arg0.translate(0, -local106, 0);
arg0.rotateZ(local101);
arg0.translate(0, local106, 0);
}
if (local28 != this.anInt3367) {
this.anInt3367 = local28;
@ -612,10 +612,10 @@ public abstract class PathingEntity extends Entity {
return;
}
local101 = this.anInt3427 >> 5 & 0x7FF;
local106 = arg0.method4549() / 2;
arg0.method4575(0, -local106, 0);
arg0.method4574(local101);
arg0.method4575(0, local106, 0);
local106 = arg0.getMaxY() / 2;
arg0.translate(0, -local106, 0);
arg0.rotateX(local101);
arg0.translate(0, local106, 0);
}
@OriginalMember(owner = "client!fe", name = "b", descriptor = "(I)I")

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

@ -156,7 +156,7 @@ public final class Player extends PathingEntity {
@OriginalMember(owner = "client!e", name = "c", descriptor = "(B)I")
@Override
public final int getSize() {
return this.appearance == null || this.appearance.anInt2492 == -1 ? super.getSize() : NpcTypeList.get(this.appearance.anInt2492).soze;
return this.appearance == null || this.appearance.anInt2492 == -1 ? super.getSize() : NpcTypeList.get(this.appearance.anInt2492).size;
}
@OriginalMember(owner = "client!e", name = "b", descriptor = "(I)I")
@ -266,7 +266,7 @@ public final class Player extends PathingEntity {
@OriginalMember(owner = "client!e", 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) {
public final void render(@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.appearance == null) {
return;
}
@ -292,7 +292,7 @@ public final class Player extends PathingEntity {
if (local76 == null) {
return;
}
this.anInt3413 = local76.method4549();
this.anInt3413 = local76.getMaxY();
@Pc(184) Model local184;
if (Preferences.characterShadowsOn && (this.appearance.anInt2492 == -1 || NpcTypeList.get(this.appearance.anInt2492).shadow)) {
local184 = ShadowModelList.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);
@ -301,11 +301,11 @@ public final class Player extends PathingEntity {
@Pc(190) float local190 = GlRenderer.method4166();
GlRenderer.disableDepthMask();
GlRenderer.method4152(local188, local190 - 150.0F);
local184.method4546(0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, -1L, arg9, null);
local184.render(0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, -1L, arg9, null);
GlRenderer.enableDepthMask();
GlRenderer.method4152(local188, local190);
} else {
local184.method4546(0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, -1L, arg9, null);
local184.render(0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, -1L, arg9, null);
}
}
if (PlayerList.self == this) {
@ -343,18 +343,18 @@ public final class Player extends PathingEntity {
local184 = null;
if (!this.aBoolean98 && this.spotAnimId != -1 && this.anInt3399 != -1) {
@Pc(471) SpotAnimType local471 = SpotAnimTypeList.get(this.spotAnimId);
local184 = local471.method1319(this.anInt3418, this.anInt3399, this.anInt3361);
local184 = local471.constructModel(this.anInt3418, this.anInt3399, this.anInt3361);
if (local184 != null) {
local184.method4575(0, -this.spotAnimY, 0);
local184.translate(0, -this.spotAnimY, 0);
if (local471.aBoolean100) {
if (Static101.anInt2640 != 0) {
local184.method4574(Static101.anInt2640);
local184.rotateX(Static101.anInt2640);
}
if (Static102.anInt2680 != 0) {
local184.method4564(Static102.anInt2680);
local184.rotateZ(Static102.anInt2680);
}
if (Static62.anInt1938 != 0) {
local184.method4575(0, Static62.anInt1938, 0);
local184.translate(0, Static62.anInt1938, 0);
}
}
}
@ -370,7 +370,7 @@ public final class Player extends PathingEntity {
} else {
local515 = (Model) this.attachment;
}
local515.method4575(this.anInt3379 - this.xFine, this.anInt3406 + -this.anInt3424, this.anInt3426 - this.zFine);
local515.translate(this.anInt3379 - this.xFine, this.anInt3406 + -this.anInt3424, this.anInt3426 - this.zFine);
if (this.anInt3400 == 512) {
local515.method4578();
} else if (this.anInt3400 == 1024) {
@ -382,10 +382,10 @@ public final class Player extends PathingEntity {
}
if (GlRenderer.enabled) {
local76.aBoolean303 = true;
local76.method4546(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, this.aClass47_Sub1_5);
local76.render(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, this.aClass47_Sub1_5);
if (local184 != null) {
local184.aBoolean303 = true;
local184.method4546(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, this.aClass47_Sub1_5);
local184.render(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, this.aClass47_Sub1_5);
}
} else {
if (local184 != null) {
@ -395,7 +395,7 @@ public final class Player extends PathingEntity {
local76 = ((SoftwareModel) local76).method4588(local515);
}
local76.aBoolean303 = true;
local76.method4546(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, this.aClass47_Sub1_5);
local76.render(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, this.aClass47_Sub1_5);
}
if (local515 == null) {
return;
@ -407,7 +407,7 @@ public final class Player extends PathingEntity {
} else if (this.anInt3400 == 1536) {
local515.method4578();
}
local515.method4575(this.xFine - this.anInt3379, -this.anInt3406 + this.anInt3424, this.zFine - this.anInt3426);
local515.translate(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")
@ -422,14 +422,14 @@ public final class Player extends PathingEntity {
return;
}
if (!GlRenderer.enabled) {
local46.method4546(0, arg10, arg12, arg9, arg8, arg4, arg13, arg7, -1L, arg5, arg0);
local46.render(0, arg10, arg12, arg9, arg8, arg4, arg13, arg7, -1L, arg5, arg0);
return;
}
@Pc(52) float local52 = GlRenderer.method4179();
@Pc(54) float local54 = GlRenderer.method4166();
GlRenderer.disableDepthMask();
GlRenderer.method4152(local52, local54 - 150.0F);
local46.method4546(0, arg10, arg12, arg9, arg8, arg4, arg13, arg7, -1L, arg5, arg0);
local46.render(0, arg10, arg12, arg9, arg8, arg4, arg13, arg7, -1L, arg5, arg0);
GlRenderer.enableDepthMask();
GlRenderer.method4152(local52, local54);
}
@ -469,7 +469,7 @@ public final class Player extends PathingEntity {
@OriginalMember(owner = "client!e", name = "b", descriptor = "()I")
@Override
public final int method4549() {
public final int getMaxY() {
return this.anInt3413;
}
}

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

@ -122,11 +122,11 @@ public final class ProjAnim extends Entity {
@OriginalMember(owner = "client!ra", name = "b", descriptor = "(I)Lclient!ak;")
private Model method3703() {
@Pc(14) SpotAnimType local14 = SpotAnimTypeList.get(this.anInt4816);
@Pc(24) Model local24 = local14.method1319(this.anInt4798, this.anInt4820, this.anInt4796);
@Pc(24) Model local24 = local14.constructModel(this.anInt4798, this.anInt4820, this.anInt4796);
if (local24 == null) {
return null;
} else {
local24.method4574(this.anInt4818);
local24.rotateX(this.anInt4818);
return local24;
}
}
@ -197,17 +197,17 @@ public final class ProjAnim extends Entity {
@OriginalMember(owner = "client!ra", 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) {
public final void render(@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) {
@Pc(3) Model local3 = this.method3703();
if (local3 != null) {
local3.method4546(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, this.aClass47_Sub1_6);
this.anInt4814 = local3.method4549();
local3.render(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, this.aClass47_Sub1_6);
this.anInt4814 = local3.getMaxY();
}
}
@OriginalMember(owner = "client!ra", name = "b", descriptor = "()I")
@Override
public final int method4549() {
public final int getMaxY() {
return this.anInt4814;
}
}

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

@ -3080,8 +3080,8 @@ public class Protocol {
if (local14.type.hasAreaSound()) {
AreaSoundManager.remove(local14);
}
local14.method2698(NpcTypeList.get(inboundBuffer.g2le()));
local14.method2692(local14.type.soze);
local14.setNpcType(NpcTypeList.get(inboundBuffer.g2le()));
local14.method2692(local14.type.size);
local14.anInt3365 = local14.type.basId;
if (local14.type.hasAreaSound()) {
AreaSoundManager.add(local14.movementQueueZ[0], null, 0, local14, local14.movementQueueX[0], Player.level, null);
@ -3128,7 +3128,7 @@ public class Protocol {
if (NpcList.npcs[local30].type.hasAreaSound()) {
AreaSoundManager.remove(NpcList.npcs[local30]);
}
NpcList.npcs[local30].method2698(null);
NpcList.npcs[local30].setNpcType(null);
NpcList.npcs[local30] = null;
}
}
@ -3232,7 +3232,7 @@ public class Protocol {
extendedIds[extendedCount++] = local14;
}
@Pc(105) int local105 = inboundBuffer.gBits(5);
local37.method2698(NpcTypeList.get(inboundBuffer.gBits(14)));
local37.setNpcType(NpcTypeList.get(inboundBuffer.gBits(14)));
if (local105 > 15) {
local105 -= 32;
}
@ -3240,7 +3240,7 @@ public class Protocol {
if (local124 > 15) {
local124 -= 32;
}
local37.method2692(local37.type.soze);
local37.method2692(local37.type.size);
local37.anInt3365 = local37.type.basId;
local37.anInt3376 = local37.type.anInt3733;
if (local37.anInt3376 == 0) {

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

@ -549,7 +549,7 @@ public final class RawModel extends Entity {
@OriginalMember(owner = "client!gb", 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) {
public final void render(@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) {
}
@OriginalMember(owner = "client!gb", name = "g", descriptor = "()V")
@ -1244,7 +1244,7 @@ public final class RawModel extends Entity {
@OriginalMember(owner = "client!gb", name = "b", descriptor = "()I")
@Override
public final int method4549() {
public final int getMaxY() {
if (!this.aBoolean121) {
this.method1664();
}

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

@ -115,11 +115,11 @@ public class ShadowModelList {
if (local386 == null) {
local33 = local33.method4560(true, true, true);
local33.resize((local115 - local384) / 2, 128, (local130 - local126) / 2);
local33.method4575((local384 + local115) / 2, 0, (local126 + local130) / 2);
local33.translate((local384 + local115) / 2, 0, (local126 + local130) / 2);
} else {
local33 = local33.method4560(!local386.isAlphaTransformed(arg10), !local386.isColorTransformed(arg10), true);
local33.resize((local115 - local384) / 2, 128, (local130 - local126) / 2);
local33.method4575((local384 + local115) / 2, 0, (local126 + local130) / 2);
local33.translate((local384 + local115) / 2, 0, (local126 + local130) / 2);
local33.method4555(local386, arg10);
}
if (arg9 != 0) {

13
client/src/main/java/rt4/SoftwareModel.java
View file

@ -506,7 +506,7 @@ public final class SoftwareModel extends Model {
@OriginalMember(owner = "client!w", name = "b", descriptor = "()I")
@Override
public final int method4549() {
public final int getMaxY() {
if (!this.boundsValid) {
this.method4592();
}
@ -581,7 +581,7 @@ public final class SoftwareModel extends Model {
@OriginalMember(owner = "client!w", name = "d", descriptor = "(I)V")
@Override
public final void method4574(@OriginalArg(0) int arg0) {
public final void rotateX(@OriginalArg(0) int arg0) {
@Pc(3) int local3 = MathUtils.sin[arg0];
@Pc(7) int local7 = MathUtils.cos[arg0];
for (@Pc(9) int local9 = 0; local9 < this.vertexCount; local9++) {
@ -607,7 +607,7 @@ public final class SoftwareModel extends Model {
@OriginalMember(owner = "client!w", name = "c", descriptor = "(I)V")
@Override
public final void method4564(@OriginalArg(0) int arg0) {
public final void rotateZ(@OriginalArg(0) int arg0) {
@Pc(3) int local3 = MathUtils.sin[arg0];
@Pc(7) int local7 = MathUtils.cos[arg0];
for (@Pc(9) int local9 = 0; local9 < this.vertexCount; local9++) {
@ -620,7 +620,7 @@ public final class SoftwareModel extends Model {
@OriginalMember(owner = "client!w", 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) {
public final void render(@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.boundsValid) {
this.method4592();
}
@ -766,7 +766,8 @@ public final class SoftwareModel extends Model {
}
try {
this.method4590(local154, local190, arg8, local24 - local53, local38 - local53 + 2, arg10);
} catch (@Pc(713) Exception local713) {
} catch (@Pc(713) Exception ex) {
ex.printStackTrace();
}
}
@ -2337,7 +2338,7 @@ public final class SoftwareModel extends Model {
@OriginalMember(owner = "client!w", name = "c", descriptor = "(III)V")
@Override
public final void method4575(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
public final void translate(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
for (@Pc(1) int local1 = 0; local1 < this.vertexCount; local1++) {
this.anIntArray528[local1] += arg0;
this.anIntArray527[local1] += arg1;

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

@ -69,26 +69,26 @@ public final class SpotAnim extends Entity {
@Pc(8) SpotAnimType local8 = SpotAnimTypeList.get(this.anInt596);
@Pc(26) Model local26;
if (this.aBoolean41) {
local26 = local8.method1319(-1, -1, 0);
local26 = local8.constructModel(-1, -1, 0);
} else {
local26 = local8.method1319(this.anInt602, this.anInt593, this.anInt607);
local26 = local8.constructModel(this.anInt602, this.anInt593, this.anInt607);
}
return local26 == null ? null : local26;
}
@OriginalMember(owner = "client!bh", name = "b", descriptor = "()I")
@Override
public final int method4549() {
public final int getMaxY() {
return this.anInt603;
}
@OriginalMember(owner = "client!bh", 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) {
public final void render(@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) {
@Pc(7) Model local7 = this.method552();
if (local7 != null) {
local7.method4546(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, this.aClass47_Sub1_1);
this.anInt603 = local7.method4549();
local7.render(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, this.aClass47_Sub1_1);
this.anInt603 = local7.getMaxY();
}
}

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

@ -100,7 +100,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) {
public final Model constructModel(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2) {
@Pc(13) Model local13 = (Model) SpotAnimTypeList.models.get((long) this.id);
if (local13 == null) {
@Pc(28) RawModel local28 = Static77.create(SpotAnimTypeList.modelsArchive, this.modelId);

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

@ -213,36 +213,36 @@ public class Sprites {
}
@OriginalMember(owner = "client!cg", name = "a", descriptor = "(ILclient!ve;)V")
public static void load(@OriginalArg(1) Js5 arg0) {
mapfunctions = SpriteLoader.loadSoftwareSprites(mapfunctionId, arg0);
hitmarks = SpriteLoader.loadAlphaSprites(hitmarksId, arg0);
hitbars = SpriteLoader.loadAlphaSprites(hitbarId, arg0);
headiconPks = SpriteLoader.loadAlphaSprites(headiconsPkId, arg0);
headiconPrayers = SpriteLoader.loadAlphaSprites(headiconsPrayerId, arg0);
headhints = SpriteLoader.loadAlphaSprites(hintHeadId, arg0);
mapmarkhints = SpriteLoader.loadAlphaSprites(hintMapMarkId, arg0);
mapflags = SpriteLoader.loadSprites(mapflagId, arg0);
crosses = SpriteLoader.method2580(crossId, arg0);
mapdots = SpriteLoader.method2580(mapdotsId, arg0);
scrollbars = SpriteLoader.loadIndexedSprites(arg0, scrollbarId);
nameIcons = SpriteLoader.loadIndexedSprites(arg0, nameIconsId);
public static void load(@OriginalArg(1) Js5 archive) {
mapfunctions = SpriteLoader.loadSoftwareSprites(mapfunctionId, archive);
hitmarks = SpriteLoader.loadAlphaSprites(hitmarksId, archive);
hitbars = SpriteLoader.loadAlphaSprites(hitbarId, archive);
headiconPks = SpriteLoader.loadAlphaSprites(headiconsPkId, archive);
headiconPrayers = SpriteLoader.loadAlphaSprites(headiconsPrayerId, archive);
headhints = SpriteLoader.loadAlphaSprites(hintHeadId, archive);
mapmarkhints = SpriteLoader.loadAlphaSprites(hintMapMarkId, archive);
mapflags = SpriteLoader.loadSprites(mapflagId, archive);
crosses = SpriteLoader.method2580(crossId, archive);
mapdots = SpriteLoader.method2580(mapdotsId, archive);
scrollbars = SpriteLoader.loadIndexedSprites(archive, scrollbarId);
nameIcons = SpriteLoader.loadIndexedSprites(archive, nameIconsId);
Fonts.p11Full.setNameIcons(nameIcons, null);
Fonts.p12Full.setNameIcons(nameIcons, null);
Fonts.b12Full.setNameIcons(nameIcons, null);
if (GlRenderer.enabled) {
floorShadows = SpriteLoader.loadSoftwareIndexedSprites(floorShadowsId, arg0);
floorShadows = SpriteLoader.loadSoftwareIndexedSprites(floorShadowsId, archive);
for (@Pc(101) int local101 = 0; local101 < floorShadows.length; local101++) {
floorShadows[local101].trim();
}
}
@Pc(124) SoftwareSprite compass = SpriteLoader.loadSoftwareSprite(0, arg0, compassId);
@Pc(124) SoftwareSprite compass = SpriteLoader.loadSoftwareSprite(0, archive, compassId);
compass.trim();
if (GlRenderer.enabled) {
Static106.compass = new GlSprite(compass);
} else {
Static106.compass = compass;
}
@Pc(143) SoftwareSprite[] local143 = SpriteLoader.loadSoftwareSprites(hintMapEdgeId, arg0);
@Pc(143) SoftwareSprite[] local143 = SpriteLoader.loadSoftwareSprites(hintMapEdgeId, archive);
@Pc(145) int local145;
for (local145 = 0; local145 < local143.length; local145++) {
local143[local145].trim();

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

@ -23,7 +23,7 @@ public final class Static109 {
@Pc(18) int local18 = Static33.anIntArray79[local7];
@Pc(22) Npc local22 = NpcList.npcs[local18];
if (local22 != null) {
Static263.method4514(local22.type.soze, local22);
Static263.method4514(local22.type.size, local22);
}
}
}

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

@ -66,7 +66,7 @@ public final class Static127 {
}
Static33.anIntArray79[Static272.anInt5214++] = local96;
} else {
NpcList.npcs[local96].method2698(null);
NpcList.npcs[local96].setNpcType(null);
NpcList.npcs[local96] = null;
}
}

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

@ -41,13 +41,13 @@ 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 = NpcTypeList.get(local74.g2());
if (NpcList.npcs[local97] == null && (local148.aByte10 & 0x1) > 0 && local107 == Static41.anInt1316 && local125 >= 0 && local148.soze + local125 < 104 && local142 >= 0 && local142 + local148.soze < 104) {
if (NpcList.npcs[local97] == null && (local148.aByte10 & 0x1) > 0 && local107 == Static41.anInt1316 && local125 >= 0 && local148.size + local125 < 104 && local142 >= 0 && local142 + local148.size < 104) {
NpcList.npcs[local97] = new Npc();
@Pc(198) Npc local198 = NpcList.npcs[local97];
Static33.anIntArray79[Static272.anInt5214++] = local97;
local198.lastSeenLoop = client.loop;
local198.method2698(local148);
local198.method2692(local198.type.soze);
local198.setNpcType(local148);
local198.method2692(local198.type.size);
local198.anInt3400 = local198.anInt3381 = PathingEntity.ANGLES[local198.type.aByte11];
local198.anInt3376 = local198.type.anInt3733;
if (local198.anInt3376 == 0) {

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

@ -208,7 +208,7 @@ public final class Static164 {
}
@Pc(176) int local176 = MathUtils.cos[local5.xAngle2d] * local145 >> 16;
@Pc(185) int local185 = MathUtils.sin[local5.xAngle2d] * local145 >> 16;
local60.method4571(local5.yAngle2d, local5.zAngle2d, local5.xAngle2d, local5.xOffset2d, local185 + local5.yOffset2d - local60.method4549() / 2, local5.yOffset2d + local176, -1L);
local60.method4571(local5.yAngle2d, local5.zAngle2d, local5.xAngle2d, local5.xOffset2d, local185 + local5.yOffset2d - local60.getMaxY() / 2, local5.yOffset2d + local176, -1L);
if (arg4 >= 1) {
local133.method303(1);
if (arg4 >= 2) {

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

@ -151,14 +151,14 @@ public final class Static176 {
@Pc(597) Player local597;
if (local133 == 1) {
@Pc(421) Npc local421 = NpcList.npcs[local140];
if ((local421.type.soze & 0x1) == 0 && (local421.xFine & 0x7F) == 0 && (local421.zFine & 0x7F) == 0 || (local421.type.soze & 0x1) == 1 && (local421.xFine & 0x7F) == 64 && (local421.zFine & 0x7F) == 64) {
local479 = local421.xFine + 64 - local421.type.soze * 64;
local240 = local421.zFine - (local421.type.soze - 1) * 64;
if ((local421.type.size & 0x1) == 0 && (local421.xFine & 0x7F) == 0 && (local421.zFine & 0x7F) == 0 || (local421.type.size & 0x1) == 1 && (local421.xFine & 0x7F) == 64 && (local421.zFine & 0x7F) == 64) {
local479 = local421.xFine + 64 - local421.type.size * 64;
local240 = local421.zFine - (local421.type.size - 1) * 64;
for (local493 = 0; local493 < Static272.anInt5214; local493++) {
local502 = NpcList.npcs[Static33.anIntArray79[local493]];
local514 = local502.xFine + 64 - local502.type.soze * 64;
local526 = local502.zFine + 64 - local502.type.soze * 64;
if (local502 != null && local421 != local502 && local514 >= local479 && local421.type.soze - (local514 - local479 >> 7) >= local502.type.soze && local240 <= local526 && local502.type.soze <= local421.type.soze - (local526 - local240 >> 7)) {
local514 = local502.xFine + 64 - local502.type.size * 64;
local526 = local502.zFine + 64 - local502.type.size * 64;
if (local502 != null && local421 != local502 && local514 >= local479 && local421.type.size - (local514 - local479 >> 7) >= local502.type.size && local240 <= local526 && local502.type.size <= local421.type.size - (local526 - local240 >> 7)) {
Static246.method4240(local502.type, local47, Static33.anIntArray79[local493], local147);
}
}
@ -166,7 +166,7 @@ public final class Static176 {
local597 = PlayerList.players[PlayerList.ids[local493]];
local514 = local597.xFine + 64 - local597.getSize() * 64;
local526 = local597.zFine + 64 - local597.getSize() * 64;
if (local597 != null && local514 >= local479 && local597.getSize() <= local421.type.soze - (local514 - local479 >> 7) && local526 >= local240 && local597.getSize() <= local421.type.soze - (local526 - local240 >> 7)) {
if (local597 != null && local514 >= local479 && local597.getSize() <= local421.type.size - (local514 - local479 >> 7) && local526 >= local240 && local597.getSize() <= local421.type.size - (local526 - local240 >> 7)) {
Static217.method3767(PlayerList.ids[local493], local147, local597, local47);
}
}
@ -180,9 +180,9 @@ public final class Static176 {
local240 = local688.zFine + 64 - local688.getSize() * 64;
for (local493 = 0; local493 < Static272.anInt5214; local493++) {
local502 = NpcList.npcs[Static33.anIntArray79[local493]];
local514 = local502.xFine + 64 - local502.type.soze * 64;
local526 = local502.zFine + 64 - local502.type.soze * 64;
if (local502 != null && local514 >= local479 && local502.type.soze <= local688.getSize() - (local514 - local479 >> 7) && local526 >= local240 && local502.type.soze <= local688.getSize() - (local526 - local240 >> 7)) {
local514 = local502.xFine + 64 - local502.type.size * 64;
local526 = local502.zFine + 64 - local502.type.size * 64;
if (local502 != null && local514 >= local479 && local502.type.size <= local688.getSize() - (local514 - local479 >> 7) && local526 >= local240 && local502.type.size <= local688.getSize() - (local526 - local240 >> 7)) {
Static246.method4240(local502.type, local47, Static33.anIntArray79[local493], local147);
}
}

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

@ -1,6 +1,5 @@
package rt4;
import org.openrs2.deob.annotation.OriginalArg;
import org.openrs2.deob.annotation.OriginalMember;
public final class Static179 {
@ -20,9 +19,4 @@ public final class Static179 {
@OriginalMember(owner = "client!oe", name = "o", descriptor = "Lclient!na;")
public static final JagString aClass100_807 = JagString.parse("n");
@OriginalMember(owner = "client!oe", name = "a", descriptor = "(IZ)I")
public static int method3322(@OriginalArg(0) int arg0) {
return arg0 & 0x7F;
}
}

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

@ -6,10 +6,7 @@ import org.openrs2.deob.annotation.Pc;
public final class Static18 {
@OriginalMember(owner = "client!bh", name = "M", descriptor = "Z")
public static boolean loaded;
@OriginalMember(owner = "client!bh", name = "t", descriptor = "I")
@OriginalMember(owner = "client!bh", name = "t", descriptor = "I")
public static int anInt588 = 0;
@OriginalMember(owner = "client!bh", name = "C", descriptor = "Lclient!na;")

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

@ -160,7 +160,7 @@ public final class Static247 {
Static120.method2388(var22.anInt3049, Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local27, local18, local21);
}
}
var22.aClass8_5.method4546(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, var22.anInt3048 - Static149.anInt3555, var22.anInt3051 - Static123.anInt3947, var22.anInt3044 - Static217.anInt4903, var22.key, local24, null);
var22.aClass8_5.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, var22.anInt3048 - Static149.anInt3555, var22.anInt3051 - Static123.anInt3947, var22.anInt3044 - Static217.anInt4903, var22.key, local24, null);
}
for (local65 = 0; local65 < local153.anInt662; local65++) {
var25 = local153.aClass31Array1[local65];
@ -168,7 +168,7 @@ public final class Static247 {
if (GlRenderer.enabled) {
Static120.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21);
}
var25.aClass8_4.method4546(var25.anInt1714, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, var25.anInt1699 - Static149.anInt3555, var25.anInt1706 - Static123.anInt3947, var25.anInt1703 - Static217.anInt4903, var25.aLong56, local24, null);
var25.aClass8_4.render(var25.anInt1714, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, var25.anInt1699 - Static149.anInt3555, var25.anInt1706 - Static123.anInt3947, var25.anInt1703 - Static217.anInt4903, var25.aLong56, local24, null);
}
}
if (GlRenderer.enabled) {
@ -202,7 +202,7 @@ public final class Static247 {
if (GlRenderer.enabled) {
Static120.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21);
}
local549.aClass8_1.method4546(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local549.anInt732 - Static149.anInt3555, local549.anInt733 - Static123.anInt3947, local549.anInt736 - Static217.anInt4903, local549.aLong26, local24, null);
local549.aClass8_1.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local549.anInt732 - Static149.anInt3555, local549.anInt733 - Static123.anInt3947, local549.anInt736 - Static217.anInt4903, local549.aLong26, local24, null);
if (GlRenderer.enabled && local549.aBoolean49) {
GlRenderer.method4159(local33);
}
@ -250,16 +250,16 @@ public final class Static247 {
if (GlRenderer.enabled) {
Static120.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21);
}
local616.aClass8_5.method4546(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local616.anInt3048 - Static149.anInt3555, local616.anInt3051 - Static123.anInt3947, local616.anInt3044 - Static217.anInt4903, local616.key, local24, null);
local616.aClass8_5.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local616.anInt3048 - Static149.anInt3555, local616.anInt3051 - Static123.anInt3947, local616.anInt3044 - Static217.anInt4903, local616.key, local24, null);
}
if ((local616.anInt3052 & local65) != 0 && !Static260.method3850(local27, local18, local21, local616.anInt3052)) {
if (GlRenderer.enabled) {
Static120.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21);
}
local616.aClass8_6.method4546(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local616.anInt3048 - Static149.anInt3555, local616.anInt3051 - Static123.anInt3947, local616.anInt3044 - Static217.anInt4903, local616.key, local24, null);
local616.aClass8_6.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local616.anInt3048 - Static149.anInt3555, local616.anInt3051 - Static123.anInt3947, local616.anInt3044 - Static217.anInt4903, local616.key, local24, null);
}
}
if (local619 != null && !Static276.method4611(local27, local18, local21, local619.aClass8_3.method4549())) {
if (local619 != null && !Static276.method4611(local27, local18, local21, local619.aClass8_3.getMaxY())) {
if (GlRenderer.enabled) {
GlRenderer.method4159(local33 - 0.5F);
}
@ -267,7 +267,7 @@ public final class Static247 {
if (GlRenderer.enabled) {
Static120.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21);
}
local619.aClass8_3.method4546(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local619.anInt1390 + local619.anInt1394 - Static149.anInt3555, local619.anInt1391 - Static123.anInt3947, local619.anInt1393 + local619.anInt1392 - Static217.anInt4903, local619.key, local24, null);
local619.aClass8_3.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local619.anInt1390 + local619.anInt1394 - Static149.anInt3555, local619.anInt1391 - Static123.anInt3947, local619.anInt1393 + local619.anInt1392 - Static217.anInt4903, local619.key, local24, null);
} else if (local619.anInt1395 == 256) {
local894 = local619.anInt1390 - Static149.anInt3555;
local899 = local619.anInt1391 - Static123.anInt3947;
@ -288,12 +288,12 @@ public final class Static247 {
if (GlRenderer.enabled) {
Static120.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21);
}
local619.aClass8_3.method4546(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local894 + local619.anInt1394, local899, local904 + local619.anInt1392, local619.key, local24, null);
local619.aClass8_3.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local894 + local619.anInt1394, local899, local904 + local619.anInt1392, local619.key, local24, null);
} else if (local619.aClass8_2 != null) {
if (GlRenderer.enabled) {
Static120.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21);
}
local619.aClass8_2.method4546(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local894, local899, local904, local619.key, local24, null);
local619.aClass8_2.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local894, local899, local904, local619.key, local24, null);
}
}
if (GlRenderer.enabled) {
@ -309,7 +309,7 @@ public final class Static247 {
if (GlRenderer.enabled) {
Static120.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21);
}
local1001.aClass8_1.method4546(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local1001.anInt732 - Static149.anInt3555, local1001.anInt733 - Static123.anInt3947, local1001.anInt736 - Static217.anInt4903, local1001.aLong26, local24, null);
local1001.aClass8_1.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local1001.anInt732 - Static149.anInt3555, local1001.anInt733 - Static123.anInt3947, local1001.anInt736 - Static217.anInt4903, local1001.aLong26, local24, null);
if (GlRenderer.enabled && local1001.aBoolean49) {
GlRenderer.method4159(local33);
}
@ -320,13 +320,13 @@ public final class Static247 {
Static120.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21);
}
if (local1064.aClass8_7 != null) {
local1064.aClass8_7.method4546(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local1064.anInt3064 - Static149.anInt3555, local1064.anInt3057 - Static123.anInt3947, local1064.anInt3061 - Static217.anInt4903, local1064.aLong108, local24, null);
local1064.aClass8_7.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local1064.anInt3064 - Static149.anInt3555, local1064.anInt3057 - Static123.anInt3947, local1064.anInt3061 - Static217.anInt4903, local1064.aLong108, local24, null);
}
if (local1064.aClass8_8 != null) {
local1064.aClass8_8.method4546(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local1064.anInt3064 - Static149.anInt3555, local1064.anInt3057 - Static123.anInt3947, local1064.anInt3061 - Static217.anInt4903, local1064.aLong108, local24, null);
local1064.aClass8_8.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local1064.anInt3064 - Static149.anInt3555, local1064.anInt3057 - Static123.anInt3947, local1064.anInt3061 - Static217.anInt4903, local1064.aLong108, local24, null);
}
if (local1064.aClass8_9 != null) {
local1064.aClass8_9.method4546(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local1064.anInt3064 - Static149.anInt3555, local1064.anInt3057 - Static123.anInt3947, local1064.anInt3061 - Static217.anInt4903, local1064.aLong108, local24, null);
local1064.aClass8_9.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local1064.anInt3064 - Static149.anInt3555, local1064.anInt3057 - Static123.anInt3947, local1064.anInt3061 - Static217.anInt4903, local1064.aLong108, local24, null);
}
}
}
@ -409,7 +409,7 @@ public final class Static247 {
Static120.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21);
}
}
var22.aClass8_5.method4546(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, var22.anInt3048 - Static149.anInt3555, var22.anInt3051 - Static123.anInt3947, var22.anInt3044 - Static217.anInt4903, var22.key, local24, null);
var22.aClass8_5.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, var22.anInt3048 - Static149.anInt3555, var22.anInt3051 - Static123.anInt3947, var22.anInt3044 - Static217.anInt4903, var22.key, local24, null);
}
local8.anInt663 = 0;
}
@ -492,7 +492,7 @@ public final class Static247 {
}
@Pc(1697) Scenery local1697 = Static25.aClass31Array2[local115];
local1697.anInt1707 = Static13.anInt437;
if (!Static73.method1599(local27, local1697.anInt1701, local1697.anInt1713, local1697.anInt1696, local1697.anInt1698, local1697.aClass8_4.method4549())) {
if (!Static73.method1599(local27, local1697.anInt1701, local1697.anInt1713, local1697.anInt1696, local1697.anInt1698, local1697.aClass8_4.getMaxY())) {
if (GlRenderer.enabled) {
if ((local1697.aLong56 & 0xFC000L) == 147456L) {
Static120.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21);
@ -514,7 +514,7 @@ public final class Static247 {
Static120.method2391(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local1697.anInt1701, local1697.anInt1696, local1697.anInt1713, local1697.anInt1698);
}
}
local1697.aClass8_4.method4546(local1697.anInt1714, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local1697.anInt1699 - Static149.anInt3555, local1697.anInt1706 - Static123.anInt3947, local1697.anInt1703 - Static217.anInt4903, local1697.aLong56, local24, null);
local1697.aClass8_4.render(local1697.anInt1714, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local1697.anInt1699 - Static149.anInt3555, local1697.anInt1706 - Static123.anInt3947, local1697.anInt1703 - Static217.anInt4903, local1697.aLong56, local24, null);
}
for (local894 = local1697.anInt1701; local894 <= local1697.anInt1713; local894++) {
for (local899 = local1697.anInt1696; local899 <= local1697.anInt1698; local899++) {
@ -565,23 +565,23 @@ public final class Static247 {
Static120.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21);
}
if (local1999.aClass8_7 != null) {
local1999.aClass8_7.method4546(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local1999.anInt3064 - Static149.anInt3555, local1999.anInt3057 - Static123.anInt3947 - local1999.anInt3063, local1999.anInt3061 - Static217.anInt4903, local1999.aLong108, local24, null);
local1999.aClass8_7.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local1999.anInt3064 - Static149.anInt3555, local1999.anInt3057 - Static123.anInt3947 - local1999.anInt3063, local1999.anInt3061 - Static217.anInt4903, local1999.aLong108, local24, null);
}
if (local1999.aClass8_8 != null) {
local1999.aClass8_8.method4546(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local1999.anInt3064 - Static149.anInt3555, local1999.anInt3057 - Static123.anInt3947 - local1999.anInt3063, local1999.anInt3061 - Static217.anInt4903, local1999.aLong108, local24, null);
local1999.aClass8_8.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local1999.anInt3064 - Static149.anInt3555, local1999.anInt3057 - Static123.anInt3947 - local1999.anInt3063, local1999.anInt3061 - Static217.anInt4903, local1999.aLong108, local24, null);
}
if (local1999.aClass8_9 != null) {
local1999.aClass8_9.method4546(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local1999.anInt3064 - Static149.anInt3555, local1999.anInt3057 - Static123.anInt3947 - local1999.anInt3063, local1999.anInt3061 - Static217.anInt4903, local1999.aLong108, local24, null);
local1999.aClass8_9.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local1999.anInt3064 - Static149.anInt3555, local1999.anInt3057 - Static123.anInt3947 - local1999.anInt3063, local1999.anInt3061 - Static217.anInt4903, local1999.aLong108, local24, null);
}
}
if (local8.anInt670 != 0) {
@Pc(2109) WallDecor local2109 = local8.aClass24_1;
if (local2109 != null && !Static276.method4611(local27, local18, local21, local2109.aClass8_3.method4549())) {
if (local2109 != null && !Static276.method4611(local27, local18, local21, local2109.aClass8_3.getMaxY())) {
if ((local2109.anInt1395 & local8.anInt670) != 0) {
if (GlRenderer.enabled) {
Static120.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21);
}
local2109.aClass8_3.method4546(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local2109.anInt1390 + local2109.anInt1394 - Static149.anInt3555, local2109.anInt1391 - Static123.anInt3947, local2109.anInt1393 + local2109.anInt1392 - Static217.anInt4903, local2109.key, local24, null);
local2109.aClass8_3.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local2109.anInt1390 + local2109.anInt1394 - Static149.anInt3555, local2109.anInt1391 - Static123.anInt3947, local2109.anInt1393 + local2109.anInt1392 - Static217.anInt4903, local2109.key, local24, null);
} else if (local2109.anInt1395 == 256) {
local65 = local2109.anInt1390 - Static149.anInt3555;
local115 = local2109.anInt1391 - Static123.anInt3947;
@ -601,12 +601,12 @@ public final class Static247 {
if (GlRenderer.enabled) {
Static120.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21);
}
local2109.aClass8_3.method4546(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local65 + local2109.anInt1394, local115, local1332 + local2109.anInt1392, local2109.key, local24, null);
local2109.aClass8_3.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local65 + local2109.anInt1394, local115, local1332 + local2109.anInt1392, local2109.key, local24, null);
} else if (local2109.aClass8_2 != null) {
if (GlRenderer.enabled) {
Static120.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21);
}
local2109.aClass8_2.method4546(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local65, local115, local1332, local2109.key, local24, null);
local2109.aClass8_2.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local65, local115, local1332, local2109.key, local24, null);
}
}
}
@ -616,13 +616,13 @@ public final class Static247 {
if (GlRenderer.enabled) {
Static120.method2388(local2275.anInt3052, Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local27, local18, local21);
}
local2275.aClass8_6.method4546(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local2275.anInt3048 - Static149.anInt3555, local2275.anInt3051 - Static123.anInt3947, local2275.anInt3044 - Static217.anInt4903, local2275.key, local24, null);
local2275.aClass8_6.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local2275.anInt3048 - Static149.anInt3555, local2275.anInt3051 - Static123.anInt3947, local2275.anInt3044 - Static217.anInt4903, local2275.key, local24, null);
}
if ((local2275.anInt3049 & local8.anInt670) != 0 && !Static260.method3850(local27, local18, local21, local2275.anInt3049)) {
if (GlRenderer.enabled) {
Static120.method2388(local2275.anInt3049, Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local27, local18, local21);
}
local2275.aClass8_5.method4546(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local2275.anInt3048 - Static149.anInt3555, local2275.anInt3051 - Static123.anInt3947, local2275.anInt3044 - Static217.anInt4903, local2275.key, local24, null);
local2275.aClass8_5.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local2275.anInt3048 - Static149.anInt3555, local2275.anInt3051 - Static123.anInt3947, local2275.anInt3044 - Static217.anInt4903, local2275.key, local24, null);
}
}
}

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

@ -45,8 +45,4 @@ public final class Static60 {
}
}
@OriginalMember(owner = "client!em", name = "a", descriptor = "(II)I")
public static int method1447(@OriginalArg(0) int arg0) {
return arg0 >>> 7;
}
}

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

@ -40,7 +40,7 @@ public final class Static69 {
for (@Pc(46) int local46 = 0; local46 < local42.anInt662; local46++) {
@Pc(55) Scenery local55 = local42.aClass31Array1[local46];
if ((local55.aLong56 & 0x400000L) == 4194304L) {
@Pc(66) int local66 = local55.aClass8_4.method4549();
@Pc(66) int local66 = local55.aClass8_4.getMaxY();
if (local66 != -32768 && local66 < local34) {
local34 = local66;
}

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

@ -677,7 +677,7 @@ public final class Static87 {
if (local2589 == null) {
Static43.redraw(local30);
} else {
local503 = -local2589.method4549() / 2;
local503 = -local2589.getMaxY() / 2;
}
}
} else if (local30.modelType == 5) {

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

@ -7,10 +7,12 @@ import org.openrs2.deob.annotation.Pc;
public class TitleScreen {
@OriginalMember(owner = "client!cb", name = "cb", descriptor = "Lclient!na;")
public static final JagString aClass100_165 = JagString.parse("titlebg");
@OriginalMember(owner = "client!bh", name = "M", descriptor = "Z")
public static boolean loaded;
@OriginalMember(owner = "client!oi", name = "a", descriptor = "(Lclient!ve;B)V")
public static void load(@OriginalArg(0) Js5 archive) {
if (Static18.loaded) {
if (loaded) {
return;
}
@ -26,14 +28,14 @@ public class TitleScreen {
Static78.titleBg.renderResizedTransparent((GameShell.canvasWidth - width) / 2, 0, width, height);
Static243.logo = Static40.loadIndexedSpriteAutoDetect(Static136.logoId, archive);
Static243.logo.renderTransparent(GameShell.canvasWidth / 2 - Static243.logo.width / 2, 18);
Static18.loaded = true;
loaded = true;
}
@OriginalMember(owner = "client!je", name = "f", descriptor = "(B)V")
public static void clear() {
if (Static18.loaded) {
if (loaded) {
Static243.logo = null;
Static18.loaded = false;
loaded = false;
Static78.titleBg = null;
}
}

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

@ -333,16 +333,16 @@ public final class client extends GameShell {
}
@OriginalMember(owner = "client!al", name = "a", descriptor = "(ZZZIZ)Lclient!ve;")
public static Js5 createJs5(@OriginalArg(0) boolean arg0, @OriginalArg(1) boolean arg1, @OriginalArg(2) boolean arg2, @OriginalArg(3) int arg3) {
@Pc(7) Cache local7 = null;
public static Js5 createJs5(@OriginalArg(0) boolean discardPacked, @OriginalArg(1) boolean arg1, @OriginalArg(2) boolean discardUnpacked, @OriginalArg(3) int archive) {
@Pc(7) Cache cache = null;
if (cacheData != null) {
local7 = new Cache(arg3, cacheData, cacheIndexes[arg3], 1000000);
cache = new Cache(archive, cacheData, cacheIndexes[archive], 1000000);
}
js5Providers[arg3] = js5MasterIndex.getResourceProvider(arg3, masterCache, local7);
js5Providers[archive] = js5MasterIndex.getResourceProvider(archive, masterCache, cache);
if (arg1) {
js5Providers[arg3].prefetchAll();
js5Providers[archive].prefetchAll();
}
return new Js5(js5Providers[arg3], arg0, arg2);
return new Js5(js5Providers[archive], discardPacked, discardUnpacked);
}
@OriginalMember(owner = "client!je", name = "h", descriptor = "(I)V")
@ -1162,7 +1162,7 @@ public final class client extends GameShell {
}
if (js5ConnectState == 4) {
@Pc(296) boolean loggedOut = gameState == 5 || gameState == 10 || gameState == 28;
js5NetQueue.loggedOut(!loggedOut, js5Socket);
js5NetQueue.start(!loggedOut, js5Socket);
js5Socket = null;
js5SocketRequest = null;
js5ConnectState = 0;

234
playground/src/main/java/com/itspazaz/rt4/Playground.java
View file

@ -2,9 +2,30 @@ package com.itspazaz.rt4;
import rt4.*;
import java.awt.image.Raster;
import java.io.IOException;
import java.net.Socket;
public class Playground extends GameShell {
public static Playground instance;
public static BufferedFile cacheMasterIndex;
public static BufferedFile cacheData;
public static BufferedFile uid;
public static BufferedFile[] cacheIndexes = new BufferedFile[28];
public static Cache[] cacheArchives = new Cache[28];
public static Cache masterCache;
public static Js5MasterIndex js5MasterIndex;
public static Js5CachedResourceProvider[] js5Providers = new Js5CachedResourceProvider[28];
public static Js5[] archives = new Js5[28];
public static Js5NetQueue js5NetQueue;
public static Js5CacheQueue js5CacheQueue;
private static PrivilegedRequest js5SocketRequest;
private static BufferedSocket js5Socket;
private static long js5ConnectTime;
public static void main(String[] args) {
instance = new Playground();
instance.startApplication(32, "runescape");
@ -23,23 +44,228 @@ public class Playground extends GameShell {
Keyboard.start(GameShell.canvas);
Mouse.start(GameShell.canvas);
SoftwareRaster.frameBuffer.makeTarget();
try {
if (GameShell.signLink.cacheData != null) {
cacheData = new BufferedFile(GameShell.signLink.cacheData, 5200, 0);
for (int i = 0; i < 28; i++) {
cacheIndexes[i] = new BufferedFile(GameShell.signLink.cacheIndexes[i], 6000, 0);
cacheArchives[i] = new Cache(i, cacheData, cacheIndexes[i], 1000000);
}
cacheMasterIndex = new BufferedFile(GameShell.signLink.cacheMasterIndex, 6000, 0);
masterCache = new Cache(255, cacheData, cacheMasterIndex, 500000);
uid = new BufferedFile(GameShell.signLink.uid, 24, 0);
GameShell.signLink.cacheIndexes = null;
GameShell.signLink.cacheMasterIndex = null;
GameShell.signLink.uid = null;
GameShell.signLink.cacheData = null;
}
} catch (Exception ex) {
ex.printStackTrace();
System.exit(1);
}
js5NetQueue = new Js5NetQueue();
js5CacheQueue = new Js5CacheQueue();
}
public int percentage = 0;
public int state = 0;
public NpcType npcType;
public Npc npc;
@Override
protected void mainLoop() {
Keyboard.loop();
Mouse.loop();
GameShell.frame.setTitle(Keyboard.pressedKeys[Keyboard.KEY_CTRL] ? "pressed" : "not pressed");
js5NetLoop();
if (state == 0) {
LoadingBarAwt.render(null, true, JagString.parse("Connecting to update server"), 1);
if (js5MasterIndex == null) {
js5MasterIndex = new Js5MasterIndex(js5NetQueue, js5CacheQueue);
}
if (js5MasterIndex.isReady()) {
for (int i = 0; i < 28; i++) {
js5Providers[i] = js5MasterIndex.getResourceProvider(i, masterCache, cacheArchives[i]);
archives[i] = new Js5(js5Providers[i], false, false);
}
state++;
}
} else if (state == 1) {
LoadingBarAwt.render(null, true, JagString.parse("Initializing sprites"), 1);
percentage = 0;
for (int i = 0; i < 28; i++) {
percentage += js5Providers[i].getIndexPercentageComplete() * Static170.JS5_ARCHIVE_WEIGHTS[i] / 100;
}
if (percentage == 100) {
Sprites.init(archives[8]);
TitleScreen.init(archives[8]);
Flames.init(archives[8]);
state++;
}
} else if (state == 2) {
LoadingBarAwt.render(null, true, JagString.parse("Preparing fonts"), 1);
int ready = Fonts.getReady(archives[8], archives[13]);
int total = Fonts.getTotal();
if (ready >= total) {
state++;
}
} else if (state == 3) {
LoadingBarAwt.render(null, true, JagString.parse("Preparing title screen"), 1);
int ready = TitleScreen.getReady(archives[8]);
int total = TitleScreen.getTotal();
if (ready >= total) {
state++;
}
} else if (state == 4) {
LoadingBarAwt.render(null, true, JagString.parse("Loading fonts"), 1);
Fonts.load(archives[13], archives[8]);
state++;
} else if (state == 5) {
LoadingBarAwt.render(null, true, JagString.parse("Prefetching"), 1);
percentage = 0;
for (int i = 0; i < 28; ++i) {
archives[i].fetchAll();
percentage += archives[i].getPercentageComplete();
}
if (percentage > 2700) {
ParamTypeList.init(archives[2]);
FloTypeList.init(archives[2]);
FluTypeList.init(archives[2]);
IdkTypeList.init(archives[7], archives[2]);
LocTypeList.init(archives[16], archives[7]);
NpcTypeList.init(archives[7], archives[18]);
ObjTypeList.init(archives[19], Fonts.p11FullSoftware, archives[7]);
StructTypeList.init(archives[2]);
SeqTypeList.init(archives[1], archives[20], archives[0]);
BasTypeList.init(archives[2]);
SpotAnimTypeList.init(archives[7], archives[21]);
VarbitTypeList.init(archives[22]);
VarpTypeList.init(archives[2]);
InterfaceList.init(archives[13], archives[8], archives[3], archives[7]);
InvTypeList.init(archives[2]);
EnumTypeList.init(archives[17]);
QuickChatPhraseTypeList.init(archives[25], archives[24], new Js5QuickChatCommandDecoder());
QuickChatCatTypeList.init(archives[25], archives[24]);
LightTypeList.init(archives[2]);
CursorTypeList.init(archives[2], archives[8]);
MsiTypeList.init(archives[2], archives[8]);
Equipment.init();
state++;
}
} else if (state == 6) {
LoadingBarAwt.render(null, true, JagString.parse("Loading sprites"), 1);
int ready = Sprites.getReady(archives[8]);
int total = Sprites.total();
if (ready >= total) {
Sprites.load(archives[8]);
state++;
}
}else if (state == 7) {
LoadingBarAwt.render(null, true, JagString.parse("Preparing to draw model"), 1);
Js5GlTextureProvider textureProvider = new Js5GlTextureProvider(archives[9], archives[26], archives[8], 20, false);
LoadingBarAwt.clear();
SoftwareRaster.clear();
Rasteriser.unpackTextures(textureProvider);
Rasteriser.setBrightness(0.8F);
Rasteriser.setBounds(GameShell.canvasWidth, GameShell.canvasHeight);
Rasteriser.prepare();
Rasteriser.prepareOffsets();
npcType = NpcTypeList.get(0);
npcType.name.print();
npc = new Npc();
npc.setNpcType(npcType);
state++;
}
GameShell.frame.setTitle(state + "");
}
public int js5ConnectState = 0;
public void js5NetLoop() {
boolean idle = js5NetQueue.loop();
if (!idle) {
js5Connect();
}
}
public void js5Connect() {
try {
if (js5ConnectState == 0) {
js5SocketRequest = GameShell.signLink.openSocket(GlobalConfig.DEFAULT_HOSTNAME, GlobalConfig.DEFAULT_PORT + 1);
js5ConnectState++;
}
if (js5ConnectState == 1) {
if (js5SocketRequest.status == 2) {
setJs5Response(1000);
return;
}
if (js5SocketRequest.status == 1) {
js5ConnectState++;
}
}
if (js5ConnectState == 2) {
js5Socket = new BufferedSocket((Socket) js5SocketRequest.result, GameShell.signLink);
Buffer buffer = new Buffer(5);
buffer.p1(15);
buffer.p4(530);
js5Socket.write(buffer.data, 5);
js5ConnectState++;
js5ConnectTime = MonotonicClock.currentTimeMillis();
}
if (js5ConnectState == 3) {
if (js5Socket.available() > 0) {
int response = js5Socket.read();
if (response != 0) {
setJs5Response(response);
return;
}
js5ConnectState++;
} else if (MonotonicClock.currentTimeMillis() - js5ConnectTime > GlobalConfig.JS5_RESPONSE_TIMEOUT) {
setJs5Response(1001);
return;
}
}
if (js5ConnectState == 4) {
js5NetQueue.start(true, js5Socket);
js5SocketRequest = null;
js5ConnectState = 0;
js5Socket = null;
}
} catch (IOException ex) {
setJs5Response(1002);
}
}
private void setJs5Response(int response) {
js5NetQueue.response = response;
js5Socket = null;
js5NetQueue.errors++;
js5ConnectState = 0;
js5SocketRequest = null;
}
@Override
protected void mainRedraw() {
SoftwareRaster.clear();
if (state == 8) {
SoftwareRaster.clear();
SoftwareRaster.drawRect(50, 50, 100, 100, 0xFF00FF);
if (npc != null) {
int orientation = 512;
int x = 256;
int z = 256;
int y = 256;
npc.render(orientation, 25079, 60547, -44308, 48222, x, z, y, 0L, 0, null);
}
SoftwareRaster.frameBuffer.draw(GameShell.canvas.getGraphics());
SoftwareRaster.frameBuffer.draw(GameShell.canvas.getGraphics());
}
}
@Override