Rename Class134 to MapFunctionGroup

This commit is contained in:
Pazaz 2022-04-23 15:18:22 -04:00
parent d8176e3013
commit 6bd95459fa
43 changed files with 108 additions and 110 deletions

View file

@ -224,7 +224,7 @@ public final class Js5GlTextureProvider implements TextureProvider {
@OriginalMember(owner = "client!nk", name = "b", descriptor = "(ZI)V")
public final void method3245(@OriginalArg(0) boolean arg0) {
this.aBoolean200 = arg0;
this.method3247();
this.clear();
}
@OriginalMember(owner = "client!nk", name = "c", descriptor = "(II)Z")
@ -240,10 +240,10 @@ public final class Js5GlTextureProvider implements TextureProvider {
}
@OriginalMember(owner = "client!nk", name = "b", descriptor = "(I)V")
public final void method3247() {
this.aClass54_12.method1815();
public final void clear() {
this.aClass54_12.clear();
if (this.aClass54_11 != null) {
this.aClass54_11.method1815();
this.aClass54_11.clear();
}
}

View file

@ -70,7 +70,7 @@ public final class LruHashTable {
}
@OriginalMember(owner = "client!gn", name = "c", descriptor = "(I)V")
public final void method1815() {
public final void clear() {
this.aClass16_1.method802();
this.aClass133_5.method3856();
this.aClass3_Sub2_37 = new SecondaryNode();

View file

@ -3,7 +3,7 @@ import org.openrs2.deob.annotation.OriginalClass;
import org.openrs2.deob.annotation.OriginalMember;
@OriginalClass("client!se")
public final class Class134 {
public final class MapFunctionGroup {
@OriginalMember(owner = "client!se", name = "i", descriptor = "I")
public final int anInt5074;
@ -24,7 +24,7 @@ public final class Class134 {
public final short[] aShortArray73;
@OriginalMember(owner = "client!se", name = "<init>", descriptor = "(I)V")
public Class134(@OriginalArg(0) int arg0) {
public MapFunctionGroup(@OriginalArg(0) int arg0) {
this.anInt5074 = arg0;
this.aClass100Array153 = new JagString[this.anInt5074];
this.aShortArray72 = new short[this.anInt5074];

View file

@ -31,7 +31,7 @@ public abstract class PathingEntity extends Entity {
public int anInt3386;
@OriginalMember(owner = "client!fe", name = "nb", descriptor = "Ljava/lang/Object;")
public Object anObject5;
public Object attachment;
@OriginalMember(owner = "client!fe", name = "rb", descriptor = "I")
public int anInt3392;

View file

@ -228,8 +228,8 @@ public final class Player extends PathingEntity {
local291 = (local245.anInt4046 - Static142.originZ) * 4 + 2 - Static173.self.anInt3421 / 32;
this.method1263(null, local291, local76, local340, arg5, arg9, arg0, arg7, arg4, arg3, arg1, local245.anInt4052, arg2, arg6);
}
if (local245.anInt4058 == 10 && local245.anInt4057 >= 0 && Static159.aClass8_Sub4_Sub1Array1.length > local245.anInt4057) {
@Pc(395) Player local395 = Static159.aClass8_Sub4_Sub1Array1[local245.anInt4057];
if (local245.anInt4058 == 10 && local245.anInt4057 >= 0 && Static159.players.length > local245.anInt4057) {
@Pc(395) Player local395 = Static159.players[local245.anInt4057];
if (local395 != null) {
local291 = local395.anInt3412 / 32 - Static173.self.anInt3412 / 32;
local302 = local395.anInt3421 / 32 - Static173.self.anInt3421 / 32;
@ -261,15 +261,15 @@ public final class Player extends PathingEntity {
}
}
@Pc(515) Model local515 = null;
if (!this.aBoolean98 && this.anObject5 != null) {
if (!this.aBoolean98 && this.attachment != null) {
if (Static83.loop >= this.anInt3375) {
this.anObject5 = null;
this.attachment = null;
}
if (this.anInt3390 <= Static83.loop && this.anInt3375 > Static83.loop) {
if (this.anObject5 instanceof Loc) {
local515 = (Model) ((Loc) this.anObject5).method1049();
if (this.attachment instanceof Loc) {
local515 = (Model) ((Loc) this.attachment).method1049();
} else {
local515 = (Model) this.anObject5;
local515 = (Model) this.attachment;
}
local515.method4575(this.anInt3379 - this.anInt3412, this.anInt3406 + -this.anInt3424, this.anInt3426 - this.anInt3421);
if (this.anInt3400 == 512) {

View file

@ -36,7 +36,7 @@ public final class Static103 {
@Pc(36) int local36 = (int) Static159.aLongArray5[arg0];
@Pc(43) Player local43;
if (local23 == 31) {
local43 = Static159.aClass8_Sub4_Sub1Array1[local36];
local43 = Static159.players[local36];
if (local43 != null) {
Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local43.movementQueueX[0], 1, 0, 2, local43.movementQueueZ[0], Static173.self.movementQueueX[0]);
Static70.type = 2;
@ -92,7 +92,7 @@ public final class Static103 {
}
}
if (local23 == 44) {
local43 = Static159.aClass8_Sub4_Sub1Array1[local36];
local43 = Static159.players[local36];
if (local43 != null) {
Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local43.movementQueueX[0], 1, 0, 2, local43.movementQueueZ[0], Static173.self.movementQueueX[0]);
Static122.x = Static7.clickX;
@ -242,7 +242,7 @@ public final class Static103 {
Static250.anInt5444 = local15;
}
if (local23 == 10) {
local43 = Static159.aClass8_Sub4_Sub1Array1[local36];
local43 = Static159.players[local36];
if (local43 != null) {
Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local43.movementQueueX[0], 1, 0, 2, local43.movementQueueZ[0], Static173.self.movementQueueX[0]);
Static70.type = 2;
@ -284,7 +284,7 @@ public final class Static103 {
Static6.outboundBuffer.p2add((int) (local31 >>> 32) & Integer.MAX_VALUE);
}
if (local23 == 37) {
local43 = Static159.aClass8_Sub4_Sub1Array1[local36];
local43 = Static159.players[local36];
if (local43 != null) {
Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local43.movementQueueX[0], 1, 0, 2, local43.movementQueueZ[0], Static173.self.movementQueueX[0]);
Static17.milliseconds = 0;
@ -357,7 +357,7 @@ public final class Static103 {
return;
}
if (local23 == 29) {
local43 = Static159.aClass8_Sub4_Sub1Array1[local36];
local43 = Static159.players[local36];
if (local43 != null) {
Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local43.movementQueueX[0], 1, 0, 2, local43.movementQueueZ[0], Static173.self.movementQueueX[0]);
Static25.y = Static60.clickY;
@ -378,7 +378,7 @@ public final class Static103 {
Static250.anInt5444 = local15;
}
if (local23 == 15) {
local43 = Static159.aClass8_Sub4_Sub1Array1[local36];
local43 = Static159.players[local36];
if (local43 != null) {
Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local43.movementQueueX[0], 1, 0, 2, local43.movementQueueZ[0], Static173.self.movementQueueX[0]);
Static17.milliseconds = 0;
@ -517,7 +517,7 @@ public final class Static103 {
}
}
if (local23 == 1) {
local43 = Static159.aClass8_Sub4_Sub1Array1[local36];
local43 = Static159.players[local36];
if (local43 != null) {
Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local43.movementQueueX[0], 1, 0, 2, local43.movementQueueZ[0], Static173.self.movementQueueX[0]);
Static17.milliseconds = 0;
@ -576,7 +576,7 @@ public final class Static103 {
Static250.anInt5444 = local15;
}
if (local23 == 57) {
local43 = Static159.aClass8_Sub4_Sub1Array1[local36];
local43 = Static159.players[local36];
if (local43 != null) {
Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local43.movementQueueX[0], 1, 0, 2, local43.movementQueueZ[0], Static173.self.movementQueueX[0]);
Static70.type = 2;
@ -618,7 +618,7 @@ public final class Static103 {
Static250.anInt5444 = local15;
}
if (local23 == 30) {
local43 = Static159.aClass8_Sub4_Sub1Array1[local36];
local43 = Static159.players[local36];
if (local43 != null) {
Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local43.movementQueueX[0], 1, 0, 2, local43.movementQueueZ[0], Static173.self.movementQueueX[0]);
Static17.milliseconds = 0;
@ -674,7 +674,7 @@ public final class Static103 {
}
}
if (local23 == 6) {
local43 = Static159.aClass8_Sub4_Sub1Array1[local36];
local43 = Static159.players[local36];
if (local43 != null) {
Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local43.movementQueueX[0], 1, 0, 2, local43.movementQueueZ[0], Static173.self.movementQueueX[0]);
Static25.y = Static60.clickY;

View file

@ -141,7 +141,7 @@ public final class Static115 {
}
@OriginalMember(owner = "client!ja", name = "a", descriptor = "(Z)V")
public static void method2315() {
public static void clear() {
Static215.aClass3_Sub2_Sub9_32 = null;
Static213.aClass3_Sub2_Sub1Array8 = null;
Static240.aClass3_Sub2_Sub1Array10 = null;

View file

@ -29,7 +29,7 @@ public final class Static116 {
}
@OriginalMember(owner = "client!jb", name = "a", descriptor = "(IZ)V")
public static void method2325(@OriginalArg(1) boolean arg0) {
public static void clear(@OriginalArg(1) boolean arg0) {
Static90.aByteArrayArrayArray8 = null;
Static83.anIntArrayArrayArray3 = null;
Static24.component = null;

View file

@ -6,7 +6,7 @@ import org.openrs2.deob.annotation.Pc;
public final class Static120 {
@OriginalMember(owner = "client!jf", name = "a", descriptor = "[Lclient!gi;")
public static Light[] aClass51Array1;
public static Light[] lights;
@OriginalMember(owner = "client!jf", name = "c", descriptor = "[I")
private static int[] anIntArray283;
@ -51,7 +51,7 @@ public final class Static120 {
private static final float[] aFloatArray17 = new float[] { 0.0F, 0.0F, 0.0F, 1.0F };
@OriginalMember(owner = "client!jf", name = "l", descriptor = "I")
public static int anInt3034 = 0;
public static int lightCount = 0;
@OriginalMember(owner = "client!jf", name = "a", descriptor = "(IIIIIII)V")
public static void method2388(@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) {
@ -79,10 +79,10 @@ public final class Static120 {
@OriginalMember(owner = "client!jf", name = "a", descriptor = "(Lclient!gi;)V")
public static void method2389(@OriginalArg(0) Light arg0) {
if (anInt3034 >= 255) {
if (lightCount >= 255) {
System.out.println("Number of lights added exceeds maximum!");
} else {
aClass51Array1[anInt3034++] = arg0;
lights[lightCount++] = arg0;
}
}
@ -151,7 +151,7 @@ public final class Static120 {
if (!aBooleanArray66[local40]) {
anIntArray284[local40] = anIntArray283[local35];
aBooleanArray66[local40] = true;
method2403(local40, aClass51Array1[anIntArray283[local35]], arg0, arg1, arg2);
method2403(local40, lights[anIntArray283[local35]], arg0, arg1, arg2);
break;
}
}
@ -207,7 +207,7 @@ public final class Static120 {
if (!aBooleanArray66[local53]) {
anIntArray284[local53] = anIntArray283[local47];
aBooleanArray66[local53] = true;
method2403(local53, aClass51Array1[anIntArray283[local47]], arg0, arg1, arg2);
method2403(local53, lights[anIntArray283[local47]], arg0, arg1, arg2);
break;
}
}
@ -229,8 +229,8 @@ public final class Static120 {
@OriginalMember(owner = "client!jf", name = "a", descriptor = "(IZ)V")
public static void method2394(@OriginalArg(0) int arg0, @OriginalArg(1) boolean arg1) {
for (@Pc(1) int local1 = 0; local1 < anInt3034; local1++) {
aClass51Array1[local1].method1765(arg1, arg0);
for (@Pc(1) int local1 = 0; local1 < lightCount; local1++) {
lights[local1].method1765(arg1, arg0);
}
anInt3031 = -1;
anInt3033 = -1;
@ -241,8 +241,8 @@ public final class Static120 {
@OriginalMember(owner = "client!jf", name = "b", descriptor = "()V")
public static void method2395() {
for (@Pc(1) int local1 = 0; local1 < anInt3034; local1++) {
@Pc(8) Light local8 = aClass51Array1[local1];
for (@Pc(1) int local1 = 0; local1 < lightCount; local1++) {
@Pc(8) Light local8 = lights[local1];
@Pc(11) int local11 = local8.anInt2241;
if (local8.aBoolean124) {
local11 = 0;
@ -331,7 +331,7 @@ public final class Static120 {
@OriginalMember(owner = "client!jf", name = "c", descriptor = "()V")
public static void method2398() {
aClass51Array1 = null;
lights = null;
anIntArray284 = null;
aBooleanArray65 = null;
anIntArray283 = null;
@ -357,7 +357,7 @@ public final class Static120 {
@OriginalMember(owner = "client!jf", name = "f", descriptor = "()V")
public static void method2401() {
aClass51Array1 = new Light[255];
lights = new Light[255];
anIntArray284 = new int[4];
aBooleanArray65 = new boolean[4];
anIntArray283 = new int[4];
@ -381,8 +381,8 @@ public final class Static120 {
local4.glFogfv(GL2.GL_FOG_COLOR, new float[] { 0.0F, 0.0F, 0.0F, 0.0F }, 0);
local4.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_SRC0_RGB, GL2.GL_CONSTANT);
local4.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_OPERAND0_RGB, GL2.GL_SRC_ALPHA);
label71: for (@Pc(56) int local56 = 0; local56 < anInt3034; local56++) {
@Pc(63) Light local63 = aClass51Array1[local56];
label71: for (@Pc(56) int local56 = 0; local56 < lightCount; local56++) {
@Pc(63) Light local63 = lights[local56];
@Pc(66) int local66 = local63.anInt2241;
if (local63.aBoolean125) {
local66--;
@ -450,7 +450,7 @@ public final class Static120 {
@OriginalMember(owner = "client!jf", name = "g", descriptor = "()V")
public static void method2404() {
anInt3034 = 0;
lightCount = 0;
for (@Pc(3) int local3 = 0; local3 < anInt3032; local3++) {
for (@Pc(8) int local8 = 0; local8 < anInt3037; local8++) {
for (@Pc(13) int local13 = 0; local13 < anInt3036; local13++) {

View file

@ -89,7 +89,7 @@ public final class Static127 {
}
}
for (local96 = 0; local96 < 2048; local96++) {
@Pc(265) Player local265 = Static159.aClass8_Sub4_Sub1Array1[local96];
@Pc(265) Player local265 = Static159.players[local96];
if (local265 != null) {
for (local109 = 0; local109 < 10; local109++) {
local265.movementQueueX[local109] -= local86;

View file

@ -97,13 +97,13 @@ public final class Static140 {
}
@OriginalMember(owner = "client!la", name = "a", descriptor = "(ILclient!na;Lclient!ve;)Lclient!se;")
public static Class134 createMapFunctionGroup(@OriginalArg(1) JagString arg0, @OriginalArg(2) Js5 arg1) {
public static MapFunctionGroup createMapFunctionGroup(@OriginalArg(1) JagString arg0, @OriginalArg(2) Js5 arg1) {
@Pc(10) int local10 = arg1.getGroupId(arg0);
if (local10 == -1) {
return new Class134(0);
return new MapFunctionGroup(0);
}
@Pc(29) int[] local29 = arg1.method4503(local10);
@Pc(35) Class134 local35 = new Class134(local29.length);
@Pc(35) MapFunctionGroup local35 = new MapFunctionGroup(local29.length);
for (@Pc(37) int local37 = 0; local37 < local35.anInt5074; local37++) {
@Pc(56) Buffer local56 = new Buffer(arg1.getFile(local10, local29[local37]));
local35.aClass100Array153[local37] = local56.gjstr();

View file

@ -36,20 +36,20 @@ public final class Static141 {
Static89.aClass3_Sub2_Sub1_5 = null;
Static107.anInt2875 = -1;
Static217.method3768();
Static255.aClass54_16.method1815();
Static255.cache.clear();
Static171.aClass139_1 = new Class139();
((Js5GlTextureProvider) Rasteriser.textureProvider).method3247();
Static120.anInt3034 = 0;
Static120.aClass51Array1 = new Light[255];
((Js5GlTextureProvider) Rasteriser.textureProvider).clear();
Static120.lightCount = 0;
Static120.lights = new Light[255];
Static237.method4120();
Static242.method4203();
Static115.method2315();
Static116.method2325(false);
Static115.clear();
Static116.clear(false);
Static119.method2381();
for (@Pc(39) int local39 = 0; local39 < 2048; local39++) {
@Pc(46) Player local46 = Static159.aClass8_Sub4_Sub1Array1[local39];
if (local46 != null) {
local46.anObject5 = null;
@Pc(46) Player player = Static159.players[local39];
if (player != null) {
player.attachment = null;
}
}
if (GlRenderer.enabled) {

View file

@ -31,7 +31,7 @@ public final class Static142 {
if (local5 == -1) {
local17 = Static173.self;
} else if (Static267.anInt5774 > local5) {
local17 = Static159.aClass8_Sub4_Sub1Array1[Static105.anIntArray256[local5]];
local17 = Static159.players[Static105.anIntArray256[local5]];
} else {
local17 = Static175.aClass8_Sub4_Sub2Array1[Static33.anIntArray79[local5 - Static267.anInt5774]];
}

View file

@ -17,7 +17,7 @@ public final class Static159 {
public static final JagString aClass100_760 = Static28.parse(")1");
@OriginalMember(owner = "client!mi", name = "S", descriptor = "[Lclient!e;")
public static final Player[] aClass8_Sub4_Sub1Array1 = new Player[2048];
public static final Player[] players = new Player[2048];
@OriginalMember(owner = "client!mi", name = "U", descriptor = "[J")
public static final long[] aLongArray5 = new long[500];

View file

@ -168,7 +168,7 @@ public final class Static176 {
}
}
for (local493 = 0; local493 < Static267.anInt5774; local493++) {
local597 = Static159.aClass8_Sub4_Sub1Array1[Static105.anIntArray256[local493]];
local597 = Static159.players[Static105.anIntArray256[local493]];
local514 = local597.anInt3412 + 64 - local597.method2693() * 64;
local526 = local597.anInt3421 + 64 - local597.method2693() * 64;
if (local597 != null && local514 >= local479 && local597.method2693() <= local421.aClass96_1.anInt3713 - (local514 - local479 >> 7) && local526 >= local240 && local597.method2693() <= local421.aClass96_1.anInt3713 - (local526 - local240 >> 7)) {
@ -179,7 +179,7 @@ public final class Static176 {
Static246.method4240(local421.aClass96_1, local47, local140, local147);
}
if (local133 == 0) {
@Pc(688) Player local688 = Static159.aClass8_Sub4_Sub1Array1[local140];
@Pc(688) Player local688 = Static159.players[local140];
if ((local688.anInt3412 & 0x7F) == 64 && (local688.anInt3421 & 0x7F) == 64) {
local479 = local688.anInt3412 - (local688.method2693() - 1) * 64;
local240 = local688.anInt3421 + 64 - local688.method2693() * 64;
@ -192,7 +192,7 @@ public final class Static176 {
}
}
for (local493 = 0; local493 < Static267.anInt5774; local493++) {
local597 = Static159.aClass8_Sub4_Sub1Array1[Static105.anIntArray256[local493]];
local597 = Static159.players[Static105.anIntArray256[local493]];
local514 = local597.anInt3412 - (local597.method2693() - 1) * 64;
local526 = local597.anInt3421 + 64 - local597.method2693() * 64;
if (local597 != null && local597 != local688 && local479 <= local514 && local597.method2693() <= local688.method2693() - (local514 - local479 >> 7) && local526 >= local240 && local597.method2693() <= local688.method2693() - (local526 - local240 >> 7)) {

View file

@ -114,7 +114,7 @@ public final class Static186 {
}
Static203.aClass134_1 = Static140.createMapFunctionGroup(Static34.concatenate(new JagString[] { Static269.aClass3_Sub2_Sub4_2.aClass100_138, Static265.aClass100_1086 }), Static119.aClass153_44);
} else {
Static203.aClass134_1 = new Class134(0);
Static203.aClass134_1 = new MapFunctionGroup(0);
}
Static41.anInt1309 = 70;
Static234.method4020();

View file

@ -1,5 +1,3 @@
import java.awt.Component;
import java.lang.reflect.Method;
import org.openrs2.deob.annotation.OriginalArg;
import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc;
@ -54,7 +52,7 @@ public final class Static19 {
} else {
local22 = Static105.anIntArray256[local11];
}
@Pc(30) Player local30 = Static159.aClass8_Sub4_Sub1Array1[local22];
@Pc(30) Player local30 = Static159.players[local22];
if (local30 != null && local30.anInt3408 > 0) {
local30.anInt3408--;
if (local30.anInt3408 == 0) {

View file

@ -20,7 +20,7 @@ public final class Static192 {
if (local29 == Static16.anInt549) {
local40 = Static173.self;
} else {
local40 = Static159.aClass8_Sub4_Sub1Array1[local29];
local40 = Static159.players[local29];
}
} else {
local29 = local17.anInt1192 - 1;
@ -73,7 +73,7 @@ public final class Static192 {
local40.anInt3375 = local17.anInt1205 + Static83.loop;
local40.anInt3426 = local83 * 64 + local17.anInt1204 * 128;
local40.anInt3379 = local86 * 64 + local17.anInt1190 * 128;
local40.anObject5 = local159;
local40.attachment = local159;
@Pc(292) int local292 = local17.anInt1188;
local40.anInt3406 = local157;
local40.anInt3390 = Static83.loop + local17.anInt1187;

View file

@ -42,7 +42,7 @@ public final class Static195 {
if (Static16.anInt549 == local102) {
local107 = Static173.self;
} else {
local107 = Static159.aClass8_Sub4_Sub1Array1[local102];
local107 = Static159.players[local102];
}
if (local107 != null && local107.anInt3412 >= 0 && local107.anInt3412 < 13312 && local107.anInt3421 >= 0 && local107.anInt3421 < 13312) {
local21.method3705(local107.anInt3421, Static83.loop, Static207.method3685(local21.anInt4810, local107.anInt3412, local107.anInt3421) - local21.anInt4805, local107.anInt3412);

View file

@ -38,7 +38,7 @@ public final class Static196 {
Static233.loadingScreenState = 0;
Static38.anInt1196 = 1;
Static175.mapFilesMissingCount = 0;
Static116.method2325(true);
Static116.clear(true);
}
if (arg0 == 25 || arg0 == 10) {
Static123.topBannerRefresh();

View file

@ -7,7 +7,7 @@ import org.openrs2.deob.annotation.Pc;
public final class Static203 {
@OriginalMember(owner = "client!qh", name = "a", descriptor = "Lclient!se;")
public static Class134 aClass134_1;
public static MapFunctionGroup aClass134_1;
@OriginalMember(owner = "client!qh", name = "d", descriptor = "Lclient!fd;")
public static WorldMapFont aClass41_8;

View file

@ -116,9 +116,9 @@ public final class Static217 {
Static90.method1857();
Static139.aClass99_22.clear();
if (!GlRenderer.enabled) {
((Js5GlTextureProvider) Rasteriser.textureProvider).method3247();
((Js5GlTextureProvider) Rasteriser.textureProvider).clear();
}
Static105.aClass54_9.method1815();
Static105.aClass54_9.clear();
Static213.js5Archive0.method4499();
Static249.js5Archive1.method4499();
Static41.js5Archive3.method4499();

View file

@ -26,15 +26,15 @@ public final class Static225 {
@Pc(20) int local20 = Static57.aClass3_Sub15_Sub1_3.method2238(11);
if (local20 != 2047) {
@Pc(27) boolean local27 = false;
if (Static159.aClass8_Sub4_Sub1Array1[local20] == null) {
Static159.aClass8_Sub4_Sub1Array1[local20] = new Player();
if (Static159.players[local20] == null) {
Static159.players[local20] = new Player();
local27 = true;
if (Static115.aClass3_Sub15Array1[local20] != null) {
Static159.aClass8_Sub4_Sub1Array1[local20].method1262(Static115.aClass3_Sub15Array1[local20]);
Static159.players[local20].method1262(Static115.aClass3_Sub15Array1[local20]);
}
}
Static105.anIntArray256[Static267.anInt5774++] = local20;
@Pc(65) Player local65 = Static159.aClass8_Sub4_Sub1Array1[local20];
@Pc(65) Player local65 = Static159.players[local20];
local65.anInt3430 = Static83.loop;
@Pc(73) int local73 = Static57.aClass3_Sub15_Sub1_3.method2238(1);
if (local73 == 1) {

View file

@ -5,7 +5,7 @@ import org.openrs2.deob.annotation.Pc;
public final class Static235 {
@OriginalMember(owner = "client!tb", name = "X", descriptor = "Lclient!se;")
public static Class134 mapFunctionGroup;
public static MapFunctionGroup mapFunctionGroup;
@OriginalMember(owner = "client!tb", name = "P", descriptor = "Lclient!na;")
public static final JagString aClass100_1002 = Static28.parse("(U5");

View file

@ -74,13 +74,13 @@ public final class Static243 {
Static230.anInt5161 = (int) (Math.random() * 80.0D) - 40;
Static272.anInt5214 = 0;
for (local3506 = 0; local3506 < 2048; local3506++) {
Static159.aClass8_Sub4_Sub1Array1[local3506] = null;
Static159.players[local3506] = null;
Static115.aClass3_Sub15Array1[local3506] = null;
}
for (local3506 = 0; local3506 < 32768; local3506++) {
Static175.aClass8_Sub4_Sub2Array1[local3506] = null;
}
Static173.self = Static159.aClass8_Sub4_Sub1Array1[2047] = new Player();
Static173.self = Static159.players[2047] = new Player();
Static217.aClass69_116.method2278();
Static99.aClass69_64.method2278();
if (Static159.aClass69ArrayArrayArray1 != null) {

View file

@ -60,7 +60,7 @@ public final class Static245 {
public static void method4226() {
for (@Pc(7) int local7 = 0; local7 < Static116.anInt2951; local7++) {
@Pc(31) int local31 = Static44.anIntArray106[local7];
@Pc(35) Player local35 = Static159.aClass8_Sub4_Sub1Array1[local31];
@Pc(35) Player local35 = Static159.players[local31];
@Pc(39) int local39 = Static57.aClass3_Sub15_Sub1_3.g1();
if ((local39 & 0x10) != 0) {
local39 += Static57.aClass3_Sub15_Sub1_3.g1() << 8;

View file

@ -3,5 +3,5 @@ import org.openrs2.deob.annotation.OriginalMember;
public final class Static255 {
@OriginalMember(owner = "client!ul", name = "I", descriptor = "Lclient!gn;")
public static final LruHashTable aClass54_16 = new LruHashTable(4);
public static final LruHashTable cache = new LruHashTable(4);
}

View file

@ -52,7 +52,7 @@ public final class Static276 {
@Pc(7) JagString local7 = arg1.method3159().method3125();
@Pc(13) boolean local13 = false;
for (@Pc(15) int local15 = 0; local15 < Static267.anInt5774; local15++) {
@Pc(28) Player local28 = Static159.aClass8_Sub4_Sub1Array1[Static105.anIntArray256[local15]];
@Pc(28) Player local28 = Static159.players[Static105.anIntArray256[local15]];
if (local28 != null && local28.aClass100_364 != null && local28.aClass100_364.method3111(local7)) {
local13 = true;
Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local28.movementQueueX[0], 1, 0, 2, local28.movementQueueZ[0], Static173.self.movementQueueX[0]);

View file

@ -205,7 +205,7 @@ public final class Static278 {
for (local19 = 0; local19 < 4; local19++) {
Static148.collisionMaps[local19].resetFlags();
}
Static116.method2325(false);
Static116.clear(false);
System.gc();
Static29.method801();
Static144.aBoolean173 = false;
@ -222,7 +222,7 @@ public final class Static278 {
Static267.anInt5774 = 0;
Static272.anInt5214 = 0;
for (local19 = 0; local19 < 2048; local19++) {
Static159.aClass8_Sub4_Sub1Array1[local19] = null;
Static159.players[local19] = null;
Static115.aClass3_Sub15Array1[local19] = null;
}
for (local19 = 0; local19 < 32768; local19++) {

View file

@ -38,7 +38,7 @@ public final class Static37 {
if (local70 == Static16.anInt549) {
local70 = 2047;
}
@Pc(83) Player local83 = Static159.aClass8_Sub4_Sub1Array1[local70];
@Pc(83) Player local83 = Static159.players[local70];
if (local83 != null) {
local94 = arg0.anInt3421 - local83.anInt3421;
local36 = arg0.anInt3412 - local83.anInt3412;

View file

@ -173,7 +173,7 @@ public final class Static38 {
if (arg0) {
local39 = Static173.self;
} else {
local39 = Static159.aClass8_Sub4_Sub1Array1[Static105.anIntArray256[local28]];
local39 = Static159.players[Static105.anIntArray256[local28]];
}
if (local39 != null && local39.method2682()) {
@Pc(55) int local55 = local39.method2693();
@ -217,7 +217,7 @@ public final class Static38 {
local39 = Static173.self;
local272 = 8791798054912L;
} else {
local39 = Static159.aClass8_Sub4_Sub1Array1[Static105.anIntArray256[local28]];
local39 = Static159.players[Static105.anIntArray256[local28]];
local272 = (long) Static105.anIntArray256[local28] << 32;
}
if (local39 != null && local39.method2682()) {
@ -279,7 +279,7 @@ public final class Static38 {
}
}
}
if (local39.anObject5 == null || Static83.loop < local39.anInt3390 || local39.anInt3375 <= Static83.loop) {
if (local39.attachment == null || Static83.loop < local39.anInt3390 || local39.anInt3375 <= Static83.loop) {
local39.anInt3424 = Static207.method3685(Static55.level, local39.anInt3412, local39.anInt3421);
Static43.method1141(Static55.level, local39.anInt3412, local39.anInt3421, local39.anInt3424, (local82 - 1) * 64 + 60, local39, local39.anInt3381, local272, local39.aBoolean171);
} else {

View file

@ -599,7 +599,7 @@ public final class Static4 {
if (Static16.anInt549 == local1146) {
local2033 = Static173.self;
} else {
local2033 = Static159.aClass8_Sub4_Sub1Array1[local1146];
local2033 = Static159.players[local1146];
}
if (local2033 != null) {
if (local171 == 65535) {
@ -1083,9 +1083,9 @@ public final class Static4 {
Static164.anInt3985 = -1;
return true;
} else if (Static164.anInt3985 == 131) {
for (local133 = 0; local133 < Static159.aClass8_Sub4_Sub1Array1.length; local133++) {
if (Static159.aClass8_Sub4_Sub1Array1[local133] != null) {
Static159.aClass8_Sub4_Sub1Array1[local133].anInt3369 = -1;
for (local133 = 0; local133 < Static159.players.length; local133++) {
if (Static159.players[local133] != null) {
Static159.players[local133].anInt3369 = -1;
}
}
for (local133 = 0; local133 < Static175.aClass8_Sub4_Sub2Array1.length; local133++) {

View file

@ -174,7 +174,7 @@ public final class Static41 {
Static267.anInt5774 = 0;
for (local20 = 0; local20 < local6; local20++) {
@Pc(75) int local75 = Static105.anIntArray256[local20];
@Pc(79) Player local79 = Static159.aClass8_Sub4_Sub1Array1[local75];
@Pc(79) Player local79 = Static159.players[local75];
@Pc(84) int local84 = Static57.aClass3_Sub15_Sub1_3.method2238(1);
if (local84 == 0) {
Static105.anIntArray256[Static267.anInt5774++] = local75;

View file

@ -35,9 +35,9 @@ public final class Static44 {
Static201.anInt1862 = 0;
Static164.anInt3985 = -1;
@Pc(35) int local35;
for (local35 = 0; local35 < Static159.aClass8_Sub4_Sub1Array1.length; local35++) {
if (Static159.aClass8_Sub4_Sub1Array1[local35] != null) {
Static159.aClass8_Sub4_Sub1Array1[local35].anInt3370 = -1;
for (local35 = 0; local35 < Static159.players.length; local35++) {
if (Static159.players[local35] != null) {
Static159.players[local35].anInt3370 = -1;
}
}
for (local35 = 0; local35 < Static175.aClass8_Sub4_Sub2Array1.length; local35++) {

View file

@ -344,7 +344,7 @@ public final class Static45 {
local2057[local2025.length + local349] = local2049[local349];
}
Static110.method2280(local152, local2057);
Static221.method3393(local1900, Static253.aByteArrayArrayArray16[local152], Static4.aByteArrayArrayArray1[local152], Static120.aClass51Array1, local152, Static120.anInt3034, local1896, Static163.aByteArrayArrayArray11[local152], Static240.aByteArrayArrayArray14[local152], Static83.activeTileHeightMap[local152], local1888);
Static221.method3393(local1900, Static253.aByteArrayArrayArray16[local152], Static4.aByteArrayArrayArray1[local152], Static120.lights, local152, Static120.lightCount, local1896, Static163.aByteArrayArrayArray11[local152], Static240.aByteArrayArrayArray14[local152], Static83.activeTileHeightMap[local152], local1888);
break;
}
for (local202 = 1; local202 <= 103; local202++) {

View file

@ -49,7 +49,7 @@ public final class Static5 {
@OriginalMember(owner = "client!af", name = "b", descriptor = "(B)V")
public static void method34() {
Static116.method2325(false);
Static116.clear(false);
System.gc();
Static196.setGameState(25);
}

View file

@ -123,7 +123,7 @@ public final class Static54 {
}
}
for (local146 = 0; local146 < Static267.anInt5774; local146++) {
@Pc(591) Player local591 = Static159.aClass8_Sub4_Sub1Array1[Static105.anIntArray256[local146]];
@Pc(591) Player local591 = Static159.players[Static105.anIntArray256[local146]];
if (local591 != null && local591.method2682()) {
local154 = local591.anInt3421 / 32 - Static173.self.anInt3421 / 32;
local150 = local591.anInt3412 / 32 - Static173.self.anInt3412 / 32;
@ -174,8 +174,8 @@ public final class Static54 {
local231 = (-Static142.originZ + local770.anInt4046) * 4 + 2 - Static173.self.anInt3421 / 32;
Static97.method1960(local770.anInt4048, arg1, arg2, local154, local231, arg3);
}
if (local770.anInt4058 == 10 && local770.anInt4057 >= 0 && Static159.aClass8_Sub4_Sub1Array1.length > local770.anInt4057) {
@Pc(905) Player local905 = Static159.aClass8_Sub4_Sub1Array1[local770.anInt4057];
if (local770.anInt4058 == 10 && local770.anInt4057 >= 0 && Static159.players.length > local770.anInt4057) {
@Pc(905) Player local905 = Static159.players[local770.anInt4057];
if (local905 != null) {
local200 = local905.anInt3421 / 32 - Static173.self.anInt3421 / 32;
local231 = local905.anInt3412 / 32 - Static173.self.anInt3412 / 32;

View file

@ -36,18 +36,18 @@ public final class Static64 {
@Pc(23) int local23;
for (local23 = 0; local23 < Static240.anInt5335; local23++) {
@Pc(30) int local30 = Static52.anIntArray136[local23];
if (Static83.loop != Static159.aClass8_Sub4_Sub1Array1[local30].anInt3430) {
if (Static159.aClass8_Sub4_Sub1Array1[local30].anInt1664 > 0) {
Static271.method4597(Static159.aClass8_Sub4_Sub1Array1[local30]);
if (Static83.loop != Static159.players[local30].anInt3430) {
if (Static159.players[local30].anInt1664 > 0) {
Static271.method4597(Static159.players[local30]);
}
Static159.aClass8_Sub4_Sub1Array1[local30] = null;
Static159.players[local30] = null;
}
}
if (Static223.anInt5028 != Static57.aClass3_Sub15_Sub1_3.offset) {
throw new RuntimeException("gpp1 pos:" + Static57.aClass3_Sub15_Sub1_3.offset + " psize:" + Static223.anInt5028);
}
for (local23 = 0; local23 < Static267.anInt5774; local23++) {
if (Static159.aClass8_Sub4_Sub1Array1[Static105.anIntArray256[local23]] == null) {
if (Static159.players[Static105.anIntArray256[local23]] == null) {
throw new RuntimeException("gpp2 pos:" + local23 + " size:" + Static267.anInt5774);
}
}

View file

@ -74,7 +74,7 @@ public final class Static71 {
} else {
local21 = Static105.anIntArray256[local7];
}
@Pc(31) Player local31 = Static159.aClass8_Sub4_Sub1Array1[local21];
@Pc(31) Player local31 = Static159.players[local21];
if (local31 != null) {
Static263.method4514(local31.method2693(), local31);
}

View file

@ -408,7 +408,7 @@ public final class Static75 {
if (Static16.anInt549 == local1188) {
local1198 = Static173.self;
} else {
local1198 = Static159.aClass8_Sub4_Sub1Array1[local1188];
local1198 = Static159.players[local1188];
}
}
if (local1198 != null) {

View file

@ -113,7 +113,7 @@ public final class Static78 {
if (Static235.mapFunctionGroup == null) {
if (Static158.aClass3_Sub2_Sub4_3 == null || !Static227.js5Archive23.method4497(Static34.concatenate(new JagString[] { Static158.aClass3_Sub2_Sub4_3.aClass100_138, Static50.aClass100_363 }))) {
Static235.mapFunctionGroup = new Class134(0);
Static235.mapFunctionGroup = new MapFunctionGroup(0);
} else if (Static227.js5Archive23.allFilesComplete(Static34.concatenate(new JagString[] { Static158.aClass3_Sub2_Sub4_3.aClass100_138, Static50.aClass100_363 }))) {
Static235.mapFunctionGroup = Static140.createMapFunctionGroup(Static34.concatenate(new JagString[] { Static158.aClass3_Sub2_Sub4_3.aClass100_138, Static50.aClass100_363 }), Static227.js5Archive23);
} else {

View file

@ -692,7 +692,7 @@ public final class Static87 {
if (local514 == Static16.anInt549) {
local514 = 2047;
}
@Pc(2751) Player local2751 = Static159.aClass8_Sub4_Sub1Array1[local514];
@Pc(2751) Player local2751 = Static159.players[local514];
@Pc(2760) SeqType local2760 = local276 == -1 ? null : Static36.method941(local276);
if (local2751 != null && (int) local2751.aClass100_364.encode37() << 11 == (local30.modelId & 0xFFFFF800)) {
local2589 = local2751.aClass59_1.method1954(null, -1, null, local2760, 0, -1, 0, local30.anInt510, 0);

View file

@ -12,7 +12,7 @@ public final class Static90 {
@OriginalMember(owner = "client!hb", name = "b", descriptor = "(Lclient!na;I)V")
public static void method1853(@OriginalArg(0) JagString arg0) {
Static116.method2325(false);
Static116.clear(false);
Static133.method4011(arg0);
}