Renamed HintArrowManager methods/fields

This commit is contained in:
Pazaz 2022-06-27 16:57:22 -04:00
parent afa18fe8a7
commit 45f3a834f7
25 changed files with 617 additions and 617 deletions

View file

@ -43,6 +43,6 @@ public class BasTypeList {
@OriginalMember(owner = "client!di", name = "d", descriptor = "(I)V")
public static void method1172() {
types.method3103();
types.removeSoft();
}
}

View file

@ -49,7 +49,7 @@ public class CursorTypeList {
@OriginalMember(owner = "client!ca", name = "a", descriptor = "(Z)V")
public static void method741() {
types.method3103();
sprites.method3103();
types.removeSoft();
sprites.removeSoft();
}
}

View file

@ -35,7 +35,7 @@ public class FloTypeList {
@OriginalMember(owner = "client!uh", name = "e", descriptor = "(I)V")
public static void method4301() {
types.method3103();
types.removeSoft();
}
@OriginalMember(owner = "client!wh", name = "a", descriptor = "(I)V")

View file

@ -32,7 +32,7 @@ public class FluTypeList {
@OriginalMember(owner = "client!sd", name = "f", descriptor = "(B)V")
public static void method3885() {
types.method3103();
types.removeSoft();
}
@OriginalMember(owner = "client!ed", name = "c", descriptor = "(I)V")

View file

@ -91,7 +91,7 @@ public final class GlModel extends Model {
private byte[] aByteArray72;
@OriginalMember(owner = "client!td", name = "H", descriptor = "[I")
public int[] anIntArray461;
public int[] vertexX;
@OriginalMember(owner = "client!td", name = "J", descriptor = "[F")
private float[] aFloatArray25;
@ -145,7 +145,7 @@ public final class GlModel extends Model {
private int[] anIntArray464;
@OriginalMember(owner = "client!td", name = "eb", descriptor = "[I")
public int[] anIntArray465;
public int[] vertexY;
@OriginalMember(owner = "client!td", name = "fb", descriptor = "Lclient!ql;")
private GlBuffer aClass127_5;
@ -154,7 +154,7 @@ public final class GlModel extends Model {
private float[] aFloatArray26;
@OriginalMember(owner = "client!td", name = "hb", descriptor = "[I")
public int[] anIntArray466;
public int[] vertexZ;
@OriginalMember(owner = "client!td", name = "ib", descriptor = "S")
private short aShort29;
@ -227,9 +227,9 @@ public final class GlModel extends Model {
}
Static173.method3243(local115, local23);
this.vertexCount = arg0.vertexCount;
this.anIntArray461 = arg0.vertexX;
this.anIntArray465 = arg0.vertexY;
this.anIntArray466 = arg0.vertexZ;
this.vertexX = arg0.vertexX;
this.vertexY = arg0.vertexY;
this.vertexZ = arg0.vertexZ;
this.anIntArray464 = arg0.vertexBones;
this.aShortArray84 = arg0.vertexSources;
local117 = this.anInt5297 * 3;
@ -1072,9 +1072,9 @@ public final class GlModel extends Model {
local362++;
}
}
local369 = this.anIntArray461[local362];
local373 = this.anIntArray465[local362];
local377 = this.anIntArray466[local362];
local369 = this.vertexX[local362];
local373 = this.vertexY[local362];
local377 = this.vertexZ[local362];
if (arg0 != 0) {
local389 = local377 * local161 + local369 * local163 >> 16;
local377 = local377 * local163 - local369 * local161 >> 16;
@ -1127,9 +1127,9 @@ public final class GlModel extends Model {
}
@Pc(7) int local7;
for (local7 = 0; local7 < this.vertexCount; local7++) {
@Pc(16) int local16 = this.anIntArray466[local7];
this.anIntArray466[local7] = this.anIntArray461[local7];
this.anIntArray461[local7] = -local16;
@Pc(16) int local16 = this.vertexZ[local7];
this.vertexZ[local7] = this.vertexX[local7];
this.vertexX[local7] = -local16;
}
for (local7 = 0; local7 < this.anInt5296; local7++) {
@Pc(43) short local43 = this.aShortArray85[local7];
@ -1154,9 +1154,9 @@ public final class GlModel extends Model {
@Pc(3) int local3 = MathUtils.sin[arg0];
@Pc(7) int local7 = MathUtils.cos[arg0];
for (@Pc(9) int local9 = 0; local9 < this.vertexCount; local9++) {
@Pc(29) int local29 = this.anIntArray465[local9] * local3 + this.anIntArray461[local9] * local7 >> 16;
this.anIntArray465[local9] = this.anIntArray465[local9] * local7 - this.anIntArray461[local9] * local3 >> 16;
this.anIntArray461[local9] = local29;
@Pc(29) int local29 = this.vertexY[local9] * local3 + this.vertexX[local9] * local7 >> 16;
this.vertexY[local9] = this.vertexY[local9] * local7 - this.vertexX[local9] * local3 >> 16;
this.vertexX[local9] = local29;
}
this.vertexBuffer.valid = false;
this.bounds.valid = false;
@ -1164,7 +1164,7 @@ public final class GlModel extends Model {
@OriginalMember(owner = "client!td", name = "g", descriptor = "()I")
@Override
public final int method4561() {
public final int getMaxX() {
if (!this.vertexBuffer.valid) {
this.method4108();
}
@ -1173,7 +1173,7 @@ public final class GlModel extends Model {
@OriginalMember(owner = "client!td", name = "c", descriptor = "()I")
@Override
public final int method4550() {
public final int getMaxZ() {
if (!this.vertexBuffer.valid) {
this.method4108();
}
@ -1183,12 +1183,12 @@ public final class GlModel extends Model {
@OriginalMember(owner = "client!td", name = "a", descriptor = "()Z")
@Override
public final boolean method4543() {
return this.aBoolean259 && this.anIntArray461 != null && this.aShortArray76 != null;
return this.aBoolean259 && this.vertexX != null && this.aShortArray76 != null;
}
@OriginalMember(owner = "client!td", name = "k", descriptor = "()I")
@Override
public final int method4576() {
public final int getMinZ() {
if (!this.vertexBuffer.valid) {
this.method4108();
}
@ -1199,9 +1199,9 @@ public final class GlModel extends Model {
@Override
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;
this.anIntArray466[local1] += arg2;
this.vertexX[local1] += arg0;
this.vertexY[local1] += arg1;
this.vertexZ[local1] += arg2;
}
this.vertexBuffer.valid = false;
this.bounds.valid = false;
@ -1221,9 +1221,9 @@ public final class GlModel extends Model {
return;
}
@Pc(12) int local12 = local2.vertexCount;
@Pc(15) int[] local15 = local2.anIntArray461;
@Pc(18) int[] local18 = local2.anIntArray465;
@Pc(21) int[] local21 = local2.anIntArray466;
@Pc(15) int[] local15 = local2.vertexX;
@Pc(18) int[] local18 = local2.vertexY;
@Pc(21) int[] local21 = local2.vertexZ;
@Pc(24) short[] local24 = local2.aShortArray76;
@Pc(27) short[] local27 = local2.aShortArray79;
@Pc(30) short[] local30 = local2.aShortArray85;
@ -1270,11 +1270,11 @@ public final class GlModel extends Model {
@Pc(121) short local121 = local2.vertexBuffer.aShort8;
@Pc(125) short local125 = local2.vertexBuffer.aShort7;
for (@Pc(127) int local127 = 0; local127 < this.vertexCount; local127++) {
@Pc(138) int local138 = this.anIntArray465[local127] - arg2;
@Pc(138) int local138 = this.vertexY[local127] - arg2;
if (local138 >= local105 && local138 <= local109) {
@Pc(152) int local152 = this.anIntArray461[local127] - arg1;
@Pc(152) int local152 = this.vertexX[local127] - arg1;
if (local152 >= local113 && local152 <= local117) {
@Pc(166) int local166 = this.anIntArray466[local127] - arg3;
@Pc(166) int local166 = this.vertexZ[local127] - arg3;
if (local166 >= local121 && local166 <= local125) {
@Pc(175) int local175 = -1;
@Pc(180) int local180 = this.anIntArray462[local127];
@ -1415,9 +1415,9 @@ public final class GlModel extends Model {
@Pc(3) int local3 = MathUtils.sin[arg0];
@Pc(7) int local7 = MathUtils.cos[arg0];
for (@Pc(9) int local9 = 0; local9 < this.vertexCount; local9++) {
@Pc(29) int local29 = this.anIntArray466[local9] * local3 + this.anIntArray461[local9] * local7 >> 16;
this.anIntArray466[local9] = this.anIntArray466[local9] * local7 - this.anIntArray461[local9] * local3 >> 16;
this.anIntArray461[local9] = local29;
@Pc(29) int local29 = this.vertexZ[local9] * local3 + this.vertexX[local9] * local7 >> 16;
this.vertexZ[local9] = this.vertexZ[local9] * local7 - this.vertexX[local9] * local3 >> 16;
this.vertexX[local9] = local29;
}
this.vertexBuffer.valid = false;
this.bounds.valid = false;
@ -1447,9 +1447,9 @@ public final class GlModel extends Model {
for (local45 = 0; local45 < local43.length; local45++) {
local53 = local43[local45];
if (this.aShortArray84 == null || (arg6 & this.aShortArray84[local53]) != 0) {
anInt5298 += this.anIntArray461[local53];
anInt5300 += this.anIntArray465[local53];
anInt5299 += this.anIntArray466[local53];
anInt5298 += this.vertexX[local53];
anInt5300 += this.vertexY[local53];
anInt5299 += this.vertexZ[local53];
local18++;
}
}
@ -1488,9 +1488,9 @@ public final class GlModel extends Model {
for (local230 = 0; local230 < local228.length; local230++) {
local45 = local228[local230];
if (this.aShortArray84 == null || (arg6 & this.aShortArray84[local45]) != 0) {
this.anIntArray461[local45] += arg2;
this.anIntArray465[local45] += arg3;
this.anIntArray466[local45] += arg4;
this.vertexX[local45] += arg2;
this.vertexY[local45] += arg3;
this.vertexZ[local45] += arg4;
}
}
}
@ -1528,33 +1528,33 @@ public final class GlModel extends Model {
for (local230 = 0; local230 < local228.length; local230++) {
local45 = local228[local230];
if (this.aShortArray84 == null || (arg6 & this.aShortArray84[local45]) != 0) {
this.anIntArray461[local45] -= anInt5298;
this.anIntArray465[local45] -= anInt5300;
this.anIntArray466[local45] -= anInt5299;
this.vertexX[local45] -= anInt5298;
this.vertexY[local45] -= anInt5300;
this.vertexZ[local45] -= anInt5299;
if (arg4 != 0) {
local53 = MathUtils.sin[arg4];
local343 = MathUtils.cos[arg4];
local365 = this.anIntArray465[local45] * local53 + this.anIntArray461[local45] * local343 + 32767 >> 16;
this.anIntArray465[local45] = this.anIntArray465[local45] * local343 + 32767 - this.anIntArray461[local45] * local53 >> 16;
this.anIntArray461[local45] = local365;
local365 = this.vertexY[local45] * local53 + this.vertexX[local45] * local343 + 32767 >> 16;
this.vertexY[local45] = this.vertexY[local45] * local343 + 32767 - this.vertexX[local45] * local53 >> 16;
this.vertexX[local45] = local365;
}
if (arg2 != 0) {
local53 = MathUtils.sin[arg2];
local343 = MathUtils.cos[arg2];
local365 = this.anIntArray465[local45] * local343 + 32767 - this.anIntArray466[local45] * local53 >> 16;
this.anIntArray466[local45] = this.anIntArray465[local45] * local53 + this.anIntArray466[local45] * local343 + 32767 >> 16;
this.anIntArray465[local45] = local365;
local365 = this.vertexY[local45] * local343 + 32767 - this.vertexZ[local45] * local53 >> 16;
this.vertexZ[local45] = this.vertexY[local45] * local53 + this.vertexZ[local45] * local343 + 32767 >> 16;
this.vertexY[local45] = local365;
}
if (arg3 != 0) {
local53 = MathUtils.sin[arg3];
local343 = MathUtils.cos[arg3];
local365 = this.anIntArray466[local45] * local53 + this.anIntArray461[local45] * local343 + 32767 >> 16;
this.anIntArray466[local45] = this.anIntArray466[local45] * local343 + 32767 - this.anIntArray461[local45] * local53 >> 16;
this.anIntArray461[local45] = local365;
local365 = this.vertexZ[local45] * local53 + this.vertexX[local45] * local343 + 32767 >> 16;
this.vertexZ[local45] = this.vertexZ[local45] * local343 + 32767 - this.vertexX[local45] * local53 >> 16;
this.vertexX[local45] = local365;
}
this.anIntArray461[local45] += anInt5298;
this.anIntArray465[local45] += anInt5300;
this.anIntArray466[local45] += anInt5299;
this.vertexX[local45] += anInt5298;
this.vertexY[local45] += anInt5300;
this.vertexZ[local45] += anInt5299;
}
}
}
@ -1686,15 +1686,15 @@ public final class GlModel extends Model {
for (@Pc(941) int local941 = 0; local941 < local939.length; local941++) {
@Pc(949) int local949 = local939[local941];
if (this.aShortArray84 == null || (arg6 & this.aShortArray84[local949]) != 0) {
@Pc(991) int local991 = local789[0] * this.anIntArray461[local949] + local789[1] * this.anIntArray465[local949] + local789[2] * this.anIntArray466[local949] + 16384 >> 15;
@Pc(1022) int local1022 = local789[3] * this.anIntArray461[local949] + local789[4] * this.anIntArray465[local949] + local789[5] * this.anIntArray466[local949] + 16384 >> 15;
@Pc(1053) int local1053 = local789[6] * this.anIntArray461[local949] + local789[7] * this.anIntArray465[local949] + local789[8] * this.anIntArray466[local949] + 16384 >> 15;
@Pc(991) int local991 = local789[0] * this.vertexX[local949] + local789[1] * this.vertexY[local949] + local789[2] * this.vertexZ[local949] + 16384 >> 15;
@Pc(1022) int local1022 = local789[3] * this.vertexX[local949] + local789[4] * this.vertexY[local949] + local789[5] * this.vertexZ[local949] + 16384 >> 15;
@Pc(1053) int local1053 = local789[6] * this.vertexX[local949] + local789[7] * this.vertexY[local949] + local789[8] * this.vertexZ[local949] + 16384 >> 15;
@Pc(1057) int local1057 = local991 + local791;
@Pc(1061) int local1061 = local1022 + local796;
@Pc(1065) int local1065 = local1053 + local801;
this.anIntArray461[local949] = local1057;
this.anIntArray465[local949] = local1061;
this.anIntArray466[local949] = local1065;
this.vertexX[local949] = local1057;
this.vertexY[local949] = local1061;
this.vertexZ[local949] = local1065;
}
}
}
@ -1709,15 +1709,15 @@ public final class GlModel extends Model {
for (local230 = 0; local230 < local228.length; local230++) {
local45 = local228[local230];
if (this.aShortArray84 == null || (arg6 & this.aShortArray84[local45]) != 0) {
this.anIntArray461[local45] -= anInt5298;
this.anIntArray465[local45] -= anInt5300;
this.anIntArray466[local45] -= anInt5299;
this.anIntArray461[local45] = this.anIntArray461[local45] * arg2 >> 7;
this.anIntArray465[local45] = this.anIntArray465[local45] * arg3 >> 7;
this.anIntArray466[local45] = this.anIntArray466[local45] * arg4 >> 7;
this.anIntArray461[local45] += anInt5298;
this.anIntArray465[local45] += anInt5300;
this.anIntArray466[local45] += anInt5299;
this.vertexX[local45] -= anInt5298;
this.vertexY[local45] -= anInt5300;
this.vertexZ[local45] -= anInt5299;
this.vertexX[local45] = this.vertexX[local45] * arg2 >> 7;
this.vertexY[local45] = this.vertexY[local45] * arg3 >> 7;
this.vertexZ[local45] = this.vertexZ[local45] * arg4 >> 7;
this.vertexX[local45] += anInt5298;
this.vertexY[local45] += anInt5300;
this.vertexZ[local45] += anInt5299;
}
}
}
@ -1781,15 +1781,15 @@ public final class GlModel extends Model {
for (local791 = 0; local791 < local789.length; local791++) {
local796 = local789[local791];
if (this.aShortArray84 == null || (arg6 & this.aShortArray84[local796]) != 0) {
local801 = local1930[0] * this.anIntArray461[local796] + local1930[1] * this.anIntArray465[local796] + local1930[2] * this.anIntArray466[local796] + 16384 >> 15;
local803 = local1930[3] * this.anIntArray461[local796] + local1930[4] * this.anIntArray465[local796] + local1930[5] * this.anIntArray466[local796] + 16384 >> 15;
local929 = local1930[6] * this.anIntArray461[local796] + local1930[7] * this.anIntArray465[local796] + local1930[8] * this.anIntArray466[local796] + 16384 >> 15;
local801 = local1930[0] * this.vertexX[local796] + local1930[1] * this.vertexY[local796] + local1930[2] * this.vertexZ[local796] + 16384 >> 15;
local803 = local1930[3] * this.vertexX[local796] + local1930[4] * this.vertexY[local796] + local1930[5] * this.vertexZ[local796] + 16384 >> 15;
local929 = local1930[6] * this.vertexX[local796] + local1930[7] * this.vertexY[local796] + local1930[8] * this.vertexZ[local796] + 16384 >> 15;
@Pc(2198) int local2198 = local801 + local652;
@Pc(2202) int local2202 = local803 + local1937;
@Pc(2206) int local2206 = local929 + local657;
this.anIntArray461[local796] = local2198;
this.anIntArray465[local796] = local2202;
this.anIntArray466[local796] = local2206;
this.vertexX[local796] = local2198;
this.vertexY[local796] = local2202;
this.vertexZ[local796] = local2206;
}
}
}
@ -1934,8 +1934,8 @@ public final class GlModel extends Model {
}
@Pc(7) int local7;
for (local7 = 0; local7 < this.vertexCount; local7++) {
this.anIntArray461[local7] = -this.anIntArray461[local7];
this.anIntArray466[local7] = -this.anIntArray466[local7];
this.vertexX[local7] = -this.vertexX[local7];
this.vertexZ[local7] = -this.vertexZ[local7];
}
for (local7 = 0; local7 < this.anInt5296; local7++) {
this.aShortArray76[local7] = (short) -this.aShortArray76[local7];
@ -1952,9 +1952,9 @@ public final class GlModel extends Model {
@Override
public final void resize(@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] = this.anIntArray461[local1] * arg0 >> 7;
this.anIntArray465[local1] = this.anIntArray465[local1] * arg1 >> 7;
this.anIntArray466[local1] = this.anIntArray466[local1] * arg2 >> 7;
this.vertexX[local1] = this.vertexX[local1] * arg0 >> 7;
this.vertexY[local1] = this.vertexY[local1] * arg1 >> 7;
this.vertexZ[local1] = this.vertexZ[local1] * arg2 >> 7;
}
this.vertexBuffer.valid = false;
this.bounds.valid = false;
@ -1970,8 +1970,8 @@ public final class GlModel extends Model {
@Override
public final void method4552() {
for (@Pc(1) int local1 = 0; local1 < this.vertexCount; local1++) {
this.anIntArray461[local1] = -this.anIntArray461[local1];
this.anIntArray466[local1] = -this.anIntArray466[local1];
this.vertexX[local1] = -this.vertexX[local1];
this.vertexZ[local1] = -this.vertexZ[local1];
}
this.vertexBuffer.valid = false;
this.bounds.valid = false;
@ -2028,9 +2028,9 @@ public final class GlModel extends Model {
return false;
}
for (@Pc(6) int local6 = 0; local6 < this.vertexCount; local6++) {
this.anIntArray461[local6] <<= 0x4;
this.anIntArray465[local6] <<= 0x4;
this.anIntArray466[local6] <<= 0x4;
this.vertexX[local6] <<= 0x4;
this.vertexY[local6] <<= 0x4;
this.vertexZ[local6] <<= 0x4;
}
anInt5298 = 0;
anInt5300 = 0;
@ -2074,9 +2074,9 @@ public final class GlModel extends Model {
@Pc(13) int local13 = 0;
@Pc(15) int local15 = 0;
for (@Pc(17) int local17 = 0; local17 < this.vertexCount; local17++) {
@Pc(26) int local26 = this.anIntArray461[local17];
@Pc(31) int local31 = this.anIntArray465[local17];
@Pc(36) int local36 = this.anIntArray466[local17];
@Pc(26) int local26 = this.vertexX[local17];
@Pc(31) int local31 = this.vertexY[local17];
@Pc(36) int local36 = this.vertexZ[local17];
if (local26 < local1) {
local1 = local26;
}
@ -2165,8 +2165,8 @@ public final class GlModel extends Model {
@Pc(244) int local244;
if (arg0 == 1) {
for (local150 = 0; local150 < this.vertexCount; local150++) {
local161 = this.anIntArray461[local150] + arg5;
local168 = this.anIntArray466[local150] + arg7;
local161 = this.vertexX[local150] + arg5;
local168 = this.vertexZ[local150] + arg7;
local172 = local161 & 0x7F;
local176 = local168 & 0x7F;
local180 = local161 >> 7;
@ -2174,7 +2174,7 @@ public final class GlModel extends Model {
local206 = arg3[local180][local184] * (128 - local172) + arg3[local180 + 1][local184] * local172 >> 7;
local232 = arg3[local180][local184 + 1] * (128 - local172) + arg3[local180 + 1][local184 + 1] * local172 >> 7;
local244 = local206 * (128 - local176) + local232 * local176 >> 7;
this.anIntArray465[local150] = this.anIntArray465[local150] + local244 - arg6;
this.vertexY[local150] = this.vertexY[local150] + local244 - arg6;
}
} else {
@Pc(362) int local362;
@ -2182,10 +2182,10 @@ public final class GlModel extends Model {
if (arg0 == 2) {
@Pc(266) short local266 = arg2.vertexBuffer.aShort2;
for (local161 = 0; local161 < this.vertexCount; local161++) {
local168 = (this.anIntArray465[local161] << 16) / local266;
local168 = (this.vertexY[local161] << 16) / local266;
if (local168 < arg1) {
local172 = this.anIntArray461[local161] + arg5;
local176 = this.anIntArray466[local161] + arg7;
local172 = this.vertexX[local161] + arg5;
local176 = this.vertexZ[local161] + arg7;
local180 = local172 & 0x7F;
local184 = local176 & 0x7F;
local206 = local172 >> 7;
@ -2193,7 +2193,7 @@ public final class GlModel extends Model {
local244 = arg3[local206][local232] * (128 - local180) + arg3[local206 + 1][local232] * local180 >> 7;
local362 = arg3[local206][local232 + 1] * (128 - local180) + arg3[local206 + 1][local232 + 1] * local180 >> 7;
local374 = local244 * (128 - local184) + local362 * local184 >> 7;
this.anIntArray465[local161] += (local374 - arg6) * (arg1 - local168) / arg1;
this.vertexY[local161] += (local374 - arg6) * (arg1 - local168) / arg1;
}
}
} else if (arg0 == 3) {
@ -2203,8 +2203,8 @@ public final class GlModel extends Model {
} else if (arg0 == 4) {
local150 = arg2.vertexBuffer.aShort3 - arg2.vertexBuffer.aShort2;
for (local161 = 0; local161 < this.vertexCount; local161++) {
local168 = this.anIntArray461[local161] + arg5;
local172 = this.anIntArray466[local161] + arg7;
local168 = this.vertexX[local161] + arg5;
local172 = this.vertexZ[local161] + arg7;
local176 = local168 & 0x7F;
local180 = local172 & 0x7F;
local184 = local168 >> 7;
@ -2212,13 +2212,13 @@ public final class GlModel extends Model {
local232 = arg4[local184][local206] * (128 - local176) + arg4[local184 + 1][local206] * local176 >> 7;
local244 = arg4[local184][local206 + 1] * (128 - local176) + arg4[local184 + 1][local206 + 1] * local176 >> 7;
local362 = local232 * (128 - local180) + local244 * local180 >> 7;
this.anIntArray465[local161] = this.anIntArray465[local161] + local362 + local150 - arg6;
this.vertexY[local161] = this.vertexY[local161] + local362 + local150 - arg6;
}
} else if (arg0 == 5) {
local150 = arg2.vertexBuffer.aShort3 - arg2.vertexBuffer.aShort2;
for (local161 = 0; local161 < this.vertexCount; local161++) {
local168 = this.anIntArray461[local161] + arg5;
local172 = this.anIntArray466[local161] + arg7;
local168 = this.vertexX[local161] + arg5;
local172 = this.vertexZ[local161] + arg7;
local176 = local168 & 0x7F;
local180 = local172 & 0x7F;
local184 = local168 >> 7;
@ -2230,7 +2230,7 @@ public final class GlModel extends Model {
local244 = arg4[local184][local206 + 1] * (128 - local176) + arg4[local184 + 1][local206 + 1] * local176 >> 7;
local374 = local232 * (128 - local180) + local244 * local180 >> 7;
@Pc(716) int local716 = local362 - local374;
this.anIntArray465[local161] = ((this.anIntArray465[local161] << 8) / local150 * local716 >> 8) - (arg6 - local362);
this.vertexY[local161] = ((this.vertexY[local161] << 8) / local150 * local716 >> 8) - (arg6 - local362);
}
}
}
@ -2255,9 +2255,9 @@ public final class GlModel extends Model {
if (!this.vertexBuffer.valid) {
this.method4108();
}
this.anIntArray461 = null;
this.anIntArray465 = null;
this.anIntArray466 = null;
this.vertexX = null;
this.vertexY = null;
this.vertexZ = null;
this.aShortArray81 = null;
this.anIntArray462 = null;
} else {
@ -2344,9 +2344,9 @@ public final class GlModel extends Model {
@Pc(109) int local109;
if (GlRenderer.bigEndian) {
for (local60 = 0; local60 < this.vertexCount; local60++) {
local71 = Float.floatToRawIntBits((float) this.anIntArray461[local60]);
local78 = Float.floatToRawIntBits((float) this.anIntArray465[local60]);
local85 = Float.floatToRawIntBits((float) this.anIntArray466[local60]);
local71 = Float.floatToRawIntBits((float) this.vertexX[local60]);
local78 = Float.floatToRawIntBits((float) this.vertexY[local60]);
local85 = Float.floatToRawIntBits((float) this.vertexZ[local60]);
local90 = this.anIntArray462[local60];
local97 = this.anIntArray462[local60 + 1];
for (local99 = local90; local99 < local97; local99++) {
@ -2362,9 +2362,9 @@ public final class GlModel extends Model {
}
} else {
for (local60 = 0; local60 < this.vertexCount; local60++) {
local71 = Float.floatToRawIntBits((float) this.anIntArray461[local60]);
local78 = Float.floatToRawIntBits((float) this.anIntArray465[local60]);
local85 = Float.floatToRawIntBits((float) this.anIntArray466[local60]);
local71 = Float.floatToRawIntBits((float) this.vertexX[local60]);
local78 = Float.floatToRawIntBits((float) this.vertexY[local60]);
local85 = Float.floatToRawIntBits((float) this.vertexZ[local60]);
local90 = this.anIntArray462[local60];
local97 = this.anIntArray462[local60 + 1];
for (local99 = local90; local99 < local97; local99++) {
@ -2657,16 +2657,16 @@ public final class GlModel extends Model {
arg3.aShort29 = this.aShort29;
arg3.aShort28 = this.aShort28;
arg3.aByte18 = (byte) ((arg0 && arg1 ? 0 : 2) | 0x1 | (arg2 ? 0 : 4));
if (arg3.anIntArray461 == null || arg3.anIntArray461.length < this.vertexCount) {
arg3.anIntArray461 = new int[this.vertexCount + 100];
arg3.anIntArray465 = new int[this.vertexCount + 100];
arg3.anIntArray466 = new int[this.vertexCount + 100];
if (arg3.vertexX == null || arg3.vertexX.length < this.vertexCount) {
arg3.vertexX = new int[this.vertexCount + 100];
arg3.vertexY = new int[this.vertexCount + 100];
arg3.vertexZ = new int[this.vertexCount + 100];
}
@Pc(69) int local69;
for (local69 = 0; local69 < this.vertexCount; local69++) {
arg3.anIntArray461[local69] = this.anIntArray461[local69];
arg3.anIntArray465[local69] = this.anIntArray465[local69];
arg3.anIntArray466[local69] = this.anIntArray466[local69];
arg3.vertexX[local69] = this.vertexX[local69];
arg3.vertexY[local69] = this.vertexY[local69];
arg3.vertexZ[local69] = this.vertexZ[local69];
}
if (arg3.bounds == null) {
arg3.bounds = new GlBuffer();
@ -2788,9 +2788,9 @@ public final class GlModel extends Model {
}
@Pc(7) int local7;
for (local7 = 0; local7 < this.vertexCount; local7++) {
@Pc(16) int local16 = this.anIntArray461[local7];
this.anIntArray461[local7] = this.anIntArray466[local7];
this.anIntArray466[local7] = -local16;
@Pc(16) int local16 = this.vertexX[local7];
this.vertexX[local7] = this.vertexZ[local7];
this.vertexZ[local7] = -local16;
}
for (local7 = 0; local7 < this.anInt5296; local7++) {
@Pc(43) short local43 = this.aShortArray76[local7];
@ -2811,16 +2811,16 @@ public final class GlModel extends Model {
local3.anInt5296 = this.anInt5296;
local3.anInt5297 = this.anInt5297;
if (arg0) {
local3.anIntArray461 = this.anIntArray461;
local3.anIntArray466 = this.anIntArray466;
local3.vertexX = this.vertexX;
local3.vertexZ = this.vertexZ;
} else {
local3.anIntArray461 = RawModel.method2308(this.anIntArray461);
local3.anIntArray466 = RawModel.method2308(this.anIntArray466);
local3.vertexX = RawModel.method2308(this.vertexX);
local3.vertexZ = RawModel.method2308(this.vertexZ);
}
if (arg1) {
local3.anIntArray465 = this.anIntArray465;
local3.vertexY = this.vertexY;
} else {
local3.anIntArray465 = RawModel.method2308(this.anIntArray465);
local3.vertexY = RawModel.method2308(this.vertexY);
}
if (arg0 && arg1) {
local3.bounds = this.bounds;
@ -2895,9 +2895,9 @@ public final class GlModel extends Model {
@Override
public final void method4563() {
for (@Pc(1) int local1 = 0; local1 < this.vertexCount; local1++) {
@Pc(10) int local10 = this.anIntArray461[local1];
this.anIntArray461[local1] = this.anIntArray466[local1];
this.anIntArray466[local1] = -local10;
@Pc(10) int local10 = this.vertexX[local1];
this.vertexX[local1] = this.vertexZ[local1];
this.vertexZ[local1] = -local10;
}
this.vertexBuffer.valid = false;
this.bounds.valid = false;
@ -2950,9 +2950,9 @@ public final class GlModel extends Model {
@Pc(43) int[] local43 = this.anIntArrayArray36[local33];
for (local45 = 0; local45 < local43.length; local45++) {
local53 = local43[local45];
anInt5298 += this.anIntArray461[local53];
anInt5300 += this.anIntArray465[local53];
anInt5299 += this.anIntArray466[local53];
anInt5298 += this.vertexX[local53];
anInt5300 += this.vertexY[local53];
anInt5299 += this.vertexZ[local53];
local18++;
}
}
@ -2980,9 +2980,9 @@ public final class GlModel extends Model {
local141 = this.anIntArrayArray36[local26];
for (local143 = 0; local143 < local141.length; local143++) {
local45 = local141[local143];
this.anIntArray461[local45] += local8;
this.anIntArray465[local45] += local12;
this.anIntArray466[local45] += local16;
this.vertexX[local45] += local8;
this.vertexY[local45] += local12;
this.vertexZ[local45] += local16;
}
}
}
@ -2998,33 +2998,33 @@ public final class GlModel extends Model {
local141 = this.anIntArrayArray36[local26];
for (local143 = 0; local143 < local141.length; local143++) {
local45 = local141[local143];
this.anIntArray461[local45] -= anInt5298;
this.anIntArray465[local45] -= anInt5300;
this.anIntArray466[local45] -= anInt5299;
this.vertexX[local45] -= anInt5298;
this.vertexY[local45] -= anInt5300;
this.vertexZ[local45] -= anInt5299;
if (arg4 != 0) {
local53 = MathUtils.sin[arg4];
local246 = MathUtils.cos[arg4];
local264 = this.anIntArray465[local45] * local53 + this.anIntArray461[local45] * local246 + 32767 >> 16;
this.anIntArray465[local45] = this.anIntArray465[local45] * local246 + 32767 - this.anIntArray461[local45] * local53 >> 16;
this.anIntArray461[local45] = local264;
local264 = this.vertexY[local45] * local53 + this.vertexX[local45] * local246 + 32767 >> 16;
this.vertexY[local45] = this.vertexY[local45] * local246 + 32767 - this.vertexX[local45] * local53 >> 16;
this.vertexX[local45] = local264;
}
if (arg2 != 0) {
local53 = MathUtils.sin[arg2];
local246 = MathUtils.cos[arg2];
local264 = this.anIntArray465[local45] * local246 + 32767 - this.anIntArray466[local45] * local53 >> 16;
this.anIntArray466[local45] = this.anIntArray465[local45] * local53 + this.anIntArray466[local45] * local246 + 32767 >> 16;
this.anIntArray465[local45] = local264;
local264 = this.vertexY[local45] * local246 + 32767 - this.vertexZ[local45] * local53 >> 16;
this.vertexZ[local45] = this.vertexY[local45] * local53 + this.vertexZ[local45] * local246 + 32767 >> 16;
this.vertexY[local45] = local264;
}
if (arg3 != 0) {
local53 = MathUtils.sin[arg3];
local246 = MathUtils.cos[arg3];
local264 = this.anIntArray466[local45] * local53 + this.anIntArray461[local45] * local246 + 32767 >> 16;
this.anIntArray466[local45] = this.anIntArray466[local45] * local246 + 32767 - this.anIntArray461[local45] * local53 >> 16;
this.anIntArray461[local45] = local264;
local264 = this.vertexZ[local45] * local53 + this.vertexX[local45] * local246 + 32767 >> 16;
this.vertexZ[local45] = this.vertexZ[local45] * local246 + 32767 - this.vertexX[local45] * local53 >> 16;
this.vertexX[local45] = local264;
}
this.anIntArray461[local45] += anInt5298;
this.anIntArray465[local45] += anInt5300;
this.anIntArray466[local45] += anInt5299;
this.vertexX[local45] += anInt5298;
this.vertexY[local45] += anInt5300;
this.vertexZ[local45] += anInt5299;
}
}
}
@ -3081,15 +3081,15 @@ public final class GlModel extends Model {
local141 = this.anIntArrayArray36[local26];
for (local143 = 0; local143 < local141.length; local143++) {
local45 = local141[local143];
this.anIntArray461[local45] -= anInt5298;
this.anIntArray465[local45] -= anInt5300;
this.anIntArray466[local45] -= anInt5299;
this.anIntArray461[local45] = this.anIntArray461[local45] * arg2 >> 7;
this.anIntArray465[local45] = this.anIntArray465[local45] * arg3 >> 7;
this.anIntArray466[local45] = this.anIntArray466[local45] * arg4 >> 7;
this.anIntArray461[local45] += anInt5298;
this.anIntArray465[local45] += anInt5300;
this.anIntArray466[local45] += anInt5299;
this.vertexX[local45] -= anInt5298;
this.vertexY[local45] -= anInt5300;
this.vertexZ[local45] -= anInt5299;
this.vertexX[local45] = this.vertexX[local45] * arg2 >> 7;
this.vertexY[local45] = this.vertexY[local45] * arg3 >> 7;
this.vertexZ[local45] = this.vertexZ[local45] * arg4 >> 7;
this.vertexX[local45] += anInt5298;
this.vertexY[local45] += anInt5300;
this.vertexZ[local45] += anInt5299;
}
}
}
@ -3160,9 +3160,9 @@ public final class GlModel extends Model {
anInt5300 = 0;
anInt5299 = 0;
for (local11 = 0; local11 < this.vertexCount; local11++) {
anInt5298 += this.anIntArray461[local11];
anInt5300 += this.anIntArray465[local11];
anInt5299 += this.anIntArray466[local11];
anInt5298 += this.vertexX[local11];
anInt5300 += this.vertexY[local11];
anInt5299 += this.vertexZ[local11];
local3++;
}
if (local3 > 0) {
@ -3176,54 +3176,54 @@ public final class GlModel extends Model {
}
} else if (arg0 == 1) {
for (local3 = 0; local3 < this.vertexCount; local3++) {
this.anIntArray461[local3] += arg1;
this.anIntArray465[local3] += arg2;
this.anIntArray466[local3] += arg3;
this.vertexX[local3] += arg1;
this.vertexY[local3] += arg2;
this.vertexZ[local3] += arg3;
}
} else {
@Pc(146) int local146;
@Pc(164) int local164;
if (arg0 == 2) {
for (local3 = 0; local3 < this.vertexCount; local3++) {
this.anIntArray461[local3] -= anInt5298;
this.anIntArray465[local3] -= anInt5300;
this.anIntArray466[local3] -= anInt5299;
this.vertexX[local3] -= anInt5298;
this.vertexY[local3] -= anInt5300;
this.vertexZ[local3] -= anInt5299;
if (arg3 != 0) {
local11 = MathUtils.sin[arg3];
local146 = MathUtils.cos[arg3];
local164 = this.anIntArray465[local3] * local11 + this.anIntArray461[local3] * local146 + 32767 >> 16;
this.anIntArray465[local3] = this.anIntArray465[local3] * local146 + 32767 - this.anIntArray461[local3] * local11 >> 16;
this.anIntArray461[local3] = local164;
local164 = this.vertexY[local3] * local11 + this.vertexX[local3] * local146 + 32767 >> 16;
this.vertexY[local3] = this.vertexY[local3] * local146 + 32767 - this.vertexX[local3] * local11 >> 16;
this.vertexX[local3] = local164;
}
if (arg1 != 0) {
local11 = MathUtils.sin[arg1];
local146 = MathUtils.cos[arg1];
local164 = this.anIntArray465[local3] * local146 + 32767 - this.anIntArray466[local3] * local11 >> 16;
this.anIntArray466[local3] = this.anIntArray465[local3] * local11 + this.anIntArray466[local3] * local146 + 32767 >> 16;
this.anIntArray465[local3] = local164;
local164 = this.vertexY[local3] * local146 + 32767 - this.vertexZ[local3] * local11 >> 16;
this.vertexZ[local3] = this.vertexY[local3] * local11 + this.vertexZ[local3] * local146 + 32767 >> 16;
this.vertexY[local3] = local164;
}
if (arg2 != 0) {
local11 = MathUtils.sin[arg2];
local146 = MathUtils.cos[arg2];
local164 = this.anIntArray466[local3] * local11 + this.anIntArray461[local3] * local146 + 32767 >> 16;
this.anIntArray466[local3] = this.anIntArray466[local3] * local146 + 32767 - this.anIntArray461[local3] * local11 >> 16;
this.anIntArray461[local3] = local164;
local164 = this.vertexZ[local3] * local11 + this.vertexX[local3] * local146 + 32767 >> 16;
this.vertexZ[local3] = this.vertexZ[local3] * local146 + 32767 - this.vertexX[local3] * local11 >> 16;
this.vertexX[local3] = local164;
}
this.anIntArray461[local3] += anInt5298;
this.anIntArray465[local3] += anInt5300;
this.anIntArray466[local3] += anInt5299;
this.vertexX[local3] += anInt5298;
this.vertexY[local3] += anInt5300;
this.vertexZ[local3] += anInt5299;
}
} else if (arg0 == 3) {
for (local3 = 0; local3 < this.vertexCount; local3++) {
this.anIntArray461[local3] -= anInt5298;
this.anIntArray465[local3] -= anInt5300;
this.anIntArray466[local3] -= anInt5299;
this.anIntArray461[local3] = this.anIntArray461[local3] * arg1 / 128;
this.anIntArray465[local3] = this.anIntArray465[local3] * arg2 / 128;
this.anIntArray466[local3] = this.anIntArray466[local3] * arg3 / 128;
this.anIntArray461[local3] += anInt5298;
this.anIntArray465[local3] += anInt5300;
this.anIntArray466[local3] += anInt5299;
this.vertexX[local3] -= anInt5298;
this.vertexY[local3] -= anInt5300;
this.vertexZ[local3] -= anInt5299;
this.vertexX[local3] = this.vertexX[local3] * arg1 / 128;
this.vertexY[local3] = this.vertexY[local3] * arg2 / 128;
this.vertexZ[local3] = this.vertexZ[local3] * arg3 / 128;
this.vertexX[local3] += anInt5298;
this.vertexY[local3] += anInt5300;
this.vertexZ[local3] += anInt5299;
}
} else if (arg0 == 5) {
for (local3 = 0; local3 < this.anInt5297; local3++) {
@ -3264,7 +3264,7 @@ public final class GlModel extends Model {
@OriginalMember(owner = "client!td", name = "h", descriptor = "()I")
@Override
public final int method4562() {
public final int getMinX() {
if (!this.vertexBuffer.valid) {
this.method4108();
}
@ -3286,9 +3286,9 @@ public final class GlModel extends Model {
}
if (this.aByte19 != 0) {
if ((this.aByte19 & 0x1) != 0) {
this.anIntArray461 = null;
this.anIntArray465 = null;
this.anIntArray466 = null;
this.vertexX = null;
this.vertexY = null;
this.vertexZ = null;
this.aShortArray81 = null;
this.anIntArray462 = null;
}
@ -3391,9 +3391,9 @@ public final class GlModel extends Model {
@Override
protected final void method4557() {
for (@Pc(1) int local1 = 0; local1 < this.vertexCount; local1++) {
this.anIntArray461[local1] = this.anIntArray461[local1] + 7 >> 4;
this.anIntArray465[local1] = this.anIntArray465[local1] + 7 >> 4;
this.anIntArray466[local1] = this.anIntArray466[local1] + 7 >> 4;
this.vertexX[local1] = this.vertexX[local1] + 7 >> 4;
this.vertexY[local1] = this.vertexY[local1] + 7 >> 4;
this.vertexZ[local1] = this.vertexZ[local1] + 7 >> 4;
}
this.vertexBuffer.valid = false;
this.bounds.valid = false;
@ -3403,7 +3403,7 @@ public final class GlModel extends Model {
public final void method4122() {
@Pc(1) int local1;
for (local1 = 0; local1 < this.vertexCount; local1++) {
this.anIntArray466[local1] = -this.anIntArray466[local1];
this.vertexZ[local1] = -this.vertexZ[local1];
}
if (this.aShortArray85 != null) {
for (local1 = 0; local1 < this.anInt5296; local1++) {
@ -3429,9 +3429,9 @@ public final class GlModel extends Model {
@Pc(3) int local3 = MathUtils.sin[arg0];
@Pc(7) int local7 = MathUtils.cos[arg0];
for (@Pc(9) int local9 = 0; local9 < this.vertexCount; local9++) {
@Pc(29) int local29 = this.anIntArray465[local9] * local7 - this.anIntArray466[local9] * local3 >> 16;
this.anIntArray466[local9] = this.anIntArray465[local9] * local3 + this.anIntArray466[local9] * local7 >> 16;
this.anIntArray465[local9] = local29;
@Pc(29) int local29 = this.vertexY[local9] * local7 - this.vertexZ[local9] * local3 >> 16;
this.vertexZ[local9] = this.vertexY[local9] * local3 + this.vertexZ[local9] * local7 >> 16;
this.vertexY[local9] = local29;
}
this.vertexBuffer.valid = false;
this.bounds.valid = false;
@ -3448,9 +3448,9 @@ public final class GlModel extends Model {
@Pc(16) int local16;
@Pc(36) int local36;
for (local16 = 0; local16 < this.vertexCount; local16++) {
local36 = this.anIntArray466[local16] * local10 + this.anIntArray461[local16] * local14 >> 16;
this.anIntArray466[local16] = this.anIntArray466[local16] * local14 - this.anIntArray461[local16] * local10 >> 16;
this.anIntArray461[local16] = local36;
local36 = this.vertexZ[local16] * local10 + this.vertexX[local16] * local14 >> 16;
this.vertexZ[local16] = this.vertexZ[local16] * local14 - this.vertexX[local16] * local10 >> 16;
this.vertexX[local16] = local36;
}
for (local16 = 0; local16 < this.anInt5296; local16++) {
local36 = this.aShortArray85[local16] * local10 + this.aShortArray76[local16] * local14 >> 16;
@ -3512,8 +3512,8 @@ public final class GlModel extends Model {
@Pc(248) int local248;
@Pc(258) int local258;
for (local194 = 0; local194 < this.vertexCount; local194++) {
@Pc(216) int local216 = (this.anIntArray461[local194] - (this.anIntArray465[local194] * FogManager.anInt3920 >> 8) >> 3) - local26;
@Pc(234) int local234 = (this.anIntArray466[local194] - (this.anIntArray465[local194] * FogManager.anInt3921 >> 8) >> 3) - local85;
@Pc(216) int local216 = (this.vertexX[local194] - (this.vertexY[local194] * FogManager.anInt3920 >> 8) >> 3) - local26;
@Pc(234) int local234 = (this.vertexZ[local194] - (this.vertexY[local194] * FogManager.anInt3921 >> 8) >> 3) - local85;
@Pc(239) int local239 = this.anIntArray462[local194];
local246 = this.anIntArray462[local194 + 1];
for (local248 = local239; local248 < local246; local248++) {
@ -3548,9 +3548,9 @@ public final class GlModel extends Model {
@Override
public final void method4578() {
for (@Pc(1) int local1 = 0; local1 < this.vertexCount; local1++) {
@Pc(10) int local10 = this.anIntArray466[local1];
this.anIntArray466[local1] = this.anIntArray461[local1];
this.anIntArray461[local1] = -local10;
@Pc(10) int local10 = this.vertexZ[local1];
this.vertexZ[local1] = this.vertexX[local1];
this.vertexX[local1] = -local10;
}
this.vertexBuffer.valid = false;
this.bounds.valid = false;

View file

@ -6,62 +6,62 @@ import org.openrs2.deob.annotation.Pc;
public class HintArrowManager {
@OriginalMember(owner = "client!ih", name = "l", descriptor = "Lclient!n;")
public static final SoftLruHashTable HINT_ARROWS = new SoftLruHashTable(4);
public static final SoftLruHashTable models = new SoftLruHashTable(4);
@OriginalMember(owner = "client!mh", name = "c", descriptor = "(II)V")
public static void clean() {
HINT_ARROWS.clean(5);
models.clean(5);
}
@OriginalMember(owner = "client!og", name = "a", descriptor = "(I)V")
public static void method3329() {
HINT_ARROWS.method3103();
public static void removeSoft() {
models.removeSoft();
}
@OriginalMember(owner = "client!oi", name = "b", descriptor = "(I)V")
public static void clear() {
HINT_ARROWS.clear();
models.clear();
}
@OriginalMember(owner = "client!rm", name = "a", descriptor = "(ZIIIILclient!ak;I)Lclient!ak;")
public static Model getModel(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) Model arg4, @OriginalArg(6) int arg5) {
@Pc(4) long local4 = (long) arg2;
@Pc(10) Model local10 = (Model) HINT_ARROWS.get(local4);
if (local10 == null) {
@Pc(4) long local4 = arg2;
@Pc(10) Model model = (Model) models.get(local4);
if (model == null) {
@Pc(22) RawModel local22 = RawModel.create(client.js5Archive7, arg2);
if (local22 == null) {
return null;
}
local10 = local22.createModel(64, 768, -50, -10, -50);
HINT_ARROWS.put(local10, local4);
model = local22.createModel(64, 768, -50, -10, -50);
models.put(model, local4);
}
@Pc(42) int local42 = arg4.method4562();
@Pc(45) int local45 = arg4.method4561();
@Pc(48) int local48 = arg4.method4576();
@Pc(51) int local51 = arg4.method4550();
local10 = local10.method4560(true, true, true);
@Pc(42) int minX = arg4.getMinX();
@Pc(45) int maxX = arg4.getMaxX();
@Pc(48) int minZ = arg4.getMinZ();
@Pc(51) int maxZ = arg4.getMaxZ();
model = model.method4560(true, true, true);
if (arg0 != 0) {
local10.method4554(arg0);
model.method4554(arg0);
}
@Pc(94) int local94;
if (GlRenderer.enabled) {
@Pc(68) GlModel local68 = (GlModel) local10;
if (arg5 != SceneGraph.getTileHeight(Player.level, arg3 + local42, arg1 + local48) || arg5 != SceneGraph.getTileHeight(Player.level, arg3 + local45, local51 + arg1)) {
@Pc(68) GlModel local68 = (GlModel) model;
if (arg5 != SceneGraph.getTileHeight(Player.level, arg3 + minX, arg1 + minZ) || arg5 != SceneGraph.getTileHeight(Player.level, arg3 + maxX, maxZ + arg1)) {
for (local94 = 0; local94 < local68.vertexCount; local94++) {
local68.anIntArray465[local94] += SceneGraph.getTileHeight(Player.level, local68.anIntArray461[local94] + arg3, local68.anIntArray466[local94] + arg1) - arg5;
local68.vertexY[local94] += SceneGraph.getTileHeight(Player.level, local68.vertexX[local94] + arg3, local68.vertexZ[local94] + arg1) - arg5;
}
local68.bounds.valid = false;
local68.vertexBuffer.valid = false;
}
} else {
@Pc(142) SoftwareModel local142 = (SoftwareModel) local10;
if (arg5 != SceneGraph.getTileHeight(Player.level, local42 + arg3, local48 + arg1) || arg5 != SceneGraph.getTileHeight(Player.level, arg3 + local45, local51 + arg1)) {
@Pc(142) SoftwareModel local142 = (SoftwareModel) model;
if (arg5 != SceneGraph.getTileHeight(Player.level, minX + arg3, minZ + arg1) || arg5 != SceneGraph.getTileHeight(Player.level, arg3 + maxX, maxZ + arg1)) {
for (local94 = 0; local94 < local142.vertexCount; local94++) {
local142.anIntArray527[local94] += SceneGraph.getTileHeight(Player.level, arg3 + local142.anIntArray528[local94], local142.anIntArray531[local94] + arg1) - arg5;
local142.vertexY[local94] += SceneGraph.getTileHeight(Player.level, arg3 + local142.vertexX[local94], local142.vertexZ[local94] + arg1) - arg5;
}
local142.boundsValid = false;
}
}
return local10;
return model;
}
}

View file

@ -38,7 +38,7 @@ public class IdkTypeList {
@OriginalMember(owner = "client!oi", name = "a", descriptor = "(I)V")
public static void method3342() {
types.method3103();
types.removeSoft();
}
@OriginalMember(owner = "client!t", name = "b", descriptor = "(I)V")

View file

@ -42,6 +42,6 @@ public class LightTypeList {
@OriginalMember(owner = "client!hd", name = "a", descriptor = "(I)V")
public static void method1882() {
types.method3103();
types.removeSoft();
}
}

View file

@ -63,10 +63,10 @@ public class LocTypeList {
@OriginalMember(owner = "client!oe", name = "b", descriptor = "(I)V")
public static void method3323() {
types.method3103();
aClass99_24.method3103();
aClass99_14.method3103();
aClass99_36.method3103();
types.removeSoft();
aClass99_24.removeSoft();
aClass99_14.removeSoft();
aClass99_36.removeSoft();
}
@OriginalMember(owner = "client!va", name = "b", descriptor = "(II)V")

View file

@ -28,7 +28,7 @@ public abstract class Model extends Entity {
}
@OriginalMember(owner = "client!ak", name = "c", descriptor = "()I")
public abstract int method4550();
public abstract int getMaxZ();
@OriginalMember(owner = "client!ak", name = "b", descriptor = "()I")
public abstract int getMinY();
@ -242,10 +242,10 @@ public abstract class Model extends Entity {
public abstract Model method4560(@OriginalArg(0) boolean arg0, @OriginalArg(1) boolean arg1, @OriginalArg(2) boolean arg2);
@OriginalMember(owner = "client!ak", name = "g", descriptor = "()I")
public abstract int method4561();
public abstract int getMaxX();
@OriginalMember(owner = "client!ak", name = "h", descriptor = "()I")
public abstract int method4562();
public abstract int getMinX();
@OriginalMember(owner = "client!ak", name = "i", descriptor = "()V")
public abstract void method4563();
@ -373,7 +373,7 @@ public abstract class Model extends Entity {
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();
public abstract int getMinZ();
@OriginalMember(owner = "client!ak", name = "a", descriptor = "(IIIIIIIIJILclient!ga;)V")
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);

View file

@ -57,8 +57,8 @@ public class MsiTypeList {
@OriginalMember(owner = "client!vl", name = "b", descriptor = "(I)V")
public static void method4529() {
types.method3103();
sprites.method3103();
types.removeSoft();
sprites.removeSoft();
}
@OriginalMember(owner = "client!wh", name = "a", descriptor = "(II)V")

View file

@ -41,9 +41,9 @@ public class NpcTypeList {
@OriginalMember(owner = "client!t", name = "b", descriptor = "(B)V")
public static void method4001() {
types.method3103();
models.method3103();
headModels.method3103();
types.removeSoft();
models.removeSoft();
headModels.removeSoft();
}
@OriginalMember(owner = "client!qi", name = "e", descriptor = "(B)V")

View file

@ -70,9 +70,9 @@ public class ObjTypeList {
@OriginalMember(owner = "client!i", name = "r", descriptor = "(I)V")
public static void method2239() {
types.method3103();
models.method3103();
objectSpriteCache.method3103();
types.removeSoft();
models.removeSoft();
objectSpriteCache.removeSoft();
}
@OriginalMember(owner = "client!ob", name = "a", descriptor = "(B)V")

View file

@ -86,8 +86,8 @@ public final class PlayerAppearance {
@OriginalMember(owner = "client!ph", name = "b", descriptor = "(B)V")
public static void method3474() {
aClass99_33.method3103();
aClass99_21.method3103();
aClass99_33.removeSoft();
aClass99_21.removeSoft();
}
@OriginalMember(owner = "client!sj", name = "c", descriptor = "(I)V")
@ -98,7 +98,7 @@ public final class PlayerAppearance {
@OriginalMember(owner = "client!q", name = "a", descriptor = "(B)I")
public static int method1029() {
return aClass99_33.method3100();
return aClass99_33.size();
}
@OriginalMember(owner = "client!hh", name = "a", descriptor = "(IIIILclient!tk;III)Lclient!ak;")
@ -161,7 +161,7 @@ public final class PlayerAppearance {
}
this.aLong88 = local13[(int) (((long) (this.gender ? 1 : 0) ^ this.aLong88) & 0xFFL)] ^ this.aLong88 >>> 8;
if (local8 != 0L && this.aLong88 != local8) {
aClass99_33.method3098(local8);
aClass99_33.remove(local8);
}
}

View file

@ -9,13 +9,13 @@ import org.openrs2.deob.annotation.Pc;
public final class SecondaryHashTable {
@OriginalMember(owner = "client!rm", name = "e", descriptor = "[Lclient!rg;")
private final SecondaryNode[] aClass3_Sub2Array1;
private final SecondaryNode[] buckets;
@OriginalMember(owner = "client!rm", name = "<init>", descriptor = "(I)V")
public SecondaryHashTable(@OriginalArg(0) int arg0) {
this.aClass3_Sub2Array1 = new SecondaryNode[arg0];
this.buckets = new SecondaryNode[arg0];
for (@Pc(7) int local7 = 0; local7 < arg0; local7++) {
@Pc(23) SecondaryNode local23 = this.aClass3_Sub2Array1[local7] = new SecondaryNode();
@Pc(23) SecondaryNode local23 = this.buckets[local7] = new SecondaryNode();
local23.secondaryPrev = local23;
local23.secondaryNext = local23;
}

View file

@ -20,7 +20,18 @@ public final class SecondaryLinkedList {
this.sentinel.secondaryPrev = this.sentinel;
}
@OriginalMember(owner = "client!ce", name = "a", descriptor = "(I)I")
@OriginalMember(owner = "client!gk", name = "a", descriptor = "(Lclient!rg;Lclient!rg;B)V")
public static void insertAfter(@OriginalArg(0) SecondaryNode arg0, @OriginalArg(1) SecondaryNode arg1) {
if (arg1.secondaryPrev != null) {
arg1.unlinkSecondary();
}
arg1.secondaryPrev = arg0;
arg1.secondaryNext = arg0.secondaryNext;
arg1.secondaryPrev.secondaryNext = arg1;
arg1.secondaryNext.secondaryPrev = arg1;
}
@OriginalMember(owner = "client!ce", name = "a", descriptor = "(I)I")
public final int size() {
@Pc(3) int local3 = 0;
@Pc(7) SecondaryNode local7 = this.sentinel.secondaryNext;

View file

@ -58,8 +58,8 @@ public class SeqTypeList {
@OriginalMember(owner = "client!sg", name = "a", descriptor = "(B)V")
public static void method3903() {
types.method3103();
animFramesets.method3103();
types.removeSoft();
animFramesets.removeSoft();
}
@OriginalMember(owner = "client!fl", name = "a", descriptor = "(IB)V")

View file

@ -15,7 +15,7 @@ public class ShadowModelList {
@OriginalMember(owner = "client!ug", name = "b", descriptor = "(B)V")
public static void method4276() {
SHADOWS.method3103();
SHADOWS.removeSoft();
}
@OriginalMember(owner = "client!dc", name = "a", descriptor = "(IZLclient!tk;IIIIILclient!ak;IIIIB)Lclient!ak;")
@ -75,11 +75,11 @@ public class ShadowModelList {
@Pc(376) int local376 = -local367;
@Pc(379) int local379 = -local367;
@Pc(381) int local381 = local367;
@Pc(384) int local384 = arg8.method4562();
@Pc(384) int local384 = arg8.getMinX();
@Pc(386) AnimFrameset local386 = null;
local115 = arg8.method4561();
local126 = arg8.method4576();
local130 = arg8.method4550();
local115 = arg8.getMaxX();
local126 = arg8.getMinZ();
local130 = arg8.getMaxZ();
if (arg2 != null) {
@Pc(403) int local403 = arg2.frames[arg10];
local386 = SeqTypeList.getAnimFrameset(local403 >> 16);
@ -129,7 +129,7 @@ public class ShadowModelList {
@Pc(650) GlModel local650 = (GlModel) local33;
if (SceneGraph.getTileHeight(Player.level, arg3 + local384, local126 + arg5) != arg11 || SceneGraph.getTileHeight(Player.level, local115 + arg3, arg5 - -local130) != arg11) {
for (local162 = 0; local162 < local650.vertexCount; local162++) {
local650.anIntArray465[local162] += SceneGraph.getTileHeight(Player.level, local650.anIntArray461[local162] + arg3, arg5 + local650.anIntArray466[local162]) - arg11;
local650.vertexY[local162] += SceneGraph.getTileHeight(Player.level, local650.vertexX[local162] + arg3, arg5 + local650.vertexZ[local162]) - arg11;
}
local650.vertexBuffer.valid = false;
local650.bounds.valid = false;
@ -138,7 +138,7 @@ public class ShadowModelList {
@Pc(574) SoftwareModel local574 = (SoftwareModel) local33;
if (SceneGraph.getTileHeight(Player.level, arg3 + local384, arg5 - -local126) != arg11 || arg11 != SceneGraph.getTileHeight(Player.level, arg3 + local115, arg5 - -local130)) {
for (local162 = 0; local162 < local574.vertexCount; local162++) {
local574.anIntArray527[local162] += SceneGraph.getTileHeight(Player.level, arg3 + local574.anIntArray528[local162], arg5 + local574.anIntArray531[local162]) - arg11;
local574.vertexY[local162] += SceneGraph.getTileHeight(Player.level, arg3 + local574.vertexX[local162], arg5 + local574.vertexZ[local162]) - arg11;
}
local574.boundsValid = false;
}

View file

@ -9,68 +9,57 @@ import org.openrs2.deob.annotation.Pc;
public final class SoftLruHashTable {
@OriginalMember(owner = "client!n", name = "k", descriptor = "Lclient!ce;")
private final SecondaryLinkedList aClass16_8 = new SecondaryLinkedList();
private final SecondaryLinkedList queue = new SecondaryLinkedList();
@OriginalMember(owner = "client!n", name = "m", descriptor = "I")
private final int anInt3970;
private final int capacity;
@OriginalMember(owner = "client!n", name = "g", descriptor = "I")
private int anInt3966;
private int available;
@OriginalMember(owner = "client!n", name = "n", descriptor = "Lclient!sc;")
private final HashTable aClass133_18;
private final HashTable table;
@OriginalMember(owner = "client!n", name = "<init>", descriptor = "(I)V")
public SoftLruHashTable(@OriginalArg(0) int arg0) {
this.anInt3970 = arg0;
this.capacity = arg0;
@Pc(11) int local11;
for (local11 = 1; local11 + local11 < arg0; local11 += local11) {
}
this.anInt3966 = arg0;
this.aClass133_18 = new HashTable(local11);
}
@OriginalMember(owner = "client!gk", name = "a", descriptor = "(Lclient!rg;Lclient!rg;B)V")
public static void method1772(@OriginalArg(0) SecondaryNode arg0, @OriginalArg(1) SecondaryNode arg1) {
if (arg1.secondaryPrev != null) {
arg1.unlinkSecondary();
}
arg1.secondaryPrev = arg0;
arg1.secondaryNext = arg0.secondaryNext;
arg1.secondaryPrev.secondaryNext = arg1;
arg1.secondaryNext.secondaryPrev = arg1;
this.available = arg0;
this.table = new HashTable(local11);
}
@OriginalMember(owner = "client!n", name = "a", descriptor = "(BLjava/lang/Object;J)V")
public final void put(@OriginalArg(1) Object arg0, @OriginalArg(2) long arg1) {
this.method3098(arg1);
if (this.anInt3966 == 0) {
@Pc(26) ReferenceNode local26 = (ReferenceNode) this.aClass16_8.removeHead();
this.remove(arg1);
if (this.available == 0) {
@Pc(26) ReferenceNode local26 = (ReferenceNode) this.queue.removeHead();
local26.unlink();
local26.unlinkSecondary();
} else {
this.anInt3966--;
this.available--;
}
@Pc(44) HardReferenceNode local44 = new HardReferenceNode(arg0);
this.aClass133_18.put(local44, arg1);
this.aClass16_8.addTail(local44);
this.table.put(local44, arg1);
this.queue.addTail(local44);
local44.secondaryKey = 0L;
}
@OriginalMember(owner = "client!n", name = "a", descriptor = "(JB)V")
public final void method3098(@OriginalArg(0) long arg0) {
@Pc(6) ReferenceNode local6 = (ReferenceNode) this.aClass133_18.get(arg0);
public final void remove(@OriginalArg(0) long arg0) {
@Pc(6) ReferenceNode local6 = (ReferenceNode) this.table.get(arg0);
if (local6 != null) {
local6.unlink();
local6.unlinkSecondary();
this.anInt3966++;
this.available++;
}
}
@OriginalMember(owner = "client!n", name = "a", descriptor = "(I)I")
public final int method3100() {
public final int size() {
@Pc(10) int local10 = 0;
for (@Pc(16) ReferenceNode local16 = (ReferenceNode) this.aClass16_8.head(); local16 != null; local16 = (ReferenceNode) this.aClass16_8.next()) {
for (@Pc(16) ReferenceNode local16 = (ReferenceNode) this.queue.head(); local16 != null; local16 = (ReferenceNode) this.queue.next()) {
if (!local16.isSoft()) {
local10++;
}
@ -83,17 +72,17 @@ public final class SoftLruHashTable {
if (ReferenceNodeFactory.SOFT_REFERENCE_NODE_FACTORY == null) {
return;
}
for (@Pc(9) ReferenceNode local9 = (ReferenceNode) this.aClass16_8.head(); local9 != null; local9 = (ReferenceNode) this.aClass16_8.next()) {
for (@Pc(9) ReferenceNode local9 = (ReferenceNode) this.queue.head(); local9 != null; local9 = (ReferenceNode) this.queue.next()) {
if (local9.isSoft()) {
if (local9.get() == null) {
local9.unlink();
local9.unlinkSecondary();
this.anInt3966++;
this.available++;
}
} else if (++local9.secondaryKey > (long) arg0) {
@Pc(33) ReferenceNode local33 = ReferenceNodeFactory.SOFT_REFERENCE_NODE_FACTORY.create(local9);
this.aClass133_18.put(local33, local9.key);
method1772(local9, local33);
this.table.put(local33, local9.key);
SecondaryLinkedList.insertAfter(local9, local33);
local9.unlink();
local9.unlinkSecondary();
}
@ -101,26 +90,26 @@ public final class SoftLruHashTable {
}
@OriginalMember(owner = "client!n", name = "b", descriptor = "(B)V")
public final void method3103() {
for (@Pc(7) ReferenceNode local7 = (ReferenceNode) this.aClass16_8.head(); local7 != null; local7 = (ReferenceNode) this.aClass16_8.next()) {
public final void removeSoft() {
for (@Pc(7) ReferenceNode local7 = (ReferenceNode) this.queue.head(); local7 != null; local7 = (ReferenceNode) this.queue.next()) {
if (local7.isSoft()) {
local7.unlink();
local7.unlinkSecondary();
this.anInt3966++;
this.available++;
}
}
}
@OriginalMember(owner = "client!n", name = "c", descriptor = "(I)V")
public final void clear() {
this.aClass16_8.clear();
this.aClass133_18.clear();
this.anInt3966 = this.anInt3970;
this.queue.clear();
this.table.clear();
this.available = this.capacity;
}
@OriginalMember(owner = "client!n", name = "b", descriptor = "(JB)Ljava/lang/Object;")
public final Object get(@OriginalArg(0) long arg0) {
@Pc(12) ReferenceNode local12 = (ReferenceNode) this.aClass133_18.get(arg0);
@Pc(12) ReferenceNode local12 = (ReferenceNode) this.table.get(arg0);
if (local12 == null) {
return null;
}
@ -128,18 +117,18 @@ public final class SoftLruHashTable {
if (local27 == null) {
local12.unlink();
local12.unlinkSecondary();
this.anInt3966++;
this.available++;
return null;
}
if (local12.isSoft()) {
@Pc(53) HardReferenceNode local53 = new HardReferenceNode(local27);
this.aClass133_18.put(local53, local12.key);
this.aClass16_8.addTail(local53);
this.table.put(local53, local12.key);
this.queue.addTail(local53);
local53.secondaryKey = 0L;
local12.unlink();
local12.unlinkSecondary();
} else {
this.aClass16_8.addTail(local12);
this.queue.addTail(local12);
local12.secondaryKey = 0L;
}
return local27;

File diff suppressed because it is too large Load diff

View file

@ -60,7 +60,7 @@ public class SpotAnimTypeList {
@OriginalMember(owner = "client!fk", name = "a", descriptor = "(B)V")
public static void method1441() {
types.method3103();
models.method3103();
types.removeSoft();
models.removeSoft();
}
}

View file

@ -68,9 +68,9 @@ public final class Static40 {
@OriginalMember(owner = "client!da", name = "h", descriptor = "(B)V")
public static void method1019() {
Component.sprites.method3103();
Component.models.method3103();
Component.fonts.method3103();
Component.sprites.removeSoft();
Component.models.removeSoft();
Component.fonts.removeSoft();
}
@OriginalMember(owner = "client!ha", name = "a", descriptor = "(ILclient!be;)Lclient!be;")

View file

@ -37,7 +37,7 @@ public class VarbitTypeList {
@OriginalMember(owner = "client!gd", name = "a", descriptor = "(I)V")
public static void method1694() {
types.method3103();
types.removeSoft();
}
@OriginalMember(owner = "client!ec", name = "b", descriptor = "(I)V")

View file

@ -40,7 +40,7 @@ public class VarpTypeList {
@OriginalMember(owner = "client!ab", name = "b", descriptor = "(B)V")
public static void method4657() {
types.method3103();
types.removeSoft();
}
@OriginalMember(owner = "client!bn", name = "c", descriptor = "(II)V")

View file

@ -385,10 +385,10 @@ public final class client extends GameShell {
CursorTypeList.method741();
PlayerAppearance.method3474();
Static40.method1019();
HintArrowManager.method3329();
HintArrowManager.removeSoft();
ShadowModelList.method4276();
HitBarList.hitBars.method3103();
FontMetricsList.fontMetrics.method3103();
HitBarList.hitBars.removeSoft();
FontMetricsList.fontMetrics.removeSoft();
}
@OriginalMember(owner = "client!rj", name = "f", descriptor = "(B)V")