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

Refactored more CS2 stuff

Browse source
This commit is contained in:
Pazaz 2022-04-23 02:28:22 -04:00
parent e5eeecd0ad
commit 79fdaf96f8
154 changed files with 1382 additions and 1378 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -108,7 +108,7 @@ public final class Class165 {
@OriginalMember(owner = "client!wm", name = "a", descriptor = "(Lclient!ek;II)Z")
public final boolean method4677(@OriginalArg(0) SoftwareIndexedSprite arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
@Pc(2) byte[] local2 = arg0.aByteArray18;
@Pc(5) int local5 = arg0.anInt4270;
@Pc(5) int local5 = arg0.width;
@Pc(19) int local19 = arg1 * 128 + (arg2 * 128 + 1) * local5 + 1;
@Pc(21) int local21 = 0;
@Pc(23) int local23;

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

@ -32,11 +32,11 @@ public final class Class2 {
if (local17 != null) {
return local17;
}
Static250.aClass153_101.method4506(this.anInt12);
Static250.aClass153_101.isFileReady(this.anInt12);
local17 = Static164.method3119(this.anInt12, Static250.aClass153_101);
if (local17 != null) {
local17.method1389(Static173.anInt4183, Static85.anInt2262, Static266.anInt5344);
local17.anInt4279 = local17.anInt4270;
local17.anInt4279 = local17.width;
local17.anInt4276 = local17.anInt4278;
for (@Pc(59) int local59 = 0; local59 < arg0; local59++) {
local17.method1395();

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

@ -108,7 +108,7 @@ public final class Class3_Sub2_Sub6 extends SecondaryNode {
@OriginalMember(owner = "client!cb", name = "f", descriptor = "(I)Lclient!na;")
public final JagString method769() {
@Pc(15) JagString local15 = Static87.method1804(80);
@Pc(15) JagString local15 = Static87.allocate(80);
if (this.aClass100Array35 == null) {
return Static202.aClass100_891;
}
@ -122,7 +122,7 @@ public final class Class3_Sub2_Sub6 extends SecondaryNode {
@OriginalMember(owner = "client!cb", name = "a", descriptor = "(ILclient!wa;)Lclient!na;")
public final JagString method770(@OriginalArg(1) Buffer arg0) {
@Pc(17) JagString local17 = Static87.method1804(80);
@Pc(17) JagString local17 = Static87.allocate(80);
if (this.anIntArray71 != null) {
for (@Pc(22) int local22 = 0; local22 < this.anIntArray71.length; local22++) {
local17.method3113(this.aClass100Array35[local22]);

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

@ -20,7 +20,7 @@ public final class ClientScript extends SecondaryNode {
public HashTable[] aClass133Array1;
@OriginalMember(owner = "client!qc", name = "R", descriptor = "Lclient!na;")
public JagString aClass100_880;
public JagString name;
@OriginalMember(owner = "client!qc", name = "S", descriptor = "I")
public int anInt4671;

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

@ -52,7 +52,7 @@ public final class Component {
public int[] anIntArray35;
@OriginalMember(owner = "client!be", name = "I", descriptor = "I")
public int anInt452;
public int type;
@OriginalMember(owner = "client!be", name = "V", descriptor = "[I")
public int[] anIntArray36;
@ -181,7 +181,7 @@ public final class Component {
public boolean aBoolean23 = false;
@OriginalMember(owner = "client!be", name = "f", descriptor = "I")
public int anInt442 = 1;
public int aspectHeight = 1;
@OriginalMember(owner = "client!be", name = "R", descriptor = "I")
public int anInt459 = 0;
@ -241,7 +241,7 @@ public final class Component {
public int anInt484 = -1;
@OriginalMember(owner = "client!be", name = "O", descriptor = "I")
public int componentId = -1;
public int createdComponentId = -1;
@OriginalMember(owner = "client!be", name = "J", descriptor = "Z")
public boolean aBoolean24 = false;
@ -265,7 +265,7 @@ public final class Component {
public int anInt499 = -1;
@OriginalMember(owner = "client!be", name = "Qb", descriptor = "B")
public byte aByte3 = 0;
public byte dynamicHeightValue = 0;
@OriginalMember(owner = "client!be", name = "bc", descriptor = "I")
public int anInt491 = 0;
@ -304,7 +304,7 @@ public final class Component {
public int anInt489 = 0;
@OriginalMember(owner = "client!be", name = "sb", descriptor = "Z")
public boolean aBoolean29 = false;
public boolean noClickThrough = false;
@OriginalMember(owner = "client!be", name = "U", descriptor = "I")
private int anInt461 = -1;
@ -313,7 +313,7 @@ public final class Component {
public int layer = -1;
@OriginalMember(owner = "client!be", name = "pb", descriptor = "I")
public int anInt473 = 1;
public int aspectWidth = 1;
@OriginalMember(owner = "client!be", name = "Q", descriptor = "I")
public int objId = -1;
@ -376,10 +376,10 @@ public final class Component {
public int anInt516 = 0;
@OriginalMember(owner = "client!be", name = "Tb", descriptor = "I")
public int anInt488 = 0;
public int baseHeight = 0;
@OriginalMember(owner = "client!be", name = "Fc", descriptor = "I")
public int anInt507 = -1;
public int id = -1;
@OriginalMember(owner = "client!be", name = "Yc", descriptor = "I")
public int anInt519 = -1;
@ -439,7 +439,7 @@ public final class Component {
public boolean aBoolean34 = false;
@OriginalMember(owner = "client!be", name = "hd", descriptor = "B")
public byte aByte5 = 0;
public byte dynamicWidthValue = 0;
@OriginalMember(owner = "client!be", name = "Wc", descriptor = "I")
private int anInt518 = 1;
@ -509,16 +509,16 @@ public final class Component {
this.anIntArray45 = new int[local18.anInt4278];
for (@Pc(37) int local37 = 0; local37 < local18.anInt4278; local37++) {
@Pc(47) int local47 = 0;
@Pc(50) int local50 = local18.anInt4270;
@Pc(50) int local50 = local18.width;
@Pc(52) int local52;
for (local52 = 0; local52 < local18.anInt4270; local52++) {
if (local18.aByteArray18[local18.anInt4270 * local37 + local52] != 0) {
for (local52 = 0; local52 < local18.width; local52++) {
if (local18.aByteArray18[local18.width * local37 + local52] != 0) {
local47 = local52;
break;
}
}
for (local52 = local47; local52 < local18.anInt4270; local52++) {
if (local18.aByteArray18[local37 * local18.anInt4270 + local52] == 0) {
for (local52 = local47; local52 < local18.width; local52++) {
if (local18.aByteArray18[local37 * local18.width + local52] == 0) {
local50 = local52;
break;
}
@ -546,15 +546,15 @@ public final class Component {
@OriginalMember(owner = "client!be", name = "a", descriptor = "(ILclient!wa;)V")
public final void method481(@OriginalArg(1) Buffer arg0) {
this.aBoolean32 = false;
this.anInt452 = arg0.g1();
this.type = arg0.g1();
this.anInt530 = arg0.g1();
this.anInt453 = arg0.g2();
this.baseX = arg0.g2s();
this.baseY = arg0.g2s();
this.baseWidth = arg0.g2();
this.anInt488 = arg0.g2();
this.aByte5 = 0;
this.aByte3 = 0;
this.baseHeight = arg0.g2();
this.dynamicWidthValue = 0;
this.dynamicHeightValue = 0;
this.yMode = 0;
this.xMode = 0;
this.anInt476 = arg0.g1();
@ -562,7 +562,7 @@ public final class Component {
if (this.layer == 65535) {
this.layer = -1;
} else {
this.layer += this.anInt507 & 0xFFFF0000;
this.layer += this.id & 0xFFFF0000;
}
this.anInt470 = arg0.g2();
if (this.anInt470 == 65535) {
@ -595,20 +595,20 @@ public final class Component {
}
}
}
if (this.anInt452 == 0) {
if (this.type == 0) {
this.anInt491 = arg0.g2();
this.hidden = arg0.g1() == 1;
}
if (this.anInt452 == 1) {
if (this.type == 1) {
arg0.g2();
arg0.g1();
}
local164 = 0;
if (this.anInt452 == 2) {
this.aByte3 = 3;
this.objCounts = new int[this.baseWidth * this.anInt488];
this.objTypes = new int[this.anInt488 * this.baseWidth];
this.aByte5 = 3;
if (this.type == 2) {
this.dynamicHeightValue = 3;
this.objCounts = new int[this.baseWidth * this.baseHeight];
this.objTypes = new int[this.baseHeight * this.baseWidth];
this.dynamicWidthValue = 3;
local175 = arg0.g1();
local183 = arg0.g1();
if (local175 == 1) {
@ -650,10 +650,10 @@ public final class Component {
}
}
}
if (this.anInt452 == 3) {
if (this.type == 3) {
this.aBoolean30 = arg0.g1() == 1;
}
if (this.anInt452 == 4 || this.anInt452 == 1) {
if (this.type == 4 || this.type == 1) {
this.anInt460 = arg0.g1();
this.anInt478 = arg0.g1();
this.anInt467 = arg0.g1();
@ -663,23 +663,23 @@ public final class Component {
}
this.aBoolean28 = arg0.g1() == 1;
}
if (this.anInt452 == 4) {
if (this.type == 4) {
this.aClass100_84 = arg0.gjstr();
this.aClass100_82 = arg0.gjstr();
}
if (this.anInt452 == 1 || this.anInt452 == 3 || this.anInt452 == 4) {
if (this.type == 1 || this.type == 3 || this.type == 4) {
this.anInt474 = arg0.g4();
}
if (this.anInt452 == 3 || this.anInt452 == 4) {
if (this.type == 3 || this.type == 4) {
this.anInt492 = arg0.g4();
this.anInt480 = arg0.g4();
this.anInt475 = arg0.g4();
}
if (this.anInt452 == 5) {
if (this.type == 5) {
this.anInt477 = arg0.g4();
this.anInt519 = arg0.g4();
}
if (this.anInt452 == 6) {
if (this.type == 6) {
this.modelType = 1;
this.modelId = arg0.g2();
this.anInt518 = 1;
@ -702,11 +702,11 @@ public final class Component {
this.modelXAngle = arg0.g2();
this.modelYAngle = arg0.g2();
}
if (this.anInt452 == 7) {
this.aByte3 = 3;
this.aByte5 = 3;
this.objCounts = new int[this.anInt488 * this.baseWidth];
this.objTypes = new int[this.baseWidth * this.anInt488];
if (this.type == 7) {
this.dynamicHeightValue = 3;
this.dynamicWidthValue = 3;
this.objCounts = new int[this.baseHeight * this.baseWidth];
this.objTypes = new int[this.baseWidth * this.baseHeight];
this.anInt460 = arg0.g1();
this.anInt502 = arg0.g2();
if (this.anInt502 == 65535) {
@ -729,10 +729,10 @@ public final class Component {
}
}
}
if (this.anInt452 == 8) {
if (this.type == 8) {
this.aClass100_84 = arg0.gjstr();
}
if (this.anInt530 == 2 || this.anInt452 == 2) {
if (this.anInt530 == 2 || this.type == 2) {
this.aClass100_86 = arg0.gjstr();
this.aClass100_85 = arg0.gjstr();
local175 = arg0.g2() & 0x3F;
@ -977,34 +977,34 @@ public final class Component {
public final void method490(@OriginalArg(1) Buffer arg0) {
this.aBoolean32 = true;
arg0.offset++;
this.anInt452 = arg0.g1();
if ((this.anInt452 & 0x80) != 0) {
this.anInt452 &= 0x7F;
this.type = arg0.g1();
if ((this.type & 0x80) != 0) {
this.type &= 0x7F;
arg0.gjstr();
}
this.anInt453 = arg0.g2();
this.baseX = arg0.g2s();
this.baseY = arg0.g2s();
this.baseWidth = arg0.g2();
this.anInt488 = arg0.g2();
this.aByte5 = arg0.g1s();
this.aByte3 = arg0.g1s();
this.baseHeight = arg0.g2();
this.dynamicWidthValue = arg0.g1s();
this.dynamicHeightValue = arg0.g1s();
this.yMode = arg0.g1s();
this.xMode = arg0.g1s();
this.layer = arg0.g2();
if (this.layer == 65535) {
this.layer = -1;
} else {
this.layer = (this.anInt507 & 0xFFFF0000) + this.layer;
this.layer = (this.id & 0xFFFF0000) + this.layer;
}
this.hidden = arg0.g1() == 1;
if (this.anInt452 == 0) {
if (this.type == 0) {
this.anInt486 = arg0.g2();
this.anInt491 = arg0.g2();
this.aBoolean29 = arg0.g1() == 1;
this.noClickThrough = arg0.g1() == 1;
}
@Pc(175) int local175;
if (this.anInt452 == 5) {
if (this.type == 5) {
this.anInt477 = arg0.g4();
this.anInt521 = arg0.g2();
local175 = arg0.g1();
@ -1016,7 +1016,7 @@ public final class Component {
this.aBoolean21 = arg0.g1() == 1;
this.aBoolean26 = arg0.g1() == 1;
}
if (this.anInt452 == 6) {
if (this.type == 6) {
this.modelType = 1;
this.modelId = arg0.g2();
if (this.modelId == 65535) {
@ -1036,14 +1036,14 @@ public final class Component {
this.aShort11 = (short) arg0.g2();
this.aShort10 = (short) arg0.g2();
this.aBoolean34 = arg0.g1() == 1;
if (this.aByte5 != 0) {
if (this.dynamicWidthValue != 0) {
this.anInt451 = arg0.g2();
}
if (this.aByte3 != 0) {
if (this.dynamicHeightValue != 0) {
this.anInt526 = arg0.g2();
}
}
if (this.anInt452 == 4) {
if (this.type == 4) {
this.anInt502 = arg0.g2();
if (this.anInt502 == 65535) {
this.anInt502 = -1;
@ -1055,12 +1055,12 @@ public final class Component {
this.aBoolean28 = arg0.g1() == 1;
this.anInt474 = arg0.g4();
}
if (this.anInt452 == 3) {
if (this.type == 3) {
this.anInt474 = arg0.g4();
this.aBoolean30 = arg0.g1() == 1;
this.anInt476 = arg0.g1();
}
if (this.anInt452 == 9) {
if (this.type == 9) {
this.anInt490 = arg0.g1();
this.anInt474 = arg0.g4();
this.aBoolean20 = arg0.g1() == 1;

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

@ -19,7 +19,7 @@ public final class DelayedStateChange extends SecondaryNode {
@OriginalMember(owner = "client!da", name = "<init>", descriptor = "(II)V")
public DelayedStateChange(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
this.aLong192 = (long) arg0 << 32 | (long) arg1;
this.uid = (long) arg0 << 32 | (long) arg1;
}
@OriginalMember(owner = "client!da", name = "a", descriptor = "(Z)V")
@ -35,12 +35,12 @@ public final class DelayedStateChange extends SecondaryNode {
@OriginalMember(owner = "client!da", name = "e", descriptor = "(I)I")
public final int method1011() {
return (int) (this.aLong192 >>> 32 & 0xFFL);
return (int) (this.uid >>> 32 & 0xFFL);
}
@OriginalMember(owner = "client!da", name = "f", descriptor = "(B)I")
public final int method1012() {
return (int) this.aLong192;
return (int) this.uid;
}
@OriginalMember(owner = "client!da", name = "g", descriptor = "(B)V")

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

@ -69,7 +69,7 @@ public final class EnumType extends SecondaryNode {
this.method3087();
}
for (@Pc(38) Class3_Sub13 local38 = (Class3_Sub13) this.aClass133_17.method3863(arg0.method3118()); local38 != null; local38 = (Class3_Sub13) this.aClass133_17.method3867()) {
if (local38.aClass100_503.method3108(arg0)) {
if (local38.aClass100_503.strEquals(arg0)) {
return true;
}
}
@ -80,7 +80,7 @@ public final class EnumType extends SecondaryNode {
private void method3087() {
this.aClass133_17 = new HashTable(this.aClass133_16.method3868());
for (@Pc(22) StringNode local22 = (StringNode) this.aClass133_16.method3859(); local22 != null; local22 = (StringNode) this.aClass133_16.method3861()) {
@Pc(36) Class3_Sub13 local36 = new Class3_Sub13(local22.aClass100_980, (int) local22.aLong192);
@Pc(36) Class3_Sub13 local36 = new Class3_Sub13(local22.aClass100_980, (int) local22.uid);
this.aClass133_17.method3862(local36, local22.aClass100_980.method3118());
}
}
@ -111,7 +111,7 @@ public final class EnumType extends SecondaryNode {
private void method3091() {
this.aClass133_17 = new HashTable(this.aClass133_16.method3868());
for (@Pc(24) IntNode local24 = (IntNode) this.aClass133_16.method3859(); local24 != null; local24 = (IntNode) this.aClass133_16.method3861()) {
@Pc(34) IntNode local34 = new IntNode((int) local24.aLong192);
@Pc(34) IntNode local34 = new IntNode((int) local24.uid);
this.aClass133_17.method3862(local34, (long) local24.anInt3141);
}
}

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

@ -78,7 +78,7 @@ public abstract class Font extends SecondaryNode {
@Pc(8) int local8 = 0;
@Pc(12) int local12 = arg0.length();
for (@Pc(14) int local14 = 0; local14 < local12; local14++) {
@Pc(22) int local22 = arg0.method3149(local14);
@Pc(22) int local22 = arg0.charAt(local14);
if (local22 == 60) {
local6 = local14;
} else {
@ -86,29 +86,29 @@ public abstract class Font extends SecondaryNode {
if (local22 == 62 && local6 != -1) {
@Pc(42) JagString local42 = arg0.substring(local14, local6 + 1);
local6 = -1;
if (local42.method3108(Static218.aClass100_696)) {
if (local42.strEquals(Static218.aClass100_696)) {
local22 = 60;
} else if (local42.method3108(Static218.aClass100_695)) {
} else if (local42.strEquals(Static218.aClass100_695)) {
local22 = 62;
} else if (local42.method3108(Static218.aClass100_710)) {
} else if (local42.strEquals(Static218.aClass100_710)) {
local22 = 160;
} else if (local42.method3108(Static218.aClass100_698)) {
} else if (local42.strEquals(Static218.aClass100_698)) {
local22 = 173;
} else if (local42.method3108(Static218.aClass100_708)) {
} else if (local42.strEquals(Static218.aClass100_708)) {
local22 = 215;
} else if (local42.method3108(Static218.aClass100_702)) {
} else if (local42.strEquals(Static218.aClass100_702)) {
local22 = 128;
} else if (local42.method3108(Static218.aClass100_716)) {
} else if (local42.strEquals(Static218.aClass100_716)) {
local22 = 169;
} else {
if (!local42.method3108(Static218.aClass100_718)) {
if (!local42.strEquals(Static218.aClass100_718)) {
if (local42.method3138(Static218.aClass100_715)) {
try {
local120 = local42.method3136(4).parseInt();
@Pc(125) IndexedSprite local125 = this.aClass36Array11[local120];
@Pc(136) int local136 = this.anIntArray346 == null ? local125.anInt4276 : this.anIntArray346[local120];
if (Static218.anInt3631 == 256) {
local125.method3336(arg1, local4 + this.anInt3626 - local136);
local125.renderTransparent(arg1, local4 + this.anInt3626 - local136);
} else {
local125.method3335(arg1, local4 + this.anInt3626 - local136, Static218.anInt3631);
}
@ -206,29 +206,29 @@ public abstract class Font extends SecondaryNode {
@Pc(9) int local9 = 0;
@Pc(13) int local13 = arg0.length();
for (@Pc(15) int local15 = 0; local15 < local13; local15++) {
@Pc(23) int local23 = arg0.method3149(local15);
@Pc(23) int local23 = arg0.charAt(local15);
if (local23 == 60) {
local5 = local15;
} else {
if (local23 == 62 && local5 != -1) {
@Pc(43) JagString local43 = arg0.substring(local15, local5 + 1);
local5 = -1;
if (local43.method3108(Static218.aClass100_696)) {
if (local43.strEquals(Static218.aClass100_696)) {
local23 = 60;
} else if (local43.method3108(Static218.aClass100_695)) {
} else if (local43.strEquals(Static218.aClass100_695)) {
local23 = 62;
} else if (local43.method3108(Static218.aClass100_710)) {
} else if (local43.strEquals(Static218.aClass100_710)) {
local23 = 160;
} else if (local43.method3108(Static218.aClass100_698)) {
} else if (local43.strEquals(Static218.aClass100_698)) {
local23 = 173;
} else if (local43.method3108(Static218.aClass100_708)) {
} else if (local43.strEquals(Static218.aClass100_708)) {
local23 = 215;
} else if (local43.method3108(Static218.aClass100_702)) {
} else if (local43.strEquals(Static218.aClass100_702)) {
local23 = 128;
} else if (local43.method3108(Static218.aClass100_716)) {
} else if (local43.strEquals(Static218.aClass100_716)) {
local23 = 169;
} else {
if (!local43.method3108(Static218.aClass100_718)) {
if (!local43.strEquals(Static218.aClass100_718)) {
if (local43.method3138(Static218.aClass100_715)) {
try {
@Pc(121) int local121 = local43.method3136(4).parseInt();
@ -284,31 +284,31 @@ public abstract class Font extends SecondaryNode {
try {
if (arg0.method3138(Static218.aClass100_705)) {
Static218.anInt3635 = arg0.method3136(4).method3110(16);
} else if (arg0.method3108(Static218.aClass100_703)) {
} else if (arg0.strEquals(Static218.aClass100_703)) {
Static218.anInt3635 = Static218.anInt3630;
} else if (arg0.method3138(Static218.aClass100_699)) {
Static218.anInt3631 = arg0.method3136(6).parseInt();
} else if (arg0.method3108(Static218.aClass100_709)) {
} else if (arg0.strEquals(Static218.aClass100_709)) {
Static218.anInt3631 = Static218.anInt3632;
} else if (arg0.method3138(Static218.aClass100_701)) {
Static218.anInt3627 = arg0.method3136(4).method3110(16);
} else if (arg0.method3108(Static218.aClass100_719)) {
} else if (arg0.strEquals(Static218.aClass100_719)) {
Static218.anInt3627 = 8388608;
} else if (arg0.method3108(Static218.aClass100_717)) {
} else if (arg0.strEquals(Static218.aClass100_717)) {
Static218.anInt3627 = -1;
} else if (arg0.method3138(Static218.aClass100_700)) {
Static218.anInt3628 = arg0.method3136(2).method3110(16);
} else if (arg0.method3108(Static218.aClass100_707)) {
} else if (arg0.strEquals(Static218.aClass100_707)) {
Static218.anInt3628 = 0;
} else if (arg0.method3108(Static218.aClass100_712)) {
} else if (arg0.strEquals(Static218.aClass100_712)) {
Static218.anInt3628 = -1;
} else if (arg0.method3138(Static218.aClass100_697)) {
Static218.anInt3634 = arg0.method3136(5).method3110(16);
} else if (arg0.method3108(Static218.aClass100_714)) {
} else if (arg0.strEquals(Static218.aClass100_714)) {
Static218.anInt3634 = 0;
} else if (arg0.method3108(Static218.aClass100_704)) {
} else if (arg0.strEquals(Static218.aClass100_704)) {
Static218.anInt3634 = Static218.anInt3633;
} else if (arg0.method3108(Static218.aClass100_713)) {
} else if (arg0.strEquals(Static218.aClass100_713)) {
this.method2877(Static218.anInt3630, Static218.anInt3633, Static218.anInt3632);
}
} catch (@Pc(144) Exception local144) {
@ -334,7 +334,7 @@ public abstract class Font extends SecondaryNode {
@Pc(3) boolean local3 = false;
@Pc(7) int local7 = arg0.length();
for (@Pc(9) int local9 = 0; local9 < local7; local9++) {
@Pc(17) int local17 = arg0.method3149(local9);
@Pc(17) int local17 = arg0.charAt(local9);
if (local17 == 60) {
local3 = true;
} else if (local17 == 62) {
@ -364,17 +364,17 @@ public abstract class Font extends SecondaryNode {
@Pc(23) int local23 = 0;
@Pc(27) int local27 = arg0.length();
for (@Pc(29) int local29 = 0; local29 < local27; local29++) {
@Pc(37) int local37 = arg0.method3149(local29);
@Pc(37) int local37 = arg0.charAt(local29);
if (local37 == 60) {
local19 = local29;
} else {
if (local37 == 62 && local19 != -1) {
@Pc(57) JagString local57 = arg0.substring(local29, local19 + 1);
local19 = -1;
Static218.aClass100_720.method3152(60);
Static218.aClass100_720.append(60);
Static218.aClass100_720.method3113(local57);
Static218.aClass100_720.method3152(62);
if (local57.method3108(Static218.aClass100_713)) {
Static218.aClass100_720.append(62);
if (local57.strEquals(Static218.aClass100_713)) {
if (arg2[local23] == null) {
arg2[local23] = Static218.aClass100_720.method3143().substring(Static218.aClass100_720.length(), local11);
} else {
@ -386,49 +386,49 @@ public abstract class Font extends SecondaryNode {
local9 = 0;
local13 = -1;
local21 = 0;
} else if (local57.method3108(Static218.aClass100_696)) {
} else if (local57.strEquals(Static218.aClass100_696)) {
local9 += this.method2863(60);
if (this.aByteArray50 != null && local21 != 0) {
local9 += this.aByteArray50[(local21 << 8) + 60];
}
local21 = 60;
} else if (local57.method3108(Static218.aClass100_695)) {
} else if (local57.strEquals(Static218.aClass100_695)) {
local9 += this.method2863(62);
if (this.aByteArray50 != null && local21 != 0) {
local9 += this.aByteArray50[(local21 << 8) + 62];
}
local21 = 62;
} else if (local57.method3108(Static218.aClass100_710)) {
} else if (local57.strEquals(Static218.aClass100_710)) {
local9 += this.method2863(160);
if (this.aByteArray50 != null && local21 != 0) {
local9 += this.aByteArray50[(local21 << 8) + 160];
}
local21 = 160;
} else if (local57.method3108(Static218.aClass100_698)) {
} else if (local57.strEquals(Static218.aClass100_698)) {
local9 += this.method2863(173);
if (this.aByteArray50 != null && local21 != 0) {
local9 += this.aByteArray50[(local21 << 8) + 173];
}
local21 = 173;
} else if (local57.method3108(Static218.aClass100_708)) {
} else if (local57.strEquals(Static218.aClass100_708)) {
local9 += this.method2863(215);
if (this.aByteArray50 != null && local21 != 0) {
local9 += this.aByteArray50[(local21 << 8) + 215];
}
local21 = 215;
} else if (local57.method3108(Static218.aClass100_702)) {
} else if (local57.strEquals(Static218.aClass100_702)) {
local9 += this.method2863(128);
if (this.aByteArray50 != null && local21 != 0) {
local9 += this.aByteArray50[(local21 << 8) + 128];
}
local21 = 128;
} else if (local57.method3108(Static218.aClass100_716)) {
} else if (local57.strEquals(Static218.aClass100_716)) {
local9 += this.method2863(169);
if (this.aByteArray50 != null && local21 != 0) {
local9 += this.aByteArray50[(local21 << 8) + 169];
}
local21 = 169;
} else if (local57.method3108(Static218.aClass100_718)) {
} else if (local57.strEquals(Static218.aClass100_718)) {
local9 += this.method2863(174);
if (this.aByteArray50 != null && local21 != 0) {
local9 += this.aByteArray50[(local21 << 8) + 174];
@ -446,7 +446,7 @@ public abstract class Font extends SecondaryNode {
}
if (local19 == -1) {
if (local37 != 0) {
Static218.aClass100_720.method3152(local37);
Static218.aClass100_720.append(local37);
local9 += this.anIntArray348[local37];
if (this.aByteArray50 != null && local21 != 0) {
local9 += this.aByteArray50[(local21 << 8) + local37];
@ -746,7 +746,7 @@ public abstract class Font extends SecondaryNode {
@Pc(10) int local10 = 0;
@Pc(14) int local14 = arg0.length();
for (@Pc(16) int local16 = 0; local16 < local14; local16++) {
@Pc(24) int local24 = arg0.method3149(local16);
@Pc(24) int local24 = arg0.charAt(local16);
if (local24 == 60) {
local6 = local16;
} else {
@ -756,22 +756,22 @@ public abstract class Font extends SecondaryNode {
if (local24 == 62 && local6 != -1) {
@Pc(44) JagString local44 = arg0.substring(local16, local6 + 1);
local6 = -1;
if (local44.method3108(Static218.aClass100_696)) {
if (local44.strEquals(Static218.aClass100_696)) {
local24 = 60;
} else if (local44.method3108(Static218.aClass100_695)) {
} else if (local44.strEquals(Static218.aClass100_695)) {
local24 = 62;
} else if (local44.method3108(Static218.aClass100_710)) {
} else if (local44.strEquals(Static218.aClass100_710)) {
local24 = 160;
} else if (local44.method3108(Static218.aClass100_698)) {
} else if (local44.strEquals(Static218.aClass100_698)) {
local24 = 173;
} else if (local44.method3108(Static218.aClass100_708)) {
} else if (local44.strEquals(Static218.aClass100_708)) {
local24 = 215;
} else if (local44.method3108(Static218.aClass100_702)) {
} else if (local44.strEquals(Static218.aClass100_702)) {
local24 = 128;
} else if (local44.method3108(Static218.aClass100_716)) {
} else if (local44.strEquals(Static218.aClass100_716)) {
local24 = 169;
} else {
if (!local44.method3108(Static218.aClass100_718)) {
if (!local44.strEquals(Static218.aClass100_718)) {
if (local44.method3138(Static218.aClass100_715)) {
try {
if (arg3 == null) {
@ -789,7 +789,7 @@ public abstract class Font extends SecondaryNode {
@Pc(146) IndexedSprite local146 = this.aClass36Array11[local141];
@Pc(157) int local157 = this.anIntArray346 == null ? local146.anInt4276 : this.anIntArray346[local141];
if (Static218.anInt3631 == 256) {
local146.method3336(arg1 + local121, local4 + this.anInt3626 - local157 + local130);
local146.renderTransparent(arg1 + local121, local4 + this.anInt3626 - local157 + local130);
} else {
local146.method3335(arg1 + local121, local4 + this.anInt3626 - local157 + local130, Static218.anInt3631);
}

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

@ -35,7 +35,7 @@ public final class GlIndexedSprite extends IndexedSprite {
this.anInt4276 = arg1;
this.anInt4280 = arg2;
this.anInt4273 = arg3;
this.anInt4270 = arg4;
this.width = arg4;
this.anInt4278 = arg5;
this.method3337(arg6, arg7);
this.method3339();
@ -43,13 +43,13 @@ public final class GlIndexedSprite extends IndexedSprite {
@OriginalMember(owner = "client!oh", name = "a", descriptor = "([B[I)V")
private void method3337(@OriginalArg(0) byte[] arg0, @OriginalArg(1) int[] arg1) {
this.anInt4287 = Static165.clp2(this.anInt4270);
this.anInt4287 = Static165.clp2(this.width);
this.anInt4286 = Static165.clp2(this.anInt4278);
@Pc(20) byte[] local20 = new byte[this.anInt4287 * this.anInt4286 * 4];
@Pc(22) int local22 = 0;
@Pc(24) int local24 = 0;
for (@Pc(26) int local26 = 0; local26 < this.anInt4278; local26++) {
for (@Pc(32) int local32 = 0; local32 < this.anInt4270; local32++) {
for (@Pc(32) int local32 = 0; local32 < this.width; local32++) {
@Pc(41) byte local41 = arg0[local24++];
if (local41 == 0) {
local22 += 4;
@ -61,7 +61,7 @@ public final class GlIndexedSprite extends IndexedSprite {
local20[local22++] = -1;
}
}
local22 += (this.anInt4287 - this.anInt4270) * 4;
local22 += (this.anInt4287 - this.width) * 4;
}
@Pc(93) ByteBuffer local93 = ByteBuffer.wrap(local20);
@Pc(95) GL2 local95 = GlRenderer.gl;
@ -104,7 +104,7 @@ public final class GlIndexedSprite extends IndexedSprite {
@OriginalMember(owner = "client!oh", name = "a", descriptor = "(II)V")
@Override
public final void method3336(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
public final void renderTransparent(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
GlRenderer.method4149();
@Pc(5) int local5 = arg0 + this.anInt4280;
@Pc(10) int local10 = arg1 + this.anInt4273;
@ -133,7 +133,7 @@ public final class GlIndexedSprite extends IndexedSprite {
@OriginalMember(owner = "client!oh", name = "a", descriptor = "()V")
private void method3339() {
@Pc(7) float local7 = (float) this.anInt4270 / (float) this.anInt4287;
@Pc(7) float local7 = (float) this.width / (float) this.anInt4287;
@Pc(15) float local15 = (float) this.anInt4278 / (float) this.anInt4286;
@Pc(17) GL2 local17 = GlRenderer.gl;
if (this.anInt4282 == -1) {
@ -143,13 +143,13 @@ public final class GlIndexedSprite extends IndexedSprite {
local17.glNewList(this.anInt4282, GL2.GL_COMPILE);
local17.glBegin(GL2.GL_TRIANGLE_FAN);
local17.glTexCoord2f(local7, 0.0F);
local17.glVertex2f((float) this.anInt4270, 0.0F);
local17.glVertex2f((float) this.width, 0.0F);
local17.glTexCoord2f(0.0F, 0.0F);
local17.glVertex2f(0.0F, 0.0F);
local17.glTexCoord2f(0.0F, local15);
local17.glVertex2f(0.0F, (float) -this.anInt4278);
local17.glTexCoord2f(local7, local15);
local17.glVertex2f((float) this.anInt4270, (float) -this.anInt4278);
local17.glVertex2f((float) this.width, (float) -this.anInt4278);
local17.glEnd();
local17.glEndList();
}

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

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

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

@ -255,7 +255,7 @@ public class GlSprite extends Sprite {
@OriginalMember(owner = "client!cf", name = "a", descriptor = "(IIII)V")
@Override
public final void method1419(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) {
public final void renderResizedTransparent(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) {
if (arg2 <= 0 || arg3 <= 0) {
return;
}

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

@ -3,6 +3,10 @@ import org.openrs2.deob.annotation.OriginalMember;
import java.math.BigInteger;
public class GlobalConfig {
// Jagex's RSA key:
// public static final BigInteger RSA_MODULUS = new BigInteger("7162900525229798032761816791230527296329313291232324290237849263501208207972894053929065636522363163621000728841182238772712427862772219676577293600221789");
// public static final BigInteger RSA_EXPONENT = new BigInteger("58778699976184461502525193738213253649000149147835990136706041084440742975821");
//region 2009scape-compatibility Configuration
@OriginalMember(owner = "client!um", name = "V", descriptor = "Ljava/math/BigInteger;")
public static final BigInteger RSA_MODULUS = new BigInteger("96982303379631821170939875058071478695026608406924780574168393250855797534862289546229721580153879336741968220328805101128831071152160922518190059946555203865621183480223212969502122536662721687753974815205744569357388338433981424032996046420057284324856368815997832596174397728134370577184183004453899764051");
@ -11,7 +15,7 @@ public class GlobalConfig {
public static final BigInteger RSA_EXPONENT = new BigInteger("65537");
// Server IP
public static String DEFAULT_HOSTNAME = "play.2009scape.org";
public static String DEFAULT_HOSTNAME = "test.2009scape.org";
// Jagex had this at 40000+id
public static int DEFAULT_PORT = 43594;
@ -35,7 +39,5 @@ public class GlobalConfig {
public static boolean USE_ISAAC = false;
//endregion
// Jagex's RSA key:
// public static final BigInteger RSA_MODULUS = new BigInteger("7162900525229798032761816791230527296329313291232324290237849263501208207972894053929065636522363163621000728841182238772712427862772219676577293600221789");
// public static final BigInteger RSA_EXPONENT = new BigInteger("58778699976184461502525193738213253649000149147835990136706041084440742975821");
public static boolean ANIMATED_SD_BACKGROUND = true;
}

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

@ -82,7 +82,7 @@ public final class HashTable {
}
@Pc(21) Node local21 = this.aClass3Array1[(int) (arg1 & (long) (this.anInt5023 - 1))];
arg0.aClass3_222 = local21;
arg0.aLong192 = arg1;
arg0.uid = arg1;
arg0.aClass3_223 = local21.aClass3_223;
arg0.aClass3_223.aClass3_222 = arg0;
arg0.aClass3_222.aClass3_223 = arg0;
@ -93,7 +93,7 @@ public final class HashTable {
this.aLong168 = arg0;
@Pc(24) Node local24 = this.aClass3Array1[(int) (arg0 & (long) (this.anInt5023 - 1))];
for (this.aClass3_192 = local24.aClass3_222; this.aClass3_192 != local24; this.aClass3_192 = this.aClass3_192.aClass3_222) {
if (arg0 == this.aClass3_192.aLong192) {
if (arg0 == this.aClass3_192.uid) {
@Pc(46) Node local46 = this.aClass3_192;
this.aClass3_192 = this.aClass3_192.aClass3_222;
return local46;
@ -136,7 +136,7 @@ public final class HashTable {
}
@Pc(23) Node local23 = this.aClass3Array1[(int) (this.aLong168 & (long) (this.anInt5023 - 1))];
while (local23 != this.aClass3_192) {
if (this.aClass3_192.aLong192 == this.aLong168) {
if (this.aClass3_192.uid == this.aLong168) {
@Pc(45) Node local45 = this.aClass3_192;
this.aClass3_192 = this.aClass3_192.aClass3_222;
return local45;

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

@ -5,28 +5,28 @@ import org.openrs2.deob.annotation.OriginalMember;
public final class HookRequest extends Node {
@OriginalMember(owner = "client!jl", name = "q", descriptor = "Lclient!be;")
public Component aClass13_16;
public Component target;
@OriginalMember(owner = "client!jl", name = "r", descriptor = "Lclient!na;")
public JagString aClass100_598;
public JagString opBase;
@OriginalMember(owner = "client!jl", name = "w", descriptor = "I")
public int anInt3097;
public int mouseY;
@OriginalMember(owner = "client!jl", name = "z", descriptor = "I")
public int anInt3099;
public int keyChar;
@OriginalMember(owner = "client!jl", name = "A", descriptor = "I")
public int anInt3100;
public int keyCode;
@OriginalMember(owner = "client!jl", name = "B", descriptor = "I")
public int anInt3101;
public int op;
@OriginalMember(owner = "client!jl", name = "C", descriptor = "Z")
public boolean aBoolean158;
@OriginalMember(owner = "client!jl", name = "D", descriptor = "I")
public int anInt3102;
public int mouseX;
@OriginalMember(owner = "client!jl", name = "E", descriptor = "[Ljava/lang/Object;")
public Object[] arguments;

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

@ -6,7 +6,7 @@ import org.openrs2.deob.annotation.OriginalMember;
public abstract class IndexedSprite {
@OriginalMember(owner = "client!ok", name = "a", descriptor = "I")
public int anInt4270;
public int width;
@OriginalMember(owner = "client!ok", name = "d", descriptor = "I")
public int anInt4273;
@ -31,5 +31,5 @@ public abstract class IndexedSprite {
public abstract void method3335(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2);
@OriginalMember(owner = "client!ok", name = "a", descriptor = "(II)V")
public abstract void method3336(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1);
public abstract void renderTransparent(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1);
}

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

@ -27,7 +27,7 @@ public final class JagString implements StringInterface {
}
@OriginalMember(owner = "client!na", name = "a", descriptor = "(BLclient!na;)Z")
public final boolean method3108(@OriginalArg(1) JagString arg0) {
public final boolean strEquals(@OriginalArg(1) JagString arg0) {
if (arg0 == null) {
return false;
} else if (arg0 == this) {
@ -361,7 +361,7 @@ public final class JagString implements StringInterface {
@OriginalMember(owner = "client!na", name = "a", descriptor = "(Lclient!na;I)I")
public final int indexOf(@OriginalArg(0) JagString arg0) {
return this.method3146(arg0, 0);
return this.indexOf(arg0, 0);
}
@OriginalMember(owner = "client!na", name = "b", descriptor = "(B)I")
@ -404,7 +404,7 @@ public final class JagString implements StringInterface {
}
@OriginalMember(owner = "client!na", name = "a", descriptor = "(III)I")
public final int method3135(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
public final int indexOf(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
@Pc(4) byte local4 = (byte) arg0;
for (@Pc(15) int local15 = arg1; local15 < this.length; local15++) {
if (this.chars[local15] == local4) {
@ -447,7 +447,7 @@ public final class JagString implements StringInterface {
if (!(arg0 instanceof JagString)) {
throw new IllegalArgumentException();
}
return this.method3108((JagString) arg0);
return this.strEquals((JagString) arg0);
}
@OriginalMember(owner = "client!na", name = "c", descriptor = "(Lclient!na;I)I")
@ -481,20 +481,20 @@ public final class JagString implements StringInterface {
@Pc(14) int local14 = arg0.length - arg1.length;
@Pc(16) int local16 = 0;
while (true) {
@Pc(22) int local22 = this.method3146(arg1, local16);
@Pc(22) int local22 = this.indexOf(arg1, local16);
if (local22 < 0) {
local16 = 0;
@Pc(45) JagString local45 = Static87.method1804(local8);
@Pc(45) JagString local45 = Static87.allocate(local8);
while (true) {
@Pc(51) int local51 = this.method3146(arg1, local16);
@Pc(51) int local51 = this.indexOf(arg1, local16);
if (local51 < 0) {
while (local16 < this.length) {
local45.method3152(this.chars[local16++] & 0xFF);
local45.append(this.chars[local16++] & 0xFF);
}
return local45;
}
while (local16 < local51) {
local45.method3152(this.chars[local16++] & 0xFF);
local45.append(this.chars[local16++] & 0xFF);
}
local45.method3113(arg0);
local16 += arg1.length;
@ -615,7 +615,7 @@ public final class JagString implements StringInterface {
}
@OriginalMember(owner = "client!na", name = "a", descriptor = "(Lclient!na;II)I")
public final int method3146(@OriginalArg(0) JagString arg0, @OriginalArg(1) int arg1) {
public final int indexOf(@OriginalArg(0) JagString arg0, @OriginalArg(1) int arg1) {
@Pc(8) int local8 = arg0.length;
if (arg1 >= this.length) {
return local8 == 0 ? this.length : -1;
@ -688,7 +688,7 @@ public final class JagString implements StringInterface {
}
@OriginalMember(owner = "client!na", name = "c", descriptor = "(IB)I")
public final int method3149(@OriginalArg(0) int arg0) {
public final int charAt(@OriginalArg(0) int arg0) {
return this.chars[arg0] & 0xFF;
}
@ -702,7 +702,7 @@ public final class JagString implements StringInterface {
Static148.aClass133_13 = new HashTable(4096);
} else {
for (local30 = (StringNode) Static148.aClass133_13.method3863(local9); local30 != null; local30 = (StringNode) Static148.aClass133_13.method3867()) {
if (this.method3108(local30.aClass100_980)) {
if (this.strEquals(local30.aClass100_980)) {
return local30.aClass100_980;
}
}
@ -716,7 +716,7 @@ public final class JagString implements StringInterface {
}
@OriginalMember(owner = "client!na", name = "d", descriptor = "(IB)Lclient!na;")
public final JagString method3152(@OriginalArg(0) int arg0) {
public final JagString append(@OriginalArg(0) int arg0) {
if (arg0 <= 0 || arg0 > 255) {
throw new IllegalArgumentException("invalid char:" + arg0);
} else if (this.aBoolean193) {

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

@ -481,7 +481,7 @@ public final class Js5 {
}
@OriginalMember(owner = "client!ve", name = "f", descriptor = "(II)Z")
public final boolean method4506(@OriginalArg(1) int arg0) {
public final boolean isFileReady(@OriginalArg(1) int arg0) {
if (!this.method4484()) {
return false;
} else if (this.aClass70_2.anIntArray270.length == 1) {

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

@ -92,12 +92,12 @@ public final class Js5CachedResourceProvider extends Js5ResourceProvider {
}
@Pc(15) Node local15;
for (local15 = this.aClass69_16.method2289(); local15 != null; local15 = this.aClass69_16.method2288()) {
if (local15.aLong192 == (long) arg0) {
if (local15.uid == (long) arg0) {
return;
}
}
local15 = new Node();
local15.aLong192 = arg0;
local15.uid = arg0;
this.aClass69_16.method2282(local15);
}
@ -184,7 +184,7 @@ public final class Js5CachedResourceProvider extends Js5ResourceProvider {
return 0;
} else if (this.aBoolean35) {
@Pc(25) Node local25 = this.aClass69_17.method2289();
return local25 == null ? 0 : (int) local25.aLong192;
return local25 == null ? 0 : (int) local25.uid;
} else {
return this.aClass70_1.anInt2902;
}
@ -202,7 +202,7 @@ public final class Js5CachedResourceProvider extends Js5ResourceProvider {
if (this.aBoolean35) {
local32 = true;
for (local37 = this.aClass69_17.method2289(); local37 != null; local37 = this.aClass69_17.method2288()) {
local43 = (int) local37.aLong192;
local43 = (int) local37.uid;
if (this.aByteArray9[local43] == 0) {
this.method536(1, local43);
}
@ -226,7 +226,7 @@ public final class Js5CachedResourceProvider extends Js5ResourceProvider {
if (this.aByteArray9[this.anInt578] == 0) {
local32 = false;
local37 = new Node();
local37.aLong192 = this.anInt578;
local37.uid = this.anInt578;
this.aClass69_17.method2282(local37);
}
this.anInt578++;
@ -239,7 +239,7 @@ public final class Js5CachedResourceProvider extends Js5ResourceProvider {
} else if (this.aBoolean36) {
local32 = true;
for (local37 = this.aClass69_17.method2289(); local37 != null; local37 = this.aClass69_17.method2288()) {
local43 = (int) local37.aLong192;
local43 = (int) local37.uid;
if (this.aByteArray9[local43] != 1) {
this.method536(2, local43);
}
@ -262,7 +262,7 @@ public final class Js5CachedResourceProvider extends Js5ResourceProvider {
}
if (this.aByteArray9[this.anInt578] != 1) {
local37 = new Node();
local37.aLong192 = this.anInt578;
local37.uid = this.anInt578;
this.aClass69_17.method2282(local37);
local32 = false;
}
@ -428,7 +428,7 @@ public final class Js5CachedResourceProvider extends Js5ResourceProvider {
return;
}
for (@Pc(21) Node local21 = this.aClass69_16.method2289(); local21 != null; local21 = this.aClass69_16.method2288()) {
@Pc(28) int local28 = (int) local21.aLong192;
@Pc(28) int local28 = (int) local21.uid;
if (local28 < 0 || this.aClass70_1.anInt2907 <= local28 || this.aClass70_1.anIntArray272[local28] == 0) {
local21.method4658();
} else {

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

@ -269,7 +269,7 @@ public final class Loc extends Entity {
@Pc(192) int local192 = (local157 >> 1) + this.anInt1300;
@Pc(201) int local201 = (local157 + 1 >> 1) + this.anInt1300;
this.method1047(local192 * 128, local185 * 128);
@Pc(256) boolean local256 = !local12 && local19.aBoolean212 && (local19.anInt4426 != this.anInt1321 || (this.anInt1297 != this.anInt1322 || this.aClass144_2 != null && (this.aClass144_2.aBoolean280 || Static204.aBoolean234) && this.anInt1297 != this.anInt1304) && Static139.anInt3451 >= 2);
@Pc(256) boolean local256 = !local12 && local19.aBoolean212 && (local19.anInt4426 != this.anInt1321 || (this.anInt1297 != this.anInt1322 || this.aClass144_2 != null && (this.aClass144_2.aBoolean280 || Static204.aBoolean234) && this.anInt1297 != this.anInt1304) && Static139.sceneryShadowsType >= 2);
if (arg0 && !local256) {
return null;
}

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

@ -111,7 +111,7 @@ public final class MidiPcmStream extends PcmStream {
@Pc(5) boolean local5 = true;
@Pc(20) int[] local20 = new int[] { 22050 };
for (@Pc(34) Class3_Sub9 local34 = (Class3_Sub9) arg0.aClass133_22.method3859(); local34 != null; local34 = (Class3_Sub9) arg0.aClass133_22.method3861()) {
@Pc(40) int local40 = (int) local34.aLong192;
@Pc(40) int local40 = (int) local34.uid;
@Pc(48) MidiInstrument local48 = (MidiInstrument) this.aClass133_23.method3863((long) local40);
if (local48 == null) {
local48 = Static116.method2320(arg1, local40);

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

@ -5,7 +5,7 @@ import org.openrs2.deob.annotation.OriginalMember;
public class Node {
@OriginalMember(owner = "client!ab", name = "a", descriptor = "J")
public long aLong192;
public long uid;
@OriginalMember(owner = "client!ab", name = "d", descriptor = "Lclient!ab;")
public Node aClass3_222;

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

@ -38,7 +38,7 @@ public final class Npc extends PathingEntity {
local84 = local84.method2932();
}
@Pc(140) Model local140;
if (Static209.aBoolean240 && local84.aBoolean180) {
if (Static209.characterShadowsOn && local84.aBoolean180) {
local140 = Static41.method1043(this.aClass96_1.aByte13, this.aBoolean171, local53 == null ? local29 : local53, this.anInt3412, this.aClass96_1.aShort23, this.anInt3421, this.aClass96_1.aShort24, this.aClass96_1.anInt3713, local74, arg0, local53 == null ? this.anInt3425 : this.anInt3407, this.anInt3424, this.aClass96_1.aByte12);
if (GlRenderer.enabled) {
@Pc(144) float local144 = GlRenderer.method4179();

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

@ -294,7 +294,7 @@ public abstract class PathingEntity extends Entity {
this.anInt3421 = arg0 * 64 + this.movementQueueZ[0] * 128;
this.anInt3412 = arg0 * 64 + this.movementQueueX[0] * 128;
if (GlRenderer.enabled && Static173.self == this) {
Static86.method1799();
Static86.setInstantFade();
}
}

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

@ -195,7 +195,7 @@ public final class Player extends PathingEntity {
}
this.anInt3413 = local76.method4549();
@Pc(184) Model local184;
if (Static209.aBoolean240 && (this.aClass59_1.anInt2492 == -1 || Static214.method4363(this.aClass59_1.anInt2492).aBoolean180)) {
if (Static209.characterShadowsOn && (this.aClass59_1.anInt2492 == -1 || Static214.method4363(this.aClass59_1.anInt2492).aBoolean180)) {
local184 = Static41.method1043(160, this.aBoolean171, local54 == null ? local25 : local54, this.anInt3412, 0, this.anInt3421, 0, 1, local76, arg0, local54 == null ? this.anInt3425 : this.anInt3407, this.anInt3424, 240);
if (GlRenderer.enabled) {
@Pc(188) float local188 = GlRenderer.method4179();

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

@ -79,7 +79,7 @@ public final class SoftLruHashTable {
}
} else if (++local9.aLong185 > (long) arg0) {
@Pc(33) ReferenceNode local33 = Static252.aClass22_1.method1027(local9);
this.aClass133_18.method3862(local33, local9.aLong192);
this.aClass133_18.method3862(local33, local9.uid);
Static84.method1772(local9, local33);
local9.method4658();
local9.method4365();
@ -99,7 +99,7 @@ public final class SoftLruHashTable {
}
@OriginalMember(owner = "client!n", name = "c", descriptor = "(I)V")
public final void method3104() {
public final void clear() {
this.aClass16_8.method802();
this.aClass133_18.method3856();
this.anInt3966 = this.anInt3970;
@ -120,7 +120,7 @@ public final class SoftLruHashTable {
}
if (local12.method3619()) {
@Pc(53) HardReferenceNode local53 = new HardReferenceNode(local27);
this.aClass133_18.method3862(local53, local12.aLong192);
this.aClass133_18.method3862(local53, local12.uid);
this.aClass16_8.method798(local53);
local53.aLong185 = 0L;
local12.method4658();

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

@ -699,7 +699,7 @@ public final class SoftwareAlphaSprite extends SoftwareSprite {
@OriginalMember(owner = "client!am", name = "a", descriptor = "(IIII)V")
@Override
public final void method1419(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) {
public final void renderResizedTransparent(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) {
if (arg2 <= 0 || arg3 <= 0) {
return;
}

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

@ -18,7 +18,7 @@ public final class SoftwareIndexedSprite extends IndexedSprite {
this.anInt4276 = arg1;
this.anInt4280 = arg2;
this.anInt4273 = arg3;
this.anInt4270 = arg4;
this.width = arg4;
this.anInt4278 = arg5;
this.aByteArray18 = arg6;
this.anIntArray144 = arg7;
@ -26,7 +26,7 @@ public final class SoftwareIndexedSprite extends IndexedSprite {
@OriginalMember(owner = "client!ek", name = "<init>", descriptor = "(III)V")
public SoftwareIndexedSprite(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
this.anInt4279 = this.anInt4270 = arg0;
this.anInt4279 = this.width = arg0;
this.anInt4276 = this.anInt4278 = arg1;
this.anInt4280 = this.anInt4273 = 0;
this.aByteArray18 = new byte[arg0 * arg1];
@ -63,7 +63,7 @@ public final class SoftwareIndexedSprite extends IndexedSprite {
@OriginalMember(owner = "client!ek", name = "a", descriptor = "(IIIII)V")
public final void method1390(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4) {
@Pc(2) int local2 = this.anInt4270;
@Pc(2) int local2 = this.width;
@Pc(5) int local5 = this.anInt4278;
@Pc(7) int local7 = 0;
@Pc(9) int local9 = 0;
@ -137,12 +137,12 @@ public final class SoftwareIndexedSprite extends IndexedSprite {
@OriginalMember(owner = "client!ek", name = "b", descriptor = "()V")
public final void method1395() {
@Pc(6) byte[] local6 = new byte[this.anInt4270 * this.anInt4278];
@Pc(6) byte[] local6 = new byte[this.width * this.anInt4278];
@Pc(8) int local8 = 0;
@Pc(10) int local10;
for (local10 = 0; local10 < this.anInt4270; local10++) {
for (local10 = 0; local10 < this.width; local10++) {
for (@Pc(19) int local19 = this.anInt4278 - 1; local19 >= 0; local19--) {
local6[local8++] = this.aByteArray18[local10 + local19 * this.anInt4270];
local6[local8++] = this.aByteArray18[local10 + local19 * this.width];
}
}
this.aByteArray18 = local6;
@ -150,8 +150,8 @@ public final class SoftwareIndexedSprite extends IndexedSprite {
this.anInt4273 = this.anInt4280;
this.anInt4280 = this.anInt4276 - this.anInt4278 - local10;
local10 = this.anInt4278;
this.anInt4278 = this.anInt4270;
this.anInt4270 = local10;
this.anInt4278 = this.width;
this.width = local10;
local10 = this.anInt4276;
this.anInt4276 = this.anInt4279;
this.anInt4279 = local10;
@ -165,7 +165,7 @@ public final class SoftwareIndexedSprite extends IndexedSprite {
@Pc(15) int local15 = arg0 + arg1 * Static129.width;
@Pc(17) int local17 = 0;
@Pc(20) int local20 = this.anInt4278;
@Pc(23) int local23 = this.anInt4270;
@Pc(23) int local23 = this.width;
@Pc(27) int local27 = Static129.width - local23;
@Pc(29) int local29 = 0;
@Pc(36) int local36;
@ -201,18 +201,18 @@ public final class SoftwareIndexedSprite extends IndexedSprite {
@OriginalMember(owner = "client!ek", name = "c", descriptor = "()V")
public final void method1396() {
if (this.anInt4270 == this.anInt4279 && this.anInt4278 == this.anInt4276) {
if (this.width == this.anInt4279 && this.anInt4278 == this.anInt4276) {
return;
}
@Pc(17) byte[] local17 = new byte[this.anInt4279 * this.anInt4276];
@Pc(19) int local19 = 0;
for (@Pc(21) int local21 = 0; local21 < this.anInt4278; local21++) {
for (@Pc(27) int local27 = 0; local27 < this.anInt4270; local27++) {
for (@Pc(27) int local27 = 0; local27 < this.width; local27++) {
local17[local27 + this.anInt4280 + (local21 + this.anInt4273) * this.anInt4279] = this.aByteArray18[local19++];
}
}
this.aByteArray18 = local17;
this.anInt4270 = this.anInt4279;
this.width = this.anInt4279;
this.anInt4278 = this.anInt4276;
this.anInt4280 = 0;
this.anInt4273 = 0;
@ -220,7 +220,7 @@ public final class SoftwareIndexedSprite extends IndexedSprite {
@OriginalMember(owner = "client!ek", name = "a", descriptor = "(IIII)V")
public final void method1398(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) {
@Pc(2) int local2 = this.anInt4270;
@Pc(2) int local2 = this.width;
@Pc(5) int local5 = this.anInt4278;
@Pc(7) int local7 = 0;
@Pc(9) int local9 = 0;
@ -274,13 +274,13 @@ public final class SoftwareIndexedSprite extends IndexedSprite {
@OriginalMember(owner = "client!ek", name = "a", descriptor = "(II)V")
@Override
public final void method3336(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
public final void renderTransparent(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
arg0 += this.anInt4280;
arg1 += this.anInt4273;
@Pc(15) int local15 = arg0 + arg1 * Static129.width;
@Pc(17) int local17 = 0;
@Pc(20) int local20 = this.anInt4278;
@Pc(23) int local23 = this.anInt4270;
@Pc(23) int local23 = this.width;
@Pc(27) int local27 = Static129.width - local23;
@Pc(29) int local29 = 0;
@Pc(36) int local36;

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

@ -1054,7 +1054,7 @@ public class SoftwareSprite extends Sprite {
@OriginalMember(owner = "client!mm", name = "a", descriptor = "(IIII)V")
@Override
public void method1419(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) {
public void renderResizedTransparent(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) {
if (arg2 <= 0 || arg3 <= 0) {
return;
}

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

@ -38,7 +38,7 @@ public abstract class Sprite extends SecondaryNode {
public abstract void method1417(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2);
@OriginalMember(owner = "client!qf", name = "a", descriptor = "(IIII)V")
public abstract void method1419(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3);
public abstract void renderResizedTransparent(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3);
@OriginalMember(owner = "client!qf", name = "a", descriptor = "(IIIII)V")
public final void method1420(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) {

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

@ -527,7 +527,7 @@ public final class Static1 {
@Pc(2826) long[] local2826 = new long[local12];
local10.method3865(local2823);
for (local38 = 0; local38 < local12; local38++) {
local2826[local38] = local2823[local38].aLong192;
local2826[local38] = local2823[local38].uid;
}
Static4.method23(local2826, local2823);
return local2823;

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

@ -91,14 +91,14 @@ public final class Static10 {
@OriginalMember(owner = "client!an", name = "a", descriptor = "(Z)V")
public static void method350() {
Static142.aClass99_23.method3104();
Static267.aClass99_37.method3104();
Static142.aClass99_23.clear();
Static267.aClass99_37.clear();
}
@OriginalMember(owner = "client!an", name = "i", descriptor = "(I)V")
public static void method351() {
Static79.aClass99_11.method3104();
Static7.aClass99_5.method3104();
Static79.aClass99_11.clear();
Static7.aClass99_5.clear();
}
@OriginalMember(owner = "client!an", name = "a", descriptor = "(IIIIIII)V")

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

@ -20,7 +20,7 @@ public final class Static101 {
public static int anInt2640 = 0;
@OriginalMember(owner = "client!hm", name = "fb", descriptor = "[Lclient!ba;")
public static World[] aClass10_Sub1Array1 = new World[0];
public static World[] worlds = new World[0];
@OriginalMember(owner = "client!hm", name = "a", descriptor = "(Lclient!na;B)I")
public static int method2053(@OriginalArg(0) JagString arg0) {

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

@ -256,7 +256,7 @@ public final class Static103 {
if (local23 == 41 && Static39.aClass13_10 == null) {
Static2.method10(local15, local19);
Static39.aClass13_10 = Static201.method1418(local19, local15);
Static43.method1143(Static39.aClass13_10);
Static43.redraw(Static39.aClass13_10);
}
if (local23 == 49) {
Static233.method4003(local31, local19, local15);
@ -594,7 +594,7 @@ public final class Static103 {
Static185.anInt4370 = local15;
Static260.anInt5014 = 1;
Static274.anInt4997 = local36;
Static43.method1143(local693);
Static43.redraw(local693);
Static34.aClass100_203 = Static34.concatenate(new JagString[] { Static8.aClass100_32, Static71.method1439(local36).aClass100_495, Static204.aClass100_896 });
if (Static34.aClass100_203 == null) {
Static34.aClass100_203 = Static92.aClass100_510;
@ -717,21 +717,21 @@ public final class Static103 {
}
if (Static260.anInt5014 != 0) {
Static260.anInt5014 = 0;
Static43.method1143(Static5.getComponent(Static224.anInt5062));
Static43.redraw(Static5.getComponent(Static224.anInt5062));
}
if (Static241.aBoolean302) {
Static53.method1294();
}
if (Static257.aClass13_7 != null && Static72.anInt2043 == 0) {
Static43.method1143(Static257.aClass13_7);
Static43.redraw(Static257.aClass13_7);
}
}
@OriginalMember(owner = "client!i", name = "b", descriptor = "(IIIII)I")
public static int method2235(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) {
if (Static222.aBoolean246) {
if (Static222.instantScreenFade) {
arg0 = 1000000;
Static222.aBoolean246 = false;
Static222.instantScreenFade = false;
}
@Pc(15) Environment local15 = Static192.aClass92ArrayArray1[arg3][arg1];
@Pc(25) float local25 = ((float) arg2 * 0.1F + 0.7F) * local15.aFloat16;
@ -739,7 +739,7 @@ public final class Static103 {
@Pc(31) int local31 = local15.anInt3526;
@Pc(34) int local34 = local15.anInt3529;
@Pc(37) int local37 = local15.anInt3525;
if (!Static71.aBoolean107) {
if (!Static71.fogEnabled) {
local34 = 0;
}
@Pc(44) float local44 = local15.aFloat17;
@ -790,7 +790,7 @@ public final class Static103 {
public static void method2239() {
Static27.aClass99_4.method3103();
Static244.aClass99_32.method3103();
Static118.aClass99_16.method3103();
Static118.objectSpriteCache.method3103();
}
@OriginalMember(owner = "client!i", name = "i", descriptor = "(Z)V")
@ -808,10 +808,10 @@ public final class Static103 {
}
}
if (!local21) {
local27 = (int) local6.aLong192;
local27 = (int) local6.uid;
@Pc(60) Component local60 = Static5.getComponent(local27);
if (local60 != null) {
Static43.method1143(local60);
Static43.redraw(local60);
}
}
}

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

@ -39,7 +39,7 @@ public final class Static109 {
@Pc(27) boolean local27 = true;
for (@Pc(29) int local29 = 0; local29 < Static241.components[arg0].length; local29++) {
if (Static241.components[arg0][local29] != null) {
if (Static241.components[arg0][local29].anInt452 == 2) {
if (Static241.components[arg0][local29].type == 2) {
local27 = false;
} else {
Static241.components[arg0][local29] = null;

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

@ -11,11 +11,11 @@ public final class Static11 {
public static int anInt384 = 0;
@OriginalMember(owner = "client!ba", name = "x", descriptor = "Z")
public static boolean aBoolean15 = true;
public static boolean flickeringEffectsOn = true;
@OriginalMember(owner = "client!ba", name = "e", descriptor = "(I)V")
public static void method443() {
Static262.aClass99_35.method3104();
Static262.aClass99_35.clear();
}
@OriginalMember(owner = "client!ba", name = "a", descriptor = "(IB)I")

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

@ -47,7 +47,7 @@ public final class Static111 {
} else {
arg0.x = arg2 - (arg2 * arg0.baseX >> 14) - arg0.anInt445;
}
if (!Static121.aBoolean154 || Static36.method940(arg0).anInt546 == 0 && arg0.anInt452 != 0) {
if (!Static121.aBoolean154 || Static36.method940(arg0).anInt546 == 0 && arg0.type != 0) {
return;
}
if (arg0.y < 0) {

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

@ -14,7 +14,7 @@ public final class Static112 {
@Pc(11) int local11 = Static13.anInt436;
@Pc(13) int local13 = Static24.anInt761;
if (Static39.aClass3_Sub2_Sub1_1 == null || Static181.aClass3_Sub2_Sub1_9 == null) {
if (Static209.js5Archive8.method4506(Static55.anInt1736) && Static209.js5Archive8.method4506(Static169.anInt4073)) {
if (Static209.js5Archive8.isFileReady(Static55.anInt1736) && Static209.js5Archive8.isFileReady(Static169.anInt4073)) {
Static39.aClass3_Sub2_Sub1_1 = Static80.method3613(Static209.js5Archive8, Static55.anInt1736);
Static181.aClass3_Sub2_Sub1_9 = Static80.method3613(Static209.js5Archive8, Static169.anInt4073);
if (GlRenderer.enabled) {
@ -65,7 +65,7 @@ public final class Static112 {
}
}
}
if ((Static165.aClass3_Sub2_Sub1_8 == null || Static92.aClass3_Sub2_Sub1_6 == null || Static204.aClass3_Sub2_Sub1_10 == null) && Static209.js5Archive8.method4506(Static85.anInt2261) && Static209.js5Archive8.method4506(Static136.anInt3324) && Static209.js5Archive8.method4506(Static254.anInt5556)) {
if ((Static165.aClass3_Sub2_Sub1_8 == null || Static92.aClass3_Sub2_Sub1_6 == null || Static204.aClass3_Sub2_Sub1_10 == null) && Static209.js5Archive8.isFileReady(Static85.anInt2261) && Static209.js5Archive8.isFileReady(Static136.anInt3324) && Static209.js5Archive8.isFileReady(Static254.anInt5556)) {
Static165.aClass3_Sub2_Sub1_8 = Static80.method3613(Static209.js5Archive8, Static85.anInt2261);
Static92.aClass3_Sub2_Sub1_6 = Static80.method3613(Static209.js5Archive8, Static136.anInt3324);
Static204.aClass3_Sub2_Sub1_10 = Static80.method3613(Static209.js5Archive8, Static254.anInt5556);

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

@ -11,7 +11,7 @@ public final class Static118 {
public static Component aClass13_15;
@OriginalMember(owner = "client!jd", name = "c", descriptor = "Lclient!n;")
public static final SoftLruHashTable aClass99_16 = new SoftLruHashTable(100);
public static final SoftLruHashTable objectSpriteCache = new SoftLruHashTable(100);
@OriginalMember(owner = "client!jd", name = "a", descriptor = "(B)I")
public static int method2352() {
@ -30,20 +30,20 @@ public final class Static118 {
for (@Pc(7) int local7 = 0; local7 < arg1.length; local7++) {
@Pc(15) Component local15 = arg1[local7];
if (local15 != null && local15.layer == arg0 && (!local15.aBoolean32 || !Static36.method947(local15))) {
if (local15.anInt452 == 0) {
if (local15.type == 0) {
if (!local15.aBoolean32 && Static36.method947(local15) && local15 != Static180.aClass13_22) {
continue;
}
method2354(local15.anInt507, arg1);
method2354(local15.id, arg1);
if (local15.createdComponents != null) {
method2354(local15.anInt507, local15.createdComponents);
method2354(local15.id, local15.createdComponents);
}
@Pc(73) Class3_Sub31 local73 = (Class3_Sub31) Static119.aClass133_9.method3863((long) local15.anInt507);
@Pc(73) Class3_Sub31 local73 = (Class3_Sub31) Static119.aClass133_9.method3863((long) local15.id);
if (local73 != null) {
Static96.method1949(local73.anInt5878);
}
}
if (local15.anInt452 == 6) {
if (local15.type == 6) {
@Pc(105) int local105;
if (local15.anInt522 != -1 || local15.anInt462 != -1) {
@Pc(100) boolean local100 = Static154.method2926(local15);
@ -72,7 +72,7 @@ public final class Static118 {
local15.anInt496 = -1;
}
}
Static43.method1143(local15);
Static43.redraw(local15);
}
}
}
@ -84,7 +84,7 @@ public final class Static118 {
local15.modelXAngle = local243 + local15.modelXAngle & 0x7FF;
local105 *= Static178.anInt4247;
local15.modelYAngle = local15.modelYAngle + local105 & 0x7FF;
Static43.method1143(local15);
Static43.redraw(local15);
}
}
}

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

@ -51,10 +51,10 @@ public final class Static119 {
@OriginalMember(owner = "client!je", name = "f", descriptor = "(B)V")
public static void method2381() {
if (Static18.aBoolean40) {
Static243.aClass36_1 = null;
Static18.aBoolean40 = false;
Static78.aClass3_Sub2_Sub1_3 = null;
if (Static18.loaded) {
Static243.logo = null;
Static18.loaded = false;
Static78.titleBg = null;
}
}

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

@ -13,7 +13,7 @@ public final class Static12 {
public static final JagString aClass100_73 = Static28.parse("runes");
@OriginalMember(owner = "client!bb", name = "n", descriptor = "I")
public static int anInt391 = 255;
public static int musicVolume = 255;
@OriginalMember(owner = "client!bb", name = "t", descriptor = "[[B")
public static final byte[][] aByteArrayArray2 = new byte[250][];

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

@ -30,13 +30,13 @@ public final class Static124 {
@OriginalMember(owner = "client!jk", name = "e", descriptor = "(B)V")
public static void method2433() {
Static262.aClass99_34.method3104();
Static262.aClass99_34.clear();
}
@OriginalMember(owner = "client!jk", name = "a", descriptor = "(ILclient!na;)Lclient!bn;")
public static Map method2434(@OriginalArg(1) JagString arg0) {
for (@Pc(15) Map local15 = (Map) Static228.aClass69_120.method2289(); local15 != null; local15 = (Map) Static228.aClass69_120.method2288()) {
if (local15.aClass100_138.method3108(arg0)) {
if (local15.aClass100_138.strEquals(arg0)) {
return local15;
}
}

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

@ -20,7 +20,7 @@ public final class Static125 {
public static int worldId = -1;
@OriginalMember(owner = "client!jl", name = "J", descriptor = "I")
public static int anInt3104 = 127;
public static int soundEffectVolume = 127;
@OriginalMember(owner = "client!jl", name = "a", descriptor = "(ILclient!ve;Lclient!ve;)V")
public static void init(@OriginalArg(1) Js5 arg0, @OriginalArg(2) Js5 arg1) {

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

@ -18,7 +18,7 @@ public final class Static127 {
public static int anInt3125 = 0;
@OriginalMember(owner = "client!k", name = "m", descriptor = "Z")
public static boolean aBoolean160 = false;
public static boolean neverRemoveRoofs = false;
@OriginalMember(owner = "client!k", name = "t", descriptor = "I")
public static int anInt3132 = 0;
@ -153,7 +153,7 @@ public final class Static127 {
Static115.anInt2939 -= local86;
}
if (GlRenderer.enabled && arg4 && (Math.abs(local86) > 104 || Math.abs(local81) > 104)) {
Static86.method1799();
Static86.setInstantFade();
}
Static107.anInt2875 = -1;
Static99.aClass69_64.method2278();
@ -325,9 +325,9 @@ public final class Static127 {
}
}
if (arg0.method3138(Static241.aClass100_1088)) {
Static76.method1645(arg0.method3136(15).parseInt());
Static203.write(GameShell.signLink);
Static18.sentToServer = false;
Static76.setParticles(arg0.method3136(15).parseInt());
Static203.savePreferences(GameShell.signLink);
Static18.serverUpdatedPreferences = false;
}
if (arg0.method3138(Static170.aClass100_623) && Static83.modeWhere != 0) {
Static115.method2312(arg0.method3136(6).parseInt());

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

@ -155,7 +155,7 @@ public final class Static129 {
}
@OriginalMember(owner = "client!kb", name = "b", descriptor = "()V")
public static void method2492() {
public static void clear() {
@Pc(1) int local1 = 0;
@Pc(7) int local7 = width * anInt3146 - 7;
while (local1 < local7) {

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

@ -25,7 +25,7 @@ public final class Static130 {
public static final int[] anIntArray300 = new int[] { 1, 1, 1, 1, 4, 1, 1, 5, 6, 1, 5, 0, 7, 0, 4, 1, 7, 2, 1, 1, 6, 1, 1, 3, 6, 1, 7, 0, 0, 6, 7, 0, 1, 7, 6, 1, 1, 1, 5, 4, 3, 2, 1, 1, 0, 4, 1, 5 };
@OriginalMember(owner = "client!kc", name = "a", descriptor = "(ILclient!ve;I)Lclient!qf;")
public static Sprite method2514(@OriginalArg(1) Js5 arg0, @OriginalArg(2) int arg1) {
public static Sprite loadSpriteAutoDetect(@OriginalArg(1) Js5 arg0, @OriginalArg(2) int arg1) {
return Static254.method4346(arg0, arg1) ? Static82.method1764() : null;
}
}

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

@ -18,7 +18,7 @@ public final class Static132 {
@OriginalMember(owner = "client!ke", name = "a", descriptor = "(ZLclient!wk;Z)V")
public static void method2605(@OriginalArg(0) boolean arg0, @OriginalArg(1) Class3_Sub31 arg1) {
@Pc(9) int local9 = (int) arg1.aLong192;
@Pc(9) int local9 = (int) arg1.uid;
@Pc(16) int local16 = arg1.anInt5878;
arg1.method4658();
if (arg0) {
@ -27,7 +27,7 @@ public final class Static132 {
Static273.method3214(local16);
@Pc(32) Component local32 = Static5.getComponent(local9);
if (local32 != null) {
Static43.method1143(local32);
Static43.redraw(local32);
}
@Pc(41) int local41 = Static231.anInt5204;
@Pc(43) int local43;
@ -160,7 +160,7 @@ public final class Static132 {
if (arg0.anInt4865 != 12345678) {
Rasteriser.fillGouraudTriangle(local315, local331, local299, local307, local323, local291, arg0.anInt4865, arg0.anInt4864, arg0.anInt4867);
}
} else if (!Static159.aBoolean189) {
} else if (!Static159.manyGroundTextures) {
local475 = Rasteriser.textureProvider.getAverageColor(arg0.anInt4869);
Rasteriser.fillGouraudTriangle(local315, local331, local299, local307, local323, local291, Static216.method1640(local475, arg0.anInt4865), Static216.method1640(local475, arg0.anInt4864), Static216.method1640(local475, arg0.anInt4867));
} else if (arg0.aBoolean241) {
@ -188,7 +188,7 @@ public final class Static132 {
if (arg0.anInt4872 != 12345678) {
Rasteriser.fillGouraudTriangle(local283, local299, local331, local275, local291, local323, arg0.anInt4872, arg0.anInt4867, arg0.anInt4864);
}
} else if (Static159.aBoolean189) {
} else if (Static159.manyGroundTextures) {
Rasteriser.fillTexturedTriangle(local283, local299, local331, local275, local291, local323, arg0.anInt4872, arg0.anInt4867, arg0.anInt4864, local97, local21, local241, local119, local49, local85, local117, local165, local261, arg0.anInt4869);
} else {
local475 = Rasteriser.textureProvider.getAverageColor(arg0.anInt4869);

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

@ -45,7 +45,7 @@ public final class Static133 {
@OriginalMember(owner = "client!kf", name = "a", descriptor = "(Lclient!na;I)V")
public static void method4011(@OriginalArg(0) JagString arg0) {
for (@Pc(15) Map local15 = (Map) Static228.aClass69_120.method2289(); local15 != null; local15 = (Map) Static228.aClass69_120.method2288()) {
if (local15.aClass100_138.method3108(arg0)) {
if (local15.aClass100_138.strEquals(arg0)) {
Static269.aClass3_Sub2_Sub4_2 = local15;
return;
}

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

@ -9,13 +9,13 @@ public final class Static136 {
public static int anInt3324;
@OriginalMember(owner = "client!kk", name = "g", descriptor = "I")
public static int anInt3322 = -1;
public static int logoId = -1;
@OriginalMember(owner = "client!kk", name = "j", descriptor = "I")
public static int anInt3325 = 0;
@OriginalMember(owner = "client!kk", name = "m", descriptor = "Lclient!na;")
public static final JagString aClass100_633 = Static28.parse("Clientscript error )2 check log for details");
public static final JagString CS_ERROR = Static28.parse("Clientscript error )2 check log for details");
@OriginalMember(owner = "client!kk", name = "a", descriptor = "(IIB)V")
public static void method2649(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
@ -81,17 +81,17 @@ public final class Static136 {
} else if (Static113.brightness > 4) {
Static113.brightness = 4;
}
Static53.method1293(arg0.g1() == 1);
Static80.aBoolean231 = arg0.g1() == 1;
Static250.aBoolean283 = arg0.g1() == 1;
Static53.setAllVisibleLevels(arg0.g1() == 1);
Static80.removeRoofsSelectively = arg0.g1() == 1;
Static250.showGroundDecorations = arg0.g1() == 1;
Static53.highDetailTextures = arg0.g1() == 1;
Static15.aBoolean33 = arg0.g1() == 1;
Static11.aBoolean15 = arg0.g1() == 1;
Static159.aBoolean189 = arg0.g1() == 1;
Static209.aBoolean240 = arg0.g1() == 1;
Static139.anInt3451 = arg0.g1();
if (Static139.anInt3451 > 2) {
Static139.anInt3451 = 2;
Static15.manyIdleAnimations = arg0.g1() == 1;
Static11.flickeringEffectsOn = arg0.g1() == 1;
Static159.manyGroundTextures = arg0.g1() == 1;
Static209.characterShadowsOn = arg0.g1() == 1;
Static139.sceneryShadowsType = arg0.g1();
if (Static139.sceneryShadowsType > 2) {
Static139.sceneryShadowsType = 2;
}
if (local21 < 2) {
Static178.highDetailLighting = arg0.g1() == 1;
@ -100,21 +100,21 @@ public final class Static136 {
Static178.highDetailLighting = arg0.g1() == 1;
}
Static220.highWaterDetail = arg0.g1() == 1;
Static71.aBoolean107 = arg0.g1() == 1;
Static71.fogEnabled = arg0.g1() == 1;
Static102.windowMode = arg0.g1();
if (Static102.windowMode > 2) {
Static102.windowMode = 2;
}
Static186.antiAliasingMode = Static102.windowMode;
Static99.stereo = arg0.g1() == 1;
Static125.anInt3104 = arg0.g1();
if (Static125.anInt3104 > 127) {
Static125.anInt3104 = 127;
Static125.soundEffectVolume = arg0.g1();
if (Static125.soundEffectVolume > 127) {
Static125.soundEffectVolume = 127;
}
Static12.anInt391 = arg0.g1();
Static30.anInt978 = arg0.g1();
if (Static30.anInt978 > 127) {
Static30.anInt978 = 127;
Static12.musicVolume = arg0.g1();
Static30.ambientSoundsVolume = arg0.g1();
if (Static30.ambientSoundsVolume > 127) {
Static30.ambientSoundsVolume = 127;
}
if (local21 >= 1) {
Static114.anInt5831 = arg0.g2();
@ -128,10 +128,10 @@ public final class Static136 {
if (GameShell.maxMemory < 96) {
local386 = 0;
}
Static76.method1645(local386);
Static76.setParticles(local386);
}
if (local21 >= 5) {
Static164.anInt3988 = arg0.g4();
Static164.lastWorldId = arg0.g4();
}
if (local21 >= 6) {
Static214.windowMode = arg0.g1();
@ -149,7 +149,7 @@ public final class Static136 {
Static127.aBoolean159 = arg0.g1() != 0;
}
if (local21 >= 11) {
Static64.aBoolean111 = arg0.g1() != 0;
Static64.cursorsEnabled = arg0.g1() != 0;
}
}

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

@ -24,7 +24,7 @@ public final class Static139 {
public static final SoftLruHashTable aClass99_22 = new SoftLruHashTable(4);
@OriginalMember(owner = "client!l", name = "k", descriptor = "I")
public static int anInt3451 = 2;
public static int sceneryShadowsType = 2;
@OriginalMember(owner = "client!l", name = "a", descriptor = "(III)J")
public static long method2703(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {

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

@ -70,7 +70,7 @@ public final class Static140 {
return;
}
}
if (local34.method3108(Static173.self.aClass100_364)) {
if (local34.strEquals(Static173.self.aClass100_364)) {
Static103.method2231(Static186.EMPTY_FILE, 0, LocalizedText.IGNORECANTADDSELF);
return;
}

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

@ -64,7 +64,7 @@ public final class Static141 {
Static165.aClass3_Sub2_Sub1_8 = null;
Static181.aClass3_Sub2_Sub1_9 = null;
if (Static244.gameState == 5) {
Static181.method3344(Static209.js5Archive8);
Static181.load(Static209.js5Archive8);
}
if (Static244.gameState == 10) {
Static73.method1596(false);

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

@ -39,7 +39,7 @@ public final class Static143 {
}
@OriginalMember(owner = "client!ld", name = "a", descriptor = "(IB)I")
public static int method2733(@OriginalArg(0) int arg0) {
public static int toUpperCase(@OriginalArg(0) int arg0) {
if (arg0 >= 97 && arg0 <= 122 || arg0 >= 224 && arg0 <= 254 && arg0 != 247) {
return arg0 - 32;
} else if (arg0 == 255) {

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

@ -230,7 +230,7 @@ public final class Static144 {
@Pc(1003) SoftwareIndexedSprite local1003 = local998.method9(local254);
if (local1003 != null) {
local276 = local162 * local1003.anInt4278 / 4;
local270 = local62 * local1003.anInt4270 / 4;
local270 = local62 * local1003.width / 4;
if (local998.aBoolean2) {
local312 = local222 >> 16 & 0xF;
local372 = local222 >> 20 & 0xF;

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

@ -102,6 +102,6 @@ public final class Static145 {
@OriginalMember(owner = "client!lf", name = "c", descriptor = "(I)I")
public static int method2746() {
return ((Static99.stereo ? 1 : 0) << 19) + (((Static71.aBoolean107 ? 1 : 0) << 16) + ((Static220.highWaterDetail ? 1 : 0) << 15) + ((Static178.highDetailLighting ? 1 : 0) << 13) + ((Static209.aBoolean240 ? 1 : 0) << 10) + ((Static159.aBoolean189 ? 1 : 0) << 9) + ((Static15.aBoolean33 ? 1 : 0) << 7) + ((Static53.highDetailTextures ? 1 : 0) << 6) + ((Static250.aBoolean283 ? 1 : 0) << 5) + (((Static162.aBoolean190 ? 1 : 0) << 3) + (Static113.brightness & 0x7) - (-((Static80.aBoolean231 ? 1 : 0) << 4) + -((Static11.aBoolean15 ? 1 : 0) << 8)) - (-((Static139.anInt3451 & 0x3) << 11) + -((Static125.anInt3104 == 0 ? 0 : 1) << 20) - (((Static12.anInt391 == 0 ? 0 : 1) << 21) + ((Static30.anInt978 == 0 ? 0 : 1) << 22)))) + (Static76.method1644() << 23));
return ((Static99.stereo ? 1 : 0) << 19) + (((Static71.fogEnabled ? 1 : 0) << 16) + ((Static220.highWaterDetail ? 1 : 0) << 15) + ((Static178.highDetailLighting ? 1 : 0) << 13) + ((Static209.characterShadowsOn ? 1 : 0) << 10) + ((Static159.manyGroundTextures ? 1 : 0) << 9) + ((Static15.manyIdleAnimations ? 1 : 0) << 7) + ((Static53.highDetailTextures ? 1 : 0) << 6) + ((Static250.showGroundDecorations ? 1 : 0) << 5) + (((Static162.aBoolean190 ? 1 : 0) << 3) + (Static113.brightness & 0x7) - (-((Static80.removeRoofsSelectively ? 1 : 0) << 4) + -((Static11.flickeringEffectsOn ? 1 : 0) << 8)) - (-((Static139.sceneryShadowsType & 0x3) << 11) + -((Static125.soundEffectVolume == 0 ? 0 : 1) << 20) - (((Static12.musicVolume == 0 ? 0 : 1) << 21) + ((Static30.ambientSoundsVolume == 0 ? 0 : 1) << 22)))) + (Static76.getParticleSetting() << 23));
}
}

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

@ -73,7 +73,7 @@ public final class Static147 {
if (arg0.anIntArray167[local5] != 12345678) {
Rasteriser.fillGouraudTriangle(local156, local160, local164, local39, local148, local152, arg0.anIntArray167[local5], arg0.anIntArray172[local5], arg0.anIntArray171[local5]);
}
} else if (!Static159.aBoolean189) {
} else if (!Static159.manyGroundTextures) {
@Pc(373) int local373 = Rasteriser.textureProvider.getAverageColor(arg0.anIntArray161[local5]);
Rasteriser.fillGouraudTriangle(local156, local160, local164, local39, local148, local152, Static216.method1640(local373, arg0.anIntArray167[local5]), Static216.method1640(local373, arg0.anIntArray172[local5]), Static216.method1640(local373, arg0.anIntArray171[local5]));
} else if (arg0.aBoolean113) {
@ -88,8 +88,8 @@ public final class Static147 {
@OriginalMember(owner = "client!lh", name = "d", descriptor = "(B)V")
public static void method2764() {
Static190.aClass99_26.method3104();
Static124.aClass99_17.method3104();
Static87.aClass99_12.method3104();
Static190.aClass99_26.clear();
Static124.aClass99_17.clear();
Static87.aClass99_12.clear();
}
}

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

@ -29,8 +29,8 @@ public final class Static148 {
public static void method2765(@OriginalArg(1) int arg0) {
if (arg0 == -1 && !Static144.aBoolean173) {
Static241.method4548();
} else if (arg0 != -1 && (Static221.anInt4363 != arg0 || !Static136.method2655()) && Static12.anInt391 != 0 && !Static144.aBoolean173) {
Static257.method526(arg0, Static130.js5Archive6, Static12.anInt391);
} else if (arg0 != -1 && (Static221.anInt4363 != arg0 || !Static136.method2655()) && Static12.musicVolume != 0 && !Static144.aBoolean173) {
Static257.method526(arg0, Static130.js5Archive6, Static12.musicVolume);
}
Static221.anInt4363 = arg0;
}

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

@ -8,10 +8,10 @@ public final class Static15 {
public static float aFloat4;
@OriginalMember(owner = "client!be", name = "ib", descriptor = "Lclient!na;")
public static final JagString aClass100_83 = Static28.parse("event_opbase");
public static final JagString EVENT_OPBASE = Static28.parse("event_opbase");
@OriginalMember(owner = "client!be", name = "Kb", descriptor = "Z")
public static boolean aBoolean33 = true;
public static boolean manyIdleAnimations = true;
@OriginalMember(owner = "client!be", name = "ac", descriptor = "Lclient!na;")
public static JagString aClass100_87 = null;

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

@ -17,15 +17,15 @@ public final class Static150 {
public static int clickButton = 0;
@OriginalMember(owner = "client!lk", name = "a", descriptor = "(ILclient!ve;)I")
public static int getReady(@OriginalArg(1) Js5 arg0) {
@Pc(1) int local1 = 0;
if (arg0.method4506(Static262.anInt5754)) {
local1++;
public static int getReady(@OriginalArg(1) Js5 archive) {
@Pc(1) int ready = 0;
if (archive.isFileReady(Static262.bgId)) {
ready++;
}
if (arg0.method4506(Static136.anInt3322)) {
local1++;
if (archive.isFileReady(Static136.logoId)) {
ready++;
}
return local1;
return ready;
}
@OriginalMember(owner = "client!lk", name = "a", descriptor = "(IIBLclient!ve;)Lclient!qf;")
@ -37,39 +37,39 @@ public final class Static150 {
public static void method2801(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) Component arg2, @OriginalArg(4) boolean arg3) {
@Pc(4) int local4 = arg2.anInt445;
@Pc(7) int local7 = arg2.anInt459;
if (arg2.aByte5 == 0) {
if (arg2.dynamicWidthValue == 0) {
arg2.anInt445 = arg2.baseWidth;
} else if (arg2.aByte5 == 1) {
} else if (arg2.dynamicWidthValue == 1) {
arg2.anInt445 = arg1 - arg2.baseWidth;
} else if (arg2.aByte5 == 2) {
} else if (arg2.dynamicWidthValue == 2) {
arg2.anInt445 = arg2.baseWidth * arg1 >> 14;
} else if (arg2.aByte5 == 3) {
if (arg2.anInt452 == 2) {
} else if (arg2.dynamicWidthValue == 3) {
if (arg2.type == 2) {
arg2.anInt445 = arg2.baseWidth * 32 + (arg2.baseWidth - 1) * arg2.anInt512;
} else if (arg2.anInt452 == 7) {
} else if (arg2.type == 7) {
arg2.anInt445 = arg2.baseWidth * 115 + arg2.anInt512 * (arg2.baseWidth - 1);
}
}
if (arg2.aByte3 == 0) {
arg2.anInt459 = arg2.anInt488;
} else if (arg2.aByte3 == 1) {
arg2.anInt459 = arg0 - arg2.anInt488;
} else if (arg2.aByte3 == 2) {
arg2.anInt459 = arg0 * arg2.anInt488 >> 14;
} else if (arg2.aByte3 == 3) {
if (arg2.anInt452 == 2) {
arg2.anInt459 = (arg2.anInt488 - 1) * arg2.anInt516 + arg2.anInt488 * 32;
} else if (arg2.anInt452 == 7) {
arg2.anInt459 = arg2.anInt488 * 12 + (arg2.anInt488 - 1) * arg2.anInt516;
if (arg2.dynamicHeightValue == 0) {
arg2.anInt459 = arg2.baseHeight;
} else if (arg2.dynamicHeightValue == 1) {
arg2.anInt459 = arg0 - arg2.baseHeight;
} else if (arg2.dynamicHeightValue == 2) {
arg2.anInt459 = arg0 * arg2.baseHeight >> 14;
} else if (arg2.dynamicHeightValue == 3) {
if (arg2.type == 2) {
arg2.anInt459 = (arg2.baseHeight - 1) * arg2.anInt516 + arg2.baseHeight * 32;
} else if (arg2.type == 7) {
arg2.anInt459 = arg2.baseHeight * 12 + (arg2.baseHeight - 1) * arg2.anInt516;
}
}
if (arg2.aByte5 == 4) {
arg2.anInt445 = arg2.anInt473 * arg2.anInt459 / arg2.anInt442;
if (arg2.dynamicWidthValue == 4) {
arg2.anInt445 = arg2.aspectWidth * arg2.anInt459 / arg2.aspectHeight;
}
if (arg2.aByte3 == 4) {
arg2.anInt459 = arg2.anInt442 * arg2.anInt445 / arg2.anInt473;
if (arg2.dynamicHeightValue == 4) {
arg2.anInt459 = arg2.aspectHeight * arg2.anInt445 / arg2.aspectWidth;
}
if (Static121.aBoolean154 && (Static36.method940(arg2).anInt546 != 0 || arg2.anInt452 == 0)) {
if (Static121.aBoolean154 && (Static36.method940(arg2).anInt546 != 0 || arg2.type == 0)) {
if (arg2.anInt459 < 5 && arg2.anInt445 < 5) {
arg2.anInt459 = 5;
arg2.anInt445 = 5;
@ -109,7 +109,7 @@ public final class Static150 {
} else if (arg4 < arg1.anInt2029) {
local20 += arg1.anInt2029 - arg4;
}
if (arg1.anInt2042 == 0 || arg1.anInt2042 < local20 - 64 || Static30.anInt978 == 0 || arg2 != arg1.anInt2033) {
if (arg1.anInt2042 == 0 || arg1.anInt2042 < local20 - 64 || Static30.ambientSoundsVolume == 0 || arg2 != arg1.anInt2033) {
if (arg1.aClass3_Sub3_Sub1_1 != null) {
Static204.soundStream.method1347(arg1.aClass3_Sub3_Sub1_1);
arg1.aClass3_Sub3_Sub1_1 = null;
@ -124,7 +124,7 @@ public final class Static150 {
if (local20 < 0) {
local20 = 0;
}
@Pc(134) int local134 = (arg1.anInt2042 - local20) * Static30.anInt978 / arg1.anInt2042;
@Pc(134) int local134 = (arg1.anInt2042 - local20) * Static30.ambientSoundsVolume / arg1.anInt2042;
if (arg1.aClass3_Sub3_Sub1_1 != null) {
arg1.aClass3_Sub3_Sub1_1.method386(local134);
} else if (arg1.anInt2044 >= 0) {

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

@ -105,7 +105,7 @@ public final class Static152 {
if (arg3) {
Static26.method744(local73, local40, 0);
}
} else if (Static30.anInt978 != 0) {
} else if (Static30.ambientSoundsVolume != 0) {
Static200.anIntArray421[Static189.anInt4451] = local40;
Static276.anIntArray563[Static189.anInt4451] = local73;
@Pc(111) int local111 = (arg0 - 64) / 128;

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

@ -74,7 +74,7 @@ public final class Static153 {
}
}
if (Static39.aClass13_10 != null) {
Static43.method1143(Static39.aClass13_10);
Static43.redraw(Static39.aClass13_10);
Static39.aClass13_10 = null;
}
}

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

@ -26,7 +26,7 @@ public final class Static159 {
public static final LinkedList[][][] aClass69ArrayArrayArray1 = new LinkedList[4][104][104];
@OriginalMember(owner = "client!mi", name = "ab", descriptor = "Z")
public static boolean aBoolean189 = true;
public static boolean manyGroundTextures = true;
@OriginalMember(owner = "client!mi", name = "a", descriptor = "([IBLclient!km;[I[I)V")
public static void method3037(@OriginalArg(0) int[] arg0, @OriginalArg(2) Npc arg1, @OriginalArg(3) int[] arg2, @OriginalArg(4) int[] arg3) {

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

@ -14,7 +14,7 @@ public final class Static164 {
public static int anInt3985 = 0;
@OriginalMember(owner = "client!na", name = "o", descriptor = "I")
public static int anInt3988 = 0;
public static int lastWorldId = 0;
@OriginalMember(owner = "client!na", name = "cb", descriptor = "Lclient!na;")
public static final JagString aClass100_770 = Static28.parse(":allyreq:");

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

@ -47,7 +47,7 @@ public final class Static167 {
@OriginalMember(owner = "client!nd", name = "a", descriptor = "(ILclient!ve;)V")
public static void init(@OriginalArg(1) Js5 arg0) {
Static262.anInt5754 = arg0.getGroupId(Static27.aClass100_165);
Static136.anInt3322 = arg0.getGroupId(Static165.aClass100_776);
Static262.bgId = arg0.getGroupId(Static27.aClass100_165);
Static136.logoId = arg0.getGroupId(Static165.aClass100_776);
}
}

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

@ -76,11 +76,11 @@ public final class Static17 {
public static void method531(@OriginalArg(0) Component arg0, @OriginalArg(1) boolean arg1) {
@Pc(20) int local20 = arg0.anInt486 == 0 ? arg0.anInt445 : arg0.anInt486;
@Pc(32) int local32 = arg0.anInt491 == 0 ? arg0.anInt459 : arg0.anInt491;
Static266.method4190(arg0.anInt507, arg1, local20, local32, Static241.components[arg0.anInt507 >> 16]);
Static266.method4190(arg0.id, arg1, local20, local32, Static241.components[arg0.id >> 16]);
if (arg0.createdComponents != null) {
Static266.method4190(arg0.anInt507, arg1, local20, local32, arg0.createdComponents);
Static266.method4190(arg0.id, arg1, local20, local32, arg0.createdComponents);
}
@Pc(66) Class3_Sub31 local66 = (Class3_Sub31) Static119.aClass133_9.method3863((long) arg0.anInt507);
@Pc(66) Class3_Sub31 local66 = (Class3_Sub31) Static119.aClass133_9.method3863((long) arg0.id);
if (local66 != null) {
Static234.method4017(local32, arg1, local66.anInt5878, local20);
}

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

@ -21,14 +21,14 @@ public final class Static176 {
@OriginalMember(owner = "client!ob", name = "a", descriptor = "(B)V")
public static void method3302() {
Static27.aClass99_4.method3104();
Static244.aClass99_32.method3104();
Static118.aClass99_16.method3104();
Static27.aClass99_4.clear();
Static244.aClass99_32.clear();
Static118.objectSpriteCache.clear();
}
@OriginalMember(owner = "client!ob", name = "a", descriptor = "(IB)Z")
public static boolean method3303(@OriginalArg(0) int arg0) {
@Pc(3) World local3 = Static54.method1310(arg0);
public static boolean hopWorld(@OriginalArg(0) int arg0) {
@Pc(3) World local3 = Static54.getWorld(arg0);
if (local3 == null) {
return false;
} else if (SignLink.anInt5928 == 1 || SignLink.anInt5928 == 2 || Static83.modeWhere == 2) {

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

@ -29,12 +29,12 @@ public final class Static178 {
if (local22 == 0L) {
return;
}
while (Static199.aClass3_Sub22Array1.length > local24 && Static199.aClass3_Sub22Array1[local24].aLong192 != local22) {
while (Static199.aClass3_Sub22Array1.length > local24 && Static199.aClass3_Sub22Array1[local24].uid != local22) {
local24++;
}
if (local24 < Static199.aClass3_Sub22Array1.length && Static199.aClass3_Sub22Array1[local24] != null) {
Static6.outboundBuffer.p1isaac(162);
Static6.outboundBuffer.p8(Static199.aClass3_Sub22Array1[local24].aLong192);
Static6.outboundBuffer.p8(Static199.aClass3_Sub22Array1[local24].uid);
}
}

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

@ -5,7 +5,7 @@ import org.openrs2.deob.annotation.Pc;
public final class Static18 {
@OriginalMember(owner = "client!bh", name = "M", descriptor = "Z")
public static boolean aBoolean40;
public static boolean loaded;
@OriginalMember(owner = "client!bh", name = "s", descriptor = "Lclient!na;")
public static final JagString aClass100_106 = Static28.parse("p11_full");
@ -17,7 +17,7 @@ public final class Static18 {
public static final JagString aClass100_107 = Static28.parse("floorshadows");
@OriginalMember(owner = "client!bh", name = "z", descriptor = "Z")
public static boolean sentToServer = true;
public static boolean serverUpdatedPreferences = true;
@OriginalMember(owner = "client!bh", name = "C", descriptor = "Lclient!na;")
public static final JagString COMPLETE_PERCENT = Static28.parse("<br>(X100(U(Y");
@ -93,9 +93,9 @@ public final class Static18 {
}
@OriginalMember(owner = "client!bh", name = "a", descriptor = "(B)Lclient!ba;")
public static World method556() {
Static51.anInt1682 = 0;
return Static88.method1821();
public static World getFirstWorld() {
Static51.worldPos = 0;
return Static88.getNextWorld();
}
@OriginalMember(owner = "client!bh", name = "a", descriptor = "(IIII)V")

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

@ -36,22 +36,24 @@ public final class Static181 {
}
@OriginalMember(owner = "client!oi", name = "a", descriptor = "(Lclient!ve;B)V")
public static void method3344(@OriginalArg(0) Js5 arg0) {
if (Static18.aBoolean40) {
public static void load(@OriginalArg(0) Js5 archive) {
if (Static18.loaded) {
return;
}
if (GlRenderer.enabled) {
Static46.method1184();
Static46.clear();
} else {
Static129.method2492();
Static129.clear();
}
Static78.aClass3_Sub2_Sub1_3 = Static130.method2514(arg0, Static262.anInt5754);
@Pc(20) int local20 = GameShell.canvasHeight;
@Pc(26) int local26 = local20 * 956 / 503;
Static78.aClass3_Sub2_Sub1_3.method1419((GameShell.canvasWidth - local26) / 2, 0, local26, local20);
Static243.aClass36_1 = Static40.method1010(Static136.anInt3322, arg0);
Static243.aClass36_1.method3336(GameShell.canvasWidth / 2 - Static243.aClass36_1.anInt4270 / 2, 18);
Static18.aBoolean40 = true;
@Pc(20) int height = GameShell.canvasHeight;
@Pc(26) int width = height * 956 / 503;
Static78.titleBg = Static130.loadSpriteAutoDetect(archive, Static262.bgId);
Static78.titleBg.renderResizedTransparent((GameShell.canvasWidth - width) / 2, 0, width, height);
Static243.logo = Static40.loadIndexedSpriteAutoDetect(Static136.logoId, archive);
Static243.logo.renderTransparent(GameShell.canvasWidth / 2 - Static243.logo.width / 2, 18);
Static18.loaded = true;
}
@OriginalMember(owner = "client!oi", name = "b", descriptor = "(II)V")
@ -67,7 +69,7 @@ public final class Static181 {
@OriginalMember(owner = "client!oi", name = "b", descriptor = "(I)V")
public static void method3347() {
Static110.aClass99_15.method3104();
Static110.aClass99_15.clear();
}
@OriginalMember(owner = "client!oi", name = "a", descriptor = "(ILclient!ve;Lclient!ve;Z)V")

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

@ -31,8 +31,8 @@ public final class Static182 {
if (GlRenderer.enabled || arg0) {
local9 = GameShell.canvasHeight;
@Pc(15) int local15 = local9 * 956 / 503;
Static78.aClass3_Sub2_Sub1_3.method1419((GameShell.canvasWidth - local15) / 2, 0, local15, local9);
Static243.aClass36_1.method3336(GameShell.canvasWidth / 2 - Static243.aClass36_1.anInt4270 / 2, 18);
Static78.titleBg.renderResizedTransparent((GameShell.canvasWidth - local15) / 2, 0, local15, local9);
Static243.logo.renderTransparent(GameShell.canvasWidth / 2 - Static243.logo.width / 2, 18);
}
arg1.method2875(LocalizedText.GAME0_LOADING, GameShell.canvasWidth / 2, GameShell.canvasHeight / 2 - 26, 16777215, -1);
local9 = GameShell.canvasHeight / 2 - 18;
@ -51,8 +51,8 @@ public final class Static182 {
}
@OriginalMember(owner = "client!oj", name = "a", descriptor = "(IZIJI)Lclient!na;")
public static JagString method3360(@OriginalArg(0) int arg0, @OriginalArg(1) boolean arg1, @OriginalArg(2) int arg2, @OriginalArg(3) long arg3) {
@Pc(9) JagString local9 = Static87.method1804(0);
public static JagString valueToBase10String(@OriginalArg(0) int arg0, @OriginalArg(1) boolean arg1, @OriginalArg(2) int arg2, @OriginalArg(3) long arg3) {
@Pc(9) JagString local9 = Static87.allocate(0);
if (arg3 < 0L) {
arg3 = -arg3;
local9.method3113(Static73.aClass100_453);
@ -71,7 +71,7 @@ public final class Static182 {
local26 = Static30.aClass100_185;
local28 = Static244.aClass100_1017;
}
@Pc(59) JagString local59 = Static87.method1804(0);
@Pc(59) JagString local59 = Static87.allocate(0);
@Pc(61) int local61;
for (local61 = 0; local61 < arg2; local61++) {
local59.method3113(Static123.parseInt((int) (arg3 % 10L)));
@ -82,7 +82,7 @@ public final class Static182 {
if (arg3 == 0L) {
local137 = Static6.aClass100_17;
} else {
@Pc(95) JagString local95 = Static87.method1804(0);
@Pc(95) JagString local95 = Static87.allocate(0);
while (arg3 > 0L) {
if (arg1 && local61 != 0 && local61 % 3 == 0) {
local95.method3113(local26);

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

@ -104,7 +104,7 @@ public final class Static185 {
@Pc(387) Entity local387;
@Pc(403) Class139 local403;
if (arg6 == 22) {
if (Static250.aBoolean283 || local62.anInt4429 != 0 || local62.anInt4435 == 1 || local62.aBoolean206) {
if (Static250.showGroundDecorations || local62.anInt4429 != 0 || local62.anInt4435 == 1 || local62.aBoolean206) {
if (local62.anInt4430 == -1 && local62.anIntArray380 == null && !local62.aBoolean214) {
local403 = local62.method3428(arg9, local165, local153, 22, local199, local213, arg1, null, local330, local173);
if (GlRenderer.enabled && local330) {

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

@ -22,7 +22,7 @@ public final class Static189 {
public static void method3438(@OriginalArg(1) boolean arg0) {
if (arg0 != Static30.aBoolean61) {
Static30.aBoolean61 = arg0;
Static90.method1854();
Static90.clearLocCache();
}
}
}

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

@ -35,14 +35,14 @@ public final class Static190 {
public static Sprite method3443(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) boolean arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4) {
@Pc(27) int local27 = (arg2 ? 65536 : 0) + arg1 + (arg0 << 17) + (arg4 << 19);
@Pc(37) long local37 = (long) local27 * 3849834839L + (long) arg3 * 3147483667L;
@Pc(43) Sprite local43 = (Sprite) Static118.aClass99_16.method3106(local37);
@Pc(43) Sprite local43 = (Sprite) Static118.objectSpriteCache.method3106(local37);
if (local43 != null) {
return local43;
}
Rasteriser.textureHasTransparency = false;
local43 = Static164.method3150(arg4, false, arg1, arg2, arg0, arg3, false);
if (local43 != null && !Rasteriser.textureHasTransparency) {
Static118.aClass99_16.method3095(local43, local37);
Static118.objectSpriteCache.method3095(local43, local37);
}
return local43;
}
@ -58,6 +58,6 @@ public final class Static190 {
public static void method3447() {
Static27.aClass99_4.method3102(5);
Static244.aClass99_32.method3102(5);
Static118.aClass99_16.method3102(5);
Static118.objectSpriteCache.method3102(5);
}
}

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

@ -268,7 +268,7 @@ public final class Static193 {
local103.method3865(local1348);
@Pc(1358) long[] local1358 = new long[local16];
for (local155 = 0; local155 < local16; local155++) {
local1358[local155] = local1348[local155].aLong192;
local1358[local155] = local1348[local155].uid;
}
Static4.method23(local1358, local1348);
return local1348;

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

@ -47,7 +47,7 @@ public final class Static196 {
Static123.topBannerRefresh();
}
if (arg0 == 5) {
Static181.method3344(Static209.js5Archive8);
Static181.load(Static209.js5Archive8);
} else {
Static119.method2381();
}
@ -55,7 +55,7 @@ public final class Static196 {
if (local106 != local37) {
if (local37) {
Static221.anInt4363 = Static250.titleSong;
if (Static12.anInt391 == 0) {
if (Static12.musicVolume == 0) {
Static29.method801();
} else {
Static257.method526(Static250.titleSong, Static130.js5Archive6, 255);

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

@ -58,7 +58,7 @@ public final class Static197 {
if (GameShell.fullScreenFrame != null) {
Static22.anInt729 = arg5;
Static114.anInt5831 = arg4;
Static203.write(GameShell.signLink);
Static203.savePreferences(GameShell.signLink);
}
}
if (arg1 == 3 && GameShell.fullScreenFrame == null) {
@ -125,7 +125,7 @@ public final class Static197 {
Static65.method1500();
Static260.frameBuffer = null;
Static260.frameBuffer = Static131.create(GameShell.canvasHeight, GameShell.canvasWidth, GameShell.canvas);
Static129.method2492();
Static129.clear();
if (Static244.gameState == 5) {
Static182.method3359(true, Static280.aClass3_Sub2_Sub9_43);
} else {

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

@ -40,11 +40,11 @@ public final class Static2 {
for (@Pc(11) int local11 = 0; local11 < arg0.length; local11++) {
@Pc(23) Component local23 = arg0[local11];
if (local23 != null) {
if (local23.anInt452 == 0) {
if (local23.type == 0) {
if (local23.createdComponents != null) {
method7(local23.createdComponents, arg1);
}
@Pc(49) Class3_Sub31 local49 = (Class3_Sub31) Static119.aClass133_9.method3863((long) local23.anInt507);
@Pc(49) Class3_Sub31 local49 = (Class3_Sub31) Static119.aClass133_9.method3863((long) local23.id);
if (local49 != null) {
Static54.method1304(arg1, local49.anInt5878);
}
@ -57,9 +57,9 @@ public final class Static2 {
Static82.method1767(local72);
}
if (arg1 == 1 && local23.anObjectArray8 != null) {
if (local23.componentId >= 0) {
@Pc(103) Component local103 = Static5.getComponent(local23.anInt507);
if (local103 == null || local103.createdComponents == null || local23.componentId >= local103.createdComponents.length || local103.createdComponents[local23.componentId] != local23) {
if (local23.createdComponentId >= 0) {
@Pc(103) Component local103 = Static5.getComponent(local23.id);
if (local103 == null || local103.createdComponents == null || local23.createdComponentId >= local103.createdComponents.length || local103.createdComponents[local23.createdComponentId] != local23) {
continue;
}
}

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

@ -24,8 +24,8 @@ public final class Static202 {
@OriginalMember(owner = "client!qg", name = "h", descriptor = "(I)V")
public static void method3653() {
Static231.aClass99_29.method3104();
Static219.aClass99_27.method3104();
Static231.aClass99_29.clear();
Static219.aClass99_27.clear();
}
@OriginalMember(owner = "client!qg", name = "a", descriptor = "(Lsignlink!ll;Lclient!wa;IB)V")

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

@ -70,7 +70,7 @@ public final class Static203 {
}
@OriginalMember(owner = "client!qh", name = "a", descriptor = "(Lsignlink!ll;B)V")
public static void write(@OriginalArg(0) SignLink arg0) {
public static void savePreferences(@OriginalArg(0) SignLink arg0) {
@Pc(11) FileOnDisk local11 = null;
try {
@Pc(16) PrivilegedRequest local16 = arg0.openPreferences("runescape");

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

@ -33,9 +33,9 @@ public final class Static204 {
@OriginalMember(owner = "client!qi", name = "e", descriptor = "(B)V")
public static void method3673() {
Static93.aClass99_13.method3104();
Static125.aClass99_18.method3104();
Static262.aClass99_35.method3104();
Static93.aClass99_13.clear();
Static125.aClass99_18.clear();
Static262.aClass99_35.clear();
}
@OriginalMember(owner = "client!qi", name = "b", descriptor = "(II)I")

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

@ -163,12 +163,12 @@ public final class Static207 {
if (Static141.anInt3469 < Static116.anInt2961) {
return -1;
} else if (Static170.method2572(Static229.aByteArray70)) {
Static101.aClass10_Sub1Array1 = new World[Static106.anInt2871];
Static101.worlds = new World[Static106.anInt2871];
local124 = 0;
for (@Pc(240) int local240 = Static19.anInt636; local240 <= Static171.anInt4157; local240++) {
@Pc(247) World local247 = Static54.method1310(local240);
@Pc(247) World local247 = Static54.getWorld(local240);
if (local247 != null) {
Static101.aClass10_Sub1Array1[local124++] = local247;
Static101.worlds[local124++] = local247;
}
}
Static124.socket.close();

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

@ -14,7 +14,7 @@ public final class Static209 {
public static int miscTransmitAt = 0;
@OriginalMember(owner = "client!ra", name = "R", descriptor = "Z")
public static boolean aBoolean240 = true;
public static boolean characterShadowsOn = true;
@OriginalMember(owner = "client!ra", name = "jb", descriptor = "J")
public static volatile long aLong161 = 0L;

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

@ -33,7 +33,7 @@ public final class Static211 {
@OriginalMember(owner = "client!rc", name = "a", descriptor = "(Z)V")
public static void method924() {
Static244.aClass99_32.method3104();
Static244.aClass99_32.clear();
}
@OriginalMember(owner = "client!rc", name = "d", descriptor = "(I)V")

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

@ -131,7 +131,7 @@ public final class Static216 {
Static17.aClass3_Sub15_Sub1_2.pjstr(Static47.aClass100_991);
Static17.aClass3_Sub15_Sub1_2.p4(Static204.anInt4760);
Static17.aClass3_Sub15_Sub1_2.p4(Static145.method2746());
Static18.sentToServer = true;
Static18.serverUpdatedPreferences = true;
Static17.aClass3_Sub15_Sub1_2.p2(Static189.anInt4443);
Static17.aClass3_Sub15_Sub1_2.p4(Static213.js5Archive0.method4480());
Static17.aClass3_Sub15_Sub1_2.p4(Static249.js5Archive1.method4480());

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

@ -93,7 +93,7 @@ public final class Static217 {
Static276.method4612();
Static54.method1308();
Static233.method3999();
Static90.method1854();
Static90.clearLocCache();
Static204.method3673();
Static176.method3302();
Static10.method350();
@ -114,7 +114,7 @@ public final class Static217 {
}
Static181.method3347();
Static90.method1857();
Static139.aClass99_22.method3104();
Static139.aClass99_22.clear();
if (!GlRenderer.enabled) {
((Js5GlTextureProvider) Rasteriser.textureProvider).method3247();
}
@ -130,7 +130,7 @@ public final class Static217 {
Static184.js5Archive10.method4499();
Static214.js5Archive11.method4499();
Static16.js5Archive12.method4499();
Static73.aClass99_10.method3104();
Static73.aClass99_10.clear();
}
@OriginalMember(owner = "client!rj", name = "a", descriptor = "([Lclient!mj;I[BIIIIZIIB)V")

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

@ -80,7 +80,7 @@ public final class Static218 {
public static final JagString aClass100_719 = Static28.parse("str");
@OriginalMember(owner = "client!rk", name = "sb", descriptor = "Lclient!na;")
public static final JagString aClass100_720 = Static87.method1804(100);
public static final JagString aClass100_720 = Static87.allocate(100);
@OriginalMember(owner = "client!rk", name = "tb", descriptor = "I")
public static int anInt3627 = -1;
@ -121,20 +121,20 @@ public final class Static218 {
@Pc(5) int local5 = 0;
@Pc(15) int local15;
for (@Pc(7) int local7 = 0; local7 < local3; local7++) {
local15 = arg0.method3149(local7);
local15 = arg0.charAt(local7);
if (local15 == 60 || local15 == 62) {
local5 += 3;
}
}
@Pc(30) JagString local30 = Static87.method1804(local3 + local5);
@Pc(30) JagString local30 = Static87.allocate(local3 + local5);
for (local15 = 0; local15 < local3; local15++) {
@Pc(40) int local40 = arg0.method3149(local15);
@Pc(40) int local40 = arg0.charAt(local15);
if (local40 == 60) {
local30.method3113(aClass100_711);
} else if (local40 == 62) {
local30.method3113(aClass100_706);
} else {
local30.method3152(local40);
local30.append(local40);
}
}
return local30;

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

@ -12,7 +12,7 @@ public final class Static222 {
public static final int[] anIntArray437 = new int[5];
@OriginalMember(owner = "client!sa", name = "W", descriptor = "Z")
public static boolean aBoolean246 = true;
public static boolean instantScreenFade = true;
@OriginalMember(owner = "client!sa", name = "Y", descriptor = "I")
public static volatile int anInt4973 = 0;

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

@ -82,7 +82,7 @@ public final class Static225 {
Static186.password = arg1;
Static5.anInt39 = arg2;
Static186.username = arg0;
if (Static186.username.method3108(Static186.EMPTY_FILE) || Static186.password.method3108(Static186.EMPTY_FILE)) {
if (Static186.username.strEquals(Static186.EMPTY_FILE) || Static186.password.strEquals(Static186.EMPTY_FILE)) {
Static266.returnCode = 3;
} else if (Static125.worldId == -1) {
Static20.anInt673 = 0;

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

@ -6,7 +6,7 @@ public final class Static227 {
public static int anInt5091;
@OriginalMember(owner = "client!sg", name = "i", descriptor = "Lclient!be;")
public static Component aClass13_25;
public static Component staticActiveComponent2;
@OriginalMember(owner = "client!sg", name = "k", descriptor = "Lclient!ve;")
public static Js5 js5Archive23;

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

@ -49,8 +49,8 @@ public final class Static228 {
}
@OriginalMember(owner = "client!sh", name = "a", descriptor = "(IZBIZ)V")
public static void method3908(@OriginalArg(0) int arg0, @OriginalArg(1) boolean arg1, @OriginalArg(3) int arg2, @OriginalArg(4) boolean arg3) {
Static79.method1697(arg0, arg2, Static101.aClass10_Sub1Array1.length - 1, arg3, 0, arg1);
public static void sortWorldList(@OriginalArg(0) int arg0, @OriginalArg(1) boolean arg1, @OriginalArg(3) int arg2, @OriginalArg(4) boolean arg3) {
Static79.method1697(arg0, arg2, Static101.worlds.length - 1, arg3, 0, arg1);
}
@OriginalMember(owner = "client!sh", name = "a", descriptor = "(I[JII[Ljava/lang/Object;)V")

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

@ -31,8 +31,8 @@ public final class Static230 {
@OriginalMember(owner = "client!sj", name = "c", descriptor = "(I)V")
public static void method3947() {
Static250.aClass99_33.method3104();
Static139.aClass99_21.method3104();
Static250.aClass99_33.clear();
Static139.aClass99_21.clear();
}
@OriginalMember(owner = "client!sj", name = "a", descriptor = "(Z)V")

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

@ -284,7 +284,7 @@ public final class Static231 {
}
@OriginalMember(owner = "client!sk", name = "c", descriptor = "(II)I")
public static int method3984(@OriginalArg(1) int arg0) {
public static int toLowerCase(@OriginalArg(1) int arg0) {
if (arg0 >= 65 && arg0 <= 90 || arg0 >= 192 && arg0 <= 222 && arg0 != 215) {
return arg0 + 32;
} else if (arg0 == 159) {
@ -298,6 +298,6 @@ public final class Static231 {
@OriginalMember(owner = "client!sk", name = "a", descriptor = "(Lclient!ve;I)Z")
public static boolean isReady(@OriginalArg(0) Js5 arg0) {
return arg0.method4506(Static138.anInt3443);
return arg0.isFileReady(Static138.anInt3443);
}
}

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

@ -54,7 +54,7 @@ public final class Static233 {
@OriginalMember(owner = "client!t", name = "b", descriptor = "(I)V")
public static void method3999() {
Static67.aClass99_20.method3104();
Static67.aClass99_20.clear();
}
@OriginalMember(owner = "client!t", name = "a", descriptor = "(IIIZIII)V")

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

@ -6,10 +6,10 @@ public final class Static236 {
@OriginalMember(owner = "client!tc", name = "a", descriptor = "(B)I")
public static int method4047() {
if (Static127.aBoolean160) {
if (Static127.neverRemoveRoofs) {
return 0;
} else if (Static138.allLevelsAreVisible()) {
return Static80.aBoolean231 ? 2 : 1;
return Static80.removeRoofsSelectively ? 2 : 1;
} else {
return 1;
}
@ -27,10 +27,10 @@ public final class Static236 {
if (Static22.anInt723 != 0) {
if (arg4 <= arg3 && arg4 + 16 > arg3 && arg0 >= arg5 && arg5 + 16 > arg0) {
arg2.scrollY -= 4;
Static43.method1143(arg2);
Static43.redraw(arg2);
} else if (arg3 >= arg4 && arg3 < arg4 + 16 && arg0 >= arg1 + arg5 - 16 && arg1 + arg5 > arg0) {
arg2.scrollY += 4;
Static43.method1143(arg2);
Static43.redraw(arg2);
} else if (arg3 >= arg4 - Static42.anInt1396 && arg3 < arg4 + Static42.anInt1396 + 16 && arg0 >= arg5 + 16 && arg1 + arg5 - 16 > arg0) {
local139 = arg1 * (arg1 - 32) / arg6;
if (local139 < 8) {
@ -39,7 +39,7 @@ public final class Static236 {
@Pc(150) int local150 = arg1 - local139 - 32;
@Pc(162) int local162 = arg0 - local139 / 2 - arg5 - 16;
arg2.scrollY = (arg6 - arg1) * local162 / local150;
Static43.method1143(arg2);
Static43.redraw(arg2);
Static45.aBoolean84 = true;
}
}
@ -49,7 +49,7 @@ public final class Static236 {
local139 = arg2.anInt445;
if (arg4 - local139 <= arg3 && arg5 <= arg0 && arg3 < arg4 + 16 && arg1 + arg5 >= arg0) {
arg2.scrollY += Static58.wheelRotation * 45;
Static43.method1143(arg2);
Static43.redraw(arg2);
}
}
}

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

@ -23,7 +23,7 @@ public final class Static238 {
@Pc(13) DelayedStateChange local13 = (DelayedStateChange) Static36.aClass133_3.method3863((long) arg1 | (long) arg0 << 32);
if (local13 == null) {
local13 = new DelayedStateChange(arg0, arg1);
Static36.aClass133_3.method3862(local13, local13.aLong192);
Static36.aClass133_3.method3862(local13, local13.uid);
}
return local13;
}

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

@ -24,18 +24,18 @@ public final class Static242 {
private static void method4194(@OriginalArg(0) SoftwareIndexedSprite arg0, @OriginalArg(1) SoftwareIndexedSprite arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) {
arg2 += arg0.anInt4280;
arg3 += arg0.anInt4273;
@Pc(16) int local16 = arg2 + arg3 * arg1.anInt4270;
@Pc(16) int local16 = arg2 + arg3 * arg1.width;
@Pc(18) int local18 = 0;
@Pc(21) int local21 = arg0.anInt4278;
@Pc(24) int local24 = arg0.anInt4270;
@Pc(29) int local29 = arg1.anInt4270 - local24;
@Pc(24) int local24 = arg0.width;
@Pc(29) int local29 = arg1.width - local24;
@Pc(31) int local31 = 0;
@Pc(37) int local37;
if (arg3 <= 0) {
local37 = 1 - arg3;
local21 -= local37;
local18 = local37 * local24;
local16 += local37 * arg1.anInt4270;
local16 += local37 * arg1.width;
arg3 = 1;
}
if (arg3 + local21 >= arg1.anInt4278) {
@ -51,8 +51,8 @@ public final class Static242 {
local29 += local37;
arg2 = 1;
}
if (arg2 + local24 >= arg1.anInt4270) {
local37 = arg2 + local24 + 1 - arg1.anInt4270;
if (arg2 + local24 >= arg1.width) {
local37 = arg2 + local24 + 1 - arg1.width;
local24 -= local37;
local31 += local37;
local29 += local37;
@ -186,15 +186,15 @@ public final class Static242 {
private static boolean method4200(@OriginalArg(0) SoftwareIndexedSprite arg0, @OriginalArg(1) SoftwareIndexedSprite arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) {
arg2 += arg0.anInt4280;
arg3 += arg0.anInt4273;
@Pc(16) int local16 = arg2 + arg3 * arg1.anInt4270;
@Pc(16) int local16 = arg2 + arg3 * arg1.width;
@Pc(19) int local19 = arg0.anInt4278;
@Pc(22) int local22 = arg0.anInt4270;
@Pc(27) int local27 = arg1.anInt4270 - local22;
@Pc(22) int local22 = arg0.width;
@Pc(27) int local27 = arg1.width - local22;
@Pc(33) int local33;
if (arg3 <= 0) {
local33 = 1 - arg3;
local19 -= local33;
local16 += local33 * arg1.anInt4270;
local16 += local33 * arg1.width;
arg3 = 1;
}
if (arg3 + local19 >= arg1.anInt4278) {
@ -208,13 +208,13 @@ public final class Static242 {
local27 += local33;
arg2 = 1;
}
if (arg2 + local22 >= arg1.anInt4270) {
local33 = arg2 + local22 + 1 - arg1.anInt4270;
if (arg2 + local22 >= arg1.width) {
local33 = arg2 + local22 + 1 - arg1.width;
local22 -= local33;
local27 += local33;
}
if (local22 > 0 && local19 > 0) {
local27 += arg1.anInt4270 * 7;
local27 += arg1.width * 7;
method4196(arg2, arg3, local22, local19);
return method4199(arg1.aByteArray18, local16, local22, local19, local27);
} else {
@ -239,18 +239,18 @@ public final class Static242 {
private static void method4202(@OriginalArg(0) SoftwareIndexedSprite arg0, @OriginalArg(1) SoftwareIndexedSprite arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) {
arg2 += arg0.anInt4280;
arg3 += arg0.anInt4273;
@Pc(16) int local16 = arg2 + arg3 * arg1.anInt4270;
@Pc(16) int local16 = arg2 + arg3 * arg1.width;
@Pc(18) int local18 = 0;
@Pc(21) int local21 = arg0.anInt4278;
@Pc(24) int local24 = arg0.anInt4270;
@Pc(29) int local29 = arg1.anInt4270 - local24;
@Pc(24) int local24 = arg0.width;
@Pc(29) int local29 = arg1.width - local24;
@Pc(31) int local31 = 0;
@Pc(37) int local37;
if (arg3 <= 0) {
local37 = 1 - arg3;
local21 -= local37;
local18 = local37 * local24;
local16 += local37 * arg1.anInt4270;
local16 += local37 * arg1.width;
arg3 = 1;
}
if (arg3 + local21 >= arg1.anInt4278) {
@ -266,8 +266,8 @@ public final class Static242 {
local29 += local37;
arg2 = 1;
}
if (arg2 + local24 >= arg1.anInt4270) {
local37 = arg2 + local24 + 1 - arg1.anInt4270;
if (arg2 + local24 >= arg1.width) {
local37 = arg2 + local24 + 1 - arg1.width;
local24 -= local37;
local31 += local37;
local29 += local37;
@ -377,11 +377,11 @@ public final class Static242 {
@OriginalMember(owner = "client!tj", name = "a", descriptor = "(Lclient!ek;Lclient!ek;IIIZ)V")
private static void method4210(@OriginalArg(0) SoftwareIndexedSprite arg0, @OriginalArg(1) SoftwareIndexedSprite arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) boolean arg5) {
if (arg2 <= 0 || arg3 <= 0 || arg2 + 16 >= arg1.anInt4270 || arg3 + 16 >= arg1.anInt4278) {
if (arg2 <= 0 || arg3 <= 0 || arg2 + 16 >= arg1.width || arg3 + 16 >= arg1.anInt4278) {
return;
}
@Pc(23) int local23 = arg2 + arg3 * arg1.anInt4270;
@Pc(28) int local28 = arg1.anInt4270 - 16;
@Pc(23) int local23 = arg2 + arg3 * arg1.width;
@Pc(28) int local28 = arg1.width - 16;
@Pc(32) short local32;
@Pc(34) byte local34;
@Pc(41) short local41;

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

@ -8,7 +8,7 @@ public final class Static243 {
public static Js5 aClass153_97;
@OriginalMember(owner = "client!tk", name = "o", descriptor = "Lclient!ok;")
public static IndexedSprite aClass36_1;
public static IndexedSprite logo;
@OriginalMember(owner = "client!tk", name = "s", descriptor = "Lclient!ve;")
public static Js5 aClass153_98;
@ -145,12 +145,12 @@ public final class Static243 {
Static227.anIntArray446[local3506] = 0;
}
if (GlRenderer.enabled) {
Static86.method1799();
Static86.setInstantFade();
}
Static197.aBoolean228 = true;
Static189.anInt4443 = 0;
Static195.aClass100_859 = LocalizedText.WALKHERE;
Static127.aBoolean160 = false;
Static127.neverRemoveRoofs = false;
Static259.aShortArray88 = Static62.aShortArray19 = Static232.aShortArray74 = Static259.aShortArray87 = new short[256];
Static114.method4637();
Static261.aBoolean298 = false;

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

@ -40,7 +40,7 @@ public final class Static245 {
@Pc(62) byte[] local62 = Static202.aClass153_84.getFile(arg0, local46);
if (local62 != null) {
@Pc(74) Component local74 = Static241.components[arg0][local46] = new Component();
local74.anInt507 = local46 + (arg0 << 16);
local74.id = local46 + (arg0 << 16);
if (local62[0] == -1) {
local74.method490(new Buffer(local62));
} else {

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

@ -674,7 +674,7 @@ public final class Static247 {
Static241.aBoolean302 = true;
Static246.anInt5393 = arg4;
Static35.anInt1092 = arg5;
Static43.method1143(local8);
Static43.redraw(local8);
}
@OriginalMember(owner = "client!ub", name = "a", descriptor = "(IB)I")
@ -699,7 +699,7 @@ public final class Static247 {
@OriginalMember(owner = "client!ub", name = "a", descriptor = "(Z)V")
public static void method4249() {
Static279.aClass99_38.method3104();
Static56.aClass99_9.method3104();
Static279.aClass99_38.clear();
Static56.aClass99_9.clear();
}
}

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

@ -133,7 +133,7 @@ public final class Static248 {
}
local336.method1944(Static130.aClass3_Sub5ArrayArrayArray1, local350, false);
}
if (local32 == 0 && Static139.anInt3451 > 0) {
if (local32 == 0 && Static139.sceneryShadowsType > 0) {
GlRenderer.method4159(101.5F);
Static242.method4198(Static167.anInt4069, Static193.anInt4539, Static277.tileVisibilityDistance, arg1, Static48.aBooleanArrayArray1, Static83.activeTileHeightMap[0]);
}

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

@ -36,6 +36,6 @@ public final class Static249 {
@OriginalMember(owner = "client!ud", name = "d", descriptor = "(I)V")
public static void method4266() {
Static232.aClass99_30.method3104();
Static232.aClass99_30.clear();
}
}

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