diff --git a/client/src/main/java/rt4/Camera.java b/client/src/main/java/rt4/Camera.java
index 4d1fa8d..29b65b3 100644
--- a/client/src/main/java/rt4/Camera.java
+++ b/client/src/main/java/rt4/Camera.java
@@ -93,6 +93,10 @@ public class Camera {
public static float aFloat15;
@OriginalMember(owner = "client!sk", name = "jb", descriptor = "I")
public static int anInt5203;
+ @OriginalMember(owner = "client!t", name = "o", descriptor = "I")
+ public static int anInt5217;
+ @OriginalMember(owner = "client!t", name = "A", descriptor = "I")
+ public static int anInt5225;
public static double mod(double a, double b) {
return ((a % b) + b) % b;
@@ -151,37 +155,37 @@ public class Camera {
anInt40 = SceneGraph.getTileHeight(Player.level, renderX, renderZ) - anInt5203;
} else {
if (renderX < local15) {
- renderX += Static233.anInt5225 + anInt4612 * (local15 - renderX) / 1000;
+ renderX += anInt5225 + anInt4612 * (local15 - renderX) / 1000;
if (renderX > local15) {
renderX = local15;
}
}
if (anInt40 < local23) {
- anInt40 += (local23 - anInt40) * anInt4612 / 1000 + Static233.anInt5225;
+ anInt40 += (local23 - anInt40) * anInt4612 / 1000 + anInt5225;
if (anInt40 > local23) {
anInt40 = local23;
}
}
if (renderX > local15) {
- renderX -= Static233.anInt5225 + (renderX - local15) * anInt4612 / 1000;
+ renderX -= anInt5225 + (renderX - local15) * anInt4612 / 1000;
if (renderX < local15) {
renderX = local15;
}
}
if (renderZ < local9) {
- renderZ += Static233.anInt5225 + anInt4612 * (local9 - renderZ) / 1000;
+ renderZ += anInt5225 + anInt4612 * (local9 - renderZ) / 1000;
if (local9 < renderZ) {
renderZ = local9;
}
}
if (local23 < anInt40) {
- anInt40 -= (anInt40 - local23) * anInt4612 / 1000 + Static233.anInt5225;
+ anInt40 -= (anInt40 - local23) * anInt4612 / 1000 + anInt5225;
if (local23 > anInt40) {
anInt40 = local23;
}
}
if (renderZ > local9) {
- renderZ -= Static233.anInt5225 + (renderZ - local9) * anInt4612 / 1000;
+ renderZ -= anInt5225 + (renderZ - local9) * anInt4612 / 1000;
if (local9 > renderZ) {
renderZ = local9;
}
@@ -203,13 +207,13 @@ public class Camera {
}
@Pc(292) int local292 = (int) (-325.949D * Math.atan2(local246, local241)) & 0x7FF;
if (cameraPitch < local268) {
- cameraPitch += anInt5230 + Static233.anInt5217 * (local268 - cameraPitch) / 1000;
+ cameraPitch += anInt5230 + anInt5217 * (local268 - cameraPitch) / 1000;
if (cameraPitch > local268) {
cameraPitch = local268;
}
}
if (cameraPitch > local268) {
- cameraPitch -= (cameraPitch - local268) * Static233.anInt5217 / 1000 + anInt5230;
+ cameraPitch -= (cameraPitch - local268) * anInt5217 / 1000 + anInt5230;
if (cameraPitch < local268) {
cameraPitch = local268;
}
@@ -222,11 +226,11 @@ public class Camera {
local350 += 2048;
}
if (local350 > 0) {
- cameraYaw += local350 * Static233.anInt5217 / 1000 + anInt5230;
+ cameraYaw += local350 * anInt5217 / 1000 + anInt5230;
cameraYaw &= 0x7FF;
}
if (local350 < 0) {
- cameraYaw -= Static233.anInt5217 * -local350 / 1000 + anInt5230;
+ cameraYaw -= anInt5217 * -local350 / 1000 + anInt5230;
cameraYaw &= 0x7FF;
}
@Pc(404) int local404 = local292 - cameraYaw;
@@ -305,10 +309,10 @@ public class Camera {
public static void method3849(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(5) int arg4) {
anInt5230 = arg2;
anInt5765 = arg1;
- Static233.anInt5217 = arg4;
+ anInt5217 = arg4;
anInt5449 = arg3;
anInt1744 = arg0;
- if (Static233.anInt5217 >= 100) {
+ if (anInt5217 >= 100) {
@Pc(30) int local30 = anInt5449 * 128 + 64;
@Pc(36) int local36 = anInt5765 * 128 + 64;
@Pc(44) int local44 = SceneGraph.getTileHeight(Player.level, local30, local36) - anInt1744;
@@ -333,7 +337,7 @@ public class Camera {
anInt4612 = arg3;
anInt5203 = arg2;
anInt5375 = arg5;
- Static233.anInt5225 = arg1;
+ anInt5225 = arg1;
anInt4232 = arg4;
if (arg0 && anInt4612 >= 100) {
renderX = anInt5375 * 128 + 64;
@@ -349,7 +353,7 @@ public class Camera {
customCameraActive[local3] = false;
}
anInt5230 = 0;
- Static233.anInt5217 = 0;
+ anInt5217 = 0;
anInt3718 = -1;
anInt1694 = -1;
cameraType = 1;
diff --git a/client/src/main/java/rt4/CharUtils.java b/client/src/main/java/rt4/CharUtils.java
new file mode 100644
index 0000000..f3328e2
--- /dev/null
+++ b/client/src/main/java/rt4/CharUtils.java
@@ -0,0 +1,64 @@
+package rt4;
+
+import org.openrs2.deob.annotation.OriginalArg;
+import org.openrs2.deob.annotation.OriginalMember;
+
+public class CharUtils {
+ @OriginalMember(owner = "client!va", name = "a", descriptor = "(IB)Z")
+ public static boolean isLetter(@OriginalArg(0) int c) {
+ return c >= 97 && c <= 122 || c >= 65 && c <= 90;
+ }
+
+ @OriginalMember(owner = "client!bn", name = "d", descriptor = "(II)Z")
+ public static boolean isDigit(@OriginalArg(1) int c) {
+ return c >= 48 && c <= 57;
+ }
+
+ @OriginalMember(owner = "client!gj", name = "a", descriptor = "(II)Z")
+ public static boolean isLetterOrDigit(@OriginalArg(0) int c) {
+ if (c >= 97 && c <= 122) {
+ return true;
+ } else if (c >= 65 && c <= 90) {
+ return true;
+ } else {
+ return c >= 48 && c <= 57;
+ }
+ }
+
+ @OriginalMember(owner = "client!we", name = "b", descriptor = "(II)Z")
+ public static boolean isValidChar(@OriginalArg(1) int c) {
+ if (c >= 32 && c <= 126) {
+ return true;
+ } else if (c >= 160 && c <= 255) {
+ return true;
+ } else {
+ return c == 128 || c == 140 || c == 151 || c == 156 || c == 159;
+ }
+ }
+
+ @OriginalMember(owner = "client!ld", name = "a", descriptor = "(IB)I")
+ public static int toUpperCase(@OriginalArg(0) int c) {
+ if (c >= 97 && c <= 122 || c >= 224 && c <= 254 && c != 247) {
+ return c - 32;
+ } else if (c == 255) {
+ return 159;
+ } else if (c == 156) {
+ return 140;
+ } else {
+ return c;
+ }
+ }
+
+ @OriginalMember(owner = "client!sk", name = "c", descriptor = "(II)I")
+ public static int toLowerCase(@OriginalArg(1) int c) {
+ if (c >= 65 && c <= 90 || c >= 192 && c <= 222 && c != 215) {
+ return c + 32;
+ } else if (c == 159) {
+ return 255;
+ } else if (c == 140) {
+ return 156;
+ } else {
+ return c;
+ }
+ }
+}
diff --git a/client/src/main/java/rt4/Cheat.java b/client/src/main/java/rt4/Cheat.java
index abeee7d..617b11a 100644
--- a/client/src/main/java/rt4/Cheat.java
+++ b/client/src/main/java/rt4/Cheat.java
@@ -100,7 +100,7 @@ public class Cheat {
@OriginalMember(owner = "client!en", name = "a", descriptor = "(IIIB)V")
public static void teleport(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
- @Pc(66) JagString local66 = JagString.concatenate(new JagString[]{aClass100_521, JagString.parseInt(arg2), Static70.aClass100_760, JagString.parseInt(arg0 >> 6), Static70.aClass100_760, JagString.parseInt(arg1 >> 6), Static70.aClass100_760, JagString.parseInt(arg0 & 0x3F), Static70.aClass100_760, JagString.parseInt(arg1 & 0x3F)});
+ @Pc(66) JagString local66 = JagString.concatenate(new JagString[]{aClass100_521, JagString.parseInt(arg2), Cs1ScriptRunner.aClass100_760, JagString.parseInt(arg0 >> 6), Cs1ScriptRunner.aClass100_760, JagString.parseInt(arg1 >> 6), Cs1ScriptRunner.aClass100_760, JagString.parseInt(arg0 & 0x3F), Cs1ScriptRunner.aClass100_760, JagString.parseInt(arg1 & 0x3F)});
local66.print();
execute(local66);
}
diff --git a/client/src/main/java/rt4/ClientProt.java b/client/src/main/java/rt4/ClientProt.java
index 0165cdd..b3144e2 100644
--- a/client/src/main/java/rt4/ClientProt.java
+++ b/client/src/main/java/rt4/ClientProt.java
@@ -128,9 +128,9 @@ public class ClientProt {
InterfaceList.closeInterface(true, local18);
}
}
- if (Static44.aClass13_10 != null) {
- InterfaceList.redraw(Static44.aClass13_10);
- Static44.aClass13_10 = null;
+ if (Cs1ScriptRunner.aClass13_10 != null) {
+ InterfaceList.redraw(Cs1ScriptRunner.aClass13_10);
+ Cs1ScriptRunner.aClass13_10 = null;
}
}
@@ -182,11 +182,11 @@ public class ClientProt {
if (client.gameState != 30 && client.gameState != 25) {
return;
}
- Static131.anInt3251++;
- if (Static131.anInt3251 < 50 && !arg0) {
+ Protocol.anInt3251++;
+ if (Protocol.anInt3251 < 50 && !arg0) {
return;
}
- Static131.anInt3251 = 0;
+ Protocol.anInt3251 = 0;
if (!LoginManager.aBoolean247 && Protocol.socket != null) {
Protocol.outboundBuffer.p1isaac(93);
try {
@@ -201,69 +201,69 @@ public class ClientProt {
@OriginalMember(owner = "client!ac", name = "b", descriptor = "(I)V")
public static void method28() {
- InterfaceList.redraw(Static40.aClass13_14);
- Static40.anInt4851++;
- if (Static44.aBoolean83 && InterfaceList.aBoolean174) {
+ InterfaceList.redraw(Cs1ScriptRunner.aClass13_14);
+ Cs1ScriptRunner.anInt4851++;
+ if (InterfaceList.aBoolean83 && InterfaceList.aBoolean174) {
@Pc(30) int local30 = Mouse.lastMouseX;
- local30 -= Static40.anInt5388;
- if (Static81.anInt2225 > local30) {
- local30 = Static81.anInt2225;
+ local30 -= Cs1ScriptRunner.anInt5388;
+ if (Cs1ScriptRunner.anInt2225 > local30) {
+ local30 = Cs1ScriptRunner.anInt2225;
}
@Pc(41) int local41 = Mouse.lastMouseY;
- if (Static81.anInt2225 + Static40.aClass13_1.width < local30 - -Static40.aClass13_14.width) {
- local30 = Static81.anInt2225 + Static40.aClass13_1.width - Static40.aClass13_14.width;
+ if (Cs1ScriptRunner.anInt2225 + Cs1ScriptRunner.aClass13_1.width < local30 - -Cs1ScriptRunner.aClass13_14.width) {
+ local30 = Cs1ScriptRunner.anInt2225 + Cs1ScriptRunner.aClass13_1.width - Cs1ScriptRunner.aClass13_14.width;
}
- local41 -= Static40.anInt4035;
+ local41 -= Cs1ScriptRunner.anInt4035;
if (local41 < InterfaceList.anInt5103) {
local41 = InterfaceList.anInt5103;
}
- if (InterfaceList.anInt5103 + Static40.aClass13_1.height < local41 - -Static40.aClass13_14.height) {
- local41 = InterfaceList.anInt5103 + Static40.aClass13_1.height - Static40.aClass13_14.height;
+ if (InterfaceList.anInt5103 + Cs1ScriptRunner.aClass13_1.height < local41 - -Cs1ScriptRunner.aClass13_14.height) {
+ local41 = InterfaceList.anInt5103 + Cs1ScriptRunner.aClass13_1.height - Cs1ScriptRunner.aClass13_14.height;
}
- @Pc(109) int local109 = local41 - Static36.anInt660;
- @Pc(114) int local114 = local30 - Static36.anInt3075;
- @Pc(122) int local122 = local30 + Static40.aClass13_1.scrollX - Static81.anInt2225;
- @Pc(130) int local130 = Static40.aClass13_1.scrollY + local41 - InterfaceList.anInt5103;
- @Pc(133) int local133 = Static40.aClass13_14.dragDeadzone;
- if (Static40.anInt4851 > Static40.aClass13_14.dragDeadtime && (local133 < local114 || -local133 > local114 || local109 > local133 || local109 < -local133)) {
- Static40.aBoolean172 = true;
+ @Pc(109) int local109 = local41 - InterfaceList.anInt660;
+ @Pc(114) int local114 = local30 - InterfaceList.anInt3075;
+ @Pc(122) int local122 = local30 + Cs1ScriptRunner.aClass13_1.scrollX - Cs1ScriptRunner.anInt2225;
+ @Pc(130) int local130 = Cs1ScriptRunner.aClass13_1.scrollY + local41 - InterfaceList.anInt5103;
+ @Pc(133) int local133 = Cs1ScriptRunner.aClass13_14.dragDeadzone;
+ if (Cs1ScriptRunner.anInt4851 > Cs1ScriptRunner.aClass13_14.dragDeadtime && (local133 < local114 || -local133 > local114 || local109 > local133 || local109 < -local133)) {
+ Cs1ScriptRunner.aBoolean172 = true;
}
@Pc(176) HookRequest local176;
- if (Static40.aClass13_14.onDragStart != null && Static40.aBoolean172) {
+ if (Cs1ScriptRunner.aClass13_14.onDragStart != null && Cs1ScriptRunner.aBoolean172) {
local176 = new HookRequest();
- local176.source = Static40.aClass13_14;
- local176.arguments = Static40.aClass13_14.onDragStart;
+ local176.source = Cs1ScriptRunner.aClass13_14;
+ local176.arguments = Cs1ScriptRunner.aClass13_14.onDragStart;
local176.mouseX = local122;
local176.mouseY = local130;
ScriptRunner.run(local176);
}
if (Mouse.pressedButton == 0) {
- if (Static40.aBoolean172) {
- if (Static40.aClass13_14.onDragRelease != null) {
+ if (Cs1ScriptRunner.aBoolean172) {
+ if (Cs1ScriptRunner.aClass13_14.onDragRelease != null) {
local176 = new HookRequest();
local176.mouseY = local130;
local176.target = InterfaceList.aClass13_12;
local176.mouseX = local122;
- local176.arguments = Static40.aClass13_14.onDragRelease;
- local176.source = Static40.aClass13_14;
+ local176.arguments = Cs1ScriptRunner.aClass13_14.onDragRelease;
+ local176.source = Cs1ScriptRunner.aClass13_14;
ScriptRunner.run(local176);
}
- if (InterfaceList.aClass13_12 != null && Static36.method938(Static40.aClass13_14) != null) {
+ if (InterfaceList.aClass13_12 != null && InterfaceList.method938(Cs1ScriptRunner.aClass13_14) != null) {
Protocol.outboundBuffer.p1isaac(79);
- Protocol.outboundBuffer.mp4(Static40.aClass13_14.id);
+ Protocol.outboundBuffer.mp4(Cs1ScriptRunner.aClass13_14.id);
Protocol.outboundBuffer.ip2(InterfaceList.aClass13_12.createdComponentId);
Protocol.outboundBuffer.p4(InterfaceList.aClass13_12.id);
- Protocol.outboundBuffer.ip2(Static40.aClass13_14.createdComponentId);
+ Protocol.outboundBuffer.ip2(Cs1ScriptRunner.aClass13_14.createdComponentId);
}
} else if ((VarpDomain.anInt2952 == 1 || MiniMenu.method4640(MiniMenu.size - 1)) && MiniMenu.size > 2) {
- Static226.method3901();
+ ScriptRunner.method3901();
} else if (MiniMenu.size > 0) {
- Static59.method1372();
+ MiniMenu.method1372();
}
- Static40.aClass13_14 = null;
+ Cs1ScriptRunner.aClass13_14 = null;
}
- } else if (Static40.anInt4851 > 1) {
- Static40.aClass13_14 = null;
+ } else if (Cs1ScriptRunner.anInt4851 > 1) {
+ Cs1ScriptRunner.aClass13_14 = null;
}
}
diff --git a/client/src/main/java/rt4/Component.java b/client/src/main/java/rt4/Component.java
index 5a07b32..0e002a5 100644
--- a/client/src/main/java/rt4/Component.java
+++ b/client/src/main/java/rt4/Component.java
@@ -137,7 +137,7 @@ public final class Component {
public int[] statTriggers;
@OriginalMember(owner = "client!be", name = "Bc", descriptor = "[I")
- public int[] anIntArray43;
+ public int[] cs1ComparisonOpcodes;
@OriginalMember(owner = "client!be", name = "Cc", descriptor = "[Ljava/lang/Object;")
public Object[] onMouseRepeat;
@@ -158,7 +158,7 @@ public final class Component {
public Object[] onDragStart;
@OriginalMember(owner = "client!be", name = "ad", descriptor = "[[I")
- public int[][] anIntArrayArray4;
+ public int[][] cs1Scripts;
@OriginalMember(owner = "client!be", name = "bd", descriptor = "[I")
public int[] anIntArray46;
@@ -170,7 +170,7 @@ public final class Component {
public Object[] onUseWith;
@OriginalMember(owner = "client!be", name = "kd", descriptor = "[I")
- public int[] anIntArray48;
+ public int[] cs1ComparisonOperands;
@OriginalMember(owner = "client!be", name = "nd", descriptor = "[I")
public int[] anIntArray49;
@@ -499,6 +499,20 @@ public final class Component {
fonts.clean(50);
}
+ @OriginalMember(owner = "client!lh", name = "d", descriptor = "(B)V")
+ public static void clear() {
+ sprites.clear();
+ models.clear();
+ fonts.clear();
+ }
+
+ @OriginalMember(owner = "client!da", name = "h", descriptor = "(B)V")
+ public static void method1019() {
+ sprites.removeSoft();
+ models.removeSoft();
+ fonts.removeSoft();
+ }
+
@OriginalMember(owner = "client!be", name = "a", descriptor = "(IIB)V")
public final void method477(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
if (this.anIntArray39 == null || this.anIntArray39.length <= arg0) {
@@ -593,11 +607,11 @@ public final class Component {
@Pc(109) int local109 = arg0.g1();
@Pc(125) int local125;
if (local109 > 0) {
- this.anIntArray48 = new int[local109];
- this.anIntArray43 = new int[local109];
+ this.cs1ComparisonOperands = new int[local109];
+ this.cs1ComparisonOpcodes = new int[local109];
for (local125 = 0; local125 < local109; local125++) {
- this.anIntArray43[local125] = arg0.g1();
- this.anIntArray48[local125] = arg0.g2();
+ this.cs1ComparisonOpcodes[local125] = arg0.g1();
+ this.cs1ComparisonOperands[local125] = arg0.g2();
}
}
local125 = arg0.g1();
@@ -605,14 +619,14 @@ public final class Component {
@Pc(175) int local175;
@Pc(183) int local183;
if (local125 > 0) {
- this.anIntArrayArray4 = new int[local125][];
+ this.cs1Scripts = new int[local125][];
for (local164 = 0; local164 < local125; local164++) {
local175 = arg0.g2();
- this.anIntArrayArray4[local164] = new int[local175];
+ this.cs1Scripts[local164] = new int[local175];
for (local183 = 0; local183 < local175; local183++) {
- this.anIntArrayArray4[local164][local183] = arg0.g2();
- if (this.anIntArrayArray4[local164][local183] == 65535) {
- this.anIntArrayArray4[local164][local183] = -1;
+ this.cs1Scripts[local164][local183] = arg0.g2();
+ if (this.cs1Scripts[local164][local183] == 65535) {
+ this.cs1Scripts[local164][local183] = -1;
}
}
}
diff --git a/client/src/main/java/rt4/Static87.java b/client/src/main/java/rt4/Cs1ScriptRunner.java
similarity index 69%
rename from client/src/main/java/rt4/Static87.java
rename to client/src/main/java/rt4/Cs1ScriptRunner.java
index 37c3206..1330916 100644
--- a/client/src/main/java/rt4/Static87.java
+++ b/client/src/main/java/rt4/Cs1ScriptRunner.java
@@ -4,107 +4,302 @@ import org.openrs2.deob.annotation.OriginalArg;
import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc;
-public final class Static87 {
-
- @OriginalMember(owner = "client!bj", name = "V", descriptor = "I")
- public static final int anInt671 = 0x332d25;
-
- @OriginalMember(owner = "client!rl", name = "Z", descriptor = "I")
- public static final int anInt4938 = 0x766654;
-
- @OriginalMember(owner = "client!ec", name = "l", descriptor = "I")
- public static final int anInt1704 = 0x4d4233;
+import java.nio.charset.StandardCharsets;
+public class Cs1ScriptRunner {
+ @OriginalMember(owner = "client!bm", name = "p", descriptor = "Lclient!na;")
+ public static final JagString aClass100_133 = JagString.parse("(U1");
+ @OriginalMember(owner = "client!wh", name = "u", descriptor = "Lclient!na;")
+ public static final JagString aClass100_1097 = JagString.parse("(U2");
+ @OriginalMember(owner = "client!mj", name = "g", descriptor = "Lclient!na;")
+ public static final JagString aClass100_761 = JagString.parse("(U3");
+ @OriginalMember(owner = "client!hh", name = "a", descriptor = "Lclient!na;")
+ public static final JagString aClass100_520 = JagString.parse("(U4");
+ @OriginalMember(owner = "client!tb", name = "P", descriptor = "Lclient!na;")
+ public static final JagString aClass100_1002 = JagString.parse("(U5");
+ @OriginalMember(owner = "client!jh", name = "g", descriptor = "Lclient!na;")
+ public static final JagString aClass100_591 = JagString.parse("(Udns");
+ @OriginalMember(owner = "client!lh", name = "z", descriptor = "Lclient!na;")
+ public static final JagString aClass100_672 = JagString.parse("(U (X");
+ @OriginalMember(owner = "client!bd", name = "b", descriptor = "Lclient!na;")
+ public static final JagString aClass100_80 = JagString.parse("(U(Y");
@OriginalMember(owner = "client!oj", name = "p", descriptor = "I")
public static final int anInt4306 = 0x23201b;
+ @OriginalMember(owner = "client!ec", name = "l", descriptor = "I")
+ public static final int anInt1704 = 0x4d4233;
+ @OriginalMember(owner = "client!rl", name = "Z", descriptor = "I")
+ public static final int anInt4938 = 0x766654;
+ @OriginalMember(owner = "client!bj", name = "V", descriptor = "I")
+ public static final int anInt671 = 0x332d25;
+ @OriginalMember(owner = "client!pg", name = "V", descriptor = "I")
+ public static final int anInt4504 = 50;
@OriginalMember(owner = "client!wa", name = "pb", descriptor = "Lclient!na;")
public static final JagString aClass100_556 = JagString.parse("
");
@OriginalMember(owner = "client!ed", name = "H", descriptor = "Lclient!na;")
public static final JagString aClass100_375 = JagString.parse("<)4col> x");
- @OriginalMember(owner = "client!bd", name = "b", descriptor = "Lclient!na;")
- public static final JagString aClass100_80 = JagString.parse("(U(Y");
- @OriginalMember(owner = "client!pg", name = "V", descriptor = "I")
- public static final int anInt4504 = 50;
-
- @OriginalMember(owner = "client!gn", name = "d", descriptor = "Z")
- public static boolean aBoolean130 = false;
-
- @OriginalMember(owner = "client!gn", name = "v", descriptor = "Lclient!na;")
- public static final JagString NULL = JagString.parse("null");
+ @OriginalMember(owner = "client!je", name = "db", descriptor = "Lclient!na;")
+ public static final JagString aClass100_589 = JagString.parse(" ");
+ @OriginalMember(owner = "client!uf", name = "s", descriptor = "Lclient!na;")
+ public static final JagString aClass100_1043 = JagString.parse(" ");
+ @OriginalMember(owner = "client!wj", name = "b", descriptor = "Lclient!na;")
+ public static final JagString aClass100_1101 = JagString.parse(" ");
+ @OriginalMember(owner = "client!mi", name = "R", descriptor = "Lclient!na;")
+ public static final JagString aClass100_760 = JagString.parse(")1");
+ @OriginalMember(owner = "client!sj", name = "w", descriptor = "Lclient!na;")
+ public static final JagString aClass100_978 = JagString.parse("<)4col>");
+ @OriginalMember(owner = "client!jb", name = "c", descriptor = "Lclient!na;")
+ public static final JagString aClass100_583 = JagString.parse("(Y<)4col>");
+ @OriginalMember(owner = "client!th", name = "m", descriptor = "[Lclient!be;")
+ public static Component[] aClass13Array13;
@OriginalMember(owner = "client!k", name = "j", descriptor = "I")
public static int anInt3126;
- @OriginalMember(owner = "client!ld", name = "c", descriptor = "I")
- public static int anInt3484 = -1;
- @OriginalMember(owner = "client!qf", name = "X", descriptor = "Lclient!be;")
- public static Component aClass13_13 = null;
@OriginalMember(owner = "client!gf", name = "K", descriptor = "I")
public static int anInt4696;
+ @OriginalMember(owner = "client!ac", name = "p", descriptor = "Lclient!be;")
+ public static Component aClass13_1 = null;
+ @OriginalMember(owner = "client!ib", name = "e", descriptor = "Lclient!be;")
+ public static Component aClass13_14 = null;
+ @OriginalMember(owner = "client!km", name = "pc", descriptor = "Z")
+ public static boolean aBoolean172 = false;
+ @OriginalMember(owner = "client!gg", name = "db", descriptor = "I")
+ public static int anInt2225 = -1;
+ @OriginalMember(owner = "client!nb", name = "d", descriptor = "I")
+ public static int anInt4035 = 0;
+ @OriginalMember(owner = "client!kd", name = "Bb", descriptor = "I")
+ public static int anInt3260 = -1;
+ @OriginalMember(owner = "client!d", name = "R", descriptor = "Lclient!be;")
+ public static Component aClass13_10 = null;
@OriginalMember(owner = "client!hi", name = "a", descriptor = "I")
public static int anInt2503 = -1;
+ @OriginalMember(owner = "client!ld", name = "c", descriptor = "I")
+ public static int anInt3484 = -1;
+ @OriginalMember(owner = "client!lf", name = "k", descriptor = "I")
+ public static int anInt3502 = -1;
+ @OriginalMember(owner = "client!mh", name = "X", descriptor = "I")
+ public static int anInt3851 = -1;
+ @OriginalMember(owner = "client!ig", name = "b", descriptor = "I")
+ public static int anInt2882;
+ @OriginalMember(owner = "client!ig", name = "f", descriptor = "I")
+ public static int anInt2884;
+ @OriginalMember(owner = "client!hc", name = "P", descriptor = "I")
+ public static int anInt2428;
+ @OriginalMember(owner = "client!u", name = "a", descriptor = "I")
+ public static int anInt5388 = 0;
+ @OriginalMember(owner = "client!re", name = "y", descriptor = "I")
+ public static int anInt4851;
+ @OriginalMember(owner = "client!em", name = "z", descriptor = "Z")
+ public static boolean aBoolean108 = false;
- @OriginalMember(owner = "client!gn", name = "a", descriptor = "(Z)Z")
- public static boolean showVideoAd() {
- if (client.objectTag) {
- try {
- Static9.aClass100_35.browserControlCall(GameShell.signLink.applet);
- return true;
- } catch (@Pc(14) Throwable local14) {
- }
+ @OriginalMember(owner = "client!we", name = "a", descriptor = "(BILclient!be;)I")
+ public static int run(@OriginalArg(1) int arg0, @OriginalArg(2) Component arg1) {
+ if (arg1.cs1Scripts == null || arg0 >= arg1.cs1Scripts.length) {
+ return -2;
}
- return false;
- }
-
- @OriginalMember(owner = "client!gn", name = "a", descriptor = "(BI)Lclient!na;")
- public static JagString allocate(@OriginalArg(1) int arg0) {
- @Pc(13) JagString local13 = new JagString();
- local13.length = 0;
- local13.chars = new byte[arg0];
- return local13;
- }
-
- @OriginalMember(owner = "client!gn", name = "a", descriptor = "(ZI)V")
- public static void method1805(@OriginalArg(0) boolean arg0) {
- @Pc(7) byte local7;
- @Pc(9) byte[][] local9;
- if (GlRenderer.enabled && arg0) {
- local7 = 1;
- local9 = LoginManager.underWaterMapFilesBuffer;
- } else {
- local7 = 4;
- local9 = LoginManager.mapFilesBuffer;
- }
- @Pc(18) int local18 = local9.length;
- @Pc(20) int local20;
- @Pc(38) int local38;
- @Pc(49) int local49;
- @Pc(53) byte[] local53;
- for (local20 = 0; local20 < local18; local20++) {
- local38 = (LoginManager.regionBitPacked[local20] >> 8) * 64 - Camera.originX;
- local49 = (LoginManager.regionBitPacked[local20] & 0xFF) * 64 - Camera.originZ;
- local53 = local9[local20];
- if (local53 != null) {
- client.audioLoop();
- method2203(PathFinder.collisionMaps, arg0, LoginManager.centralZoneX * 8 - 48, local49, local38, (LoginManager.centralZoneZ - 6) * 8, local53);
- }
- }
- for (local20 = 0; local20 < local18; local20++) {
- local38 = (LoginManager.regionBitPacked[local20] >> 8) * 64 - Camera.originX;
- local49 = (LoginManager.regionBitPacked[local20] & 0xFF) * 64 - Camera.originZ;
- local53 = local9[local20];
- if (local53 == null && LoginManager.centralZoneZ < 800) {
- client.audioLoop();
- for (@Pc(130) int local130 = 0; local130 < local7; local130++) {
- method645(local130, local49, local38, 64, 64);
+ try {
+ @Pc(33) int[] script = arg1.cs1Scripts[arg0];
+ @Pc(35) byte accumulatorMode = 0;
+ @Pc(37) int accumulator = 0;
+ @Pc(39) int pc = 0;
+ while (true) {
+ @Pc(41) int value = 0;
+ @Pc(46) int opcode = script[pc++];
+ @Pc(48) byte nextAccumulatorMode = 0;
+ if (opcode == 0) {
+ return accumulator;
+ }
+ if (opcode == 15) {
+ nextAccumulatorMode = 1;
+ }
+ if (opcode == 16) {
+ nextAccumulatorMode = 2;
+ }
+ if (opcode == 1) {
+ value = PlayerSkillXpTable.boostedLevels[script[pc++]];
+ }
+ if (opcode == 17) {
+ nextAccumulatorMode = 3;
+ }
+ if (opcode == 2) {
+ value = PlayerSkillXpTable.baseLevels[script[pc++]];
+ }
+ if (opcode == 3) {
+ value = PlayerSkillXpTable.experience[script[pc++]];
+ }
+ @Pc(124) int pc2;
+ @Pc(135) Component otherComponent;
+ @Pc(140) int pc3;
+ @Pc(152) int local152;
+ if (opcode == 4) {
+ pc2 = script[pc++] << 16;
+ @Pc(131) int componentId = pc2 + script[pc++];
+ otherComponent = InterfaceList.getComponent(componentId);
+ pc3 = script[pc++];
+ if (pc3 != -1 && (!ObjTypeList.get(pc3).members || LoginManager.mapMembers)) {
+ for (local152 = 0; local152 < otherComponent.objTypes.length; local152++) {
+ if (pc3 + 1 == otherComponent.objTypes[local152]) {
+ value += otherComponent.objCounts[local152];
+ }
+ }
+ }
+ }
+ if (opcode == 5) {
+ value = VarpDomain.activeVarps[script[pc++]];
+ }
+ if (opcode == 6) {
+ value = PlayerSkillXpTable.xpLevelLookup[PlayerSkillXpTable.baseLevels[script[pc++]] - 1];
+ }
+ if (opcode == 7) {
+ value = VarpDomain.activeVarps[script[pc++]] * 100 / 46875;
+ }
+ if (opcode == 8) {
+ value = PlayerList.self.combatLevel;
+ }
+ if (opcode == 9) {
+ for (pc2 = 0; pc2 < 25; pc2++) {
+ if (PlayerSkillXpTable.ENABLED_SKILLS[pc2]) {
+ value += PlayerSkillXpTable.baseLevels[pc2];
+ }
+ }
+ }
+ if (opcode == 10) {
+ pc2 = script[pc++] << 16;
+ pc2 += script[pc++];
+ otherComponent = InterfaceList.getComponent(pc2);
+ pc3 = script[pc++];
+ if (pc3 != -1 && (!ObjTypeList.get(pc3).members || LoginManager.mapMembers)) {
+ for (local152 = 0; local152 < otherComponent.objTypes.length; local152++) {
+ if (otherComponent.objTypes[local152] == pc3 + 1) {
+ value = 999999999;
+ break;
+ }
+ }
+ }
+ }
+ if (opcode == 11) {
+ value = Player.runEnergy;
+ }
+ if (opcode == 12) {
+ value = Player.weight;
+ }
+ if (opcode == 13) {
+ pc2 = VarpDomain.activeVarps[script[pc++]];
+ @Pc(353) int local353 = script[pc++];
+ value = (0x1 << local353 & pc2) == 0 ? 0 : 1;
+ }
+ if (opcode == 14) {
+ pc2 = script[pc++];
+ value = VarpDomain.getVarbit(pc2);
+ }
+ if (opcode == 18) {
+ value = (PlayerList.self.xFine >> 7) + Camera.originX;
+ }
+ if (opcode == 19) {
+ value = (PlayerList.self.zFine >> 7) + Camera.originZ;
+ }
+ if (opcode == 20) {
+ value = script[pc++];
+ }
+ if (nextAccumulatorMode == 0) {
+ if (accumulatorMode == 0) {
+ accumulator += value;
+ }
+ if (accumulatorMode == 1) {
+ accumulator -= value;
+ }
+ if (accumulatorMode == 2 && value != 0) {
+ accumulator /= value;
+ }
+ if (accumulatorMode == 3) {
+ accumulator *= value;
+ }
+ accumulatorMode = 0;
+ } else {
+ accumulatorMode = nextAccumulatorMode;
}
}
+ } catch (@Pc(464) Exception ignored) {
+ return -1;
}
}
- @OriginalMember(owner = "client!gn", name = "b", descriptor = "(Z)V")
- public static void method1807() {
- for (@Pc(11) int local11 = 0; local11 < 100; local11++) {
- InterfaceList.aBooleanArray100[local11] = true;
+ @OriginalMember(owner = "client!k", name = "a", descriptor = "(Lclient!be;Lclient!na;I)Lclient!na;")
+ public static JagString interpolate(@OriginalArg(0) Component arg0, @OriginalArg(1) JagString text) {
+ if (text.indexOf(JagString.PERCENT_SIGN) == -1) {
+ return text;
}
+
+ while (true) {
+ @Pc(14) int local14 = text.indexOf(aClass100_133);
+ if (local14 == -1) {
+ while (true) {
+ local14 = text.indexOf(aClass100_1097);
+ if (local14 == -1) {
+ while (true) {
+ local14 = text.indexOf(aClass100_761);
+ if (local14 == -1) {
+ while (true) {
+ local14 = text.indexOf(aClass100_520);
+ if (local14 == -1) {
+ while (true) {
+ local14 = text.indexOf(aClass100_1002);
+ if (local14 == -1) {
+ while (true) {
+ local14 = text.indexOf(aClass100_591);
+ if (local14 == -1) {
+ return text;
+ }
+ @Pc(246) JagString local246 = JagString.EMPTY;
+ if (Player.lastLogAddress != null) {
+ local246 = JagString.formatIp(Player.lastLogAddress.intArg2);
+ if (Player.lastLogAddress.result != null) {
+ @Pc(265) byte[] local265 = ((String) Player.lastLogAddress.result).getBytes(StandardCharsets.ISO_8859_1);
+ local246 = JagString.decodeString(local265, local265.length, 0);
+ }
+ }
+ text = JagString.concatenate(new JagString[]{text.substring(local14, 0), local246, text.substring(local14 + 4)});
+ }
+ }
+ text = JagString.concatenate(new JagString[]{text.substring(local14, 0), StringUtils.toString(run(4, arg0)), text.substring(local14 + 2)});
+ }
+ }
+ text = JagString.concatenate(new JagString[]{text.substring(local14, 0), StringUtils.toString(run(3, arg0)), text.substring(local14 + 2)});
+ }
+ }
+ text = JagString.concatenate(new JagString[]{text.substring(local14, 0), StringUtils.toString(run(2, arg0)), text.substring(local14 + 2)});
+ }
+ }
+ text = JagString.concatenate(new JagString[]{text.substring(local14, 0), StringUtils.toString(run(1, arg0)), text.substring(local14 + 2)});
+ }
+ }
+ text = JagString.concatenate(new JagString[]{text.substring(local14, 0), StringUtils.toString(run(0, arg0)), text.substring(local14 + 2)});
+ }
+ }
+
+ @OriginalMember(owner = "client!md", name = "a", descriptor = "(Lclient!be;I)Z")
+ public static boolean isTrue(@OriginalArg(0) Component component) {
+ if (component.cs1ComparisonOpcodes == null) {
+ return false;
+ }
+ for (@Pc(14) int i = 0; i < component.cs1ComparisonOpcodes.length; i++) {
+ @Pc(34) int value = run(i, component);
+ @Pc(39) int operand = component.cs1ComparisonOperands[i];
+ if (component.cs1ComparisonOpcodes[i] == 2) {
+ if (operand <= value) {
+ return false;
+ }
+ } else if (component.cs1ComparisonOpcodes[i] == 3) {
+ if (value <= operand) {
+ return false;
+ }
+ } else if (component.cs1ComparisonOpcodes[i] == 4) {
+ if (value == operand) {
+ return false;
+ }
+ } else if (operand != value) {
+ return false;
+ }
+ }
+ return true;
}
@OriginalMember(owner = "client!gn", name = "a", descriptor = "(III[Lclient!be;IIIIBI)V")
@@ -115,9 +310,10 @@ public final class Static87 {
SoftwareRaster.setClip(arg0, arg6, arg4, arg7);
Rasteriser.prepare();
}
+
for (@Pc(18) int i = 0; i < components.length; i++) {
@Pc(30) Component component = components[i];
- if (component != null && (component.layer == layer || layer == 0xabcdabcd && component == Static40.aClass13_14)) {
+ if (component != null && (component.layer == layer || layer == 0xabcdabcd && component == aClass13_14)) {
@Pc(57) int rectangle;
if (parentRectangle == -1) {
InterfaceList.rectangleX[InterfaceList.rectangles] = arg2 + component.x;
@@ -130,7 +326,7 @@ public final class Static87 {
}
component.rectangleLoop = client.loop;
component.rectangle = rectangle;
- if (!component.if3 || !Static36.method947(component)) {
+ if (!component.if3 || !InterfaceList.method947(component)) {
if (component.clientCode > 0) {
method13(component);
}
@@ -142,30 +338,30 @@ public final class Static87 {
}
@Pc(166) int local166;
@Pc(164) int local164;
- if (component == Static40.aClass13_14) {
+ if (component == aClass13_14) {
if (layer != 0xabcdabcd && !component.dragRenderBehavior) {
anInt4696 = arg2;
anInt3126 = arg1;
- Static9.aClass13Array13 = components;
+ aClass13Array13 = components;
continue;
}
- if (Static40.aBoolean172 && InterfaceList.aBoolean174) {
+ if (aBoolean172 && InterfaceList.aBoolean174) {
local164 = Mouse.lastMouseY;
local166 = Mouse.lastMouseX;
- local164 -= Static40.anInt4035;
+ local164 -= anInt4035;
if (local164 < InterfaceList.anInt5103) {
local164 = InterfaceList.anInt5103;
}
- if (local164 + component.height > Static40.aClass13_1.height + InterfaceList.anInt5103) {
- local164 = Static40.aClass13_1.height + InterfaceList.anInt5103 - component.height;
+ if (local164 + component.height > aClass13_1.height + InterfaceList.anInt5103) {
+ local164 = aClass13_1.height + InterfaceList.anInt5103 - component.height;
}
local114 = local164;
- local166 -= Static40.anInt5388;
- if (Static81.anInt2225 > local166) {
- local166 = Static81.anInt2225;
+ local166 -= anInt5388;
+ if (anInt2225 > local166) {
+ local166 = anInt2225;
}
- if (Static40.aClass13_1.width + Static81.anInt2225 < component.width + local166) {
- local166 = Static40.aClass13_1.width + Static81.anInt2225 - component.width;
+ if (aClass13_1.width + anInt2225 < component.width + local166) {
+ local166 = aClass13_1.width + anInt2225 - component.width;
}
local123 = local166;
}
@@ -226,7 +422,7 @@ public final class Static87 {
} else {
SoftwareRaster.setClip(arg0, arg6, arg4, arg7);
}
- if (MiniMap.state != 0 && MiniMap.state != 3 || Static40.aBoolean108 || local166 > ScriptRunner.anInt3751 || ScriptRunner.anInt1892 < local164 || ScriptRunner.anInt3751 >= local302 || local291 <= ScriptRunner.anInt1892) {
+ if (MiniMap.state != 0 && MiniMap.state != 3 || aBoolean108 || local166 > ScriptRunner.anInt3751 || ScriptRunner.anInt1892 < local164 || ScriptRunner.anInt3751 >= local302 || local291 <= ScriptRunner.anInt1892) {
continue;
}
local270 = ScriptRunner.anInt3751 - local123;
@@ -263,7 +459,7 @@ public final class Static87 {
}
if (component.clientCode == 1339) {
if (component.method478()) {
- Static160.method3047(local123, local114, component, rectangle);
+ method3047(local123, local114, component, rectangle);
if (GlRenderer.enabled) {
GlRaster.setClip(arg0, arg6, arg4, arg7);
} else {
@@ -284,7 +480,7 @@ public final class Static87 {
continue;
}
if (component.clientCode == 1401) {
- Static1.method4(local123, component.height, component.width, local114);
+ method4(local123, component.height, component.width, local114);
InterfaceList.aBooleanArray100[rectangle] = true;
InterfaceList.rectangleRedraw[rectangle] = true;
if (GlRenderer.enabled) {
@@ -337,7 +533,7 @@ public final class Static87 {
}
local571 = local556 * 10000 / cardMemory;
local563 = objId * 100 / cardMemory;
- @Pc(968) JagString local968 = JagString.concatenate(new JagString[]{Cheat.DEBUG_CAHE, StringUtils.formatNumber(0, true, 2, local571), Static147.aClass100_672, JagString.parseInt(local563), aClass100_80});
+ @Pc(968) JagString local968 = JagString.concatenate(new JagString[]{Cheat.DEBUG_CAHE, StringUtils.formatNumber(0, true, 2, local571), aClass100_672, JagString.parseInt(local563), aClass100_80});
Fonts.p11Full.renderRight(local968, local270, local276, 16776960, 0);
local276 += 12;
InterfaceList.aBooleanArray100[rectangle] = true;
@@ -346,12 +542,12 @@ public final class Static87 {
}
if (component.clientCode == 1406) {
anInt3484 = local114;
- aClass13_13 = component;
- Static131.anInt3260 = local123;
+ LoginManager.aClass13_13 = component;
+ anInt3260 = local123;
continue;
}
}
- if (!Static40.aBoolean108) {
+ if (!aBoolean108) {
if (component.type == 0 && component.noClickThrough && ScriptRunner.anInt3751 >= local166 && ScriptRunner.anInt1892 >= local164 && ScriptRunner.anInt3751 < local302 && local291 > ScriptRunner.anInt1892 && !Cheat.qaOpTest) {
MiniMenu.size = 1;
MiniMenu.cursors[0] = MiniMenu.anInt1092;
@@ -364,7 +560,7 @@ public final class Static87 {
}
}
if (component.type == 0) {
- if (!component.if3 && Static36.method947(component) && InterfaceList.aClass13_22 != component) {
+ if (!component.if3 && InterfaceList.method947(component) && InterfaceList.aClass13_22 != component) {
continue;
}
if (!component.if3) {
@@ -381,7 +577,7 @@ public final class Static87 {
}
@Pc(1186) ComponentPointer local1186 = (ComponentPointer) InterfaceList.openInterfaces.get(component.id);
if (local1186 != null) {
- if (local1186.anInt5879 == 0 && !Static40.aBoolean108 && ScriptRunner.anInt3751 >= local166 && local164 <= ScriptRunner.anInt1892 && local302 > ScriptRunner.anInt3751 && ScriptRunner.anInt1892 < local291 && !Cheat.qaOpTest) {
+ if (local1186.anInt5879 == 0 && !aBoolean108 && ScriptRunner.anInt3751 >= local166 && local164 <= ScriptRunner.anInt1892 && local302 > ScriptRunner.anInt3751 && ScriptRunner.anInt1892 < local291 && !Cheat.qaOpTest) {
MiniMenu.ops[0] = LocalizedText.CANCEL;
MiniMenu.size = 1;
MiniMenu.cursors[0] = MiniMenu.anInt1092;
@@ -515,7 +711,7 @@ public final class Static87 {
}
}
} else if (component.type == 3) {
- if (method2926(component)) {
+ if (isTrue(component)) {
local270 = component.anInt492;
if (InterfaceList.aClass13_22 == component && component.anInt475 != 0) {
local270 = component.anInt475;
@@ -555,7 +751,7 @@ public final class Static87 {
local1921 = component.method491(Sprites.nameIcons);
if (local1921 != null) {
@Pc(1934) JagString local1934 = component.text;
- if (method2926(component)) {
+ if (isTrue(component)) {
local276 = component.anInt492;
if (InterfaceList.aClass13_22 == component && component.anInt475 != 0) {
local276 = component.anInt475;
@@ -576,15 +772,15 @@ public final class Static87 {
local1934 = MiniMenu.NULL;
}
if ((local1989.stackable == 1 || component.objCount != 1) && component.objCount != -1) {
- local1934 = JagString.concatenate(new JagString[]{MiniMenu.aClass100_32, local1934, aClass100_375, Static70.method1548(component.objCount)});
+ local1934 = JagString.concatenate(new JagString[]{MiniMenu.aClass100_32, local1934, aClass100_375, method1548(component.objCount)});
}
}
- if (Static44.aClass13_10 == component) {
+ if (aClass13_10 == component) {
local276 = component.color;
local1934 = LocalizedText.PLEASEWAIT;
}
if (!component.if3) {
- local1934 = JagString.method2465(component, local1934);
+ local1934 = interpolate(component, local1934);
}
local1921.drawInterfaceText(local1934, local123, local114, component.width, component.height, local276, component.textAntiMacro ? 0 : -1, component.anInt460, component.anInt478, component.anInt467);
} else if (Component.aBoolean72) {
@@ -681,7 +877,7 @@ public final class Static87 {
InterfaceList.redraw(component);
}
} else {
- sprite = component.method489(method2926(component));
+ sprite = component.method489(isTrue(component));
if (sprite != null) {
sprite.render(local123, local114);
} else if (Component.aBoolean72) {
@@ -691,7 +887,7 @@ public final class Static87 {
} else {
@Pc(2611) ObjType local2611;
if (component.type == 6) {
- @Pc(2587) boolean local2587 = method2926(component);
+ @Pc(2587) boolean local2587 = isTrue(component);
@Pc(2589) Model local2589 = null;
if (local2587) {
local276 = component.anInt462;
@@ -810,9 +1006,9 @@ public final class Static87 {
local2611 = ObjTypeList.get(component.objTypes[local276] - 1);
@Pc(3159) JagString local3159;
if (local2611.stackable != 1 && component.objCounts[local276] == 1) {
- local3159 = JagString.concatenate(new JagString[]{MiniMenu.aClass100_32, local2611.name, Static70.aClass100_978});
+ local3159 = JagString.concatenate(new JagString[]{MiniMenu.aClass100_32, local2611.name, aClass100_978});
} else {
- local3159 = JagString.concatenate(new JagString[]{MiniMenu.aClass100_32, local2611.name, aClass100_375, Static70.method1548(component.objCounts[local276])});
+ local3159 = JagString.concatenate(new JagString[]{MiniMenu.aClass100_32, local2611.name, aClass100_375, method1548(component.objCounts[local276])});
}
local556 = local123 + memory * (component.anInt512 + 115);
objId = (component.anInt516 + 12) * local468 + local114;
@@ -833,7 +1029,7 @@ public final class Static87 {
local270 = 0;
@Pc(3297) JagString local3297 = component.text;
@Pc(3299) Font local3299 = Fonts.p12Full;
- local3297 = JagString.method2465(component, local3297);
+ local3297 = interpolate(component, local3297);
@Pc(3325) JagString local3325;
while (local3297.length() > 0) {
cardMemory = local3297.indexOf(aClass100_556);
@@ -872,7 +1068,7 @@ public final class Static87 {
}
local3297 = component.text;
objId = local556 + local3299.lineHeight + 2;
- local3297 = JagString.method2465(component, local3297);
+ local3297 = interpolate(component, local3297);
while (local3297.length() > 0) {
local563 = local3297.indexOf(aClass100_556);
if (local563 == -1) {
@@ -919,6 +1115,51 @@ public final class Static87 {
}
}
+ @OriginalMember(owner = "client!ag", name = "a", descriptor = "(IIIIIIIII)V")
+ public static void method86(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5, @OriginalArg(7) int arg6, @OriginalArg(8) int arg7) {
+ if (InterfaceList.load(arg0)) {
+ method1809(arg1, arg7, arg3, InterfaceList.components[arg0], arg2, -1, arg6, arg5, arg4);
+ } else if (arg4 == -1) {
+ for (@Pc(27) int local27 = 0; local27 < 100; local27++) {
+ InterfaceList.aBooleanArray100[local27] = true;
+ }
+ } else {
+ InterfaceList.aBooleanArray100[arg4] = true;
+ }
+ }
+
+ @OriginalMember(owner = "client!al", name = "a", descriptor = "(Z)V")
+ public static void method182() {
+ aClass13Array13 = null;
+ method86(InterfaceList.topLevelInterface, 0, GameShell.canvasWidth, 0, -1, GameShell.canvasHeight, 0, 0);
+ if (aClass13Array13 != null) {
+ method1809(0, anInt3126, anInt4696, aClass13Array13, GameShell.canvasWidth, -1412584499, 0, GameShell.canvasHeight, aClass13_1.rectangle);
+ aClass13Array13 = null;
+ }
+ }
+
+ @OriginalMember(owner = "client!mj", name = "a", descriptor = "(IILclient!be;IB)V")
+ public static void method3047(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) Component arg2, @OriginalArg(3) int arg3) {
+ if (GlRenderer.enabled) {
+ GlRaster.setClip(arg0, arg1, arg2.width + arg0, arg2.height + arg1);
+ }
+ if (MiniMap.state >= 3) {
+ if (GlRenderer.enabled) {
+ @Pc(44) Sprite local44 = arg2.method489(false);
+ if (local44 != null) {
+ local44.render(arg0, arg1);
+ }
+ } else {
+ SoftwareRaster.method2504(arg0, arg1, arg2.anIntArray37, arg2.anIntArray45);
+ }
+ } else if (GlRenderer.enabled) {
+ ((GlSprite) Sprites.compass).renderRotatedTransparent(arg0, arg1, arg2.width, arg2.height, Sprites.compass.width / 2, Sprites.compass.height / 2, (int) Camera.yawTarget, 256, (GlSprite) arg2.method489(false));
+ } else {
+ ((SoftwareSprite) Sprites.compass).renderRotated(arg0, arg1, arg2.width, arg2.height, Sprites.compass.width / 2, Sprites.compass.height / 2, (int) Camera.yawTarget, arg2.anIntArray37, arg2.anIntArray45);
+ }
+ InterfaceList.rectangleRedraw[arg3] = true;
+ }
+
@OriginalMember(owner = "client!fn", name = "a", descriptor = "(BIIIII)V")
public static void method1624(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4) {
Sprites.scrollbars[0].renderTransparent(arg2, arg3);
@@ -953,283 +1194,28 @@ public final class Static87 {
GlRaster.method1174(arg2 + 1, arg3 + 14 - -local54 + local35, 15, anInt671);
}
- @OriginalMember(owner = "client!wa", name = "a", descriptor = "([Lclient!mj;ZIIIII[B)V")
- public static void method2203(@OriginalArg(0) CollisionMap[] arg0, @OriginalArg(1) boolean arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5, @OriginalArg(7) byte[] arg6) {
- @Pc(14) int local14;
- @Pc(21) int local21;
- if (!arg1) {
- for (@Pc(9) int local9 = 0; local9 < 4; local9++) {
- for (local14 = 0; local14 < 64; local14++) {
- for (local21 = 0; local21 < 64; local21++) {
- if (arg4 + local14 > 0 && local14 + arg4 < 103 && arg3 + local21 > 0 && local21 + arg3 < 103) {
- arg0[local9].flags[local14 + arg4][arg3 + local21] &= 0xFEFFFFFF;
- }
- }
- }
- }
- }
- @Pc(95) Buffer local95 = new Buffer(arg6);
- @Pc(99) byte local99;
- if (arg1) {
- local99 = 1;
- } else {
- local99 = 4;
- }
- @Pc(117) int local117;
- for (local14 = 0; local14 < local99; local14++) {
- for (local21 = 0; local21 < 64; local21++) {
- for (local117 = 0; local117 < 64; local117++) {
- SceneGraph.readTile(arg2, arg5, arg1, local95, local117 + arg3, arg4 + local21, 0, local14);
- }
- }
- }
- @Pc(146) boolean local146 = false;
- @Pc(243) int local243;
- @Pc(188) int local188;
- @Pc(190) int local190;
- @Pc(194) int local194;
- while (local95.offset < local95.data.length) {
- local21 = local95.g1();
- if (local21 != 129) {
- local95.offset--;
- break;
- }
- for (local117 = 0; local117 < 4; local117++) {
- @Pc(168) byte local168 = local95.g1b();
- if (local168 == 0) {
- local243 = arg4;
- if (arg4 < 0) {
- local243 = 0;
- } else if (arg4 >= 104) {
- local243 = 104;
- }
- local190 = arg3;
- if (arg3 < 0) {
- local190 = 0;
- } else if (arg3 >= 104) {
- local190 = 104;
- }
- local188 = arg4 + 64;
- local194 = arg3 + 64;
- if (local194 < 0) {
- local194 = 0;
- } else if (local194 >= 104) {
- local194 = 104;
- }
- if (local188 < 0) {
- local188 = 0;
- } else if (local188 >= 104) {
- local188 = 104;
- }
- while (local243 < local188) {
- while (local190 < local194) {
- SceneGraph.aByteArrayArrayArray13[local117][local243][local190] = 0;
- local190++;
- }
- local243++;
- }
- } else if (local168 == 1) {
- for (local243 = 0; local243 < 64; local243 += 4) {
- for (local188 = 0; local188 < 64; local188 += 4) {
- @Pc(305) byte local305 = local95.g1b();
- for (local194 = local243 + arg4; local194 < arg4 + local243 + 4; local194++) {
- for (@Pc(320) int local320 = arg3 + local188; local320 < arg3 + local188 + 4; local320++) {
- if (local194 >= 0 && local194 < 104 && local320 >= 0 && local320 < 104) {
- SceneGraph.aByteArrayArrayArray13[local117][local194][local320] = local305;
- }
- }
- }
- }
- }
- } else if (local168 == 2 && local117 > 0) {
- local188 = arg4 + 64;
- local190 = arg3;
- local194 = arg3 + 64;
- if (local188 < 0) {
- local188 = 0;
- } else if (local188 >= 104) {
- local188 = 104;
- }
- if (arg3 < 0) {
- local190 = 0;
- } else if (arg3 >= 104) {
- local190 = 104;
- }
- if (local194 < 0) {
- local194 = 0;
- } else if (local194 >= 104) {
- local194 = 104;
- }
- local243 = arg4;
- if (arg4 < 0) {
- local243 = 0;
- } else if (arg4 >= 104) {
- local243 = 104;
- }
- while (local188 > local243) {
- while (local190 < local194) {
- SceneGraph.aByteArrayArrayArray13[local117][local243][local190] = SceneGraph.aByteArrayArrayArray13[local117 - 1][local243][local190];
- local190++;
- }
- local243++;
- }
- }
- }
- local146 = true;
- }
- @Pc(515) int local515;
- if (GlRenderer.enabled && !arg1) {
- @Pc(490) Environment local490 = null;
- label270:
- while (true) {
- label263:
- do {
- while (local95.offset < local95.data.length) {
- local117 = local95.g1();
- if (local117 != 0) {
- if (local117 != 1) {
- throw new IllegalStateException();
- }
- local515 = local95.g1();
- continue label263;
- }
- local490 = new Environment(local95);
- }
- if (local490 == null) {
- local490 = new Environment();
- }
- for (local117 = 0; local117 < 8; local117++) {
- for (local515 = 0; local515 < 8; local515++) {
- local243 = local117 + (arg4 >> 3);
- local188 = (arg3 >> 3) + local515;
- if (local243 >= 0 && local243 < 13 && local188 >= 0 && local188 < 13) {
- FogManager.chunksAtmosphere[local243][local188] = local490;
- }
- }
- }
- break label270;
- } while (local515 <= 0);
- for (local243 = 0; local243 < local515; local243++) {
- @Pc(529) Light local529 = new Light(local95);
- if (local529.anInt2243 == 31) {
- @Pc(541) LightType local541 = LightTypeList.get(local95.g2());
- local529.method1762(local541.anInt2865, local541.anInt2873, local541.anInt2867, local541.anInt2872);
- }
- local529.z += arg3 << 7;
- local529.x += arg4 << 7;
- local194 = local529.z >> 7;
- local190 = local529.x >> 7;
- if (local190 >= 0 && local194 >= 0 && local190 < 104 && local194 < 104) {
- local529.aBoolean125 = (SceneGraph.tileFlags[1][local190][local194] & 0x2) != 0;
- local529.y = SceneGraph.tileHeights[local529.level][local190][local194] - local529.y;
- LightingManager.method2389(local529);
- }
- }
- }
- }
- if (local146) {
- return;
- }
- for (local21 = 0; local21 < 4; local21++) {
- for (local117 = 0; local117 < 16; local117++) {
- for (local515 = 0; local515 < 16; local515++) {
- local243 = (arg4 >> 2) + local117;
- local188 = local515 + (arg3 >> 2);
- if (local243 >= 0 && local243 < 26 && local188 >= 0 && local188 < 26) {
- SceneGraph.aByteArrayArrayArray13[local21][local243][local188] = 0;
- }
- }
- }
- }
- }
-
- @OriginalMember(owner = "client!ag", name = "a", descriptor = "(IIIIIIIII)V")
- public static void method86(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5, @OriginalArg(7) int arg6, @OriginalArg(8) int arg7) {
- if (InterfaceList.load(arg0)) {
- method1809(arg1, arg7, arg3, InterfaceList.components[arg0], arg2, -1, arg6, arg5, arg4);
- } else if (arg4 == -1) {
- for (@Pc(27) int local27 = 0; local27 < 100; local27++) {
- InterfaceList.aBooleanArray100[local27] = true;
- }
- } else {
- InterfaceList.aBooleanArray100[arg4] = true;
- }
- }
-
- @OriginalMember(owner = "client!bm", name = "a", descriptor = "(IBIIII)V")
- public static void method645(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4) {
- @Pc(3) int local3;
- @Pc(10) int local10;
- for (local3 = arg1; local3 <= arg3 + arg1; local3++) {
- for (local10 = arg2; local10 <= arg4 + arg2; local10++) {
- if (local10 >= 0 && local10 < 104 && local3 >= 0 && local3 < 104) {
- SceneGraph.aByteArrayArrayArray9[arg0][local10][local3] = 127;
- }
- }
- }
- for (local3 = arg1; local3 < arg3 + arg1; local3++) {
- for (local10 = arg2; local10 < arg2 + arg4; local10++) {
- if (local10 >= 0 && local10 < 104 && local3 >= 0 && local3 < 104) {
- SceneGraph.tileHeights[arg0][local10][local3] = arg0 <= 0 ? 0 : SceneGraph.tileHeights[arg0 - 1][local10][local3];
- }
- }
- }
- if (arg2 > 0 && arg2 < 104) {
- for (local3 = arg1 + 1; local3 < arg1 + arg3; local3++) {
- if (local3 >= 0 && local3 < 104) {
- SceneGraph.tileHeights[arg0][arg2][local3] = SceneGraph.tileHeights[arg0][arg2 - 1][local3];
- }
- }
- }
- if (arg1 > 0 && arg1 < 104) {
- for (local3 = arg2 + 1; local3 < arg2 + arg4; local3++) {
- if (local3 >= 0 && local3 < 104) {
- SceneGraph.tileHeights[arg0][local3][arg1] = SceneGraph.tileHeights[arg0][local3][arg1 - 1];
- }
- }
- }
- if (arg2 < 0 || arg1 < 0 || arg2 >= 104 || arg1 >= 104) {
- return;
- }
- if (arg0 == 0) {
- if (arg2 > 0 && SceneGraph.tileHeights[arg0][arg2 - 1][arg1] != 0) {
- SceneGraph.tileHeights[arg0][arg2][arg1] = SceneGraph.tileHeights[arg0][arg2 - 1][arg1];
- } else if (arg1 > 0 && SceneGraph.tileHeights[arg0][arg2][arg1 - 1] != 0) {
- SceneGraph.tileHeights[arg0][arg2][arg1] = SceneGraph.tileHeights[arg0][arg2][arg1 - 1];
- } else if (arg2 > 0 && arg1 > 0 && SceneGraph.tileHeights[arg0][arg2 - 1][arg1 - 1] != 0) {
- SceneGraph.tileHeights[arg0][arg2][arg1] = SceneGraph.tileHeights[arg0][arg2 - 1][arg1 - 1];
- }
- } else if (arg2 > 0 && SceneGraph.tileHeights[arg0 - 1][arg2 - 1][arg1] != SceneGraph.tileHeights[arg0][arg2 - 1][arg1]) {
- SceneGraph.tileHeights[arg0][arg2][arg1] = SceneGraph.tileHeights[arg0][arg2 - 1][arg1];
- } else if (arg1 > 0 && SceneGraph.tileHeights[arg0][arg2][arg1 - 1] != SceneGraph.tileHeights[arg0 - 1][arg2][arg1 - 1]) {
- SceneGraph.tileHeights[arg0][arg2][arg1] = SceneGraph.tileHeights[arg0][arg2][arg1 - 1];
- } else if (arg2 > 0 && arg1 > 0 && SceneGraph.tileHeights[arg0][arg2 - 1][arg1 - 1] != SceneGraph.tileHeights[arg0 - 1][arg2 - 1][arg1 - 1]) {
- SceneGraph.tileHeights[arg0][arg2][arg1] = SceneGraph.tileHeights[arg0][arg2 - 1][arg1 - 1];
- }
- }
-
@OriginalMember(owner = "client!aa", name = "a", descriptor = "(BLclient!be;)V")
public static void method13(@OriginalArg(1) Component arg0) {
@Pc(16) int local16 = arg0.clientCode;
if (local16 == 324) {
- if (Static158.anInt3851 == -1) {
- Static158.anInt3851 = arg0.spriteId;
- Static145.anInt3502 = arg0.anInt519;
+ if (anInt3851 == -1) {
+ anInt3851 = arg0.spriteId;
+ anInt3502 = arg0.anInt519;
}
if (PlayerAppearance.DEFAULT.gender) {
- arg0.spriteId = Static158.anInt3851;
+ arg0.spriteId = anInt3851;
} else {
- arg0.spriteId = Static145.anInt3502;
+ arg0.spriteId = anInt3502;
}
} else if (local16 == 325) {
- if (Static158.anInt3851 == -1) {
- Static145.anInt3502 = arg0.anInt519;
- Static158.anInt3851 = arg0.spriteId;
+ if (anInt3851 == -1) {
+ anInt3502 = arg0.anInt519;
+ anInt3851 = arg0.spriteId;
}
if (PlayerAppearance.DEFAULT.gender) {
- arg0.spriteId = Static145.anInt3502;
+ arg0.spriteId = anInt3502;
} else {
- arg0.spriteId = Static158.anInt3851;
+ arg0.spriteId = anInt3851;
}
} else if (local16 == 327) {
arg0.modelXAngle = 150;
@@ -1252,30 +1238,105 @@ public final class Static87 {
}
}
- @OriginalMember(owner = "client!md", name = "a", descriptor = "(Lclient!be;I)Z")
- public static boolean method2926(@OriginalArg(0) Component arg0) {
- if (arg0.anIntArray43 == null) {
- return false;
+ @OriginalMember(owner = "client!fi", name = "a", descriptor = "(BI)Lclient!na;")
+ public static JagString method1548(@OriginalArg(1) int arg0) {
+ @Pc(9) JagString local9 = JagString.parseInt(arg0);
+ for (@Pc(21) int local21 = local9.length() - 3; local21 > 0; local21 -= 3) {
+ local9 = JagString.concatenate(new JagString[]{local9.substring(local21, 0), aClass100_760, local9.substring(local21)});
}
- for (@Pc(14) int local14 = 0; local14 < arg0.anIntArray43.length; local14++) {
- @Pc(34) int local34 = JagString.method3212(local14, arg0);
- @Pc(39) int local39 = arg0.anIntArray48[local14];
- if (arg0.anIntArray43[local14] == 2) {
- if (local39 <= local34) {
- return false;
- }
- } else if (arg0.anIntArray43[local14] == 3) {
- if (local34 <= local39) {
- return false;
- }
- } else if (arg0.anIntArray43[local14] == 4) {
- if (local34 == local39) {
- return false;
- }
- } else if (local39 != local34) {
- return false;
+ if (local9.length() > 9) {
+ return JagString.concatenate(new JagString[]{aClass100_1043, local9.substring(local9.length() - 8, 0), LocalizedText.MILLION_SHORT, MiniMenu.OPEN_PARENTHESIS, local9, aClass100_583});
+ } else if (local9.length() > 6) {
+ return JagString.concatenate(new JagString[]{aClass100_589, local9.substring(local9.length() - 4, 0), LocalizedText.THOUSAND_SHORT, MiniMenu.OPEN_PARENTHESIS, local9, aClass100_583});
+ } else {
+ return JagString.concatenate(new JagString[]{aClass100_1101, local9, aClass100_978});
+ }
+ }
+
+ @OriginalMember(owner = "client!a", name = "a", descriptor = "(IIIII)V")
+ public static void method4(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(4) int arg3) {
+ if (GlRenderer.enabled) {
+ GlRaster.setClip(arg0, arg3, arg2 + arg0, arg1 + arg3);
+ GlRaster.fillRect(arg0, arg3, arg2, arg1, 0);
+ } else {
+ SoftwareRaster.setClip(arg0, arg3, arg2 + arg0, arg3 + arg1);
+ SoftwareRaster.fillRect(arg0, arg3, arg2, arg1, 0);
+ }
+ if (WorldMap.loadPercentage < 100) {
+ return;
+ }
+ if (WorldMap.aClass3_Sub2_Sub1_2 == null || arg2 != WorldMap.aClass3_Sub2_Sub1_2.width || WorldMap.aClass3_Sub2_Sub1_2.height != arg1) {
+ @Pc(63) SoftwareSprite local63 = new SoftwareSprite(arg2, arg1);
+ SoftwareRaster.setSize(local63.pixels, arg2, arg1);
+ WorldMap.method4364(arg2, 0, WorldMap.width, 0, 0, WorldMap.length, arg1, 0);
+ if (GlRenderer.enabled) {
+ WorldMap.aClass3_Sub2_Sub1_2 = new GlSprite(local63);
+ } else {
+ WorldMap.aClass3_Sub2_Sub1_2 = local63;
+ }
+ if (GlRenderer.enabled) {
+ SoftwareRaster.pixels = null;
+ } else {
+ SoftwareRaster.frameBuffer.makeTarget();
}
}
- return true;
+ WorldMap.aClass3_Sub2_Sub1_2.drawPixels(arg0, arg3);
+ @Pc(147) int local147 = arg1 * anInt2884 / WorldMap.length + arg3;
+ @Pc(153) int local153 = WorldMap.anInt1176 * arg1 / WorldMap.length;
+ @Pc(161) int local161 = arg0 + arg2 * anInt2882 / WorldMap.width;
+ @Pc(167) int local167 = arg2 * WorldMap.anInt2387 / WorldMap.width;
+ @Pc(169) int local169 = 16711680;
+ if (client.game == 1) {
+ local169 = 16777215;
+ }
+ if (GlRenderer.enabled) {
+ GlRaster.fillRectAlpha(local161, local147, local167, local153, local169, 128);
+ GlRaster.drawRect(local161, local147, local167, local153, local169);
+ } else {
+ SoftwareRaster.fillRectAlpha(local161, local147, local167, local153, local169, 128);
+ SoftwareRaster.drawRect(local161, local147, local167, local153, local169);
+ }
+ if (WorldMap.anInt1864 <= 0) {
+ return;
+ }
+ @Pc(225) int local225;
+ if (anInt2428 > 10) {
+ local225 = (20 - anInt2428) * 25;
+ } else {
+ local225 = anInt2428 * 25;
+ }
+ for (@Pc(238) MapElement local238 = (MapElement) WorldMap.mapElements.head(); local238 != null; local238 = (MapElement) WorldMap.mapElements.next()) {
+ if (local238.id == WorldMap.anInt172) {
+ @Pc(258) int local258 = arg3 + local238.anInt4314 * arg1 / WorldMap.length;
+ @Pc(267) int local267 = arg2 * local238.anInt4307 / WorldMap.width + arg0;
+ if (GlRenderer.enabled) {
+ GlRaster.fillRectAlpha(local267 - 2, local258 + -2, 4, 4, 16776960, local225);
+ } else {
+ SoftwareRaster.fillRectAlpha(local267 - 2, local258 + -2, 4, 4, 16776960, local225);
+ }
+ }
+ }
+ }
+
+ @OriginalMember(owner = "client!da", name = "a", descriptor = "(IIILclient!be;)V")
+ public static void method1015(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(3) Component arg2) {
+ if (aClass13_14 != null || aBoolean108 || (arg2 == null || method1836(arg2) == null)) {
+ return;
+ }
+ aClass13_14 = arg2;
+ aClass13_1 = method1836(arg2);
+ anInt5388 = arg1;
+ aBoolean172 = false;
+ anInt4851 = 0;
+ anInt4035 = arg0;
+ }
+
+ @OriginalMember(owner = "client!ha", name = "a", descriptor = "(ILclient!be;)Lclient!be;")
+ public static Component method1836(@OriginalArg(1) Component arg0) {
+ @Pc(12) Component local12 = InterfaceList.method938(arg0);
+ if (local12 == null) {
+ local12 = arg0.aClass13_5;
+ }
+ return local12;
}
}
diff --git a/client/src/main/java/rt4/DeadClass.java b/client/src/main/java/rt4/DeadClass.java
index dbb9071..1fdeb9d 100644
--- a/client/src/main/java/rt4/DeadClass.java
+++ b/client/src/main/java/rt4/DeadClass.java
@@ -13,6 +13,8 @@ public final class DeadClass {
private static final JagString aClass100_195 = JagString.parse("Discard");
@OriginalMember(owner = "client!ck", name = "o", descriptor = "Lclient!na;")
private static final JagString aClass100_200 = JagString.parse("Loaded world list data");
+ @OriginalMember(owner = "client!cn", name = "L", descriptor = "I")
+ public static double yawAccel = 0;
@OriginalMember(owner = "client!rc", name = "R", descriptor = "Z")
private static boolean aBoolean74;
diff --git a/client/src/main/java/rt4/DisplayMode.java b/client/src/main/java/rt4/DisplayMode.java
index 28d37a9..82d6205 100644
--- a/client/src/main/java/rt4/DisplayMode.java
+++ b/client/src/main/java/rt4/DisplayMode.java
@@ -154,7 +154,7 @@ public final class DisplayMode {
if (!aBoolean73) {
SceneGraph.clear();
SoftwareRaster.frameBuffer = null;
- SoftwareRaster.frameBuffer = Static131.create(GameShell.canvasHeight, GameShell.canvasWidth, GameShell.canvas);
+ SoftwareRaster.frameBuffer = FrameBuffer.create(GameShell.canvasHeight, GameShell.canvasWidth, GameShell.canvas);
SoftwareRaster.clear();
if (client.gameState == 5) {
LoadingBar.render(true, Fonts.b12Full);
@@ -166,9 +166,9 @@ public final class DisplayMode {
SoftwareRaster.frameBuffer.draw(local269);
} catch (@Pc(277) Exception local277) {
}
- Static139.method2704();
+ GameShell.method2704();
if (arg3 == 0) {
- SoftwareRaster.frameBuffer = Static131.create(503, 765, GameShell.canvas);
+ SoftwareRaster.frameBuffer = FrameBuffer.create(503, 765, GameShell.canvas);
} else {
SoftwareRaster.frameBuffer = null;
}
@@ -196,10 +196,10 @@ public final class DisplayMode {
if (Preferences.highDetailLighting) {
Rasteriser.setBrightness(0.7F);
}
- Static40.method4637();
+ LoginManager.method4637();
} else if (arg1 == 0 && arg3 > 0) {
GameShell.thread.setPriority(1);
- SoftwareRaster.frameBuffer = Static131.create(503, 765, GameShell.canvas);
+ SoftwareRaster.frameBuffer = FrameBuffer.create(503, 765, GameShell.canvas);
SoftwareModel.method4583();
ParticleSystem.quit();
((Js5GlTextureProvider) Rasteriser.textureProvider).method3248(20);
@@ -218,9 +218,9 @@ public final class DisplayMode {
}
}
GlTile.method1939();
- Static40.method4637();
+ LoginManager.method4637();
}
- Static87.aBoolean130 = !SceneGraph.allLevelsAreVisible();
+ SceneGraph.aBoolean130 = !SceneGraph.allLevelsAreVisible();
if (arg2) {
client.method2721();
}
diff --git a/client/src/main/java/rt4/EnumType.java b/client/src/main/java/rt4/EnumType.java
index e082798..cffcefc 100644
--- a/client/src/main/java/rt4/EnumType.java
+++ b/client/src/main/java/rt4/EnumType.java
@@ -23,8 +23,10 @@ public final class EnumType extends SecondaryNode {
@OriginalMember(owner = "client!ml", name = "cb", descriptor = "I")
private int defaultInt;
+ @OriginalMember(owner = "client!gn", name = "v", descriptor = "Lclient!na;")
+ public static final JagString NULL = JagString.parse("null");
@OriginalMember(owner = "client!ml", name = "Z", descriptor = "Lclient!na;")
- private JagString defaultString = Static87.NULL;
+ private JagString defaultString = NULL;
@OriginalMember(owner = "client!ml", name = "a", descriptor = "(ILclient!wa;B)V")
private void decode(@OriginalArg(0) int arg0, @OriginalArg(1) Buffer arg1) {
diff --git a/client/src/main/java/rt4/Font.java b/client/src/main/java/rt4/Font.java
index 584496a..c25dc84 100644
--- a/client/src/main/java/rt4/Font.java
+++ b/client/src/main/java/rt4/Font.java
@@ -57,7 +57,7 @@ public abstract class Font extends SecondaryNode {
@OriginalMember(owner = "client!rk", name = "rb", descriptor = "Lclient!na;")
public static final JagString TAG_STR2 = JagString.parse("str");
@OriginalMember(owner = "client!rk", name = "sb", descriptor = "Lclient!na;")
- public static final JagString buffer = Static87.allocate(100);
+ public static final JagString buffer = JagString.allocate(100);
@OriginalMember(owner = "client!rk", name = "Ab", descriptor = "[Lclient!na;")
public static final JagString[] lines = new JagString[100];
@OriginalMember(owner = "client!rk", name = "Z", descriptor = "Lclient!na;")
@@ -154,7 +154,7 @@ public abstract class Font extends SecondaryNode {
local5 += 3;
}
}
- @Pc(30) JagString local30 = Static87.allocate(local3 + local5);
+ @Pc(30) JagString local30 = JagString.allocate(local3 + local5);
for (local15 = 0; local15 < local3; local15++) {
@Pc(40) int local40 = arg0.charAt(local15);
if (local40 == 60) {
diff --git a/client/src/main/java/rt4/FrameBuffer.java b/client/src/main/java/rt4/FrameBuffer.java
index 57a0e63..5999c44 100644
--- a/client/src/main/java/rt4/FrameBuffer.java
+++ b/client/src/main/java/rt4/FrameBuffer.java
@@ -3,6 +3,7 @@ package rt4;
import org.openrs2.deob.annotation.OriginalArg;
import org.openrs2.deob.annotation.OriginalClass;
import org.openrs2.deob.annotation.OriginalMember;
+import org.openrs2.deob.annotation.Pc;
import java.awt.Component;
import java.awt.*;
@@ -22,6 +23,19 @@ public abstract class FrameBuffer {
@OriginalMember(owner = "client!vk", name = "k", descriptor = "I")
protected int width;
+ @OriginalMember(owner = "client!kd", name = "a", descriptor = "(IIZLjava/awt/Component;)Lclient!vk;")
+ public static FrameBuffer create(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(3) Component arg2) {
+ try {
+ @Pc(16) FrameBuffer local16 = new BufferedImageFrameBuffer();
+ local16.init(arg0, arg1, arg2);
+ return local16;
+ } catch (@Pc(25) Throwable local25) {
+ @Pc(29) ImageProducerFrameBuffer local29 = new ImageProducerFrameBuffer();
+ local29.init(arg0, arg1, arg2);
+ return local29;
+ }
+ }
+
@OriginalMember(owner = "client!vk", name = "a", descriptor = "(IILjava/awt/Graphics;I)V")
public abstract void draw(@OriginalArg(2) Graphics graphics);
diff --git a/client/src/main/java/rt4/GameShell.java b/client/src/main/java/rt4/GameShell.java
index 00fc98e..687b636 100644
--- a/client/src/main/java/rt4/GameShell.java
+++ b/client/src/main/java/rt4/GameShell.java
@@ -120,6 +120,8 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
@OriginalMember(owner = "client!te", name = "C", descriptor = "I")
public static int maxMemory = 64;
+ @OriginalMember(owner = "client!fh", name = "cb", descriptor = "Lsignlink!ll;")
+ public static SignLink signLink2;
@OriginalMember(owner = "client!rc", name = "b", descriptor = "Z")
private boolean error = false;
@@ -137,7 +139,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
@OriginalMember(owner = "client!rc", name = "providesignlink", descriptor = "(Lsignlink!ll;)V")
public static void providesignlink(@OriginalArg(0) SignLink signLink) {
GameShell.signLink = signLink;
- Static69.signLink = signLink;
+ signLink2 = signLink;
}
@OriginalMember(owner = "client!sd", name = "e", descriptor = "(I)V")
@@ -220,7 +222,50 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
if (InterfaceList.topLevelInterface != -1) {
InterfaceList.method3712(true);
}
- Static139.method2704();
+ method2704();
+ }
+
+ @OriginalMember(owner = "client!l", name = "b", descriptor = "(I)V")
+ public static void method2704() {
+ @Pc(7) int local7 = topMargin;
+ @Pc(9) int local9 = leftMargin;
+ @Pc(16) int local16 = frameHeight - canvasHeight - local7;
+ @Pc(23) int local23 = frameWidth - local9 - canvasWidth;
+ if (local9 <= 0 && local23 <= 0 && local7 <= 0 && local16 <= 0) {
+ return;
+ }
+ try {
+ @Pc(46) Container local46;
+ if (fullScreenFrame != null) {
+ local46 = fullScreenFrame;
+ } else if (frame == null) {
+ local46 = signLink.applet;
+ } else {
+ local46 = frame;
+ }
+ @Pc(59) int local59 = 0;
+ @Pc(61) int local61 = 0;
+ if (frame == local46) {
+ @Pc(68) Insets local68 = frame.getInsets();
+ local61 = local68.left;
+ local59 = local68.top;
+ }
+ @Pc(77) Graphics local77 = local46.getGraphics();
+ local77.setColor(Color.black);
+ if (local9 > 0) {
+ local77.fillRect(local61, local59, local9, frameHeight);
+ }
+ if (local7 > 0) {
+ local77.fillRect(local61, local59, frameWidth, local7);
+ }
+ if (local23 > 0) {
+ local77.fillRect(local61 + frameWidth - local23, local59, local23, frameHeight);
+ }
+ if (local16 > 0) {
+ local77.fillRect(local61, local59 + frameHeight - local16, frameWidth, local16);
+ }
+ } catch (@Pc(132) Exception local132) {
+ }
}
@OriginalMember(owner = "client!rc", name = "focusLost", descriptor = "(Ljava/awt/event/FocusEvent;)V")
@@ -315,7 +360,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
if (instance == this && !shutdown) {
killTime = MonotonicClock.currentTimeMillis();
ThreadUtils.sleep(5000L);
- Static69.signLink = null;
+ signLink2 = null;
this.shutdown(false);
}
}
@@ -561,7 +606,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
}
getMaxMemory();
this.addCanvas();
- SoftwareRaster.frameBuffer = Static131.create(canvasHeight, canvasWidth, canvas);
+ SoftwareRaster.frameBuffer = FrameBuffer.create(canvasHeight, canvasWidth, canvas);
this.mainInit();
timer = Timer.create();
@@ -644,7 +689,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
@Pc(44) Insets insets = frame.getInsets();
frame.setSize(insets.left + frameWidth + insets.right, insets.top + frameHeight + insets.bottom);
GameShell.setFpsTarget(getCurrentDevice().getDisplayMode().getRefreshRate());
- Static69.signLink = signLink = new SignLink(null, cacheId, cacheSubDir, 28);
+ signLink2 = signLink = new SignLink(null, cacheId, cacheSubDir, 28);
@Pc(76) PrivilegedRequest request = signLink.startThread(1, this);
while (request.status == 0) {
ThreadUtils.sleep(10L);
@@ -691,7 +736,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
@Pc(54) String openWindowJavaScriptStr = this.getParameter("openwinjs");
openWindowJavaScript = openWindowJavaScriptStr != null && openWindowJavaScriptStr.equals("1");
if (signLink == null) {
- Static69.signLink = signLink = new SignLink(this, cacheId, null, 0);
+ signLink2 = signLink = new SignLink(this, cacheId, null, 0);
}
@Pc(86) PrivilegedRequest request = signLink.startThread(1, this);
while (request.status == 0) {
diff --git a/client/src/main/java/rt4/InterfaceList.java b/client/src/main/java/rt4/InterfaceList.java
index 2a8007a..fda704b 100644
--- a/client/src/main/java/rt4/InterfaceList.java
+++ b/client/src/main/java/rt4/InterfaceList.java
@@ -4,6 +4,8 @@ import org.openrs2.deob.annotation.OriginalArg;
import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc;
+import java.awt.*;
+
public class InterfaceList {
@OriginalMember(owner = "client!p", name = "c", descriptor = "Lclient!ih;")
public static final LinkedList lowPriorityRequests = new LinkedList();
@@ -93,6 +95,28 @@ public class InterfaceList {
public static int anInt5574 = -1;
@OriginalMember(owner = "client!oj", name = "v", descriptor = "I")
public static int anInt4311 = -2;
+ @OriginalMember(owner = "client!pm", name = "hb", descriptor = "I")
+ public static int anInt4620;
+ @OriginalMember(owner = "client!fk", name = "e", descriptor = "I")
+ public static int anInt1885;
+ @OriginalMember(owner = "client!bj", name = "s", descriptor = "I")
+ public static int anInt660 = -1;
+ @OriginalMember(owner = "client!kl", name = "s", descriptor = "I")
+ public static int anInt3337 = 0;
+ @OriginalMember(owner = "client!jk", name = "p", descriptor = "I")
+ public static int anInt3075 = -1;
+ @OriginalMember(owner = "client!df", name = "n", descriptor = "I")
+ public static int anInt1396 = 0;
+ @OriginalMember(owner = "client!di", name = "H", descriptor = "Z")
+ public static boolean aBoolean84 = false;
+ @OriginalMember(owner = "client!dh", name = "a", descriptor = "Z")
+ public static boolean aBoolean83 = false;
+ @OriginalMember(owner = "client!ja", name = "r", descriptor = "I")
+ public static int anInt2941 = -1;
+ @OriginalMember(owner = "client!a", name = "h", descriptor = "I")
+ public static int anInt5;
+ @OriginalMember(owner = "client!ve", name = "w", descriptor = "Z")
+ public static boolean aBoolean298 = false;
@OriginalMember(owner = "client!ab", name = "a", descriptor = "(ZLclient!ve;Lclient!ve;Lclient!ve;Lclient!ve;)V")
public static void init(@OriginalArg(1) Js5 arg0, @OriginalArg(2) Js5 arg1, @OriginalArg(3) Js5 arg2, @OriginalArg(4) Js5 arg3) {
@@ -362,7 +386,7 @@ public class InterfaceList {
}
}
if (MiniMenu.size == 1) {
- Static40.aBoolean108 = false;
+ Cs1ScriptRunner.aBoolean108 = false;
redrawScreen(anInt4271, anInt761, anInt5138, anInt436);
} else {
redrawScreen(anInt4271, anInt761, anInt5138, anInt436);
@@ -373,7 +397,7 @@ public class InterfaceList {
local43 = local88;
}
}
- anInt436 = MiniMenu.size * 15 + (Static40.aBoolean298 ? 26 : 22);
+ anInt436 = MiniMenu.size * 15 + (aBoolean298 ? 26 : 22);
anInt761 = local43 + 8;
}
if (topLevelInterface != -1) {
@@ -588,7 +612,7 @@ public class InterfaceList {
public static void method946(@OriginalArg(0) Component[] arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7) {
for (@Pc(1) int local1 = 0; local1 < arg0.length; local1++) {
@Pc(9) Component component = arg0[local1];
- if (component != null && component.layer == arg1 && (!component.if3 || component.type == 0 || component.aBoolean25 || getServerActiveProperties(component).events != 0 || component == Static40.aClass13_1 || component.clientCode == 1338) && (!component.if3 || !Static36.method947(component))) {
+ if (component != null && component.layer == arg1 && (!component.if3 || component.type == 0 || component.aBoolean25 || getServerActiveProperties(component).events != 0 || component == Cs1ScriptRunner.aClass13_1 || component.clientCode == 1338) && (!component.if3 || !method947(component))) {
@Pc(50) int local50 = component.x + arg6;
@Pc(55) int local55 = component.y + arg7;
@Pc(61) int local61;
@@ -612,14 +636,14 @@ public class InterfaceList {
local65 = local73 < arg4 ? local73 : arg4;
local67 = local78 < arg5 ? local78 : arg5;
}
- if (component == Static40.aClass13_14) {
- Static44.aBoolean83 = true;
- Static36.anInt3075 = local50;
- Static36.anInt660 = local55;
+ if (component == Cs1ScriptRunner.aClass13_14) {
+ aBoolean83 = true;
+ anInt3075 = local50;
+ anInt660 = local55;
}
if (!component.if3 || local61 < local65 && local63 < local67) {
if (component.type == 0) {
- if (!component.if3 && Static36.method947(component) && aClass13_22 != component) {
+ if (!component.if3 && method947(component) && aClass13_22 != component) {
continue;
}
if (component.noClickThrough && Mouse.lastMouseX >= local61 && Mouse.lastMouseY >= local63 && Mouse.lastMouseX < local65 && Mouse.lastMouseY < local67) {
@@ -629,11 +653,11 @@ public class InterfaceList {
local164.source.aBoolean19 = false;
}
}
- if (Static40.anInt4851 == 0) {
- Static40.aClass13_14 = null;
- Static40.aClass13_1 = null;
+ if (Cs1ScriptRunner.anInt4851 == 0) {
+ Cs1ScriptRunner.aClass13_14 = null;
+ Cs1ScriptRunner.aClass13_1 = null;
}
- Static36.anInt3337 = 0;
+ anInt3337 = 0;
}
}
if (component.if3) {
@@ -667,14 +691,14 @@ public class InterfaceList {
}
}
if (local221) {
- Static40.method1015(Mouse.clickY - local55, Mouse.clickX - local50, component);
+ Cs1ScriptRunner.method1015(Mouse.clickY - local55, Mouse.clickX - local50, component);
}
- if (Static40.aClass13_14 != null && Static40.aClass13_14 != component && local207 && getServerActiveProperties(component).isDragTarget()) {
+ if (Cs1ScriptRunner.aClass13_14 != null && Cs1ScriptRunner.aClass13_14 != component && local207 && getServerActiveProperties(component).isDragTarget()) {
aClass13_12 = component;
}
- if (component == Static40.aClass13_1) {
+ if (component == Cs1ScriptRunner.aClass13_1) {
aBoolean174 = true;
- Static81.anInt2225 = local50;
+ Cs1ScriptRunner.anInt2225 = local50;
anInt5103 = local55;
}
if (component.aBoolean25 || component.clientCode != 0) {
@@ -687,7 +711,7 @@ public class InterfaceList {
request.arguments = component.onScroll;
lowPriorityRequests.addTail(request);
}
- if (Static40.aClass13_14 != null || clickedInventoryComponent != null || Static40.aBoolean108 || component.clientCode != 1400 && Static36.anInt3337 > 0) {
+ if (Cs1ScriptRunner.aClass13_14 != null || clickedInventoryComponent != null || Cs1ScriptRunner.aBoolean108 || component.clientCode != 1400 && anInt3337 > 0) {
local221 = false;
local212 = false;
local207 = false;
@@ -701,7 +725,7 @@ public class InterfaceList {
}
if (component.clientCode == 1338) {
if (local221) {
- Static1.anInt5 = Mouse.clickX - local50;
+ anInt5 = Mouse.clickX - local50;
MiniMenu.anInt2878 = Mouse.clickY - local55;
}
continue;
@@ -720,24 +744,24 @@ public class InterfaceList {
ClientProt.closeWidget();
continue;
}
- Static36.anInt3337 = 1;
- Static40.anInt5388 = Mouse.lastMouseX;
- Static40.anInt4035 = Mouse.lastMouseY;
+ anInt3337 = 1;
+ Cs1ScriptRunner.anInt5388 = Mouse.lastMouseX;
+ Cs1ScriptRunner.anInt4035 = Mouse.lastMouseY;
continue;
}
- if (local212 && Static36.anInt3337 > 0) {
- if (Static36.anInt3337 == 1 && (Static40.anInt5388 != Mouse.lastMouseX || Static40.anInt4035 != Mouse.lastMouseY)) {
- Static36.anInt4620 = WorldMap.anInt435;
- Static36.anInt1885 = WorldMap.anInt919;
- Static36.anInt3337 = 2;
+ if (local212 && anInt3337 > 0) {
+ if (anInt3337 == 1 && (Cs1ScriptRunner.anInt5388 != Mouse.lastMouseX || Cs1ScriptRunner.anInt4035 != Mouse.lastMouseY)) {
+ anInt4620 = WorldMap.anInt435;
+ anInt1885 = WorldMap.anInt919;
+ anInt3337 = 2;
}
- if (Static36.anInt3337 == 2) {
- WorldMap.method1964(Static36.anInt4620 + (int) ((double) (Static40.anInt5388 - Mouse.lastMouseX) * 2.0D / (double) WorldMap.targetZoom));
- WorldMap.method4641(Static36.anInt1885 + (int) ((double) (Static40.anInt4035 - Mouse.lastMouseY) * 2.0D / (double) WorldMap.targetZoom));
+ if (anInt3337 == 2) {
+ WorldMap.method1964(anInt4620 + (int) ((double) (Cs1ScriptRunner.anInt5388 - Mouse.lastMouseX) * 2.0D / (double) WorldMap.targetZoom));
+ WorldMap.method4641(anInt1885 + (int) ((double) (Cs1ScriptRunner.anInt4035 - Mouse.lastMouseY) * 2.0D / (double) WorldMap.targetZoom));
}
continue;
}
- Static36.anInt3337 = 0;
+ anInt3337 = 0;
continue;
}
if (component.clientCode == 1401) {
@@ -999,7 +1023,7 @@ public class InterfaceList {
}
}
}
- if (!component.if3 && Static40.aClass13_14 == null && clickedInventoryComponent == null && !Static40.aBoolean108) {
+ if (!component.if3 && Cs1ScriptRunner.aClass13_14 == null && clickedInventoryComponent == null && !Cs1ScriptRunner.aBoolean108) {
if ((component.anInt470 >= 0 || component.anInt480 != 0) && Mouse.lastMouseX >= local61 && Mouse.lastMouseY >= local63 && Mouse.lastMouseX < local65 && Mouse.lastMouseY < local67) {
if (component.anInt470 >= 0) {
aClass13_22 = arg0[component.anInt470];
@@ -1011,7 +1035,7 @@ public class InterfaceList {
Protocol.aClass13_11 = component;
}
if (component.scrollMaxV > component.height) {
- Static36.method4049(Mouse.lastMouseY, component.height, component, Mouse.lastMouseX, local50 + component.width, local55, component.scrollMaxV);
+ method4049(Mouse.lastMouseY, component.height, component, Mouse.lastMouseX, local50 + component.width, local55, component.scrollMaxV);
}
}
if (component.type == 0) {
@@ -1054,13 +1078,13 @@ public class InterfaceList {
topLevelInterface = -1;
openInterfaces = new HashTable(8);
method1287();
- topLevelInterface = Static156.loginScreenId;
+ topLevelInterface = LoginManager.loginScreenId;
method3712(false);
- Static87.method1807();
+ ScriptRunner.method1807();
method1626(topLevelInterface);
}
MiniMenu.anInt1092 = -1;
- Static81.method1750(ScriptRunner.anInt5794);
+ method1750(ScriptRunner.anInt5794);
PlayerList.self = new Player();
PlayerList.self.zFine = 3000;
PlayerList.self.xFine = 3000;
@@ -1092,7 +1116,7 @@ public class InterfaceList {
@OriginalMember(owner = "client!jm", name = "a", descriptor = "(Z)V")
public static void method2460() {
if (topLevelInterface != -1) {
- Static96.method1949(topLevelInterface);
+ method1949(topLevelInterface);
}
for (@Pc(15) int local15 = 0; local15 < rectangles; local15++) {
if (aBooleanArray100[local15]) {
@@ -1101,7 +1125,7 @@ public class InterfaceList {
aBooleanArray116[local15] = aBooleanArray100[local15];
aBooleanArray100[local15] = false;
}
- Static87.anInt2503 = -1;
+ Cs1ScriptRunner.anInt2503 = -1;
mouseOverInventoryInterface = null;
anInt4311 = client.loop;
if (GlRenderer.enabled) {
@@ -1110,7 +1134,7 @@ public class InterfaceList {
anInt5574 = -1;
if (topLevelInterface != -1) {
rectangles = 0;
- Static9.method182();
+ Cs1ScriptRunner.method182();
}
if (GlRenderer.enabled) {
GlRaster.method1177();
@@ -1119,4 +1143,167 @@ public class InterfaceList {
}
Protocol.anInt4247 = 0;
}
+
+ @OriginalMember(owner = "client!client", name = "a", descriptor = "(Lclient!be;)Lclient!be;")
+ public static Component method938(@OriginalArg(0) Component arg0) {
+ @Pc(4) int local4 = getServerActiveProperties(arg0).getDragDepth();
+ if (local4 == 0) {
+ return null;
+ }
+ for (@Pc(10) int local10 = 0; local10 < local4; local10++) {
+ arg0 = getComponent(arg0.layer);
+ if (arg0 == null) {
+ return null;
+ }
+ }
+ return arg0;
+ }
+
+ @OriginalMember(owner = "client!client", name = "c", descriptor = "(Lclient!be;)Z")
+ public static boolean method947(@OriginalArg(0) Component arg0) {
+ if (Cheat.qaOpTest) {
+ if (getServerActiveProperties(arg0).events != 0) {
+ return false;
+ }
+ if (arg0.type == 0) {
+ return false;
+ }
+ }
+ return arg0.hidden;
+ }
+
+ @OriginalMember(owner = "client!tc", name = "a", descriptor = "(IILclient!be;BIIII)V")
+ public static void method4049(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) Component arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5, @OriginalArg(7) int arg6) {
+ if (aBoolean84) {
+ anInt1396 = 32;
+ } else {
+ anInt1396 = 0;
+ }
+ aBoolean84 = false;
+ @Pc(139) int local139;
+ if (Mouse.pressedButton != 0) {
+ if (arg4 <= arg3 && arg4 + 16 > arg3 && arg0 >= arg5 && arg5 + 16 > arg0) {
+ arg2.scrollY -= 4;
+ redraw(arg2);
+ } else if (arg3 >= arg4 && arg3 < arg4 + 16 && arg0 >= arg1 + arg5 - 16 && arg1 + arg5 > arg0) {
+ arg2.scrollY += 4;
+ redraw(arg2);
+ } else if (arg3 >= arg4 - anInt1396 && arg3 < arg4 + anInt1396 + 16 && arg0 >= arg5 + 16 && arg1 + arg5 - 16 > arg0) {
+ local139 = arg1 * (arg1 - 32) / arg6;
+ if (local139 < 8) {
+ local139 = 8;
+ }
+ @Pc(150) int local150 = arg1 - local139 - 32;
+ @Pc(162) int local162 = arg0 - local139 / 2 - arg5 - 16;
+ arg2.scrollY = (arg6 - arg1) * local162 / local150;
+ redraw(arg2);
+ aBoolean84 = true;
+ }
+ }
+ if (MouseWheel.wheelRotation == 0) {
+ return;
+ }
+ local139 = arg2.width;
+ if (arg4 - local139 <= arg3 && arg5 <= arg0 && arg3 < arg4 + 16 && arg1 + arg5 >= arg0) {
+ arg2.scrollY += MouseWheel.wheelRotation * 45;
+ redraw(arg2);
+ }
+ }
+
+ @OriginalMember(owner = "client!hh", name = "a", descriptor = "(II)V")
+ public static void method1949(@OriginalArg(1) int arg0) {
+ if (load(arg0)) {
+ method2354(-1, components[arg0]);
+ }
+ }
+
+ @OriginalMember(owner = "client!jd", name = "a", descriptor = "(II[Lclient!be;)V")
+ public static void method2354(@OriginalArg(1) int arg0, @OriginalArg(2) Component[] arg1) {
+ for (@Pc(7) int local7 = 0; local7 < arg1.length; local7++) {
+ @Pc(15) Component local15 = arg1[local7];
+ if (local15 != null && local15.layer == arg0 && (!local15.if3 || !method947(local15))) {
+ if (local15.type == 0) {
+ if (!local15.if3 && method947(local15) && local15 != aClass13_22) {
+ continue;
+ }
+ method2354(local15.id, arg1);
+ if (local15.createdComponents != null) {
+ method2354(local15.id, local15.createdComponents);
+ }
+ @Pc(73) ComponentPointer local73 = (ComponentPointer) openInterfaces.get(local15.id);
+ if (local73 != null) {
+ method1949(local73.anInt5878);
+ }
+ }
+ if (local15.type == 6) {
+ @Pc(105) int local105;
+ if (local15.modelSeqId != -1 || local15.anInt462 != -1) {
+ @Pc(100) boolean local100 = Cs1ScriptRunner.isTrue(local15);
+ if (local100) {
+ local105 = local15.anInt462;
+ } else {
+ local105 = local15.modelSeqId;
+ }
+ if (local105 != -1) {
+ @Pc(118) SeqType local118 = SeqTypeList.get(local105);
+ if (local118 != null) {
+ local15.anInt500 += Protocol.anInt4247;
+ while (local15.anInt500 > local118.anIntArray474[local15.anInt510]) {
+ local15.anInt500 -= local118.anIntArray474[local15.anInt510];
+ local15.anInt510++;
+ if (local118.frames.length <= local15.anInt510) {
+ local15.anInt510 -= local118.anInt5362;
+ if (local15.anInt510 < 0 || local118.frames.length <= local15.anInt510) {
+ local15.anInt510 = 0;
+ }
+ }
+ local15.anInt496 = local15.anInt510 + 1;
+ if (local118.frames.length <= local15.anInt496) {
+ local15.anInt496 -= local118.anInt5362;
+ if (local15.anInt496 < 0 || local118.frames.length <= local15.anInt496) {
+ local15.anInt496 = -1;
+ }
+ }
+ redraw(local15);
+ }
+ }
+ }
+ }
+ if (local15.modelRotationSpeed != 0 && !local15.if3) {
+ @Pc(239) int local239 = local15.modelRotationSpeed >> 16;
+ @Pc(243) int local243 = local239 * Protocol.anInt4247;
+ local105 = local15.modelRotationSpeed << 16 >> 16;
+ local15.modelXAngle = local243 + local15.modelXAngle & 0x7FF;
+ local105 *= Protocol.anInt4247;
+ local15.modelYAngle = local15.modelYAngle + local105 & 0x7FF;
+ redraw(local15);
+ }
+ }
+ }
+ }
+ }
+
+ @OriginalMember(owner = "client!gg", name = "c", descriptor = "(II)V")
+ public static void method1750(@OriginalArg(0) int arg0) {
+ if (!Preferences.cursorsEnabled) {
+ arg0 = -1;
+ }
+ if (arg0 == anInt2941) {
+ return;
+ }
+ if (arg0 != -1) {
+ @Pc(24) CursorType local24 = CursorTypeList.get(arg0);
+ @Pc(28) SoftwareSprite local28 = local24.getSprite();
+ if (local28 == null) {
+ arg0 = -1;
+ } else {
+ GameShell.signLink.setCursor(local28.method301(), local28.anInt1860, GameShell.canvas, new Point(local24.hotSpotX, local24.hotSpotY), local28.anInt1866);
+ anInt2941 = arg0;
+ }
+ }
+ if (arg0 == -1 && anInt2941 != -1) {
+ GameShell.signLink.setCursor(null, -1, GameShell.canvas, new Point(), -1);
+ anInt2941 = -1;
+ }
+ }
}
diff --git a/client/src/main/java/rt4/JagString.java b/client/src/main/java/rt4/JagString.java
index a92d3f4..e5c7b2b 100644
--- a/client/src/main/java/rt4/JagString.java
+++ b/client/src/main/java/rt4/JagString.java
@@ -20,24 +20,12 @@ public final class JagString implements StringInterface {
public static final JagString aClass100_853 = parse("null");
@OriginalMember(owner = "client!t", name = "C", descriptor = "Lclient!na;")
public static final JagString aClass100_994 = parse(")3");
- @OriginalMember(owner = "client!dm", name = "n", descriptor = "Lclient!na;")
- public static final JagString PERCENT_SIGN = parse("(U");
- @OriginalMember(owner = "client!jh", name = "g", descriptor = "Lclient!na;")
- public static final JagString aClass100_591 = parse("(Udns");
- @OriginalMember(owner = "client!tb", name = "P", descriptor = "Lclient!na;")
- public static final JagString aClass100_1002 = parse("(U5");
- @OriginalMember(owner = "client!hh", name = "a", descriptor = "Lclient!na;")
- public static final JagString aClass100_520 = parse("(U4");
- @OriginalMember(owner = "client!mj", name = "g", descriptor = "Lclient!na;")
- public static final JagString aClass100_761 = parse("(U3");
- @OriginalMember(owner = "client!wh", name = "u", descriptor = "Lclient!na;")
- public static final JagString aClass100_1097 = parse("(U2");
- @OriginalMember(owner = "client!bm", name = "p", descriptor = "Lclient!na;")
- public static final JagString aClass100_133 = parse("(U1");
@OriginalMember(owner = "client!vk", name = "a", descriptor = "[I")
public static final int[] anIntArray471 = new int[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 73, 74, 76, 78, 83, 84, 85, 86, 91, 92, 93, 94, 95, 97, 103, 104, 105, 106, 107, 108, 113, 114, 115, 116, 118, 119, 120, 121, 122, 123, 124, 125, 133, 134, 136, 138, 143, 144, 145, 146, 151, 152, 153, 154, 155, 157, 163, 164, 165, 166, 168, 169, 174, 175, 176, 177, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 97, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 157, 215, 216, 117, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 66, 66, 66, 66, 66, 66, 65, 75, 79, 79, 79, 79, 87, 87, 87, 87, 77, 96, 98, 98, 98, 98, 98, 250, 251, 109, 109, 109, 109, 117, 252, 167, 126, 126, 126, 126, 126, 126, 125, 135, 139, 139, 139, 139, 147, 147, 147, 147, 137, 156, 158, 158, 158, 158, 158, 253, 254, 170, 170, 170, 170, 178, 255, 178};
@OriginalMember(owner = "client!sh", name = "e", descriptor = "Lclient!na;")
public static final JagString aClass100_967 = parse("");
+ @OriginalMember(owner = "client!dm", name = "n", descriptor = "Lclient!na;")
+ public static final JagString PERCENT_SIGN = parse("(U");
@OriginalMember(owner = "client!li", name = "w", descriptor = "Lclient!sc;")
public static HashTable aClass133_13;
@OriginalMember(owner = "client!na", name = "T", descriptor = "[B")
@@ -218,190 +206,6 @@ public final class JagString implements StringInterface {
return concatenate(new JagString[]{parseInt(arg0 >> 24 & 0xFF), aClass100_994, parseInt(arg0 >> 16 & 0xFF), aClass100_994, parseInt(arg0 >> 8 & 0xFF), aClass100_994, parseInt(arg0 & 0xFF)});
}
- @OriginalMember(owner = "client!k", name = "a", descriptor = "(Lclient!be;Lclient!na;I)Lclient!na;")
- public static JagString method2465(@OriginalArg(0) Component arg0, @OriginalArg(1) JagString arg1) {
- if (arg1.indexOf(PERCENT_SIGN) == -1) {
- return arg1;
- }
- while (true) {
- @Pc(14) int local14 = arg1.indexOf(aClass100_133);
- if (local14 == -1) {
- while (true) {
- local14 = arg1.indexOf(aClass100_1097);
- if (local14 == -1) {
- while (true) {
- local14 = arg1.indexOf(aClass100_761);
- if (local14 == -1) {
- while (true) {
- local14 = arg1.indexOf(aClass100_520);
- if (local14 == -1) {
- while (true) {
- local14 = arg1.indexOf(aClass100_1002);
- if (local14 == -1) {
- while (true) {
- local14 = arg1.indexOf(aClass100_591);
- if (local14 == -1) {
- return arg1;
- }
- @Pc(246) JagString local246 = EMPTY;
- if (Player.lastLogAddress != null) {
- local246 = formatIp(Player.lastLogAddress.intArg2);
- if (Player.lastLogAddress.result != null) {
- @Pc(265) byte[] local265 = ((String) Player.lastLogAddress.result).getBytes(StandardCharsets.ISO_8859_1);
- local246 = decodeString(local265, local265.length, 0);
- }
- }
- arg1 = concatenate(new JagString[]{arg1.substring(local14, 0), local246, arg1.substring(local14 + 4)});
- }
- }
- arg1 = concatenate(new JagString[]{arg1.substring(local14, 0), StringUtils.method4510(method3212(4, arg0)), arg1.substring(local14 + 2)});
- }
- }
- arg1 = concatenate(new JagString[]{arg1.substring(local14, 0), StringUtils.method4510(method3212(3, arg0)), arg1.substring(local14 + 2)});
- }
- }
- arg1 = concatenate(new JagString[]{arg1.substring(local14, 0), StringUtils.method4510(method3212(2, arg0)), arg1.substring(local14 + 2)});
- }
- }
- arg1 = concatenate(new JagString[]{arg1.substring(local14, 0), StringUtils.method4510(method3212(1, arg0)), arg1.substring(local14 + 2)});
- }
- }
- arg1 = concatenate(new JagString[]{arg1.substring(local14, 0), StringUtils.method4510(method3212(0, arg0)), arg1.substring(local14 + 2)});
- }
- }
-
- @OriginalMember(owner = "client!we", name = "a", descriptor = "(BILclient!be;)I")
- public static int method3212(@OriginalArg(1) int arg0, @OriginalArg(2) Component arg1) {
- if (arg1.anIntArrayArray4 == null || arg0 >= arg1.anIntArrayArray4.length) {
- return -2;
- }
- try {
- @Pc(33) int[] local33 = arg1.anIntArrayArray4[arg0];
- @Pc(35) byte local35 = 0;
- @Pc(37) int local37 = 0;
- @Pc(39) int local39 = 0;
- while (true) {
- @Pc(41) int local41 = 0;
- @Pc(46) int local46 = local33[local39++];
- @Pc(48) byte local48 = 0;
- if (local46 == 0) {
- return local37;
- }
- if (local46 == 15) {
- local48 = 1;
- }
- if (local46 == 16) {
- local48 = 2;
- }
- if (local46 == 1) {
- local41 = PlayerSkillXpTable.boostedLevels[local33[local39++]];
- }
- if (local46 == 17) {
- local48 = 3;
- }
- if (local46 == 2) {
- local41 = PlayerSkillXpTable.baseLevels[local33[local39++]];
- }
- if (local46 == 3) {
- local41 = PlayerSkillXpTable.experience[local33[local39++]];
- }
- @Pc(124) int local124;
- @Pc(135) Component local135;
- @Pc(140) int local140;
- @Pc(152) int local152;
- if (local46 == 4) {
- local124 = local33[local39++] << 16;
- @Pc(131) int local131 = local124 + local33[local39++];
- local135 = InterfaceList.getComponent(local131);
- local140 = local33[local39++];
- if (local140 != -1 && (!ObjTypeList.get(local140).members || LoginManager.mapMembers)) {
- for (local152 = 0; local152 < local135.objTypes.length; local152++) {
- if (local140 + 1 == local135.objTypes[local152]) {
- local41 += local135.objCounts[local152];
- }
- }
- }
- }
- if (local46 == 5) {
- local41 = VarpDomain.activeVarps[local33[local39++]];
- }
- if (local46 == 6) {
- local41 = PlayerSkillXpTable.xpLevelLookup[PlayerSkillXpTable.baseLevels[local33[local39++]] - 1];
- }
- if (local46 == 7) {
- local41 = VarpDomain.activeVarps[local33[local39++]] * 100 / 46875;
- }
- if (local46 == 8) {
- local41 = PlayerList.self.combatLevel;
- }
- if (local46 == 9) {
- for (local124 = 0; local124 < 25; local124++) {
- if (PlayerSkillXpTable.ENABLED_SKILLS[local124]) {
- local41 += PlayerSkillXpTable.baseLevels[local124];
- }
- }
- }
- if (local46 == 10) {
- local124 = local33[local39++] << 16;
- local124 += local33[local39++];
- local135 = InterfaceList.getComponent(local124);
- local140 = local33[local39++];
- if (local140 != -1 && (!ObjTypeList.get(local140).members || LoginManager.mapMembers)) {
- for (local152 = 0; local152 < local135.objTypes.length; local152++) {
- if (local135.objTypes[local152] == local140 + 1) {
- local41 = 999999999;
- break;
- }
- }
- }
- }
- if (local46 == 11) {
- local41 = Player.runEnergy;
- }
- if (local46 == 12) {
- local41 = Player.weight;
- }
- if (local46 == 13) {
- local124 = VarpDomain.activeVarps[local33[local39++]];
- @Pc(353) int local353 = local33[local39++];
- local41 = (0x1 << local353 & local124) == 0 ? 0 : 1;
- }
- if (local46 == 14) {
- local124 = local33[local39++];
- local41 = VarpDomain.getVarbit(local124);
- }
- if (local46 == 18) {
- local41 = (PlayerList.self.xFine >> 7) + Camera.originX;
- }
- if (local46 == 19) {
- local41 = (PlayerList.self.zFine >> 7) + Camera.originZ;
- }
- if (local46 == 20) {
- local41 = local33[local39++];
- }
- if (local48 == 0) {
- if (local35 == 0) {
- local37 += local41;
- }
- if (local35 == 1) {
- local37 -= local41;
- }
- if (local35 == 2 && local41 != 0) {
- local37 /= local41;
- }
- if (local35 == 3) {
- local37 *= local41;
- }
- local35 = 0;
- } else {
- local35 = local48;
- }
- }
- } catch (@Pc(464) Exception local464) {
- return -1;
- }
- }
-
@OriginalMember(owner = "client!nb", name = "a", descriptor = "(II)Lclient!na;")
public static JagString getNbsp() {
@Pc(21) JagString str = new JagString();
@@ -425,6 +229,52 @@ public final class JagString implements StringInterface {
return local23;
}
+ @OriginalMember(owner = "client!gn", name = "a", descriptor = "(BI)Lclient!na;")
+ public static JagString allocate(@OriginalArg(1) int arg0) {
+ @Pc(13) JagString local13 = new JagString();
+ local13.length = 0;
+ local13.chars = new byte[arg0];
+ return local13;
+ }
+
+ @OriginalMember(owner = "client!md", name = "a", descriptor = "(JB)Lclient!na;")
+ public static JagString method2929(@OriginalArg(0) long arg0) {
+ return method1376(arg0);
+ }
+
+ @OriginalMember(owner = "client!ej", name = "a", descriptor = "(IZIJ)Lclient!na;")
+ public static JagString method1376(@OriginalArg(3) long arg0) {
+ @Pc(35) long local35 = arg0 / (long) 10;
+ @Pc(37) int local37 = 1;
+ while (local35 != 0L) {
+ local37++;
+ local35 /= 10;
+ }
+ @Pc(51) int local51 = local37;
+ if (arg0 < 0L) {
+ local51 = local37 + 1;
+ }
+ @Pc(61) byte[] local61 = new byte[local51];
+ if (arg0 < 0L) {
+ local61[0] = 45;
+ }
+ for (@Pc(79) int local79 = 0; local79 < local37; local79++) {
+ @Pc(92) int local92 = (int) (arg0 % (long) 10);
+ arg0 /= 10;
+ if (local92 < 0) {
+ local92 = -local92;
+ }
+ if (local92 > 9) {
+ local92 += 39;
+ }
+ local61[local51 - local79 - 1] = (byte) (local92 + 48);
+ }
+ @Pc(126) JagString local126 = new JagString();
+ local126.chars = local61;
+ local126.length = local51;
+ return local126;
+ }
+
@OriginalMember(owner = "client!na", name = "a", descriptor = "(Z)Ljava/net/URL;")
public final URL method3107() throws MalformedURLException {
return new URL(new String(this.chars, 0, this.length));
@@ -878,7 +728,7 @@ public final class JagString implements StringInterface {
@Pc(22) int local22 = this.indexOf(arg1, local16);
if (local22 < 0) {
local16 = 0;
- @Pc(45) JagString local45 = Static87.allocate(local8);
+ @Pc(45) JagString local45 = allocate(local8);
while (true) {
@Pc(51) int local51 = this.indexOf(arg1, local16);
if (local51 < 0) {
diff --git a/client/src/main/java/rt4/LocType.java b/client/src/main/java/rt4/LocType.java
index b228209..f746e8d 100644
--- a/client/src/main/java/rt4/LocType.java
+++ b/client/src/main/java/rt4/LocType.java
@@ -400,7 +400,7 @@ public final class LocType {
if (arg1 == 1) {
defaultMultiLoc = arg0.g1();
if (defaultMultiLoc > 0) {
- if (this.models == null || Static87.aBoolean130) {
+ if (this.models == null || SceneGraph.aBoolean130) {
this.shapes = new int[defaultMultiLoc];
this.models = new int[defaultMultiLoc];
for (len = 0; len < defaultMultiLoc; len++) {
@@ -416,7 +416,7 @@ public final class LocType {
} else if (arg1 == 5) {
defaultMultiLoc = arg0.g1();
if (defaultMultiLoc > 0) {
- if (this.models == null || Static87.aBoolean130) {
+ if (this.models == null || SceneGraph.aBoolean130) {
this.models = new int[defaultMultiLoc];
this.shapes = null;
for (len = 0; len < defaultMultiLoc; len++) {
diff --git a/client/src/main/java/rt4/LoginManager.java b/client/src/main/java/rt4/LoginManager.java
index 3909a05..0393f2d 100644
--- a/client/src/main/java/rt4/LoginManager.java
+++ b/client/src/main/java/rt4/LoginManager.java
@@ -28,6 +28,8 @@ public class LoginManager {
public static final JagString UNDERSCORE = JagString.parse("_");
@OriginalMember(owner = "client!gd", name = "h", descriptor = "[I")
public static final int[] anIntArray204 = new int[]{16, 32, 64, 128};
+ @OriginalMember(owner = "client!rj", name = "Z", descriptor = "[I")
+ public static final int[] anIntArray434 = new int[64];
@OriginalMember(owner = "client!rl", name = "X", descriptor = "I")
public static int anInt4937 = 0;
@OriginalMember(owner = "client!sd", name = "X", descriptor = "Z")
@@ -116,6 +118,44 @@ public class LoginManager {
public static int loadingScreenState = 0;
@OriginalMember(owner = "client!sk", name = "lb", descriptor = "Z")
public static boolean aBoolean252 = false;
+ @OriginalMember(owner = "client!mg", name = "Q", descriptor = "I")
+ public static int anInt3811 = 0;
+ @OriginalMember(owner = "client!mf", name = "X", descriptor = "I")
+ public static int loginScreenId;
+ @OriginalMember(owner = "client!hd", name = "e", descriptor = "Lclient!qf;")
+ public static Sprite aClass3_Sub2_Sub1_6;
+ @OriginalMember(owner = "client!d", name = "ib", descriptor = "Lclient!qf;")
+ public static Sprite aClass3_Sub2_Sub1_1;
+ @OriginalMember(owner = "client!oi", name = "h", descriptor = "Lclient!qf;")
+ public static Sprite aClass3_Sub2_Sub1_9;
+ @OriginalMember(owner = "client!qi", name = "z", descriptor = "Lclient!qf;")
+ public static Sprite aClass3_Sub2_Sub1_10;
+ @OriginalMember(owner = "client!nb", name = "i", descriptor = "Lclient!qf;")
+ public static Sprite aClass3_Sub2_Sub1_8;
+ @OriginalMember(owner = "client!qf", name = "X", descriptor = "Lclient!be;")
+ public static Component aClass13_13 = null;
+ @OriginalMember(owner = "client!vf", name = "c", descriptor = "I")
+ public static int anInt5752;
+ @OriginalMember(owner = "client!pk", name = "Y", descriptor = "I")
+ public static int anInt4581;
+ @OriginalMember(owner = "client!da", name = "ab", descriptor = "I")
+ public static int anInt1275;
+ @OriginalMember(owner = "client!ii", name = "y", descriptor = "I")
+ public static int anInt2910;
+ @OriginalMember(owner = "client!ug", name = "p", descriptor = "I")
+ public static int anInt5457;
+ @OriginalMember(owner = "client!sm", name = "b", descriptor = "I")
+ public static int anInt5208;
+ @OriginalMember(owner = "client!ee", name = "c", descriptor = "I")
+ public static int anInt1736;
+ @OriginalMember(owner = "client!gl", name = "d", descriptor = "I")
+ public static int anInt2261;
+ @OriginalMember(owner = "client!nf", name = "e", descriptor = "I")
+ public static int anInt4073;
+ @OriginalMember(owner = "client!kk", name = "i", descriptor = "I")
+ public static int anInt3324;
+ @OriginalMember(owner = "client!uj", name = "E", descriptor = "I")
+ public static int anInt5556;
@OriginalMember(owner = "client!dm", name = "d", descriptor = "(I)V")
public static void clear() {
@@ -790,7 +830,7 @@ public class LoginManager {
public static void reconnect() {
Protocol.outboundBuffer.offset = 0;
Protocol.opcode3 = -1;
- Static40.aBoolean108 = false;
+ Cs1ScriptRunner.aBoolean108 = false;
Protocol.length = 0;
mapFlagX = 0;
MiniMenu.size = 0;
@@ -985,7 +1025,7 @@ public class LoginManager {
ClientProt.ping(true);
SceneGraph.load(false);
if (!dynamicMapRegion) {
- Static87.method1805(false);
+ method1805(false);
ClientProt.ping(true);
if (GlRenderer.enabled) {
i = PlayerList.self.movementQueueX[0] >> 3;
@@ -994,18 +1034,18 @@ public class LoginManager {
}
method743(false);
if (npcSpawnsFilesBuffer != null) {
- Static158.decodeNpcFiles();
+ decodeNpcFiles();
}
}
if (dynamicMapRegion) {
- Static89.method1835(false);
+ method1835(false);
ClientProt.ping(true);
if (GlRenderer.enabled) {
i = PlayerList.self.movementQueueX[0] >> 3;
chunkX = PlayerList.self.movementQueueZ[0] >> 3;
FogManager.setLightPosition(chunkX, i);
}
- Static233.method4002(false);
+ method4002(false);
}
client.method3768();
ClientProt.ping(true);
@@ -1030,14 +1070,14 @@ public class LoginManager {
SceneGraph.setUnderwater(true);
SceneGraph.load(true);
if (!dynamicMapRegion) {
- Static87.method1805(true);
+ method1805(true);
ClientProt.ping(true);
method743(true);
}
if (dynamicMapRegion) {
- Static89.method1835(true);
+ method1835(true);
ClientProt.ping(true);
- Static233.method4002(true);
+ method4002(true);
}
client.method3768();
ClientProt.ping(true);
@@ -1150,4 +1190,946 @@ public class LoginManager {
}
}
}
+
+ @OriginalMember(owner = "client!t", name = "a", descriptor = "(ZB)V")
+ public static void method4002(@OriginalArg(0) boolean arg0) {
+ @Pc(19) byte local19;
+ @Pc(21) byte[][] local21;
+ if (GlRenderer.enabled && arg0) {
+ local21 = underWaterLocationsMapFilesBuffer;
+ local19 = 1;
+ } else {
+ local19 = 4;
+ local21 = locationMapFilesBuffer;
+ }
+ for (@Pc(29) int local29 = 0; local29 < local19; local29++) {
+ client.audioLoop();
+ for (@Pc(36) int local36 = 0; local36 < 13; local36++) {
+ for (@Pc(43) int local43 = 0; local43 < 13; local43++) {
+ @Pc(56) int local56 = Protocol.anIntArrayArrayArray18[local29][local36][local43];
+ if (local56 != -1) {
+ @Pc(67) int local67 = local56 >> 24 & 0x3;
+ if (!arg0 || local67 == 0) {
+ @Pc(77) int local77 = local56 >> 1 & 0x3;
+ @Pc(83) int local83 = local56 >> 14 & 0x3FF;
+ @Pc(89) int local89 = local56 >> 3 & 0x7FF;
+ @Pc(99) int local99 = local89 / 8 + (local83 / 8 << 8);
+ for (@Pc(101) int local101 = 0; local101 < regionBitPacked.length; local101++) {
+ if (regionBitPacked[local101] == local99 && local21[local101] != null) {
+ method3771(PathFinder.collisionMaps, local29, local21[local101], local67, local77, local36 * 8, local43 * 8, arg0, (local83 & 0x7) * 8, (local89 & 0x7) * 8);
+ break;
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+
+ @OriginalMember(owner = "client!rj", name = "a", descriptor = "([Lclient!mj;I[BIIIIZIIB)V")
+ public static void method3771(@OriginalArg(0) CollisionMap[] arg0, @OriginalArg(1) int arg1, @OriginalArg(2) byte[] arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) boolean arg7, @OriginalArg(8) int arg8, @OriginalArg(9) int arg9) {
+ @Pc(7) int local7 = -1;
+ @Pc(12) Buffer local12 = new Buffer(arg2);
+ while (true) {
+ @Pc(20) int local20 = local12.gVarSmart();
+ if (local20 == 0) {
+ return;
+ }
+ local7 += local20;
+ @Pc(31) int local31 = 0;
+ while (true) {
+ @Pc(35) int local35 = local12.gsmarts();
+ if (local35 == 0) {
+ break;
+ }
+ local31 += local35 - 1;
+ @Pc(50) int local50 = local31 & 0x3F;
+ @Pc(56) int local56 = local31 >> 6 & 0x3F;
+ @Pc(60) int local60 = local31 >> 12;
+ @Pc(64) int local64 = local12.g1();
+ @Pc(68) int local68 = local64 >> 2;
+ @Pc(72) int local72 = local64 & 0x3;
+ if (arg3 == local60 && local56 >= arg8 && local56 < arg8 + 8 && arg9 <= local50 && arg9 + 8 > local50) {
+ @Pc(103) LocType local103 = LocTypeList.get(local7);
+ @Pc(120) int local120 = method1286(local50 & 0x7, arg4, local72, local103.length, local103.width, local56 & 0x7) + arg5;
+ @Pc(137) int local137 = method4541(local103.width, arg4, local103.length, local56 & 0x7, local72, local50 & 0x7) + arg6;
+ if (local120 > 0 && local137 > 0 && local120 < 103 && local137 < 103) {
+ @Pc(154) CollisionMap local154 = null;
+ if (!arg7) {
+ @Pc(159) int local159 = arg1;
+ if ((SceneGraph.tileFlags[1][local120][local137] & 0x2) == 2) {
+ local159 = arg1 - 1;
+ }
+ if (local159 >= 0) {
+ local154 = arg0[local159];
+ }
+ }
+ SceneGraph.method3397(arg1, !arg7, arg1, arg7, local154, local7, local68, local120, local137, local72 + arg4 & 0x3);
+ }
+ }
+ }
+ }
+ }
+
+ @OriginalMember(owner = "client!eb", name = "a", descriptor = "(IIIIIII)I")
+ public static int method1286(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(6) int arg5) {
+ if ((arg2 & 0x1) == 1) {
+ @Pc(10) int local10 = arg4;
+ arg4 = arg3;
+ arg3 = local10;
+ }
+ @Pc(18) int local18 = arg1 & 0x3;
+ if (local18 == 0) {
+ return arg5;
+ } else if (local18 == 1) {
+ return arg0;
+ } else if (local18 == 2) {
+ return 7 + 1 - arg5 - arg4;
+ } else {
+ return 7 + 1 - arg0 - arg3;
+ }
+ }
+
+ @OriginalMember(owner = "client!th", name = "a", descriptor = "(IIBIIII)I")
+ public static int method4541(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5) {
+ if ((arg4 & 0x1) == 1) {
+ @Pc(9) int local9 = arg0;
+ arg0 = arg2;
+ arg2 = local9;
+ }
+ @Pc(29) int local29 = arg1 & 0x3;
+ if (local29 == 0) {
+ return arg5;
+ } else if (local29 == 1) {
+ return 7 + 1 - arg3 - arg0;
+ } else if (local29 == 2) {
+ return 1 + 7 - arg2 - arg5;
+ } else {
+ return arg3;
+ }
+ }
+
+ @OriginalMember(owner = "client!mh", name = "h", descriptor = "(B)V")
+ public static void decodeNpcFiles() {
+ @Pc(10) int local10 = npcSpawnsFilesBuffer.length;
+ for (@Pc(16) int local16 = 0; local16 < local10; local16++) {
+ if (npcSpawnsFilesBuffer[local16] != null) {
+ @Pc(25) int local25 = -1;
+ for (@Pc(27) int local27 = 0; local27 < anInt3811; local27++) {
+ if (anIntArray434[local27] == regionBitPacked[local16]) {
+ local25 = local27;
+ break;
+ }
+ }
+ if (local25 == -1) {
+ anIntArray434[anInt3811] = regionBitPacked[local16];
+ local25 = anInt3811++;
+ }
+ @Pc(67) int local67 = 0;
+ @Pc(74) Buffer local74 = new Buffer(npcSpawnsFilesBuffer[local16]);
+ while (local74.offset < npcSpawnsFilesBuffer[local16].length && local67 < 511) {
+ @Pc(97) int local97 = local67++ << 6 | local25;
+ @Pc(103) int local103 = local74.g2();
+ @Pc(107) int local107 = local103 >> 14;
+ @Pc(113) int local113 = local103 >> 7 & 0x3F;
+ @Pc(125) int local125 = local113 + (regionBitPacked[local16] >> 8) * 64 - Camera.originX;
+ @Pc(129) int local129 = local103 & 0x3F;
+ @Pc(142) int local142 = local129 + (regionBitPacked[local16] & 0xFF) * 64 - Camera.originZ;
+ @Pc(148) NpcType local148 = NpcTypeList.get(local74.g2());
+ if (NpcList.npcs[local97] == null && (local148.aByte10 & 0x1) > 0 && local107 == centralPlane && local125 >= 0 && local148.size + local125 < 104 && local142 >= 0 && local142 + local148.size < 104) {
+ NpcList.npcs[local97] = new Npc();
+ @Pc(198) Npc local198 = NpcList.npcs[local97];
+ NpcList.ids[NpcList.size++] = local97;
+ local198.lastSeenLoop = client.loop;
+ local198.setNpcType(local148);
+ local198.setSize(local198.type.size);
+ local198.anInt3400 = local198.anInt3381 = PathingEntity.ANGLES[local198.type.aByte11];
+ local198.anInt3376 = local198.type.anInt3733;
+ if (local198.anInt3376 == 0) {
+ local198.anInt3381 = 0;
+ }
+ local198.anInt3365 = local198.type.basId;
+ local198.method2683(local198.getSize(), local125, local142, true);
+ }
+ }
+ }
+ }
+ }
+
+ @OriginalMember(owner = "client!ha", name = "a", descriptor = "(ZB)V")
+ public static void method1835(@OriginalArg(0) boolean arg0) {
+ @Pc(11) byte local11;
+ @Pc(13) byte[][] local13;
+ if (GlRenderer.enabled && arg0) {
+ local11 = 1;
+ local13 = underWaterMapFilesBuffer;
+ } else {
+ local13 = mapFilesBuffer;
+ local11 = 4;
+ }
+ for (@Pc(21) int local21 = 0; local21 < local11; local21++) {
+ client.audioLoop();
+ for (@Pc(32) int local32 = 0; local32 < 13; local32++) {
+ for (@Pc(39) int local39 = 0; local39 < 13; local39++) {
+ @Pc(52) int local52 = Protocol.anIntArrayArrayArray18[local21][local32][local39];
+ @Pc(54) boolean local54 = false;
+ if (local52 != -1) {
+ @Pc(65) int local65 = local52 >> 24 & 0x3;
+ if (!arg0 || local65 == 0) {
+ @Pc(76) int local76 = local52 >> 3 & 0x7FF;
+ @Pc(82) int local82 = local52 >> 1 & 0x3;
+ @Pc(88) int local88 = local52 >> 14 & 0x3FF;
+ @Pc(98) int local98 = (local88 / 8 << 8) + local76 / 8;
+ for (@Pc(100) int local100 = 0; local100 < regionBitPacked.length; local100++) {
+ if (regionBitPacked[local100] == local98 && local13[local100] != null) {
+ method4228(local82, local32 * 8, local21, PathFinder.collisionMaps, local39 * 8, local13[local100], local65, (local76 & 0x7) * 8, (local88 & 0x7) * 8, arg0);
+ local54 = true;
+ break;
+ }
+ }
+ }
+ }
+ if (!local54) {
+ method645(local21, local39 * 8, local32 * 8, 8, 8);
+ }
+ }
+ }
+ }
+ }
+
+ @OriginalMember(owner = "client!ha", name = "a", descriptor = "(I)V")
+ public static void method1841() {
+ if (!Cs1ScriptRunner.aBoolean108) {
+ if (MiniMenu.anInt3953 != 0) {
+ ScriptRunner.anInt3751 = Mouse.anInt5850;
+ ScriptRunner.anInt1892 = Mouse.anInt5895;
+ } else if (Mouse.clickButton == 0) {
+ ScriptRunner.anInt3751 = Mouse.lastMouseX;
+ ScriptRunner.anInt1892 = Mouse.lastMouseY;
+ } else {
+ ScriptRunner.anInt3751 = Mouse.clickX;
+ ScriptRunner.anInt1892 = Mouse.clickY;
+ }
+ MiniMenu.size = 1;
+ MiniMenu.ops[0] = LocalizedText.CANCEL;
+ MiniMenu.opBases[0] = JagString.EMPTY;
+ MiniMenu.actions[0] = 1005;
+ MiniMenu.cursors[0] = MiniMenu.anInt1092;
+ }
+ if (InterfaceList.topLevelInterface != -1) {
+ InterfaceList.method1949(InterfaceList.topLevelInterface);
+ }
+ @Pc(60) int local60;
+ for (local60 = 0; local60 < InterfaceList.rectangles; local60++) {
+ if (InterfaceList.aBooleanArray100[local60]) {
+ InterfaceList.rectangleRedraw[local60] = true;
+ }
+ InterfaceList.aBooleanArray116[local60] = InterfaceList.aBooleanArray100[local60];
+ InterfaceList.aBooleanArray100[local60] = false;
+ }
+ aClass13_13 = null;
+ Cs1ScriptRunner.anInt2503 = -1;
+ InterfaceList.anInt5574 = -1;
+ InterfaceList.mouseOverInventoryInterface = null;
+ if (GlRenderer.enabled) {
+ ScriptRunner.aBoolean299 = true;
+ }
+ InterfaceList.anInt4311 = client.loop;
+ if (InterfaceList.topLevelInterface != -1) {
+ InterfaceList.rectangles = 0;
+ Cs1ScriptRunner.method182();
+ }
+ if (GlRenderer.enabled) {
+ GlRaster.method1177();
+ } else {
+ SoftwareRaster.method2503();
+ }
+ MiniMenu.sort();
+ if (Cs1ScriptRunner.aBoolean108) {
+ if (InterfaceList.aBoolean298) {
+ method2297();
+ } else {
+ method2744();
+ }
+ } else if (aClass13_13 != null) {
+ MiniMenu.method1207(aClass13_13, Cs1ScriptRunner.anInt3484, Cs1ScriptRunner.anInt3260);
+ } else if (Cs1ScriptRunner.anInt2503 != -1) {
+ MiniMenu.method1207(null, InterfaceList.anInt5574, Cs1ScriptRunner.anInt2503);
+ }
+ local60 = Cs1ScriptRunner.aBoolean108 ? -1 : method4044();
+ if (local60 == -1) {
+ local60 = ScriptRunner.anInt5794;
+ }
+ InterfaceList.method1750(local60);
+ if (MiniMenu.anInt3096 == 1) {
+ MiniMenu.anInt3096 = 2;
+ }
+ if (Protocol.anInt4422 == 1) {
+ Protocol.anInt4422 = 2;
+ }
+ if (Cheat.rectDebug == 3) {
+ for (@Pc(189) int local189 = 0; local189 < InterfaceList.rectangles; local189++) {
+ if (InterfaceList.aBooleanArray116[local189]) {
+ if (GlRenderer.enabled) {
+ GlRaster.fillRectAlpha(InterfaceList.rectangleX[local189], InterfaceList.rectangleY[local189], InterfaceList.rectangleWidth[local189], InterfaceList.rectangleHeight[local189], 16711935, 128);
+ } else {
+ SoftwareRaster.fillRectAlpha(InterfaceList.rectangleX[local189], InterfaceList.rectangleY[local189], InterfaceList.rectangleWidth[local189], InterfaceList.rectangleHeight[local189], 16711935, 128);
+ }
+ } else if (InterfaceList.rectangleRedraw[local189]) {
+ if (GlRenderer.enabled) {
+ GlRaster.fillRectAlpha(InterfaceList.rectangleX[local189], InterfaceList.rectangleY[local189], InterfaceList.rectangleWidth[local189], InterfaceList.rectangleHeight[local189], 16711680, 128);
+ } else {
+ SoftwareRaster.fillRectAlpha(InterfaceList.rectangleX[local189], InterfaceList.rectangleY[local189], InterfaceList.rectangleWidth[local189], InterfaceList.rectangleHeight[local189], 16711680, 128);
+ }
+ }
+ }
+ }
+ AreaSoundManager.redraw(Protocol.anInt4247, PlayerList.self.xFine, PlayerList.self.zFine, Player.level);
+ Protocol.anInt4247 = 0;
+ }
+
+ @OriginalMember(owner = "client!tm", name = "a", descriptor = "(III[Lclient!mj;IB[BIIIZ)V")
+ public static void method4228(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) CollisionMap[] arg3, @OriginalArg(4) int arg4, @OriginalArg(6) byte[] arg5, @OriginalArg(7) int arg6, @OriginalArg(8) int arg7, @OriginalArg(9) int arg8, @OriginalArg(10) boolean arg9) {
+ @Pc(17) int local17;
+ if (!arg9) {
+ for (@Pc(10) int local10 = 0; local10 < 8; local10++) {
+ for (local17 = 0; local17 < 8; local17++) {
+ if (arg1 + local10 > 0 && local10 + arg1 < 103 && local17 + arg4 > 0 && arg4 + local17 < 103) {
+ arg3[arg2].flags[local10 + arg1][local17 + arg4] &= 0xFEFFFFFF;
+ }
+ }
+ }
+ }
+ @Pc(87) byte local87;
+ if (arg9) {
+ local87 = 1;
+ } else {
+ local87 = 4;
+ }
+ @Pc(96) Buffer local96 = new Buffer(arg5);
+ @Pc(103) int local103;
+ @Pc(108) int local108;
+ for (local17 = 0; local17 < local87; local17++) {
+ for (local103 = 0; local103 < 64; local103++) {
+ for (local108 = 0; local108 < 64; local108++) {
+ if (arg6 == local17 && arg8 <= local103 && arg8 + 8 > local103 && arg7 <= local108 && local108 < arg7 + 8) {
+ SceneGraph.readTile(0, 0, arg9, local96, method3659(arg0, local103 & 0x7, local108 & 0x7) + arg4, method4360(arg0, local108 & 0x7, local103 & 0x7) + arg1, arg0, arg2);
+ } else {
+ SceneGraph.readTile(0, 0, arg9, local96, -1, -1, 0, 0);
+ }
+ }
+ }
+ }
+ @Pc(232) int local232;
+ @Pc(417) int local417;
+ @Pc(255) int local255;
+ @Pc(266) int local266;
+ @Pc(316) int local316;
+ while (local96.data.length > local96.offset) {
+ local103 = local96.g1();
+ if (local103 != 129) {
+ local96.offset--;
+ break;
+ }
+ for (local108 = 0; local108 < 4; local108++) {
+ @Pc(223) byte local223 = local96.g1b();
+ @Pc(237) int local237;
+ if (local223 == 0) {
+ if (local108 <= arg6) {
+ local237 = arg1 + 7;
+ local232 = arg1;
+ local255 = arg4 + 7;
+ if (local255 < 0) {
+ local255 = 0;
+ } else if (local255 >= 104) {
+ local255 = 104;
+ }
+ if (local237 < 0) {
+ local237 = 0;
+ } else if (local237 >= 104) {
+ local237 = 104;
+ }
+ local417 = arg4;
+ if (arg4 < 0) {
+ local417 = 0;
+ } else if (arg4 >= 104) {
+ local417 = 104;
+ }
+ if (arg1 < 0) {
+ local232 = 0;
+ } else if (arg1 >= 104) {
+ local232 = 104;
+ }
+ while (local237 > local232) {
+ while (local417 < local255) {
+ SceneGraph.aByteArrayArrayArray13[arg2][local232][local417] = 0;
+ local417++;
+ }
+ local232++;
+ }
+ }
+ } else if (local223 == 1) {
+ for (local232 = 0; local232 < 64; local232 += 4) {
+ for (local237 = 0; local237 < 64; local237 += 4) {
+ @Pc(246) byte local246 = local96.g1b();
+ if (local108 <= arg6) {
+ for (local255 = local232; local255 < local232 + 4; local255++) {
+ for (local266 = local237; local266 < local237 + 4; local266++) {
+ if (local255 >= arg8 && local255 < arg8 + 8 && local266 >= arg7 && arg7 + 8 > arg7) {
+ local316 = arg1 + method4360(arg0, local266 & 0x7, local255 & 0x7);
+ @Pc(328) int local328 = method3659(arg0, local255 & 0x7, local266 & 0x7) + arg4;
+ if (local316 >= 0 && local316 < 104 && local328 >= 0 && local328 < 104) {
+ SceneGraph.aByteArrayArrayArray13[arg2][local316][local328] = local246;
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ } else if (local223 == 2) {
+ }
+ }
+ }
+ @Pc(497) int local497;
+ if (GlRenderer.enabled && !arg9) {
+ @Pc(472) Environment local472 = null;
+ label207:
+ while (true) {
+ label200:
+ do {
+ while (local96.data.length > local96.offset) {
+ local108 = local96.g1();
+ if (local108 != 0) {
+ if (local108 != 1) {
+ throw new IllegalStateException();
+ }
+ local497 = local96.g1();
+ continue label200;
+ }
+ local472 = new Environment(local96);
+ }
+ if (local472 == null) {
+ local472 = new Environment();
+ }
+ FogManager.chunksAtmosphere[arg1 >> 3][arg4 >> 3] = local472;
+ break label207;
+ } while (local497 <= 0);
+ for (local232 = 0; local232 < local497; local232++) {
+ @Pc(517) Light local517 = new Light(local96);
+ if (local517.anInt2243 == 31) {
+ @Pc(529) LightType local529 = LightTypeList.get(local96.g2());
+ local517.method1762(local529.anInt2865, local529.anInt2873, local529.anInt2867, local529.anInt2872);
+ }
+ local417 = local517.x >> 7;
+ local255 = local517.z >> 7;
+ if (arg6 == local517.level && local417 >= arg8 && arg8 + 8 > local417 && arg7 <= local255 && arg7 + 8 > local255) {
+ local266 = method3675(arg0, local517.x & 0x3FF, local517.z & 0x3FF) + (arg1 << 7);
+ local316 = method3388(local517.x & 0x3FF, arg0, local517.z & 0x3FF) + (arg4 << 7);
+ local517.x = local266;
+ local517.z = local316;
+ local417 = local517.x >> 7;
+ local255 = local517.z >> 7;
+ if (local417 >= 0 && local255 >= 0 && local417 < 104 && local255 < 104) {
+ local517.aBoolean125 = (SceneGraph.tileFlags[1][local417][local255] & 0x2) != 0;
+ local517.y = SceneGraph.tileHeights[local517.level][local417][local255] - local517.y;
+ LightingManager.method2389(local517);
+ }
+ }
+ }
+ }
+ }
+ local103 = arg1 + 7;
+ local108 = arg4 + 7;
+ for (local497 = arg1; local497 < local103; local497++) {
+ for (local232 = arg4; local232 < local108; local232++) {
+ SceneGraph.aByteArrayArrayArray13[arg2][local497][local232] = 0;
+ }
+ }
+ }
+
+ @OriginalMember(owner = "client!tb", name = "h", descriptor = "(I)I")
+ public static int method4044() {
+ return Cheat.shiftClick && Keyboard.pressedKeys[Keyboard.KEY_SHIFT] && MiniMenu.size > 2 ? MiniMenu.cursors[MiniMenu.size - 2] : MiniMenu.cursors[MiniMenu.size - 1];
+ }
+
+ @OriginalMember(owner = "client!rg", name = "a", descriptor = "(IZII)I")
+ public static int method4360(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2) {
+ @Pc(3) int local3 = arg0 & 0x3;
+ if (local3 == 0) {
+ return arg2;
+ } else if (local3 == 1) {
+ return arg1;
+ } else if (local3 == 2) {
+ return 7 - arg2;
+ } else {
+ return 7 - arg1;
+ }
+ }
+
+ @OriginalMember(owner = "client!qg", name = "a", descriptor = "(IBII)I")
+ public static int method3659(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2) {
+ @Pc(3) int local3 = arg0 & 0x3;
+ if (local3 == 0) {
+ return arg2;
+ } else if (local3 == 1) {
+ return 7 - arg1;
+ } else if (local3 == 2) {
+ return 7 - arg2;
+ } else {
+ return arg1;
+ }
+ }
+
+ @OriginalMember(owner = "client!qi", name = "a", descriptor = "(IIBI)I")
+ public static int method3675(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2) {
+ @Pc(3) int local3 = arg0 & 0x3;
+ if (local3 == 0) {
+ return arg1;
+ } else if (local3 == 1) {
+ return arg2;
+ } else if (local3 == 2) {
+ return 1023 - arg1;
+ } else {
+ return 1023 - arg2;
+ }
+ }
+
+ @OriginalMember(owner = "client!ol", name = "a", descriptor = "(IIZI)I")
+ public static int method3388(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2) {
+ @Pc(3) int local3 = arg1 & 0x3;
+ if (local3 == 0) {
+ return arg2;
+ } else if (local3 == 1) {
+ return 1023 - arg0;
+ } else if (local3 == 2) {
+ return 1023 - arg2;
+ } else {
+ return arg0;
+ }
+ }
+
+ @OriginalMember(owner = "client!ij", name = "a", descriptor = "(B)V")
+ public static void method2297() {
+ @Pc(3) int local3 = InterfaceList.anInt4271;
+ @Pc(9) int local9 = InterfaceList.anInt5138;
+ @Pc(11) int local11 = InterfaceList.anInt436;
+ @Pc(13) int local13 = InterfaceList.anInt761;
+ if (aClass3_Sub2_Sub1_1 == null || aClass3_Sub2_Sub1_9 == null) {
+ if (client.js5Archive8.isFileReady(anInt1736) && client.js5Archive8.isFileReady(anInt4073)) {
+ aClass3_Sub2_Sub1_1 = SoftwareSprite.loadSoftwareAlphaSprite(client.js5Archive8, anInt1736);
+ aClass3_Sub2_Sub1_9 = SoftwareSprite.loadSoftwareAlphaSprite(client.js5Archive8, anInt4073);
+ if (GlRenderer.enabled) {
+ if (aClass3_Sub2_Sub1_1 instanceof SoftwareAlphaSprite) {
+ aClass3_Sub2_Sub1_1 = new GlAlphaSprite((SoftwareSprite) aClass3_Sub2_Sub1_1);
+ } else {
+ aClass3_Sub2_Sub1_1 = new GlSprite((SoftwareSprite) aClass3_Sub2_Sub1_1);
+ }
+ if (aClass3_Sub2_Sub1_9 instanceof SoftwareAlphaSprite) {
+ aClass3_Sub2_Sub1_9 = new GlAlphaSprite((SoftwareSprite) aClass3_Sub2_Sub1_9);
+ } else {
+ aClass3_Sub2_Sub1_9 = new GlSprite((SoftwareSprite) aClass3_Sub2_Sub1_9);
+ }
+ }
+ } else if (GlRenderer.enabled) {
+ GlRaster.fillRectAlpha(local3, local9, local13, 20, anInt1275, 256 - anInt2910);
+ } else {
+ SoftwareRaster.fillRectAlpha(local3, local9, local13, 20, anInt1275, 256 - anInt2910);
+ }
+ }
+ @Pc(112) int local112;
+ @Pc(114) int local114;
+ if (aClass3_Sub2_Sub1_1 != null && aClass3_Sub2_Sub1_9 != null) {
+ local112 = local13 / aClass3_Sub2_Sub1_1.width;
+ for (local114 = 0; local114 < local112; local114++) {
+ aClass3_Sub2_Sub1_1.render(local114 * aClass3_Sub2_Sub1_1.width + local3, local9);
+ }
+ aClass3_Sub2_Sub1_9.render(local3, local9);
+ aClass3_Sub2_Sub1_9.renderHorizontalFlip(local3 + local13 - aClass3_Sub2_Sub1_9.width, local9);
+ }
+ Fonts.b12Full.renderLeft(LocalizedText.CHOOSE_OPTION, local3 + 3, local9 + 14, anInt4581, -1);
+ if (GlRenderer.enabled) {
+ GlRaster.fillRectAlpha(local3, local9 + 20, local13, local11 - 20, anInt1275, 256 - anInt2910);
+ } else {
+ SoftwareRaster.fillRectAlpha(local3, local9 + 20, local13, local11 - 20, anInt1275, 256 - anInt2910);
+ }
+ local114 = Mouse.lastMouseY;
+ local112 = Mouse.lastMouseX;
+ @Pc(203) int local203;
+ @Pc(219) int local219;
+ for (local203 = 0; local203 < MiniMenu.size; local203++) {
+ local219 = (MiniMenu.size - local203 - 1) * 15 + local9 + 35;
+ if (local3 < local112 && local112 < local3 + local13 && local114 > local219 - 13 && local114 < local219 + 3) {
+ if (GlRenderer.enabled) {
+ GlRaster.fillRectAlpha(local3, local219 - 13, local13, 16, anInt5457, 256 - anInt5208);
+ } else {
+ SoftwareRaster.fillRectAlpha(local3, local219 - 13, local13, 16, anInt5457, 256 - anInt5208);
+ }
+ }
+ }
+ if ((aClass3_Sub2_Sub1_8 == null || aClass3_Sub2_Sub1_6 == null || aClass3_Sub2_Sub1_10 == null) && client.js5Archive8.isFileReady(anInt2261) && client.js5Archive8.isFileReady(anInt3324) && client.js5Archive8.isFileReady(anInt5556)) {
+ aClass3_Sub2_Sub1_8 = SoftwareSprite.loadSoftwareAlphaSprite(client.js5Archive8, anInt2261);
+ aClass3_Sub2_Sub1_6 = SoftwareSprite.loadSoftwareAlphaSprite(client.js5Archive8, anInt3324);
+ aClass3_Sub2_Sub1_10 = SoftwareSprite.loadSoftwareAlphaSprite(client.js5Archive8, anInt5556);
+ if (GlRenderer.enabled) {
+ if (aClass3_Sub2_Sub1_8 instanceof SoftwareAlphaSprite) {
+ aClass3_Sub2_Sub1_8 = new GlAlphaSprite((SoftwareSprite) aClass3_Sub2_Sub1_8);
+ } else {
+ aClass3_Sub2_Sub1_8 = new GlSprite((SoftwareSprite) aClass3_Sub2_Sub1_8);
+ }
+ if (aClass3_Sub2_Sub1_6 instanceof SoftwareAlphaSprite) {
+ aClass3_Sub2_Sub1_6 = new GlAlphaSprite((SoftwareSprite) aClass3_Sub2_Sub1_6);
+ } else {
+ aClass3_Sub2_Sub1_6 = new GlSprite((SoftwareSprite) aClass3_Sub2_Sub1_6);
+ }
+ if (aClass3_Sub2_Sub1_10 instanceof SoftwareAlphaSprite) {
+ aClass3_Sub2_Sub1_10 = new GlAlphaSprite((SoftwareSprite) aClass3_Sub2_Sub1_10);
+ } else {
+ aClass3_Sub2_Sub1_10 = new GlSprite((SoftwareSprite) aClass3_Sub2_Sub1_10);
+ }
+ }
+ }
+ @Pc(418) int local418;
+ if (aClass3_Sub2_Sub1_8 != null && aClass3_Sub2_Sub1_6 != null && aClass3_Sub2_Sub1_10 != null) {
+ local203 = local13 / aClass3_Sub2_Sub1_8.width;
+ for (local219 = 0; local219 < local203; local219++) {
+ aClass3_Sub2_Sub1_8.render(local3 + aClass3_Sub2_Sub1_8.width * local219, local11 + local9 + -aClass3_Sub2_Sub1_8.height);
+ }
+ local219 = (local11 - 20) / aClass3_Sub2_Sub1_6.height;
+ for (local418 = 0; local418 < local219; local418++) {
+ aClass3_Sub2_Sub1_6.render(local3, local9 + local418 * aClass3_Sub2_Sub1_6.height + 20);
+ aClass3_Sub2_Sub1_6.renderHorizontalFlip(local3 + local13 - aClass3_Sub2_Sub1_6.width, local9 + 20 + local418 * aClass3_Sub2_Sub1_6.height);
+ }
+ aClass3_Sub2_Sub1_10.render(local3, local11 + local9 - aClass3_Sub2_Sub1_10.height);
+ aClass3_Sub2_Sub1_10.renderHorizontalFlip(local3 + local13 - aClass3_Sub2_Sub1_10.width, local9 - -local11 + -aClass3_Sub2_Sub1_10.height);
+ }
+ for (local203 = 0; local203 < MiniMenu.size; local203++) {
+ local219 = (MiniMenu.size - local203 - 1) * 15 + local9 + 35;
+ local418 = anInt4581;
+ if (local3 < local112 && local13 + local3 > local112 && local219 - 13 < local114 && local114 < local219 + 3) {
+ local418 = anInt5752;
+ }
+ Fonts.b12Full.renderLeft(MiniMenu.getOp(local203), local3 + 3, local219, local418, 0);
+ }
+ InterfaceList.forceRedrawScreen(InterfaceList.anInt4271, InterfaceList.anInt5138, InterfaceList.anInt436, InterfaceList.anInt761);
+ }
+
+ @OriginalMember(owner = "client!lf", name = "b", descriptor = "(I)V")
+ public static void method2744() {
+ @Pc(3) int local3 = InterfaceList.anInt5138;
+ @Pc(9) int local9 = InterfaceList.anInt761;
+ @Pc(11) int local11 = InterfaceList.anInt4271;
+ @Pc(15) int local15 = InterfaceList.anInt436;
+ if (GlRenderer.enabled) {
+ GlRaster.fillRect(local11, local3, local9, local15, 6116423);
+ GlRaster.fillRect(local11 + 1, local3 + 1, local9 - 2, 16, 0);
+ GlRaster.drawRect(local11 + 1, local3 + 18, local9 - 2, local15 + -19, 0);
+ } else {
+ SoftwareRaster.fillRect(local11, local3, local9, local15, 6116423);
+ SoftwareRaster.fillRect(local11 + 1, local3 + 1, local9 - 2, 16, 0);
+ SoftwareRaster.drawRect(local11 + 1, local3 + 18, local9 - 2, local15 + -19, 0);
+ }
+ Fonts.b12Full.renderLeft(LocalizedText.CHOOSE_OPTION, local11 + 3, local3 + 14, 6116423, -1);
+ @Pc(96) int local96 = Mouse.lastMouseY;
+ @Pc(98) int local98 = Mouse.lastMouseX;
+ for (@Pc(107) int local107 = 0; local107 < MiniMenu.size; local107++) {
+ @Pc(127) int local127 = (MiniMenu.size - local107 - 1) * 15 + local3 + 31;
+ @Pc(129) int local129 = 16777215;
+ if (local11 < local98 && local98 < local11 + local9 && local127 - 13 < local96 && local96 < local127 + 3) {
+ local129 = 16776960;
+ }
+ Fonts.b12Full.renderLeft(MiniMenu.getOp(local107), local11 + 3, local127, local129, 0);
+ }
+ InterfaceList.forceRedrawScreen(InterfaceList.anInt4271, InterfaceList.anInt5138, InterfaceList.anInt436, InterfaceList.anInt761);
+ }
+
+ @OriginalMember(owner = "client!gn", name = "a", descriptor = "(ZI)V")
+ public static void method1805(@OriginalArg(0) boolean arg0) {
+ @Pc(7) byte local7;
+ @Pc(9) byte[][] local9;
+ if (GlRenderer.enabled && arg0) {
+ local7 = 1;
+ local9 = underWaterMapFilesBuffer;
+ } else {
+ local7 = 4;
+ local9 = mapFilesBuffer;
+ }
+ @Pc(18) int local18 = local9.length;
+ @Pc(20) int local20;
+ @Pc(38) int local38;
+ @Pc(49) int local49;
+ @Pc(53) byte[] local53;
+ for (local20 = 0; local20 < local18; local20++) {
+ local38 = (regionBitPacked[local20] >> 8) * 64 - Camera.originX;
+ local49 = (regionBitPacked[local20] & 0xFF) * 64 - Camera.originZ;
+ local53 = local9[local20];
+ if (local53 != null) {
+ client.audioLoop();
+ method2203(PathFinder.collisionMaps, arg0, centralZoneX * 8 - 48, local49, local38, (centralZoneZ - 6) * 8, local53);
+ }
+ }
+ for (local20 = 0; local20 < local18; local20++) {
+ local38 = (regionBitPacked[local20] >> 8) * 64 - Camera.originX;
+ local49 = (regionBitPacked[local20] & 0xFF) * 64 - Camera.originZ;
+ local53 = local9[local20];
+ if (local53 == null && centralZoneZ < 800) {
+ client.audioLoop();
+ for (@Pc(130) int local130 = 0; local130 < local7; local130++) {
+ method645(local130, local49, local38, 64, 64);
+ }
+ }
+ }
+ }
+
+ @OriginalMember(owner = "client!wa", name = "a", descriptor = "([Lclient!mj;ZIIIII[B)V")
+ public static void method2203(@OriginalArg(0) CollisionMap[] arg0, @OriginalArg(1) boolean arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5, @OriginalArg(7) byte[] arg6) {
+ @Pc(14) int local14;
+ @Pc(21) int local21;
+ if (!arg1) {
+ for (@Pc(9) int local9 = 0; local9 < 4; local9++) {
+ for (local14 = 0; local14 < 64; local14++) {
+ for (local21 = 0; local21 < 64; local21++) {
+ if (arg4 + local14 > 0 && local14 + arg4 < 103 && arg3 + local21 > 0 && local21 + arg3 < 103) {
+ arg0[local9].flags[local14 + arg4][arg3 + local21] &= 0xFEFFFFFF;
+ }
+ }
+ }
+ }
+ }
+ @Pc(95) Buffer local95 = new Buffer(arg6);
+ @Pc(99) byte local99;
+ if (arg1) {
+ local99 = 1;
+ } else {
+ local99 = 4;
+ }
+ @Pc(117) int local117;
+ for (local14 = 0; local14 < local99; local14++) {
+ for (local21 = 0; local21 < 64; local21++) {
+ for (local117 = 0; local117 < 64; local117++) {
+ SceneGraph.readTile(arg2, arg5, arg1, local95, local117 + arg3, arg4 + local21, 0, local14);
+ }
+ }
+ }
+ @Pc(146) boolean local146 = false;
+ @Pc(243) int local243;
+ @Pc(188) int local188;
+ @Pc(190) int local190;
+ @Pc(194) int local194;
+ while (local95.offset < local95.data.length) {
+ local21 = local95.g1();
+ if (local21 != 129) {
+ local95.offset--;
+ break;
+ }
+ for (local117 = 0; local117 < 4; local117++) {
+ @Pc(168) byte local168 = local95.g1b();
+ if (local168 == 0) {
+ local243 = arg4;
+ if (arg4 < 0) {
+ local243 = 0;
+ } else if (arg4 >= 104) {
+ local243 = 104;
+ }
+ local190 = arg3;
+ if (arg3 < 0) {
+ local190 = 0;
+ } else if (arg3 >= 104) {
+ local190 = 104;
+ }
+ local188 = arg4 + 64;
+ local194 = arg3 + 64;
+ if (local194 < 0) {
+ local194 = 0;
+ } else if (local194 >= 104) {
+ local194 = 104;
+ }
+ if (local188 < 0) {
+ local188 = 0;
+ } else if (local188 >= 104) {
+ local188 = 104;
+ }
+ while (local243 < local188) {
+ while (local190 < local194) {
+ SceneGraph.aByteArrayArrayArray13[local117][local243][local190] = 0;
+ local190++;
+ }
+ local243++;
+ }
+ } else if (local168 == 1) {
+ for (local243 = 0; local243 < 64; local243 += 4) {
+ for (local188 = 0; local188 < 64; local188 += 4) {
+ @Pc(305) byte local305 = local95.g1b();
+ for (local194 = local243 + arg4; local194 < arg4 + local243 + 4; local194++) {
+ for (@Pc(320) int local320 = arg3 + local188; local320 < arg3 + local188 + 4; local320++) {
+ if (local194 >= 0 && local194 < 104 && local320 >= 0 && local320 < 104) {
+ SceneGraph.aByteArrayArrayArray13[local117][local194][local320] = local305;
+ }
+ }
+ }
+ }
+ }
+ } else if (local168 == 2 && local117 > 0) {
+ local188 = arg4 + 64;
+ local190 = arg3;
+ local194 = arg3 + 64;
+ if (local188 < 0) {
+ local188 = 0;
+ } else if (local188 >= 104) {
+ local188 = 104;
+ }
+ if (arg3 < 0) {
+ local190 = 0;
+ } else if (arg3 >= 104) {
+ local190 = 104;
+ }
+ if (local194 < 0) {
+ local194 = 0;
+ } else if (local194 >= 104) {
+ local194 = 104;
+ }
+ local243 = arg4;
+ if (arg4 < 0) {
+ local243 = 0;
+ } else if (arg4 >= 104) {
+ local243 = 104;
+ }
+ while (local188 > local243) {
+ while (local190 < local194) {
+ SceneGraph.aByteArrayArrayArray13[local117][local243][local190] = SceneGraph.aByteArrayArrayArray13[local117 - 1][local243][local190];
+ local190++;
+ }
+ local243++;
+ }
+ }
+ }
+ local146 = true;
+ }
+ @Pc(515) int local515;
+ if (GlRenderer.enabled && !arg1) {
+ @Pc(490) Environment local490 = null;
+ label270:
+ while (true) {
+ label263:
+ do {
+ while (local95.offset < local95.data.length) {
+ local117 = local95.g1();
+ if (local117 != 0) {
+ if (local117 != 1) {
+ throw new IllegalStateException();
+ }
+ local515 = local95.g1();
+ continue label263;
+ }
+ local490 = new Environment(local95);
+ }
+ if (local490 == null) {
+ local490 = new Environment();
+ }
+ for (local117 = 0; local117 < 8; local117++) {
+ for (local515 = 0; local515 < 8; local515++) {
+ local243 = local117 + (arg4 >> 3);
+ local188 = (arg3 >> 3) + local515;
+ if (local243 >= 0 && local243 < 13 && local188 >= 0 && local188 < 13) {
+ FogManager.chunksAtmosphere[local243][local188] = local490;
+ }
+ }
+ }
+ break label270;
+ } while (local515 <= 0);
+ for (local243 = 0; local243 < local515; local243++) {
+ @Pc(529) Light local529 = new Light(local95);
+ if (local529.anInt2243 == 31) {
+ @Pc(541) LightType local541 = LightTypeList.get(local95.g2());
+ local529.method1762(local541.anInt2865, local541.anInt2873, local541.anInt2867, local541.anInt2872);
+ }
+ local529.z += arg3 << 7;
+ local529.x += arg4 << 7;
+ local194 = local529.z >> 7;
+ local190 = local529.x >> 7;
+ if (local190 >= 0 && local194 >= 0 && local190 < 104 && local194 < 104) {
+ local529.aBoolean125 = (SceneGraph.tileFlags[1][local190][local194] & 0x2) != 0;
+ local529.y = SceneGraph.tileHeights[local529.level][local190][local194] - local529.y;
+ LightingManager.method2389(local529);
+ }
+ }
+ }
+ }
+ if (local146) {
+ return;
+ }
+ for (local21 = 0; local21 < 4; local21++) {
+ for (local117 = 0; local117 < 16; local117++) {
+ for (local515 = 0; local515 < 16; local515++) {
+ local243 = (arg4 >> 2) + local117;
+ local188 = local515 + (arg3 >> 2);
+ if (local243 >= 0 && local243 < 26 && local188 >= 0 && local188 < 26) {
+ SceneGraph.aByteArrayArrayArray13[local21][local243][local188] = 0;
+ }
+ }
+ }
+ }
+ }
+
+ @OriginalMember(owner = "client!bm", name = "a", descriptor = "(IBIIII)V")
+ public static void method645(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4) {
+ @Pc(3) int local3;
+ @Pc(10) int local10;
+ for (local3 = arg1; local3 <= arg3 + arg1; local3++) {
+ for (local10 = arg2; local10 <= arg4 + arg2; local10++) {
+ if (local10 >= 0 && local10 < 104 && local3 >= 0 && local3 < 104) {
+ SceneGraph.aByteArrayArrayArray9[arg0][local10][local3] = 127;
+ }
+ }
+ }
+ for (local3 = arg1; local3 < arg3 + arg1; local3++) {
+ for (local10 = arg2; local10 < arg2 + arg4; local10++) {
+ if (local10 >= 0 && local10 < 104 && local3 >= 0 && local3 < 104) {
+ SceneGraph.tileHeights[arg0][local10][local3] = arg0 <= 0 ? 0 : SceneGraph.tileHeights[arg0 - 1][local10][local3];
+ }
+ }
+ }
+ if (arg2 > 0 && arg2 < 104) {
+ for (local3 = arg1 + 1; local3 < arg1 + arg3; local3++) {
+ if (local3 >= 0 && local3 < 104) {
+ SceneGraph.tileHeights[arg0][arg2][local3] = SceneGraph.tileHeights[arg0][arg2 - 1][local3];
+ }
+ }
+ }
+ if (arg1 > 0 && arg1 < 104) {
+ for (local3 = arg2 + 1; local3 < arg2 + arg4; local3++) {
+ if (local3 >= 0 && local3 < 104) {
+ SceneGraph.tileHeights[arg0][local3][arg1] = SceneGraph.tileHeights[arg0][local3][arg1 - 1];
+ }
+ }
+ }
+ if (arg2 < 0 || arg1 < 0 || arg2 >= 104 || arg1 >= 104) {
+ return;
+ }
+ if (arg0 == 0) {
+ if (arg2 > 0 && SceneGraph.tileHeights[arg0][arg2 - 1][arg1] != 0) {
+ SceneGraph.tileHeights[arg0][arg2][arg1] = SceneGraph.tileHeights[arg0][arg2 - 1][arg1];
+ } else if (arg1 > 0 && SceneGraph.tileHeights[arg0][arg2][arg1 - 1] != 0) {
+ SceneGraph.tileHeights[arg0][arg2][arg1] = SceneGraph.tileHeights[arg0][arg2][arg1 - 1];
+ } else if (arg2 > 0 && arg1 > 0 && SceneGraph.tileHeights[arg0][arg2 - 1][arg1 - 1] != 0) {
+ SceneGraph.tileHeights[arg0][arg2][arg1] = SceneGraph.tileHeights[arg0][arg2 - 1][arg1 - 1];
+ }
+ } else if (arg2 > 0 && SceneGraph.tileHeights[arg0 - 1][arg2 - 1][arg1] != SceneGraph.tileHeights[arg0][arg2 - 1][arg1]) {
+ SceneGraph.tileHeights[arg0][arg2][arg1] = SceneGraph.tileHeights[arg0][arg2 - 1][arg1];
+ } else if (arg1 > 0 && SceneGraph.tileHeights[arg0][arg2][arg1 - 1] != SceneGraph.tileHeights[arg0 - 1][arg2][arg1 - 1]) {
+ SceneGraph.tileHeights[arg0][arg2][arg1] = SceneGraph.tileHeights[arg0][arg2][arg1 - 1];
+ } else if (arg2 > 0 && arg1 > 0 && SceneGraph.tileHeights[arg0][arg2 - 1][arg1 - 1] != SceneGraph.tileHeights[arg0 - 1][arg2 - 1][arg1 - 1]) {
+ SceneGraph.tileHeights[arg0][arg2][arg1] = SceneGraph.tileHeights[arg0][arg2 - 1][arg1 - 1];
+ }
+ }
+
+ @OriginalMember(owner = "client!j", name = "g", descriptor = "(I)V")
+ public static void method4637() {
+ aClass3_Sub2_Sub1_8 = null;
+ aClass3_Sub2_Sub1_1 = null;
+ aClass3_Sub2_Sub1_6 = null;
+ aClass3_Sub2_Sub1_9 = null;
+ aClass3_Sub2_Sub1_10 = null;
+ }
}
diff --git a/client/src/main/java/rt4/MaterialManager.java b/client/src/main/java/rt4/MaterialManager.java
index 5815700..d3d9d5b 100644
--- a/client/src/main/java/rt4/MaterialManager.java
+++ b/client/src/main/java/rt4/MaterialManager.java
@@ -223,4 +223,11 @@ public class MaterialManager {
}
GlCleaner.onCardTexture += aByteBuffer6.limit() * 2;
}
+
+ @OriginalMember(owner = "client!lh", name = "b", descriptor = "(II)V")
+ public static void method2761(@OriginalArg(0) int arg0) {
+ UnderwaterMaterialRenderer.anInt3241 = arg0;
+ resetArgument(3);
+ resetArgument(4);
+ }
}
diff --git a/client/src/main/java/rt4/MiniMap.java b/client/src/main/java/rt4/MiniMap.java
index f2300b0..0e0efbb 100644
--- a/client/src/main/java/rt4/MiniMap.java
+++ b/client/src/main/java/rt4/MiniMap.java
@@ -187,7 +187,7 @@ public class MiniMap {
local35 = (int) (Math.random() * 20.0D) + 238 - 10 << 16;
for (local37 = 1; local37 < 103; local37++) {
for (local76 = 1; local76 < 103; local76++) {
- if ((SceneGraph.tileFlags[arg0][local76][local37] & 0x18) == 0 && !Static164.method3109(local76, local455, local37, local35, arg0)) {
+ if ((SceneGraph.tileFlags[arg0][local76][local37] & 0x18) == 0 && !method3109(local76, local455, local37, local35, arg0)) {
if (GlRenderer.enabled) {
SoftwareRaster.pixels = null;
} else {
@@ -195,7 +195,7 @@ public class MiniMap {
}
return false;
}
- if (arg0 < 3 && (SceneGraph.tileFlags[arg0 + 1][local76][local37] & 0x8) != 0 && !Static164.method3109(local76, local455, local37, local35, arg0 + 1)) {
+ if (arg0 < 3 && (SceneGraph.tileFlags[arg0 + 1][local76][local37] & 0x8) != 0 && !method3109(local76, local455, local37, local35, arg0 + 1)) {
if (GlRenderer.enabled) {
SoftwareRaster.pixels = null;
} else {
@@ -510,4 +510,143 @@ public class MiniMap {
}
return true;
}
+
+ @OriginalMember(owner = "client!t", name = "a", descriptor = "(IIIZIII)V")
+ public static void method4000(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5) {
+ @Pc(3) int local3 = 0;
+ @Pc(5) MapMarker[] local5 = hintMapMarkers;
+ while (local5.length > local3) {
+ @Pc(17) MapMarker local17 = local5[local3];
+ if (local17 != null && local17.type == 2) {
+ ScriptRunner.method1026(arg0 >> 1, arg4, (local17.anInt4046 - Camera.originZ << 7) + local17.anInt4047, local17.anInt4050 * 2, arg2 >> 1, local17.anInt4045 + (local17.targetX - Camera.originX << 7), arg3);
+ if (ScriptRunner.anInt1951 > -1 && client.loop % 20 < 10) {
+ Sprites.headhints[local17.anInt4048].render(arg1 + ScriptRunner.anInt1951 - 12, arg5 + -28 - -ScriptRunner.anInt548);
+ }
+ }
+ local3++;
+ }
+ }
+
+ @OriginalMember(owner = "client!na", name = "a", descriptor = "(IIIIIIIZ)Z")
+ public static boolean method3109(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(6) int arg4) {
+ @Pc(14) long local14 = SceneGraph.getWallKey(arg4, arg0 + 0, arg2);
+ @Pc(28) int local28;
+ @Pc(35) int local35;
+ @Pc(42) int local42;
+ @Pc(46) LocType local46;
+ @Pc(65) int local65;
+ @Pc(75) int[] local75;
+ @Pc(90) int local90;
+ if (local14 != 0L) {
+ local28 = (int) local14 >> 20 & 0x3;
+ local35 = (int) local14 >> 14 & 0x1F;
+ local42 = Integer.MAX_VALUE & (int) (local14 >>> 32);
+ local46 = LocTypeList.get(local42);
+ if (local46.mapSceneId == -1) {
+ local65 = arg1;
+ if (local14 > 0L) {
+ local65 = arg3;
+ }
+ local75 = SoftwareRaster.pixels;
+ local90 = (52736 - arg2 * 512) * 4 + arg0 * 4 + 24624;
+ if (local35 == 0 || local35 == 2) {
+ if (local28 == 0) {
+ local75[local90] = local65;
+ local75[local90 + 512] = local65;
+ local75[local90 + 1024] = local65;
+ local75[local90 + 1536] = local65;
+ } else if (local28 == 1) {
+ local75[local90] = local65;
+ local75[local90 + 1] = local65;
+ local75[local90 + 2] = local65;
+ local75[local90 + 3] = local65;
+ } else if (local28 == 2) {
+ local75[local90 + 3] = local65;
+ local75[local90 + 3 + 512] = local65;
+ local75[local90 + 3 + 1024] = local65;
+ local75[local90 + 3 + 1536] = local65;
+ } else if (local28 == 3) {
+ local75[local90 + 1536] = local65;
+ local75[local90 + 1536 + 1] = local65;
+ local75[local90 + 1538] = local65;
+ local75[local90 + 3 + 1536] = local65;
+ }
+ }
+ if (local35 == 3) {
+ if (local28 == 0) {
+ local75[local90] = local65;
+ } else if (local28 == 1) {
+ local75[local90 + 3] = local65;
+ } else if (local28 == 2) {
+ local75[local90 + 3 + 1536] = local65;
+ } else if (local28 == 3) {
+ local75[local90 + 1536] = local65;
+ }
+ }
+ if (local35 == 2) {
+ if (local28 == 3) {
+ local75[local90] = local65;
+ local75[local90 + 512] = local65;
+ local75[local90 + 1024] = local65;
+ local75[local90 + 1536] = local65;
+ } else if (local28 == 0) {
+ local75[local90] = local65;
+ local75[local90 + 1] = local65;
+ local75[local90 + 2] = local65;
+ local75[local90 + 3] = local65;
+ } else if (local28 == 1) {
+ local75[local90 + 3] = local65;
+ local75[local90 + 512 + 3] = local65;
+ local75[local90 + 1024 + 3] = local65;
+ local75[local90 + 1536 + 3] = local65;
+ } else if (local28 == 2) {
+ local75[local90 + 1536] = local65;
+ local75[local90 + 1536 + 1] = local65;
+ local75[local90 + 1536 + 2] = local65;
+ local75[local90 + 1539] = local65;
+ }
+ }
+ } else if (!renderScenery(arg0, local46, arg2, local28)) {
+ return false;
+ }
+ }
+ local14 = SceneGraph.getSceneryKey(arg4, arg0 + 0, arg2);
+ if (local14 != 0L) {
+ local28 = (int) local14 >> 20 & 0x3;
+ local35 = (int) local14 >> 14 & 0x1F;
+ local42 = (int) (local14 >>> 32) & Integer.MAX_VALUE;
+ local46 = LocTypeList.get(local42);
+ if (local46.mapSceneId == -1) {
+ if (local35 == 9) {
+ local65 = 15658734;
+ if (local14 > 0L) {
+ local65 = 15597568;
+ }
+ local90 = arg0 * 4 + (103 - arg2) * 2048 + 24624;
+ local75 = SoftwareRaster.pixels;
+ if (local28 == 0 || local28 == 2) {
+ local75[local90 + 1536] = local65;
+ local75[local90 + 1025] = local65;
+ local75[local90 + 512 + 2] = local65;
+ local75[local90 + 3] = local65;
+ } else {
+ local75[local90] = local65;
+ local75[local90 + 512 + 1] = local65;
+ local75[local90 + 1024 + 2] = local65;
+ local75[local90 + 1536 + 3] = local65;
+ }
+ }
+ } else if (!renderScenery(arg0, local46, arg2, local28)) {
+ return false;
+ }
+ }
+ local14 = SceneGraph.getGroundDecorKey(arg4, arg0 + 0, arg2);
+ if (local14 != 0L) {
+ local28 = (int) local14 >> 20 & 0x3;
+ local35 = (int) (local14 >>> 32) & Integer.MAX_VALUE;
+ @Pc(586) LocType local586 = LocTypeList.get(local35);
+ return local586.mapSceneId == -1 || renderScenery(arg0, local586, arg2, local28);
+ }
+ return true;
+ }
}
diff --git a/client/src/main/java/rt4/MiniMenu.java b/client/src/main/java/rt4/MiniMenu.java
index b93f3b2..5d59f55 100644
--- a/client/src/main/java/rt4/MiniMenu.java
+++ b/client/src/main/java/rt4/MiniMenu.java
@@ -135,6 +135,8 @@ public class MiniMenu {
public static int clickedInventoryIndex = 0;
@OriginalMember(owner = "client!em", name = "D", descriptor = "I")
public static int gregorianDateSeed;
+ @OriginalMember(owner = "client!ml", name = "Q", descriptor = "I")
+ public static int anInt3953 = 0;
@OriginalMember(owner = "client!va", name = "a", descriptor = "(IZILclient!be;)V")
public static void addComponentEntries(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) Component component) {
@@ -157,7 +159,7 @@ public class MiniMenu {
if (component.anInt530 == 5) {
add(-1, 0L, JagString.EMPTY, 0, (short) 51, component.aClass100_89, component.id);
}
- if (component.anInt530 == 6 && Static44.aClass13_10 == null) {
+ if (component.anInt530 == 6 && Cs1ScriptRunner.aClass13_10 == null) {
add(-1, 0L, JagString.EMPTY, -1, (short) 41, component.aClass100_89, component.id);
}
@Pc(173) int local173;
@@ -291,7 +293,7 @@ public class MiniMenu {
@OriginalMember(owner = "client!hj", name = "a", descriptor = "(IJBLclient!na;ISLclient!na;I)V")
public static void add(@OriginalArg(0) int cursor, @OriginalArg(1) long arg1, @OriginalArg(3) JagString arg2, @OriginalArg(4) int arg3, @OriginalArg(5) short arg4, @OriginalArg(6) JagString arg5, @OriginalArg(7) int arg6) {
- if (Static40.aBoolean108 || size >= 500) {
+ if (Cs1ScriptRunner.aBoolean108 || size >= 500) {
return;
}
ops[size] = arg5;
@@ -527,7 +529,7 @@ public class MiniMenu {
if (LoginManager.staffModLevel > 0 && Keyboard.pressedKeys[Keyboard.KEY_CTRL] && Keyboard.pressedKeys[Keyboard.KEY_SHIFT]) {
Cheat.teleport(Camera.originX + local15, Camera.originZ + local19, Player.level);
} else if (PathFinder.findPath(PlayerList.self.movementQueueZ[0], 0, 0, true, 0, local15, 0, 0, 1, local19, PlayerList.self.movementQueueX[0])) {
- Protocol.outboundBuffer.p1(Static1.anInt5);
+ Protocol.outboundBuffer.p1(InterfaceList.anInt5);
Protocol.outboundBuffer.p1(anInt2878);
Protocol.outboundBuffer.p2((int) Camera.yawTarget);
Protocol.outboundBuffer.p1(57);
@@ -590,10 +592,10 @@ public class MiniMenu {
Protocol.outboundBuffer.ip2(local36);
}
}
- if (local23 == 41 && Static44.aClass13_10 == null) {
+ if (local23 == 41 && Cs1ScriptRunner.aClass13_10 == null) {
ClientProt.method10(local15, local19);
- Static44.aClass13_10 = InterfaceList.method1418(local19, local15);
- InterfaceList.redraw(Static44.aClass13_10);
+ Cs1ScriptRunner.aClass13_10 = InterfaceList.method1418(local19, local15);
+ InterfaceList.redraw(Cs1ScriptRunner.aClass13_10);
}
if (local23 == 49) {
PathFinder.findPathToLoc(local31, local19, local15);
@@ -772,10 +774,10 @@ public class MiniMenu {
Protocol.outboundBuffer.p1isaac(10);
Protocol.outboundBuffer.p4(local19);
local693 = InterfaceList.getComponent(local19);
- if (local693.anIntArrayArray4 != null && local693.anIntArrayArray4[0][0] == 5) {
- local1955 = local693.anIntArrayArray4[0][1];
- if (VarpDomain.activeVarps[local1955] != local693.anIntArray48[0]) {
- VarpDomain.activeVarps[local1955] = local693.anIntArray48[0];
+ if (local693.cs1Scripts != null && local693.cs1Scripts[0][0] == 5) {
+ local1955 = local693.cs1Scripts[0][1];
+ if (VarpDomain.activeVarps[local1955] != local693.cs1ComparisonOperands[0]) {
+ VarpDomain.activeVarps[local1955] = local693.cs1ComparisonOperands[0];
VarpDomain.refreshMagicVarp(local1955);
}
}
@@ -799,8 +801,8 @@ public class MiniMenu {
Protocol.outboundBuffer.p1isaac(10);
Protocol.outboundBuffer.p4(local19);
local693 = InterfaceList.getComponent(local19);
- if (local693.anIntArrayArray4 != null && local693.anIntArrayArray4[0][0] == 5) {
- local1955 = local693.anIntArrayArray4[0][1];
+ if (local693.cs1Scripts != null && local693.cs1Scripts[0][0] == 5) {
+ local1955 = local693.cs1Scripts[0][1];
VarpDomain.activeVarps[local1955] = 1 - VarpDomain.activeVarps[local1955];
VarpDomain.refreshMagicVarp(local1955);
}
@@ -1569,4 +1571,30 @@ public class MiniMenu {
local59.method2878(local24, arg2, arg1, arg0.width, arg0.height, arg0.color, arg0.shadowColor, arg0.anInt460, arg0.anInt478, client.aRandom1, gregorianDateSeed, anIntArray132);
InterfaceList.redrawScreen(anIntArray132[0], anIntArray132[2], anIntArray132[1], anIntArray132[3]);
}
+
+ @OriginalMember(owner = "client!ej", name = "h", descriptor = "(I)V")
+ public static void method1372() {
+ if (anInt3953 == 2) {
+ if (ScriptRunner.anInt3751 == Mouse.anInt5850 && ScriptRunner.anInt1892 == Mouse.anInt5895) {
+ anInt3953 = 0;
+ if (Cheat.shiftClick && Keyboard.pressedKeys[Keyboard.KEY_SHIFT] && size > 2) {
+ doAction(size - 2);
+ } else {
+ doAction(size - 1);
+ }
+ }
+ } else if (ScriptRunner.anInt3751 == Mouse.clickX && ScriptRunner.anInt1892 == Mouse.clickY) {
+ anInt3953 = 0;
+ if (Cheat.shiftClick && Keyboard.pressedKeys[Keyboard.KEY_SHIFT] && size > 2) {
+ doAction(size - 2);
+ } else {
+ doAction(size - 1);
+ }
+ } else {
+ Mouse.anInt5895 = Mouse.clickY;
+ anInt3953 = 2;
+ Mouse.anInt5850 = Mouse.clickX;
+ }
+ }
+
}
diff --git a/client/src/main/java/rt4/Mouse.java b/client/src/main/java/rt4/Mouse.java
index 733fbc9..923e69a 100644
--- a/client/src/main/java/rt4/Mouse.java
+++ b/client/src/main/java/rt4/Mouse.java
@@ -48,6 +48,8 @@ public final class Mouse implements MouseListener, MouseMotionListener, FocusLis
public static int anInt5850 = 0;
@OriginalMember(owner = "client!ok", name = "f", descriptor = "J")
public static long prevClickTime = 0L;
+ @OriginalMember(owner = "client!wl", name = "u", descriptor = "I")
+ public static int anInt5895 = 0;
public int mouseWheelX;
public int mouseWheelY;
diff --git a/client/src/main/java/rt4/Preferences.java b/client/src/main/java/rt4/Preferences.java
index b968137..c837012 100644
--- a/client/src/main/java/rt4/Preferences.java
+++ b/client/src/main/java/rt4/Preferences.java
@@ -157,7 +157,7 @@ public class Preferences {
@OriginalMember(owner = "client!ec", name = "a", descriptor = "(IZ)V")
public static void setAllVisibleLevels(@OriginalArg(1) boolean arg0) {
allLevelsVisible = arg0;
- Static87.aBoolean130 = !SceneGraph.allLevelsAreVisible();
+ SceneGraph.aBoolean130 = !SceneGraph.allLevelsAreVisible();
}
@OriginalMember(owner = "client!ga", name = "b", descriptor = "(I)V")
diff --git a/client/src/main/java/rt4/Protocol.java b/client/src/main/java/rt4/Protocol.java
index 9fc026f..7a3db40 100644
--- a/client/src/main/java/rt4/Protocol.java
+++ b/client/src/main/java/rt4/Protocol.java
@@ -62,6 +62,10 @@ public class Protocol {
public static final JagString ASSISTREQ = JagString.parse(":assistreq:");
@OriginalMember(owner = "client!rj", name = "ab", descriptor = "Lclient!na;")
public static final JagString aClass100_916 = JagString.parse(":clanreq:");
+ @OriginalMember(owner = "client!na", name = "cb", descriptor = "Lclient!na;")
+ public static final JagString aClass100_770 = JagString.parse(":allyreq:");
+ @OriginalMember(owner = "client!dh", name = "i", descriptor = "Lclient!na;")
+ public static final JagString IMG1 = JagString.parse("");
@OriginalMember(owner = "client!jk", name = "B", descriptor = "Lclient!ma;")
public static BufferedSocket socket;
@OriginalMember(owner = "client!fl", name = "C", descriptor = "Lsignlink!im;")
@@ -112,6 +116,10 @@ public class Protocol {
public static int anInt4941 = 1;
@OriginalMember(owner = "client!cj", name = "n", descriptor = "Lsignlink!im;")
public static PrivilegedRequest openUrlRequest;
+ @OriginalMember(owner = "client!na", name = "W", descriptor = "Z")
+ public static boolean newTab;
+ @OriginalMember(owner = "client!kd", name = "ob", descriptor = "I")
+ public static int anInt3251 = 0;
@OriginalMember(owner = "client!g", name = "b", descriptor = "(B)V")
public static void readZonePacket() {
@@ -574,7 +582,7 @@ public class Protocol {
player.chatLoops = 150;
player.chatColor = int1 >> 8;
if (int2 == 2) {
- Chat.add(local106, local35 ? 17 : 1, message, null, JagString.concatenate(new JagString[]{Static44.IMG1, player.getName()}));
+ Chat.add(local106, local35 ? 17 : 1, message, null, JagString.concatenate(new JagString[]{IMG1, player.getName()}));
} else if (int2 == 1) {
Chat.add(local106, local35 ? 17 : 1, message, null, JagString.concatenate(new JagString[]{IMG0, player.getName()}));
} else {
@@ -1050,7 +1058,7 @@ public class Protocol {
if (!ignored && Player.inTutorialIsland == 0) {
Chat.add(name, 16, JagString.EMPTY);
}
- } else if (message.endsWith(Static164.aClass100_770)) {
+ } else if (message.endsWith(aClass100_770)) {
JagString name = message.substring(message.indexOf(DateUtil.COLON), 0);
long name37 = name.encode37();
boolean ignored = false;
@@ -1136,7 +1144,7 @@ public class Protocol {
Chat.messageCounter = (Chat.messageCounter + 1) % 100;
@Pc(999) JagString message = QuickChatPhraseTypeList.get(quickchatId).decodeMessage(inboundBuffer);
if (rights == 2 || rights == 3) {
- Chat.add(quickchatId, 20, message, Base37.decode37(clan37).toTitleCase(), JagString.concatenate(new JagString[]{Static44.IMG1, Base37.decode37(name37).toTitleCase()}));
+ Chat.add(quickchatId, 20, message, Base37.decode37(clan37).toTitleCase(), JagString.concatenate(new JagString[]{IMG1, Base37.decode37(name37).toTitleCase()}));
} else if (rights == 1) {
Chat.add(quickchatId, 20, message, Base37.decode37(clan37).toTitleCase(), JagString.concatenate(new JagString[]{IMG0, Base37.decode37(name37).toTitleCase()}));
} else {
@@ -1466,9 +1474,9 @@ public class Protocol {
if (pointer != null) {
InterfaceList.closeInterface(true, pointer);
}
- if (Static44.aClass13_10 != null) {
- InterfaceList.redraw(Static44.aClass13_10);
- Static44.aClass13_10 = null;
+ if (Cs1ScriptRunner.aClass13_10 != null) {
+ InterfaceList.redraw(Cs1ScriptRunner.aClass13_10);
+ Cs1ScriptRunner.aClass13_10 = null;
}
opcode = -1;
return true;
@@ -1687,7 +1695,7 @@ public class Protocol {
Chat.messageCounter = (Chat.messageCounter + 1) % 100;
JagString message = QuickChatPhraseTypeList.get(chatId).decodeMessage(inboundBuffer);
if (rights == 2) {
- Chat.add(chatId, 18, message, null, JagString.concatenate(new JagString[]{Static44.IMG1, Base37.decode37(name).toTitleCase()}));
+ Chat.add(chatId, 18, message, null, JagString.concatenate(new JagString[]{IMG1, Base37.decode37(name).toTitleCase()}));
} else if (rights == 1) {
Chat.add(chatId, 18, message, null, JagString.concatenate(new JagString[]{IMG0, Base37.decode37(name).toTitleCase()}));
} else {
@@ -1815,7 +1823,7 @@ public class Protocol {
ScriptRunner.openUrl(url, true);
} else {
ScriptRunner.url = url;
- Static164.newTab = true;
+ newTab = true;
openUrlRequest = GameShell.signLink.openUrl(new String(url.method3148(), StandardCharsets.ISO_8859_1));
}
opcode = -1;
@@ -1846,7 +1854,7 @@ public class Protocol {
if (ptr != null) {
InterfaceList.closeInterface(ptr.anInt5878 != component, ptr);
}
- Static44.method1148(component, pointer, type);
+ method1148(component, pointer, type);
opcode = -1;
return true;
} else if (opcode == ServerProt.RESET_ANIMS) {
@@ -1982,7 +1990,7 @@ public class Protocol {
Chat.messageCounter = (Chat.messageCounter + 1) % 100;
@Pc(4518) JagString message = Font.escape(formatChatMessage(inboundBuffer).encodeMessage());
if (rights == 2 || rights == 3) {
- Chat.add(JagString.concatenate(new JagString[]{Static44.IMG1, Base37.decode37(name37).toTitleCase()}), 7, message);
+ Chat.add(JagString.concatenate(new JagString[]{IMG1, Base37.decode37(name37).toTitleCase()}), 7, message);
} else if (rights == 1) {
Chat.add(JagString.concatenate(new JagString[]{IMG0, Base37.decode37(name37).toTitleCase()}), 7, message);
} else {
@@ -2029,7 +2037,7 @@ public class Protocol {
Chat.messageCounter = (Chat.messageCounter + 1) % 100;
JagString message = Font.escape(formatChatMessage(inboundBuffer).encodeMessage());
if (rights == 2 || rights == 3) {
- Chat.method1598(message, JagString.concatenate(new JagString[]{Static44.IMG1, Base37.decode37(name37).toTitleCase()}), Base37.decode37(chat37).toTitleCase());
+ Chat.method1598(message, JagString.concatenate(new JagString[]{IMG1, Base37.decode37(name37).toTitleCase()}), Base37.decode37(chat37).toTitleCase());
} else if (rights == 1) {
Chat.method1598(message, JagString.concatenate(new JagString[]{IMG0, Base37.decode37(name37).toTitleCase()}), Base37.decode37(chat37).toTitleCase());
} else {
@@ -2560,7 +2568,7 @@ public class Protocol {
WorldMap.method447();
}
// VarpDomain
- for (i = Static38.poll(true); i != -1; i = Static38.poll(false)) {
+ for (i = VarpDomain.poll(true); i != -1; i = VarpDomain.poll(false)) {
VarpDomain.refreshMagicVarp(i);
VarpDomain.updatedVarps[VarpDomain.updatedVarpsWriterIndex++ & 0x1F] = i;
}
@@ -2745,9 +2753,9 @@ public class Protocol {
outboundBuffer.p1sub(inserting);
}
} else if ((VarpDomain.anInt2952 == 1 || MiniMenu.method4640(MiniMenu.size - 1)) && MiniMenu.size > 2) {
- Static226.method3901();
+ ScriptRunner.method3901();
} else if (MiniMenu.size > 0) {
- Static59.method1372();
+ MiniMenu.method1372();
}
Mouse.clickButton = 0;
MiniMenu.anInt2043 = 10;
@@ -2756,7 +2764,7 @@ public class Protocol {
}
InterfaceList.aBoolean174 = false;
InterfaceList.aClass13_12 = null;
- Static44.aBoolean83 = false;
+ InterfaceList.aBoolean83 = false;
InterfaceList.keyQueueSize = 0;
component = InterfaceList.aClass13_22;
InterfaceList.aClass13_22 = null;
@@ -2788,9 +2796,9 @@ public class Protocol {
priorityRequest = (HookRequest) InterfaceList.lowPriorityRequests.removeHead();
if (priorityRequest == null) {
if (WorldMap.component == null) {
- Static36.anInt3337 = 0;
+ InterfaceList.anInt3337 = 0;
}
- if (Static40.aClass13_14 != null) {
+ if (Cs1ScriptRunner.aClass13_14 != null) {
ClientProt.method28();
}
if (LoginManager.staffModLevel > 0 && Keyboard.pressedKeys[Keyboard.KEY_CTRL] && Keyboard.pressedKeys[Keyboard.KEY_SHIFT] && MouseWheel.wheelRotation != 0) {
@@ -2843,7 +2851,7 @@ public class Protocol {
}
}
MiniMenu.anInt1742 = -1;
- Static7.method843();
+ method843();
if (InterfaceList.aClass13_22 != component) {
if (component != null) {
InterfaceList.redraw(component);
@@ -2852,7 +2860,7 @@ public class Protocol {
InterfaceList.redraw(InterfaceList.aClass13_22);
}
}
- if (local1508 != aClass13_11 && Static87.anInt4504 == anInt5235) {
+ if (local1508 != aClass13_11 && Cs1ScriptRunner.anInt4504 == anInt5235) {
if (local1508 != null) {
InterfaceList.redraw(local1508);
}
@@ -2864,9 +2872,9 @@ public class Protocol {
if (anInt5235 > 0) {
anInt5235--;
}
- } else if (anInt5235 < Static87.anInt4504) {
+ } else if (anInt5235 < Cs1ScriptRunner.anInt4504) {
anInt5235++;
- if (Static87.anInt4504 == anInt5235) {
+ if (Cs1ScriptRunner.anInt4504 == anInt5235) {
InterfaceList.redraw(aClass13_11);
}
}
@@ -2889,13 +2897,13 @@ public class Protocol {
}
if (openUrlRequest != null && openUrlRequest.status == 1) {
if (openUrlRequest.result != null) {
- ScriptRunner.openUrl(ScriptRunner.url, Static164.newTab);
+ ScriptRunner.openUrl(ScriptRunner.url, newTab);
}
ScriptRunner.url = null;
openUrlRequest = null;
- Static164.newTab = false;
+ newTab = false;
}
- Static131.anInt3251++;
+ anInt3251++;
MiniMap.anInt2252++;
anInt3486++;
if (anInt3486 > 500) {
@@ -2951,7 +2959,7 @@ public class Protocol {
if (MiniMap.anInt1814 > 60) {
MiniMap.anInt5755 = -2;
}
- if (Static131.anInt3251 > 50) {
+ if (anInt3251 > 50) {
outboundBuffer.p1isaac(93);
}
if (verifyIdChanged) {
@@ -2961,7 +2969,7 @@ public class Protocol {
try {
if (socket != null && outboundBuffer.offset > 0) {
socket.write(outboundBuffer.data, outboundBuffer.offset);
- Static131.anInt3251 = 0;
+ anInt3251 = 0;
outboundBuffer.offset = 0;
}
} catch (@Pc(2266) IOException local2266) {
@@ -3410,51 +3418,13 @@ public class Protocol {
if (arg0.length() == 0) {
local48 = JagString.concatenate(new JagString[]{local48, aClass100_1018});
} else {
- local48 = JagString.concatenate(new JagString[]{local48, aClass100_1082, DateUtil.getDateString(MonotonicClock.currentTimeMillis() + 94608000000L), aClass100_431, method2929(94608000L)});
+ local48 = JagString.concatenate(new JagString[]{local48, aClass100_1082, DateUtil.getDateString(MonotonicClock.currentTimeMillis() + 94608000000L), aClass100_431, JagString.method2929(94608000L)});
}
JagString.concatenate(new JagString[]{aClass100_821, local48, aClass100_946}).method3134(GameShell.signLink.applet);
} catch (@Pc(124) Throwable local124) {
}
}
- @OriginalMember(owner = "client!md", name = "a", descriptor = "(JB)Lclient!na;")
- public static JagString method2929(@OriginalArg(0) long arg0) {
- return method1376(arg0);
- }
-
- @OriginalMember(owner = "client!ej", name = "a", descriptor = "(IZIJ)Lclient!na;")
- public static JagString method1376(@OriginalArg(3) long arg0) {
- @Pc(35) long local35 = arg0 / (long) 10;
- @Pc(37) int local37 = 1;
- while (local35 != 0L) {
- local37++;
- local35 /= 10;
- }
- @Pc(51) int local51 = local37;
- if (arg0 < 0L) {
- local51 = local37 + 1;
- }
- @Pc(61) byte[] local61 = new byte[local51];
- if (arg0 < 0L) {
- local61[0] = 45;
- }
- for (@Pc(79) int local79 = 0; local79 < local37; local79++) {
- @Pc(92) int local92 = (int) (arg0 % (long) 10);
- arg0 /= 10;
- if (local92 < 0) {
- local92 = -local92;
- }
- if (local92 > 9) {
- local92 += 39;
- }
- local61[local51 - local79 - 1] = (byte) (local92 + 48);
- }
- @Pc(126) JagString local126 = new JagString();
- local126.chars = local61;
- local126.length = local51;
- return local126;
- }
-
@OriginalMember(owner = "client!rm", name = "a", descriptor = "(IBI)V")
public static void spawnGroundObject(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) {
@Pc(9) LinkedList local9 = SceneGraph.objStacks[Player.level][arg1][arg0];
@@ -3497,4 +3467,129 @@ public class Protocol {
@Pc(152) long local152 = (arg0 << 7) + arg1 + 1610612736;
SceneGraph.setObjStack(Player.level, arg1, arg0, SceneGraph.getTileHeight(Player.level, arg1 * 128 + 64, arg0 * 128 + 64), local30.value, local152, local89, local91);
}
+
+ @OriginalMember(owner = "client!dh", name = "a", descriptor = "(IIII)Lclient!wk;")
+ public static ComponentPointer method1148(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2) {
+ @Pc(9) ComponentPointer local9 = new ComponentPointer();
+ local9.anInt5879 = arg2;
+ local9.anInt5878 = arg0;
+ InterfaceList.openInterfaces.put(local9, arg1);
+ InterfaceList.method1753(arg0);
+ @Pc(28) Component local28 = InterfaceList.getComponent(arg1);
+ if (local28 != null) {
+ InterfaceList.redraw(local28);
+ }
+ if (Cs1ScriptRunner.aClass13_10 != null) {
+ InterfaceList.redraw(Cs1ScriptRunner.aClass13_10);
+ Cs1ScriptRunner.aClass13_10 = null;
+ }
+ @Pc(45) int local45 = MiniMenu.size;
+ @Pc(53) int local53;
+ for (local53 = 0; local53 < local45; local53++) {
+ if (InterfaceList.method5(MiniMenu.actions[local53])) {
+ MiniMenu.remove(local53);
+ }
+ }
+ if (MiniMenu.size == 1) {
+ Cs1ScriptRunner.aBoolean108 = false;
+ InterfaceList.redrawScreen(InterfaceList.anInt4271, InterfaceList.anInt761, InterfaceList.anInt5138, InterfaceList.anInt436);
+ } else {
+ InterfaceList.redrawScreen(InterfaceList.anInt4271, InterfaceList.anInt761, InterfaceList.anInt5138, InterfaceList.anInt436);
+ local53 = Fonts.b12Full.getStringWidth(LocalizedText.CHOOSE_OPTION);
+ for (@Pc(95) int local95 = 0; local95 < MiniMenu.size; local95++) {
+ @Pc(104) int local104 = Fonts.b12Full.getStringWidth(MiniMenu.getOp(local95));
+ if (local104 > local53) {
+ local53 = local104;
+ }
+ }
+ InterfaceList.anInt761 = local53 + 8;
+ InterfaceList.anInt436 = MiniMenu.size * 15 + (InterfaceList.aBoolean298 ? 26 : 22);
+ }
+ if (local28 != null) {
+ InterfaceList.method531(local28, false);
+ }
+ InterfaceList.method1626(arg0);
+ if (InterfaceList.topLevelInterface != -1) {
+ InterfaceList.runScripts(1, InterfaceList.topLevelInterface);
+ }
+ return local9;
+ }
+
+ @OriginalMember(owner = "client!ah", name = "b", descriptor = "(I)V")
+ public static void method843() {
+ if (InterfaceList.clickedInventoryComponent != null || Cs1ScriptRunner.aClass13_14 != null) {
+ return;
+ }
+ @Pc(20) int local20 = Mouse.clickButton;
+ @Pc(93) int local93;
+ @Pc(99) int local99;
+ if (!Cs1ScriptRunner.aBoolean108) {
+ if (local20 == 1 && MiniMenu.size > 0) {
+ @Pc(37) short local37 = MiniMenu.actions[MiniMenu.size - 1];
+ if (local37 == 25 || local37 == 23 || local37 == 48 || local37 == 7 || local37 == 13 || local37 == 47 || local37 == 5 || local37 == 43 || local37 == 35 || local37 == 58 || local37 == 22 || local37 == 1006) {
+ local93 = MiniMenu.intArgs1[MiniMenu.size - 1];
+ local99 = MiniMenu.intArgs2[MiniMenu.size - 1];
+ @Pc(103) Component local103 = InterfaceList.getComponent(local99);
+ @Pc(106) ServerActiveProperties local106 = InterfaceList.getServerActiveProperties(local103);
+ if (local106.isObjSwapEnabled() || local106.isObjReplaceEnabled()) {
+ InterfaceList.clickedInventoryComponentCycle = 0;
+ InterfaceList.draggingClickedInventoryObject = false;
+ if (InterfaceList.clickedInventoryComponent != null) {
+ InterfaceList.redraw(InterfaceList.clickedInventoryComponent);
+ }
+ InterfaceList.clickedInventoryComponent = InterfaceList.getComponent(local99);
+ InterfaceList.clickedInventoryComponentX = Mouse.clickX;
+ InterfaceList.clickedInventoryComponentY = Mouse.clickY;
+ InterfaceList.mouseOverInventoryObjectIndex = local93;
+ InterfaceList.redraw(InterfaceList.clickedInventoryComponent);
+ return;
+ }
+ }
+ }
+ if (local20 == 1 && (VarpDomain.anInt2952 == 1 && MiniMenu.size > 2 || MiniMenu.method4640(MiniMenu.size - 1))) {
+ local20 = 2;
+ }
+ if (local20 == 2 && MiniMenu.size > 0 || MiniMenu.anInt3953 == 1) {
+ ScriptRunner.method3901();
+ }
+ if (local20 == 1 && MiniMenu.size > 0 || MiniMenu.anInt3953 == 2) {
+ MiniMenu.method1372();
+ }
+ return;
+ }
+ @Pc(204) int local204;
+ if (local20 != 1) {
+ local93 = Mouse.lastMouseY;
+ local204 = Mouse.lastMouseX;
+ if (local204 < InterfaceList.anInt4271 - 10 || local204 > InterfaceList.anInt761 + InterfaceList.anInt4271 + 10 || InterfaceList.anInt5138 - 10 > local93 || local93 > InterfaceList.anInt436 + InterfaceList.anInt5138 + 10) {
+ Cs1ScriptRunner.aBoolean108 = false;
+ InterfaceList.redrawScreen(InterfaceList.anInt4271, InterfaceList.anInt761, InterfaceList.anInt5138, InterfaceList.anInt436);
+ }
+ }
+ if (local20 != 1) {
+ return;
+ }
+ local204 = InterfaceList.anInt4271;
+ local93 = InterfaceList.anInt5138;
+ local99 = InterfaceList.anInt761;
+ @Pc(265) int local265 = Mouse.clickX;
+ @Pc(267) int local267 = Mouse.clickY;
+ @Pc(269) int local269 = -1;
+ for (@Pc(271) int local271 = 0; local271 < MiniMenu.size; local271++) {
+ @Pc(289) int local289;
+ if (InterfaceList.aBoolean298) {
+ local289 = (MiniMenu.size - local271 - 1) * 15 + local93 + 35;
+ } else {
+ local289 = (MiniMenu.size - local271 - 1) * 15 + local93 + 31;
+ }
+ if (local265 > local204 && local204 + local99 > local265 && local289 - 13 < local267 && local289 + 3 > local267) {
+ local269 = local271;
+ }
+ }
+ if (local269 != -1) {
+ MiniMenu.doAction(local269);
+ }
+ Cs1ScriptRunner.aBoolean108 = false;
+ InterfaceList.redrawScreen(InterfaceList.anInt4271, InterfaceList.anInt761, InterfaceList.anInt5138, InterfaceList.anInt436);
+ }
}
diff --git a/client/src/main/java/rt4/QuickChatPhraseType.java b/client/src/main/java/rt4/QuickChatPhraseType.java
index 4df873c..d8749b5 100644
--- a/client/src/main/java/rt4/QuickChatPhraseType.java
+++ b/client/src/main/java/rt4/QuickChatPhraseType.java
@@ -128,7 +128,7 @@ public final class QuickChatPhraseType extends SecondaryNode {
@OriginalMember(owner = "client!cb", name = "f", descriptor = "(I)Lclient!na;")
public final JagString getText() {
- @Pc(15) JagString local15 = Static87.allocate(80);
+ @Pc(15) JagString local15 = JagString.allocate(80);
if (this.aClass100Array35 == null) {
return aClass100_891;
}
@@ -142,11 +142,11 @@ public final class QuickChatPhraseType extends SecondaryNode {
@OriginalMember(owner = "client!cb", name = "a", descriptor = "(ILclient!wa;)Lclient!na;")
public final JagString decodeMessage(@OriginalArg(1) Buffer arg0) {
- @Pc(17) JagString local17 = Static87.allocate(80);
+ @Pc(17) JagString local17 = JagString.allocate(80);
if (this.anIntArray71 != null) {
for (@Pc(22) int local22 = 0; local22 < this.anIntArray71.length; local22++) {
local17.method3113(this.aClass100Array35[local22]);
- local17.method3113(Static89.method1838(this.anIntArrayArray5[local22], arg0.gVarLong(anIntArray51[this.anIntArray71[local22]]), this.anIntArray71[local22]));
+ local17.method3113(QuickChatPhraseTypeList.method1838(this.anIntArrayArray5[local22], arg0.gVarLong(anIntArray51[this.anIntArray71[local22]]), this.anIntArray71[local22]));
}
}
local17.method3113(this.aClass100Array35[this.aClass100Array35.length - 1]);
diff --git a/client/src/main/java/rt4/QuickChatPhraseTypeList.java b/client/src/main/java/rt4/QuickChatPhraseTypeList.java
index 19c25a2..51b35af 100644
--- a/client/src/main/java/rt4/QuickChatPhraseTypeList.java
+++ b/client/src/main/java/rt4/QuickChatPhraseTypeList.java
@@ -53,4 +53,15 @@ public class QuickChatPhraseTypeList {
types.put(local10, arg0);
return local10;
}
+
+ @OriginalMember(owner = "client!ha", name = "a", descriptor = "([IJIZ)Lclient!na;")
+ public static JagString method1838(@OriginalArg(0) int[] arg0, @OriginalArg(1) long arg1, @OriginalArg(2) int arg2) {
+ if (decoder != null) {
+ @Pc(17) JagString local17 = decoder.decode(arg2, arg0, arg1);
+ if (local17 != null) {
+ return local17;
+ }
+ }
+ return JagString.method2929(arg1);
+ }
}
diff --git a/client/src/main/java/rt4/SceneGraph.java b/client/src/main/java/rt4/SceneGraph.java
index 7746a0d..d0f5f99 100644
--- a/client/src/main/java/rt4/SceneGraph.java
+++ b/client/src/main/java/rt4/SceneGraph.java
@@ -40,6 +40,28 @@ public class SceneGraph {
public static final int[] anIntArray215 = new int[]{160, 192, 80, 96, 0, 144, 80, 48, 160};
@OriginalMember(owner = "client!km", name = "Rc", descriptor = "[I")
public static final int[] anIntArray324 = new int[]{19, 55, 38, 155, 255, 110, 137, 205, 76};
+ @OriginalMember(owner = "client!fh", name = "U", descriptor = "[[Z")
+ public static final boolean[][] aBooleanArrayArray2 = new boolean[][]{new boolean[0], {true, false, true}, {true, false, false, true}, {false, false, true, true}, {true, true, false}, {false, true, true}, {true, false, false, true}, {false, false, false, true, true}, {false, true, true}, {true, false, true, true, true}, {false, true, true, true, true}, {false, true, true, true, true, false}};
+ @OriginalMember(owner = "client!fg", name = "d", descriptor = "[I")
+ public static final int[] anIntArray159 = new int[6];
+ @OriginalMember(owner = "client!fg", name = "l", descriptor = "[I")
+ public static final int[] anIntArray164 = new int[6];
+ @OriginalMember(owner = "client!fg", name = "m", descriptor = "[I")
+ public static final int[] anIntArray165 = new int[6];
+ @OriginalMember(owner = "client!fg", name = "r", descriptor = "[I")
+ public static final int[] anIntArray169 = new int[6];
+ @OriginalMember(owner = "client!fg", name = "t", descriptor = "[I")
+ public static final int[] anIntArray170 = new int[6];
+ @OriginalMember(owner = "client!ah", name = "p", descriptor = "Lclient!ih;")
+ public static final LinkedList aClass69_32 = new LinkedList();
+ @OriginalMember(owner = "client!sh", name = "i", descriptor = "[[I")
+ public static final int[][] anIntArrayArray35 = new int[][]{{0, 128, 0, 0, 128, 0, 128, 128}, {0, 128, 0, 0, 128, 0}, {0, 0, 64, 128, 0, 128}, {128, 128, 64, 128, 128, 0}, {0, 0, 128, 0, 128, 128, 64, 128}, {0, 128, 0, 0, 128, 0, 64, 128}, {64, 128, 0, 128, 0, 0, 64, 0}, {0, 0, 64, 0, 0, 64}, {128, 0, 128, 128, 0, 128, 0, 64, 64, 0}, {0, 128, 0, 0, 32, 64, 64, 96, 128, 128}, {0, 0, 128, 0, 128, 128, 64, 96, 32, 64}, {0, 0, 128, 0, 96, 32, 32, 32}};
+ @OriginalMember(owner = "client!gf", name = "S", descriptor = "[I")
+ public static final int[] anIntArray419 = new int[]{0, 2, 2, 2, 1, 1, 2, 2, 1, 3, 1, 1};
+ @OriginalMember(owner = "client!kc", name = "s", descriptor = "[I")
+ 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!wi", name = "hb", descriptor = "[[Z")
+ public static final boolean[][] aBooleanArrayArray4 = new boolean[][]{{true, true, true}, {false, false}, {false, true}, {true, false}, {false, true, true}, {true, false, true}, {false, true, false}, {true, false, false}};
@OriginalMember(owner = "client!kc", name = "o", descriptor = "[[[Lclient!bj;")
public static Tile[][][] tiles;
@@ -137,6 +159,32 @@ public class SceneGraph {
public static int anInt3038;
@OriginalMember(owner = "client!ma", name = "z", descriptor = "I")
public static int anInt3604 = -1;
+ @OriginalMember(owner = "client!ig", name = "i", descriptor = "I")
+ public static int anInt2886;
+ @OriginalMember(owner = "client!k", name = "l", descriptor = "[I")
+ public static int[] anIntArray292;
+ @OriginalMember(owner = "client!ta", name = "o", descriptor = "[I")
+ public static int[] anIntArray454;
+ @OriginalMember(owner = "client!qk", name = "c", descriptor = "[I")
+ public static int[] anIntArray427;
+ @OriginalMember(owner = "client!hh", name = "p", descriptor = "[I")
+ public static int[] anIntArray234;
+ @OriginalMember(owner = "client!ml", name = "K", descriptor = "I")
+ public static int anInt3947;
+ @OriginalMember(owner = "client!nd", name = "s", descriptor = "I")
+ public static int anInt4069;
+ @OriginalMember(owner = "client!lj", name = "B", descriptor = "I")
+ public static int anInt3555;
+ @OriginalMember(owner = "client!tb", name = "Q", descriptor = "I")
+ public static int anInt5276 = 0;
+ @OriginalMember(owner = "client!bc", name = "Z", descriptor = "I")
+ public static int anInt437;
+ @OriginalMember(owner = "client!rc", name = "p", descriptor = "I")
+ public static int anInt1142 = 0;
+ @OriginalMember(owner = "client!gn", name = "d", descriptor = "Z")
+ public static boolean aBoolean130 = false;
+ @OriginalMember(owner = "client!gg", name = "Z", descriptor = "I")
+ public static int anInt2222;
@OriginalMember(owner = "client!km", name = "f", descriptor = "(I)Z")
public static boolean allLevelsAreVisible() {
@@ -1036,7 +1084,7 @@ public class SceneGraph {
break;
}
local2025 = method3501(tileFlags, tileShapes[local152], tileUnderlays[local152], local146, local1896, null, tileOverlays[local152], tileAngles[local152], local1888, local152, local1900, local142, tileHeights[local152], null);
- @Pc(2049) GlTile[] local2049 = Static1.method2(local1896, local1888, tileHeights[local152], local152, local1900, tileAngles[local152], local146, tileShapes[local152], tileUnderlays[local152], tileOverlays[local152], tileFlags);
+ @Pc(2049) GlTile[] local2049 = method2(local1896, local1888, tileHeights[local152], local152, local1900, tileAngles[local152], local146, tileShapes[local152], tileUnderlays[local152], tileOverlays[local152], tileFlags);
@Pc(2057) GlTile[] local2057 = new GlTile[local2025.length + local2049.length];
for (local349 = 0; local349 < local2025.length; local349++) {
local2057[local349] = local2025[local349];
@@ -1524,7 +1572,7 @@ public class SceneGraph {
if (arg1 != arg2 || arg3 != arg4) {
for (local16 = arg1; local16 <= arg2; local16++) {
for (local20 = arg3; local20 <= arg4; local20++) {
- if (anIntArrayArrayArray12[arg0][local16][local20] == -Static156.anInt437) {
+ if (anIntArrayArrayArray12[arg0][local16][local20] == -anInt437) {
return false;
}
}
@@ -1543,7 +1591,7 @@ public class SceneGraph {
if (!method4394(local16, local156, local182)) {
return false;
} else return method4394(local169, local156, local182);
- } else if (Static9.method187(arg0, arg1, arg3)) {
+ } else if (method187(arg0, arg1, arg3)) {
local16 = arg1 << 7;
local20 = arg3 << 7;
return method4394(local16 + 1, tileHeights[arg0][arg1][arg3] + arg5, local20 + 1) && method4394(local16 + 128 - 1, tileHeights[arg0][arg1 + 1][arg3] + arg5, local20 + 1) && method4394(local16 + 128 - 1, tileHeights[arg0][arg1 + 1][arg3 + 1] + arg5, local20 + 128 - 1) && method4394(local16 + 1, tileHeights[arg0][arg1][arg3 + 1] + arg5, local20 + 128 - 1);
@@ -1590,7 +1638,7 @@ public class SceneGraph {
@OriginalMember(owner = "client!ub", name = "a", descriptor = "(Lclient!bj;Z)V")
public static void method4245(@OriginalArg(0) Tile arg0, @OriginalArg(1) boolean arg1) {
- Static7.aClass69_32.addTail(arg0);
+ aClass69_32.addTail(arg0);
while (true) {
@Pc(8) Tile local8;
@Pc(18) int local18;
@@ -1622,7 +1670,7 @@ public class SceneGraph {
@Pc(1179) Tile var32;
while (true) {
do {
- local8 = (Tile) Static7.aClass69_32.removeHead();
+ local8 = (Tile) aClass69_32.removeHead();
if (local8 == null) {
return;
}
@@ -1645,7 +1693,7 @@ public class SceneGraph {
local65 = var9 >>> 24 << 3;
if (local65 != anInt730) {
anInt730 = local65;
- Static147.method2761(local65);
+ MaterialManager.method2761(local65);
}
local115 = surfaceTileHeights[0][local18][local21] + surfaceTileHeights[0][local18 + 1][local21] + surfaceTileHeights[0][local18][local21 + 1] + surfaceTileHeights[0][local18 + 1][local21 + 1] >> 2;
MaterialManager.setMaterial(-local115, 3);
@@ -1666,13 +1714,13 @@ public class SceneGraph {
continue;
}
}
- if (local18 <= Static123.anInt4069 && local18 > LightingManager.anInt987) {
+ if (local18 <= anInt4069 && local18 > LightingManager.anInt987) {
local153 = local31[local18 - 1][local21];
if (local153 != null && local153.aBoolean46 && (local153.aBoolean45 || (local8.allInteriorFlags & 0x1) == 0)) {
continue;
}
}
- if (local18 >= Static123.anInt4069 && local18 < LightingManager.anInt15 - 1) {
+ if (local18 >= anInt4069 && local18 < LightingManager.anInt15 - 1) {
local153 = local31[local18 + 1][local21];
if (local153 != null && local153.aBoolean46 && (local153.aBoolean45 || (local8.allInteriorFlags & 0x4) == 0)) {
continue;
@@ -1701,28 +1749,28 @@ public class SceneGraph {
}
if (local153.plainTile == null) {
if (local153.shapedTile != null) {
- Static147.method2762(local153.shapedTile, Static160.anInt2886, anInt3038, anInt5205, Static81.anInt2222, local18, local21, Static9.method187(0, local18, local21));
+ method2762(local153.shapedTile, anInt2886, anInt3038, anInt5205, anInt2222, local18, local21, method187(0, local18, local21));
}
} else
- method2610(local153.plainTile, 0, Static160.anInt2886, anInt3038, anInt5205, Static81.anInt2222, local18, local21, Static9.method187(0, local18, local21));
+ method2610(local153.plainTile, 0, anInt2886, anInt3038, anInt5205, anInt2222, local18, local21, method187(0, local18, local21));
var22 = local153.wall;
if (var22 != null) {
if (GlRenderer.enabled) {
if ((var22.anInt3049 & local8.anInt670) == 0) {
- LightingManager.method2393(Static123.anInt3555, Static123.anInt3947, anInt4903, local24, local18, local21);
+ LightingManager.method2393(anInt3555, anInt3947, anInt4903, local24, local18, local21);
} else {
- LightingManager.method2388(var22.anInt3049, Static123.anInt3555, Static123.anInt3947, anInt4903, local27, local18, local21);
+ LightingManager.method2388(var22.anInt3049, anInt3555, anInt3947, anInt4903, local27, local18, local21);
}
}
- var22.primary.render(0, Static160.anInt2886, anInt3038, anInt5205, Static81.anInt2222, var22.xFine - Static123.anInt3555, var22.anInt3051 - Static123.anInt3947, var22.zFine - anInt4903, var22.key, local24, null);
+ var22.primary.render(0, anInt2886, anInt3038, anInt5205, anInt2222, var22.xFine - anInt3555, var22.anInt3051 - anInt3947, var22.zFine - anInt4903, var22.key, local24, null);
}
for (local65 = 0; local65 < local153.sceneryLen; local65++) {
var25 = local153.scenery[local65];
if (var25 != null) {
if (GlRenderer.enabled) {
- LightingManager.method2393(Static123.anInt3555, Static123.anInt3947, anInt4903, local24, local18, local21);
+ LightingManager.method2393(anInt3555, anInt3947, anInt4903, local24, local18, local21);
}
- var25.entity.render(var25.anInt1714, Static160.anInt2886, anInt3038, anInt5205, Static81.anInt2222, var25.anInt1699 - Static123.anInt3555, var25.anInt1706 - Static123.anInt3947, var25.anInt1703 - anInt4903, var25.key, local24, null);
+ var25.entity.render(var25.anInt1714, anInt2886, anInt3038, anInt5205, anInt2222, var25.anInt1699 - anInt3555, var25.anInt1706 - anInt3947, var25.anInt1703 - anInt4903, var25.key, local24, null);
}
}
if (GlRenderer.enabled) {
@@ -1732,19 +1780,19 @@ public class SceneGraph {
var24 = false;
if (local8.plainTile == null) {
if (local8.shapedTile != null) {
- if (Static9.method187(local27, local18, local21)) {
- Static147.method2762(local8.shapedTile, Static160.anInt2886, anInt3038, anInt5205, Static81.anInt2222, local18, local21, true);
+ if (method187(local27, local18, local21)) {
+ method2762(local8.shapedTile, anInt2886, anInt3038, anInt5205, anInt2222, local18, local21, true);
} else {
var24 = true;
- Static147.method2762(local8.shapedTile, Static160.anInt2886, anInt3038, anInt5205, Static81.anInt2222, local18, local21, false);
+ method2762(local8.shapedTile, anInt2886, anInt3038, anInt5205, anInt2222, local18, local21, false);
}
}
- } else if (Static9.method187(local27, local18, local21)) {
- method2610(local8.plainTile, local27, Static160.anInt2886, anInt3038, anInt5205, Static81.anInt2222, local18, local21, true);
+ } else if (method187(local27, local18, local21)) {
+ method2610(local8.plainTile, local27, anInt2886, anInt3038, anInt5205, anInt2222, local18, local21, true);
} else {
var24 = true;
if (local8.plainTile.anInt4865 != 12345678 || MiniMenu.aBoolean187 && local24 <= MiniMenu.anInt3902) {
- method2610(local8.plainTile, local27, Static160.anInt2886, anInt3038, anInt5205, Static81.anInt2222, local18, local21, false);
+ method2610(local8.plainTile, local27, anInt2886, anInt3038, anInt5205, anInt2222, local18, local21, false);
}
}
if (var24) {
@@ -1754,9 +1802,9 @@ public class SceneGraph {
GlRenderer.method4159(local33 + 50.0F - 1.5F);
}
if (GlRenderer.enabled) {
- LightingManager.method2393(Static123.anInt3555, Static123.anInt3947, anInt4903, local24, local18, local21);
+ LightingManager.method2393(anInt3555, anInt3947, anInt4903, local24, local18, local21);
}
- local549.entity.render(0, Static160.anInt2886, anInt3038, anInt5205, Static81.anInt2222, local549.xFine - Static123.anInt3555, local549.anInt733 - Static123.anInt3947, local549.zFine - anInt4903, local549.key, local24, null);
+ local549.entity.render(0, anInt2886, anInt3038, anInt5205, anInt2222, local549.xFine - anInt3555, local549.anInt733 - anInt3947, local549.zFine - anInt4903, local549.key, local24, null);
if (GlRenderer.enabled && local549.aBoolean49) {
GlRenderer.method4159(local33);
}
@@ -1767,9 +1815,9 @@ public class SceneGraph {
@Pc(616) Wall local616 = local8.wall;
@Pc(619) WallDecor local619 = local8.wallDecor;
if (local616 != null || local619 != null) {
- if (Static123.anInt4069 == local18) {
+ if (anInt4069 == local18) {
var10++;
- } else if (Static123.anInt4069 < local18) {
+ } else if (anInt4069 < local18) {
var10 += 2;
}
if (anInt4539 == local21) {
@@ -1802,15 +1850,15 @@ public class SceneGraph {
}
if ((local616.anInt3049 & local65) != 0 && !method3850(local27, local18, local21, local616.anInt3049)) {
if (GlRenderer.enabled) {
- LightingManager.method2393(Static123.anInt3555, Static123.anInt3947, anInt4903, local24, local18, local21);
+ LightingManager.method2393(anInt3555, anInt3947, anInt4903, local24, local18, local21);
}
- local616.primary.render(0, Static160.anInt2886, anInt3038, anInt5205, Static81.anInt2222, local616.xFine - Static123.anInt3555, local616.anInt3051 - Static123.anInt3947, local616.zFine - anInt4903, local616.key, local24, null);
+ local616.primary.render(0, anInt2886, anInt3038, anInt5205, anInt2222, local616.xFine - anInt3555, local616.anInt3051 - anInt3947, local616.zFine - anInt4903, local616.key, local24, null);
}
if ((local616.anInt3052 & local65) != 0 && !method3850(local27, local18, local21, local616.anInt3052)) {
if (GlRenderer.enabled) {
- LightingManager.method2393(Static123.anInt3555, Static123.anInt3947, anInt4903, local24, local18, local21);
+ LightingManager.method2393(anInt3555, anInt3947, anInt4903, local24, local18, local21);
}
- local616.secondary.render(0, Static160.anInt2886, anInt3038, anInt5205, Static81.anInt2222, local616.xFine - Static123.anInt3555, local616.anInt3051 - Static123.anInt3947, local616.zFine - anInt4903, local616.key, local24, null);
+ local616.secondary.render(0, anInt2886, anInt3038, anInt5205, anInt2222, local616.xFine - anInt3555, local616.anInt3051 - anInt3947, local616.zFine - anInt4903, local616.key, local24, null);
}
}
if (local619 != null && !method4611(local27, local18, local21, local619.primary.getMinY())) {
@@ -1819,12 +1867,12 @@ public class SceneGraph {
}
if ((local619.anInt1395 & local65) != 0) {
if (GlRenderer.enabled) {
- LightingManager.method2393(Static123.anInt3555, Static123.anInt3947, anInt4903, local24, local18, local21);
+ LightingManager.method2393(anInt3555, anInt3947, anInt4903, local24, local18, local21);
}
- local619.primary.render(0, Static160.anInt2886, anInt3038, anInt5205, Static81.anInt2222, local619.xFine + local619.xOffset - Static123.anInt3555, local619.anInt1391 - Static123.anInt3947, local619.zFine + local619.zOffset - anInt4903, local619.key, local24, null);
+ local619.primary.render(0, anInt2886, anInt3038, anInt5205, anInt2222, local619.xFine + local619.xOffset - anInt3555, local619.anInt1391 - anInt3947, local619.zFine + local619.zOffset - anInt4903, local619.key, local24, null);
} else if (local619.anInt1395 == 256) {
- local894 = local619.xFine - Static123.anInt3555;
- local899 = local619.anInt1391 - Static123.anInt3947;
+ local894 = local619.xFine - anInt3555;
+ local899 = local619.anInt1391 - anInt3947;
local904 = local619.zFine - anInt4903;
var17 = local619.anInt1388;
if (var17 == 1 || var17 == 2) {
@@ -1840,14 +1888,14 @@ public class SceneGraph {
}
if (local928 < var18) {
if (GlRenderer.enabled) {
- LightingManager.method2393(Static123.anInt3555, Static123.anInt3947, anInt4903, local24, local18, local21);
+ LightingManager.method2393(anInt3555, anInt3947, anInt4903, local24, local18, local21);
}
- local619.primary.render(0, Static160.anInt2886, anInt3038, anInt5205, Static81.anInt2222, local894 + local619.xOffset, local899, local904 + local619.zOffset, local619.key, local24, null);
+ local619.primary.render(0, anInt2886, anInt3038, anInt5205, anInt2222, local894 + local619.xOffset, local899, local904 + local619.zOffset, local619.key, local24, null);
} else if (local619.secondary != null) {
if (GlRenderer.enabled) {
- LightingManager.method2393(Static123.anInt3555, Static123.anInt3947, anInt4903, local24, local18, local21);
+ LightingManager.method2393(anInt3555, anInt3947, anInt4903, local24, local18, local21);
}
- local619.secondary.render(0, Static160.anInt2886, anInt3038, anInt5205, Static81.anInt2222, local894, local899, local904, local619.key, local24, null);
+ local619.secondary.render(0, anInt2886, anInt3038, anInt5205, anInt2222, local894, local899, local904, local619.key, local24, null);
}
}
if (GlRenderer.enabled) {
@@ -1861,9 +1909,9 @@ public class SceneGraph {
GlRenderer.method4159(local33 + 50.0F - 1.5F);
}
if (GlRenderer.enabled) {
- LightingManager.method2393(Static123.anInt3555, Static123.anInt3947, anInt4903, local24, local18, local21);
+ LightingManager.method2393(anInt3555, anInt3947, anInt4903, local24, local18, local21);
}
- local1001.entity.render(0, Static160.anInt2886, anInt3038, anInt5205, Static81.anInt2222, local1001.xFine - Static123.anInt3555, local1001.anInt733 - Static123.anInt3947, local1001.zFine - anInt4903, local1001.key, local24, null);
+ local1001.entity.render(0, anInt2886, anInt3038, anInt5205, anInt2222, local1001.xFine - anInt3555, local1001.anInt733 - anInt3947, local1001.zFine - anInt4903, local1001.key, local24, null);
if (GlRenderer.enabled && local1001.aBoolean49) {
GlRenderer.method4159(local33);
}
@@ -1871,43 +1919,43 @@ public class SceneGraph {
@Pc(1064) ObjStackEntity local1064 = local8.objStack;
if (local1064 != null && local1064.anInt3063 == 0) {
if (GlRenderer.enabled) {
- LightingManager.method2393(Static123.anInt3555, Static123.anInt3947, anInt4903, local24, local18, local21);
+ LightingManager.method2393(anInt3555, anInt3947, anInt4903, local24, local18, local21);
}
if (local1064.secondary != null) {
- local1064.secondary.render(0, Static160.anInt2886, anInt3038, anInt5205, Static81.anInt2222, local1064.xFine - Static123.anInt3555, local1064.anInt3057 - Static123.anInt3947, local1064.zFine - anInt4903, local1064.key, local24, null);
+ local1064.secondary.render(0, anInt2886, anInt3038, anInt5205, anInt2222, local1064.xFine - anInt3555, local1064.anInt3057 - anInt3947, local1064.zFine - anInt4903, local1064.key, local24, null);
}
if (local1064.tertiary != null) {
- local1064.tertiary.render(0, Static160.anInt2886, anInt3038, anInt5205, Static81.anInt2222, local1064.xFine - Static123.anInt3555, local1064.anInt3057 - Static123.anInt3947, local1064.zFine - anInt4903, local1064.key, local24, null);
+ local1064.tertiary.render(0, anInt2886, anInt3038, anInt5205, anInt2222, local1064.xFine - anInt3555, local1064.anInt3057 - anInt3947, local1064.zFine - anInt4903, local1064.key, local24, null);
}
if (local1064.primary != null) {
- local1064.primary.render(0, Static160.anInt2886, anInt3038, anInt5205, Static81.anInt2222, local1064.xFine - Static123.anInt3555, local1064.anInt3057 - Static123.anInt3947, local1064.zFine - anInt4903, local1064.key, local24, null);
+ local1064.primary.render(0, anInt2886, anInt3038, anInt5205, anInt2222, local1064.xFine - anInt3555, local1064.anInt3057 - anInt3947, local1064.zFine - anInt4903, local1064.key, local24, null);
}
}
}
local894 = local8.allInteriorFlags;
if (local894 != 0) {
- if (local18 < Static123.anInt4069 && (local894 & 0x4) != 0) {
+ if (local18 < anInt4069 && (local894 & 0x4) != 0) {
var32 = local31[local18 + 1][local21];
if (var32 != null && var32.aBoolean46) {
- Static7.aClass69_32.addTail(var32);
+ aClass69_32.addTail(var32);
}
}
if (local21 < anInt4539 && (local894 & 0x2) != 0) {
var32 = local31[local18][local21 + 1];
if (var32 != null && var32.aBoolean46) {
- Static7.aClass69_32.addTail(var32);
+ aClass69_32.addTail(var32);
}
}
- if (local18 > Static123.anInt4069 && (local894 & 0x1) != 0) {
+ if (local18 > anInt4069 && (local894 & 0x1) != 0) {
var32 = local31[local18 - 1][local21];
if (var32 != null && var32.aBoolean46) {
- Static7.aClass69_32.addTail(var32);
+ aClass69_32.addTail(var32);
}
}
if (local21 > anInt4539 && (local894 & 0x8) != 0) {
var32 = local31[local18][local21 - 1];
if (var32 != null && var32.aBoolean46) {
- Static7.aClass69_32.addTail(var32);
+ aClass69_32.addTail(var32);
}
}
}
@@ -1916,7 +1964,7 @@ public class SceneGraph {
if (local8.anInt663 != 0) {
var24 = true;
for (var10 = 0; var10 < local8.sceneryLen; var10++) {
- if (local8.scenery[var10].anInt1707 != Static156.anInt437 && (local8.interiorFlags[var10] & local8.anInt663) == local8.anInt665) {
+ if (local8.scenery[var10].anInt1707 != anInt437 && (local8.interiorFlags[var10] & local8.anInt663) == local8.anInt665) {
var24 = false;
break;
}
@@ -1928,43 +1976,43 @@ public class SceneGraph {
label882:
{
if ((var22.key & 0xFC000L) == 16384L) {
- local65 = var22.xFine - Static123.anInt3555;
+ local65 = var22.xFine - anInt3555;
local115 = var22.zFine - anInt4903;
local1332 = (int) (var22.key >> 20 & 0x3L);
if (local1332 == 0) {
local65 -= 64;
local115 += 64;
if (local115 < local65 && local18 > 0 && local21 < length - 1) {
- LightingManager.method2393(Static123.anInt3555, Static123.anInt3947, anInt4903, local24, local18 - 1, local21 + 1);
+ LightingManager.method2393(anInt3555, anInt3947, anInt4903, local24, local18 - 1, local21 + 1);
break label882;
}
} else if (local1332 == 1) {
local65 += 64;
local115 += 64;
if (local115 < -local65 && local18 < width - 1 && local21 < length - 1) {
- LightingManager.method2393(Static123.anInt3555, Static123.anInt3947, anInt4903, local24, local18 + 1, local21 + 1);
+ LightingManager.method2393(anInt3555, anInt3947, anInt4903, local24, local18 + 1, local21 + 1);
break label882;
}
} else if (local1332 == 2) {
local65 += 64;
local115 -= 64;
if (local115 > local65 && local18 < width - 1 && local21 > 0) {
- LightingManager.method2393(Static123.anInt3555, Static123.anInt3947, anInt4903, local24, local18 + 1, local21 - 1);
+ LightingManager.method2393(anInt3555, anInt3947, anInt4903, local24, local18 + 1, local21 - 1);
break label882;
}
} else if (local1332 == 3) {
local65 -= 64;
local115 -= 64;
if (local115 > -local65 && local18 > 0 && local21 > 0) {
- LightingManager.method2393(Static123.anInt3555, Static123.anInt3947, anInt4903, local24, local18 - 1, local21 - 1);
+ LightingManager.method2393(anInt3555, anInt3947, anInt4903, local24, local18 - 1, local21 - 1);
break label882;
}
}
}
- LightingManager.method2393(Static123.anInt3555, Static123.anInt3947, anInt4903, local24, local18, local21);
+ LightingManager.method2393(anInt3555, anInt3947, anInt4903, local24, local18, local21);
}
}
- var22.primary.render(0, Static160.anInt2886, anInt3038, anInt5205, Static81.anInt2222, var22.xFine - Static123.anInt3555, var22.anInt3051 - Static123.anInt3947, var22.zFine - anInt4903, var22.key, local24, null);
+ var22.primary.render(0, anInt2886, anInt3038, anInt5205, anInt2222, var22.xFine - anInt3555, var22.anInt3051 - anInt3947, var22.zFine - anInt4903, var22.key, local24, null);
}
local8.anInt663 = 0;
}
@@ -1979,7 +2027,7 @@ public class SceneGraph {
label767:
for (local65 = 0; local65 < var9; local65++) {
var25 = local8.scenery[local65];
- if (var25.anInt1707 != Static156.anInt437) {
+ if (var25.anInt1707 != anInt437) {
for (local1332 = var25.xMin; local1332 <= var25.xMax; local1332++) {
for (local894 = var25.zMin; local894 <= var25.zMax; local894++) {
var32 = local31[local1332][local894];
@@ -2009,8 +2057,8 @@ public class SceneGraph {
}
}
aClass31Array2[var10++] = var25;
- local1332 = Static123.anInt4069 - var25.xMin;
- local894 = var25.xMax - Static123.anInt4069;
+ local1332 = anInt4069 - var25.xMin;
+ local894 = var25.xMax - anInt4069;
if (local894 > local1332) {
local1332 = local894;
}
@@ -2028,14 +2076,14 @@ public class SceneGraph {
local115 = -1;
for (local1332 = 0; local1332 < var10; local1332++) {
@Pc(1628) Scenery local1628 = aClass31Array2[local1332];
- if (local1628.anInt1707 != Static156.anInt437) {
+ if (local1628.anInt1707 != anInt437) {
if (local1628.anInt1705 > local65) {
local65 = local1628.anInt1705;
local115 = local1332;
} else if (local1628.anInt1705 == local65) {
- local899 = local1628.anInt1699 - Static123.anInt3555;
+ local899 = local1628.anInt1699 - anInt3555;
local904 = local1628.anInt1703 - anInt4903;
- var17 = aClass31Array2[local115].anInt1699 - Static123.anInt3555;
+ var17 = aClass31Array2[local115].anInt1699 - anInt3555;
var18 = aClass31Array2[local115].anInt1703 - anInt4903;
if (local899 * local899 + local904 * local904 > var17 * var17 + var18 * var18) {
local115 = local1332;
@@ -2047,12 +2095,12 @@ public class SceneGraph {
break;
}
@Pc(1697) Scenery local1697 = aClass31Array2[local115];
- local1697.anInt1707 = Static156.anInt437;
+ local1697.anInt1707 = anInt437;
if (!method1599(local27, local1697.xMin, local1697.xMax, local1697.zMin, local1697.zMax, local1697.entity.getMinY())) {
if (GlRenderer.enabled) {
if ((local1697.key & 0xFC000L) == 147456L) {
- LightingManager.method2393(Static123.anInt3555, Static123.anInt3947, anInt4903, local24, local18, local21);
- local894 = local1697.anInt1699 - Static123.anInt3555;
+ LightingManager.method2393(anInt3555, anInt3947, anInt4903, local24, local18, local21);
+ local894 = local1697.anInt1699 - anInt3555;
local899 = local1697.anInt1703 - anInt4903;
local904 = (int) (local1697.key >> 20 & 0x3L);
if (local904 == 1 || local904 == 3) {
@@ -2067,18 +2115,18 @@ public class SceneGraph {
LightingManager.method2397(local24, local18, local21 + 1, local18 - 1, local21);
}
} else {
- LightingManager.method2391(Static123.anInt3555, Static123.anInt3947, anInt4903, local24, local1697.xMin, local1697.zMin, local1697.xMax, local1697.zMax);
+ LightingManager.method2391(anInt3555, anInt3947, anInt4903, local24, local1697.xMin, local1697.zMin, local1697.xMax, local1697.zMax);
}
}
- local1697.entity.render(local1697.anInt1714, Static160.anInt2886, anInt3038, anInt5205, Static81.anInt2222, local1697.anInt1699 - Static123.anInt3555, local1697.anInt1706 - Static123.anInt3947, local1697.anInt1703 - anInt4903, local1697.key, local24, null);
+ local1697.entity.render(local1697.anInt1714, anInt2886, anInt3038, anInt5205, anInt2222, local1697.anInt1699 - anInt3555, local1697.anInt1706 - anInt3947, local1697.anInt1703 - anInt4903, local1697.key, local24, null);
}
for (local894 = local1697.xMin; local894 <= local1697.xMax; local894++) {
for (local899 = local1697.zMin; local899 <= local1697.zMax; local899++) {
@Pc(1863) Tile local1863 = local31[local894][local899];
if (local1863.anInt663 != 0) {
- Static7.aClass69_32.addTail(local1863);
+ aClass69_32.addTail(local1863);
} else if ((local894 != local18 || local899 != local21) && local1863.aBoolean46) {
- Static7.aClass69_32.addTail(local1863);
+ aClass69_32.addTail(local1863);
}
}
}
@@ -2093,12 +2141,12 @@ public class SceneGraph {
}
} while (!local8.aBoolean46);
} while (local8.anInt663 != 0);
- if (local18 > Static123.anInt4069 || local18 <= LightingManager.anInt987) {
+ if (local18 > anInt4069 || local18 <= LightingManager.anInt987) {
break;
}
local153 = local31[local18 - 1][local21];
} while (local153 != null && local153.aBoolean46);
- if (local18 < Static123.anInt4069 || local18 >= LightingManager.anInt15 - 1) {
+ if (local18 < anInt4069 || local18 >= LightingManager.anInt15 - 1) {
break;
}
local153 = local31[local18 + 1][local21];
@@ -2114,20 +2162,20 @@ public class SceneGraph {
local153 = local31[local18][local21 + 1];
} while (local153 != null && local153.aBoolean46);
local8.aBoolean46 = false;
- Static156.anInt1142--;
+ anInt1142--;
@Pc(1999) ObjStackEntity local1999 = local8.objStack;
if (local1999 != null && local1999.anInt3063 != 0) {
if (GlRenderer.enabled) {
- LightingManager.method2393(Static123.anInt3555, Static123.anInt3947, anInt4903, local24, local18, local21);
+ LightingManager.method2393(anInt3555, anInt3947, anInt4903, local24, local18, local21);
}
if (local1999.secondary != null) {
- local1999.secondary.render(0, Static160.anInt2886, anInt3038, anInt5205, Static81.anInt2222, local1999.xFine - Static123.anInt3555, local1999.anInt3057 - Static123.anInt3947 - local1999.anInt3063, local1999.zFine - anInt4903, local1999.key, local24, null);
+ local1999.secondary.render(0, anInt2886, anInt3038, anInt5205, anInt2222, local1999.xFine - anInt3555, local1999.anInt3057 - anInt3947 - local1999.anInt3063, local1999.zFine - anInt4903, local1999.key, local24, null);
}
if (local1999.tertiary != null) {
- local1999.tertiary.render(0, Static160.anInt2886, anInt3038, anInt5205, Static81.anInt2222, local1999.xFine - Static123.anInt3555, local1999.anInt3057 - Static123.anInt3947 - local1999.anInt3063, local1999.zFine - anInt4903, local1999.key, local24, null);
+ local1999.tertiary.render(0, anInt2886, anInt3038, anInt5205, anInt2222, local1999.xFine - anInt3555, local1999.anInt3057 - anInt3947 - local1999.anInt3063, local1999.zFine - anInt4903, local1999.key, local24, null);
}
if (local1999.primary != null) {
- local1999.primary.render(0, Static160.anInt2886, anInt3038, anInt5205, Static81.anInt2222, local1999.xFine - Static123.anInt3555, local1999.anInt3057 - Static123.anInt3947 - local1999.anInt3063, local1999.zFine - anInt4903, local1999.key, local24, null);
+ local1999.primary.render(0, anInt2886, anInt3038, anInt5205, anInt2222, local1999.xFine - anInt3555, local1999.anInt3057 - anInt3947 - local1999.anInt3063, local1999.zFine - anInt4903, local1999.key, local24, null);
}
}
if (local8.anInt670 != 0) {
@@ -2135,12 +2183,12 @@ public class SceneGraph {
if (local2109 != null && !method4611(local27, local18, local21, local2109.primary.getMinY())) {
if ((local2109.anInt1395 & local8.anInt670) != 0) {
if (GlRenderer.enabled) {
- LightingManager.method2393(Static123.anInt3555, Static123.anInt3947, anInt4903, local24, local18, local21);
+ LightingManager.method2393(anInt3555, anInt3947, anInt4903, local24, local18, local21);
}
- local2109.primary.render(0, Static160.anInt2886, anInt3038, anInt5205, Static81.anInt2222, local2109.xFine + local2109.xOffset - Static123.anInt3555, local2109.anInt1391 - Static123.anInt3947, local2109.zFine + local2109.zOffset - anInt4903, local2109.key, local24, null);
+ local2109.primary.render(0, anInt2886, anInt3038, anInt5205, anInt2222, local2109.xFine + local2109.xOffset - anInt3555, local2109.anInt1391 - anInt3947, local2109.zFine + local2109.zOffset - anInt4903, local2109.key, local24, null);
} else if (local2109.anInt1395 == 256) {
- local65 = local2109.xFine - Static123.anInt3555;
- local115 = local2109.anInt1391 - Static123.anInt3947;
+ local65 = local2109.xFine - anInt3555;
+ local115 = local2109.anInt1391 - anInt3947;
local1332 = local2109.zFine - anInt4903;
local894 = local2109.anInt1388;
if (local894 == 1 || local894 == 2) {
@@ -2155,14 +2203,14 @@ public class SceneGraph {
}
if (local904 >= local899) {
if (GlRenderer.enabled) {
- LightingManager.method2393(Static123.anInt3555, Static123.anInt3947, anInt4903, local24, local18, local21);
+ LightingManager.method2393(anInt3555, anInt3947, anInt4903, local24, local18, local21);
}
- local2109.primary.render(0, Static160.anInt2886, anInt3038, anInt5205, Static81.anInt2222, local65 + local2109.xOffset, local115, local1332 + local2109.zOffset, local2109.key, local24, null);
+ local2109.primary.render(0, anInt2886, anInt3038, anInt5205, anInt2222, local65 + local2109.xOffset, local115, local1332 + local2109.zOffset, local2109.key, local24, null);
} else if (local2109.secondary != null) {
if (GlRenderer.enabled) {
- LightingManager.method2393(Static123.anInt3555, Static123.anInt3947, anInt4903, local24, local18, local21);
+ LightingManager.method2393(anInt3555, anInt3947, anInt4903, local24, local18, local21);
}
- local2109.secondary.render(0, Static160.anInt2886, anInt3038, anInt5205, Static81.anInt2222, local65, local115, local1332, local2109.key, local24, null);
+ local2109.secondary.render(0, anInt2886, anInt3038, anInt5205, anInt2222, local65, local115, local1332, local2109.key, local24, null);
}
}
}
@@ -2170,15 +2218,15 @@ public class SceneGraph {
if (local2275 != null) {
if ((local2275.anInt3052 & local8.anInt670) != 0 && !method3850(local27, local18, local21, local2275.anInt3052)) {
if (GlRenderer.enabled) {
- LightingManager.method2388(local2275.anInt3052, Static123.anInt3555, Static123.anInt3947, anInt4903, local27, local18, local21);
+ LightingManager.method2388(local2275.anInt3052, anInt3555, anInt3947, anInt4903, local27, local18, local21);
}
- local2275.secondary.render(0, Static160.anInt2886, anInt3038, anInt5205, Static81.anInt2222, local2275.xFine - Static123.anInt3555, local2275.anInt3051 - Static123.anInt3947, local2275.zFine - anInt4903, local2275.key, local24, null);
+ local2275.secondary.render(0, anInt2886, anInt3038, anInt5205, anInt2222, local2275.xFine - anInt3555, local2275.anInt3051 - anInt3947, local2275.zFine - anInt4903, local2275.key, local24, null);
}
if ((local2275.anInt3049 & local8.anInt670) != 0 && !method3850(local27, local18, local21, local2275.anInt3049)) {
if (GlRenderer.enabled) {
- LightingManager.method2388(local2275.anInt3049, Static123.anInt3555, Static123.anInt3947, anInt4903, local27, local18, local21);
+ LightingManager.method2388(local2275.anInt3049, anInt3555, anInt3947, anInt4903, local27, local18, local21);
}
- local2275.primary.render(0, Static160.anInt2886, anInt3038, anInt5205, Static81.anInt2222, local2275.xFine - Static123.anInt3555, local2275.anInt3051 - Static123.anInt3947, local2275.zFine - anInt4903, local2275.key, local24, null);
+ local2275.primary.render(0, anInt2886, anInt3038, anInt5205, anInt2222, local2275.xFine - anInt3555, local2275.anInt3051 - anInt3947, local2275.zFine - anInt4903, local2275.key, local24, null);
}
}
}
@@ -2186,31 +2234,31 @@ public class SceneGraph {
if (local24 < levels - 1) {
local2388 = tiles[local24 + 1][local18][local21];
if (local2388 != null && local2388.aBoolean46) {
- Static7.aClass69_32.addTail(local2388);
+ aClass69_32.addTail(local2388);
}
}
- if (local18 < Static123.anInt4069) {
+ if (local18 < anInt4069) {
local2388 = local31[local18 + 1][local21];
if (local2388 != null && local2388.aBoolean46) {
- Static7.aClass69_32.addTail(local2388);
+ aClass69_32.addTail(local2388);
}
}
if (local21 < anInt4539) {
local2388 = local31[local18][local21 + 1];
if (local2388 != null && local2388.aBoolean46) {
- Static7.aClass69_32.addTail(local2388);
+ aClass69_32.addTail(local2388);
}
}
- if (local18 > Static123.anInt4069) {
+ if (local18 > anInt4069) {
local2388 = local31[local18 - 1][local21];
if (local2388 != null && local2388.aBoolean46) {
- Static7.aClass69_32.addTail(local2388);
+ aClass69_32.addTail(local2388);
}
}
if (local21 > anInt4539) {
local2388 = local31[local18][local21 - 1];
if (local2388 != null && local2388.aBoolean46) {
- Static7.aClass69_32.addTail(local2388);
+ aClass69_32.addTail(local2388);
}
}
}
@@ -2218,7 +2266,7 @@ public class SceneGraph {
@OriginalMember(owner = "client!wh", name = "a", descriptor = "(IIII)Z")
public static boolean method4611(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) {
- if (Static9.method187(arg0, arg1, arg2)) {
+ if (method187(arg0, arg1, arg2)) {
@Pc(10) int local10 = arg1 << 7;
@Pc(14) int local14 = arg2 << 7;
return method4394(local10 + 1, tileHeights[arg0][arg1][arg2] + arg3, local14 + 1) && method4394(local10 + 128 - 1, tileHeights[arg0][arg1 + 1][arg2] + arg3, local14 + 1) && method4394(local10 + 128 - 1, tileHeights[arg0][arg1 + 1][arg2 + 1] + arg3, local14 + 128 - 1) && method4394(local10 + 1, tileHeights[arg0][arg1][arg2 + 1] + arg3, local14 + 128 - 1);
@@ -2229,7 +2277,7 @@ public class SceneGraph {
@OriginalMember(owner = "client!vd", name = "b", descriptor = "(IIII)Z")
public static boolean method3850(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) {
- if (!Static9.method187(arg0, arg1, arg2)) {
+ if (!method187(arg0, arg1, arg2)) {
return false;
}
@Pc(10) int local10 = arg1 << 7;
@@ -2240,7 +2288,7 @@ public class SceneGraph {
@Pc(36) int local36 = local24 - 238;
if (arg3 < 16) {
if (arg3 == 1) {
- if (local10 > Static123.anInt3555) {
+ if (local10 > anInt3555) {
if (!method4394(local10, local24, local14)) {
return false;
}
@@ -2284,7 +2332,7 @@ public class SceneGraph {
return method4394(local10 + 128, local32, local14 + 128);
}
if (arg3 == 4) {
- if (local10 < Static123.anInt3555) {
+ if (local10 < anInt3555) {
if (!method4394(local10 + 128, local24, local14)) {
return false;
}
@@ -2830,16 +2878,16 @@ public class SceneGraph {
} else if (arg2 >= length * 128) {
arg2 = length * 128 - 1;
}
- Static160.anInt2886 = MathUtils.sin[arg3];
+ anInt2886 = MathUtils.sin[arg3];
anInt3038 = MathUtils.cos[arg3];
anInt5205 = MathUtils.sin[arg4];
- Static81.anInt2222 = MathUtils.cos[arg4];
- Static123.anInt3555 = arg0;
- Static123.anInt3947 = arg1;
+ anInt2222 = MathUtils.cos[arg4];
+ anInt3555 = arg0;
+ anInt3947 = arg1;
anInt4903 = arg2;
- Static123.anInt4069 = arg0 / 128;
+ anInt4069 = arg0 / 128;
anInt4539 = arg2 / 128;
- LightingManager.anInt987 = Static123.anInt4069 - visibility;
+ LightingManager.anInt987 = anInt4069 - visibility;
if (LightingManager.anInt987 < 0) {
LightingManager.anInt987 = 0;
}
@@ -2847,7 +2895,7 @@ public class SceneGraph {
if (LightingManager.anInt4698 < 0) {
LightingManager.anInt4698 = 0;
}
- LightingManager.anInt15 = Static123.anInt4069 + visibility;
+ LightingManager.anInt15 = anInt4069 + visibility;
if (LightingManager.anInt15 > width) {
LightingManager.anInt15 = width;
}
@@ -2865,19 +2913,19 @@ public class SceneGraph {
@Pc(113) int local113;
for (local104 = 0; local104 < visibility + visibility + 2; local104++) {
for (local113 = 0; local113 < visibility + visibility + 2; local113++) {
- @Pc(130) int local130 = (local104 - visibility << 7) - (Static123.anInt3555 & 0x7F);
+ @Pc(130) int local130 = (local104 - visibility << 7) - (anInt3555 & 0x7F);
@Pc(140) int local140 = (local113 - visibility << 7) - (anInt4903 & 0x7F);
- @Pc(146) int local146 = Static123.anInt4069 + local104 - visibility;
+ @Pc(146) int local146 = anInt4069 + local104 - visibility;
@Pc(152) int local152 = anInt4539 + local113 - visibility;
if (local146 >= 0 && local152 >= 0 && local146 < width && local152 < length) {
@Pc(176) int local176;
if (underwaterTileHeights == null) {
- local176 = surfaceTileHeights[0][local146][local152] + 128 - Static123.anInt3947;
+ local176 = surfaceTileHeights[0][local146][local152] + 128 - anInt3947;
} else {
- local176 = underwaterTileHeights[0][local146][local152] + 128 - Static123.anInt3947;
+ local176 = underwaterTileHeights[0][local146][local152] + 128 - anInt3947;
}
- @Pc(201) int local201 = surfaceTileHeights[3][local146][local152] - Static123.anInt3947 - 1000;
- aBooleanArrayArray3[local104][local113] = Static160.method3049(local130, local201, local176, local140, local99);
+ @Pc(201) int local201 = surfaceTileHeights[3][local146][local152] - anInt3947 - 1000;
+ aBooleanArrayArray3[local104][local113] = method3049(local130, local201, local176, local140, local99);
} else {
aBooleanArrayArray3[local104][local113] = false;
}
@@ -2889,11 +2937,11 @@ public class SceneGraph {
}
}
anIntArray8 = arg6;
- Static123.anIntArray292 = arg7;
- Static96.anIntArray234 = arg8;
- Static123.anIntArray454 = arg9;
- Static123.anIntArray427 = arg10;
- Static123.method2419();
+ anIntArray292 = arg7;
+ anIntArray234 = arg8;
+ anIntArray454 = arg9;
+ anIntArray427 = arg10;
+ method2419();
if (underWaterGroundTiles != null) {
setUnderwater(true);
method3292(arg0, arg1, arg2, null, 0, (byte) 0, arg13, arg14);
@@ -2910,8 +2958,8 @@ public class SceneGraph {
@OriginalMember(owner = "client!uc", name = "a", descriptor = "(III[[[BIBII)V")
public static void method3292(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) byte[][][] arg3, @OriginalArg(4) int arg4, @OriginalArg(5) byte arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7) {
- Static156.anInt437++;
- Static156.anInt1142 = 0;
+ anInt437++;
+ anInt1142 = 0;
@Pc(9) int local9 = arg6 - 16;
@Pc(13) int local13 = arg6 + 16;
@Pc(17) int local17 = arg7 - 16;
@@ -2919,17 +2967,17 @@ public class SceneGraph {
@Pc(32) int local32;
@Pc(37) int local37;
@Pc(183) int local183;
- for (@Pc(23) int local23 = Static156.anInt5276; local23 < levels; local23++) {
+ for (@Pc(23) int local23 = anInt5276; local23 < levels; local23++) {
@Pc(30) Tile[][] local30 = tiles[local23];
for (local32 = LightingManager.anInt987; local32 < LightingManager.anInt15; local32++) {
for (local37 = LightingManager.anInt4698; local37 < LightingManager.anInt4866; local37++) {
@Pc(46) Tile local46 = local30[local32][local37];
if (local46 != null) {
- if (aBooleanArrayArray1[local32 + visibility - Static123.anInt4069][local37 + visibility - anInt4539] && (arg3 == null || local23 < arg4 || arg3[local23][local32][local37] != arg5)) {
+ if (aBooleanArrayArray1[local32 + visibility - anInt4069][local37 + visibility - anInt4539] && (arg3 == null || local23 < arg4 || arg3[local23][local32][local37] != arg5)) {
local46.aBoolean45 = true;
local46.aBoolean46 = true;
local46.aBoolean47 = local46.sceneryLen > 0;
- Static156.anInt1142++;
+ anInt1142++;
} else {
local46.aBoolean45 = false;
local46.aBoolean46 = false;
@@ -2989,10 +3037,10 @@ public class SceneGraph {
}
UnderwaterMaterialRenderer.method4608();
} else {
- local32 = Static156.anInt5276;
+ local32 = anInt5276;
while (true) {
if (local32 >= levels) {
- LightingManager.method2402(Static123.anInt4069, anInt4539, tiles);
+ LightingManager.method2402(anInt4069, anInt4539, tiles);
break;
}
for (local37 = 0; local37 < underwaterHdTiles[local32].length; local37++) {
@@ -3005,7 +3053,7 @@ public class SceneGraph {
}
if (local32 == 0 && Preferences.sceneryShadowsType > 0) {
GlRenderer.method4159(101.5F);
- ShadowManager.method4198(Static123.anInt4069, anInt4539, visibility, arg1, aBooleanArrayArray1, tileHeights[0]);
+ ShadowManager.method4198(anInt4069, anInt4539, visibility, arg1, aBooleanArrayArray1, tileHeights[0]);
}
local32++;
}
@@ -3019,11 +3067,11 @@ public class SceneGraph {
@Pc(406) Tile[][] local406;
@Pc(415) int local415;
@Pc(428) int local428;
- for (local399 = Static156.anInt5276; local399 < levels; local399++) {
+ for (local399 = anInt5276; local399 < levels; local399++) {
local406 = tiles[local399];
for (local37 = -visibility; local37 <= 0; local37++) {
- local415 = Static123.anInt4069 + local37;
- local183 = Static123.anInt4069 - local37;
+ local415 = anInt4069 + local37;
+ local183 = anInt4069 - local37;
if (local415 >= LightingManager.anInt987 || local183 < LightingManager.anInt15) {
for (local428 = -visibility; local428 <= 0; local428++) {
local434 = anInt4539 + local428;
@@ -3056,7 +3104,7 @@ public class SceneGraph {
}
}
}
- if (Static156.anInt1142 == 0) {
+ if (anInt1142 == 0) {
if (!local240) {
MiniMenu.aBoolean187 = false;
}
@@ -3066,11 +3114,11 @@ public class SceneGraph {
}
}
}
- for (local399 = Static156.anInt5276; local399 < levels; local399++) {
+ for (local399 = anInt5276; local399 < levels; local399++) {
local406 = tiles[local399];
for (local37 = -visibility; local37 <= 0; local37++) {
- local415 = Static123.anInt4069 + local37;
- local183 = Static123.anInt4069 - local37;
+ local415 = anInt4069 + local37;
+ local183 = anInt4069 - local37;
if (local415 >= LightingManager.anInt987 || local183 < LightingManager.anInt15) {
for (local428 = -visibility; local428 <= 0; local428++) {
local434 = anInt4539 + local428;
@@ -3103,7 +3151,7 @@ public class SceneGraph {
}
}
}
- if (Static156.anInt1142 == 0) {
+ if (anInt1142 == 0) {
if (!local240) {
MiniMenu.aBoolean187 = false;
}
@@ -3118,7 +3166,7 @@ public class SceneGraph {
@OriginalMember(owner = "client!lg", name = "a", descriptor = "(I)V")
public static void method2750(@OriginalArg(0) int arg0) {
- Static156.anInt5276 = arg0;
+ anInt5276 = arg0;
for (@Pc(3) int local3 = 0; local3 < width; local3++) {
for (@Pc(8) int local8 = 0; local8 < length; local8++) {
if (tiles[arg0][local3][local8] == null) {
@@ -3266,7 +3314,7 @@ public class SceneGraph {
continue;
}
if (arg7[local114][local72] != 0) {
- local176 = Static1.anIntArrayArray35[arg7[local114][local72]];
+ local176 = anIntArrayArray35[arg7[local114][local72]];
local28.anInt2016 += ((local176.length >> 1) - 2) * 3;
local28.anInt2019 += local176.length >> 1;
continue;
@@ -3313,11 +3361,11 @@ public class SceneGraph {
local328 = local114 > local349 && local114 < local355;
}
if (local315 && local328) {
- local234 = Static1.anIntArrayArray35[0];
+ local234 = anIntArrayArray35[0];
} else if (local315) {
- local234 = Static1.anIntArrayArray35[1];
+ local234 = anIntArrayArray35[1];
} else if (local328) {
- local234 = Static1.anIntArrayArray35[1];
+ local234 = anIntArrayArray35[1];
}
} else {
local315 = local90 <= local114 - 1;
@@ -3335,11 +3383,11 @@ public class SceneGraph {
local328 = local349 < local114 && local355 > local114;
}
if (local315 && local328) {
- local234 = Static1.anIntArrayArray35[0];
+ local234 = anIntArrayArray35[0];
} else if (local315) {
- local234 = Static1.anIntArrayArray35[1];
+ local234 = anIntArrayArray35[1];
} else if (local328) {
- local234 = Static1.anIntArrayArray35[1];
+ local234 = anIntArrayArray35[1];
}
}
if (local234 != null) {
@@ -3351,13 +3399,13 @@ public class SceneGraph {
}
if (local135) {
local234 = anIntArrayArray8[arg7[local114][local72]];
- local176 = Static1.anIntArrayArray35[arg7[local114][local72]];
+ local176 = anIntArrayArray35[arg7[local114][local72]];
local28.anInt2016 += ((local176.length >> 1) - 2) * 3;
local28.anInt2016 += ((local234.length >> 1) - 2) * 3;
local28.anInt2019 += local176.length >> 1;
local28.anInt2019 += local234.length >> 1;
} else {
- local176 = Static1.anIntArrayArray35[0];
+ local176 = anIntArrayArray35[0];
local28.anInt2016 += ((local176.length >> 1) - 2) * 3;
local28.anInt2019 += local176.length >> 1;
}
@@ -3394,13 +3442,13 @@ public class SceneGraph {
continue;
}
if (arg7[local114][local72] != 0) {
- Static131.method2578(arg0, arg9, local114, arg6, local72, Static1.anIntArrayArray35[arg7[local114][local72]], local28, local18, arg10, arg2[local114][local72]);
+ method2578(arg0, arg9, local114, arg6, local72, anIntArrayArray35[arg7[local114][local72]], local28, local18, arg10, arg2[local114][local72]);
continue;
}
} else if (local775 != 0) {
local805 = FloTypeList.method4395(local775 - 1);
if (local805.anInt5899 == -1) {
- Static131.method2578(arg0, arg9, local114, arg6, local72, anIntArrayArray8[arg7[local114][local72]], local28, local18, arg10, arg2[local114][local72]);
+ method2578(arg0, arg9, local114, arg6, local72, anIntArrayArray8[arg7[local114][local72]], local28, local18, arg10, arg2[local114][local72]);
continue;
}
@Pc(815) byte local815 = arg7[local114][local72];
@@ -3433,12 +3481,12 @@ public class SceneGraph {
local947 = local355 < local114 && local973 > local114;
}
if (local328 && local947) {
- local917 = Static1.anIntArrayArray35[0];
+ local917 = anIntArrayArray35[0];
} else if (local328) {
- local917 = Static1.anIntArrayArray35[1];
+ local917 = anIntArrayArray35[1];
local789 = 1;
} else if (local947) {
- local917 = Static1.anIntArrayArray35[1];
+ local917 = anIntArrayArray35[1];
local789 = 3;
}
} else {
@@ -3457,26 +3505,26 @@ public class SceneGraph {
local947 = local114 > local355 && local973 > local114;
}
if (local328 && local947) {
- local917 = Static1.anIntArrayArray35[0];
+ local917 = anIntArrayArray35[0];
} else if (local328) {
local789 = 0;
- local917 = Static1.anIntArrayArray35[1];
+ local917 = anIntArrayArray35[1];
} else if (local947) {
- local917 = Static1.anIntArrayArray35[1];
+ local917 = anIntArrayArray35[1];
local789 = 2;
}
}
if (local917 != null) {
- Static131.method2578(arg0, arg9, local114, arg6, local72, local917, local28, local18, arg10, local789);
+ method2578(arg0, arg9, local114, arg6, local72, local917, local28, local18, arg10, local789);
}
continue;
}
}
if (local791) {
- Static131.method2578(arg0, arg9, local114, arg6, local72, anIntArrayArray8[arg7[local114][local72]], local28, local18, arg10, arg2[local114][local72]);
- Static131.method2578(arg0, arg9, local114, arg6, local72, Static1.anIntArrayArray35[arg7[local114][local72]], local28, local18, arg10, arg2[local114][local72]);
+ method2578(arg0, arg9, local114, arg6, local72, anIntArrayArray8[arg7[local114][local72]], local28, local18, arg10, arg2[local114][local72]);
+ method2578(arg0, arg9, local114, arg6, local72, anIntArrayArray35[arg7[local114][local72]], local28, local18, arg10, arg2[local114][local72]);
} else {
- Static131.method2578(arg0, arg9, local114, arg6, local72, Static1.anIntArrayArray35[0], local28, local18, arg10, local789);
+ method2578(arg0, arg9, local114, arg6, local72, anIntArrayArray35[0], local28, local18, arg10, local789);
}
}
local24++;
@@ -3521,7 +3569,7 @@ public class SceneGraph {
if (arg2[local16][local112] != 0) {
@Pc(135) int[] local135;
if (arg6[local16][local112] == 0) {
- local135 = Static1.anIntArrayArray35[0];
+ local135 = anIntArrayArray35[0];
} else {
local135 = anIntArrayArray8[arg1[local16][local112]];
if (local135.length == 0) {
@@ -3608,7 +3656,7 @@ public class SceneGraph {
@Pc(754) int local754;
if (arg6[local16][local112] == 0) {
local655 = local524 == arg2[local16 - 1][local112 - 1] ? 1 : -1;
- local614 = Static1.anIntArrayArray35[0];
+ local614 = anIntArrayArray35[0];
local678 = local524 == arg2[local16 + 1][local112 - 1] ? 1 : -1;
if (arg2[local16][local112 - 1] == local524) {
local678++;
@@ -3652,7 +3700,7 @@ public class SceneGraph {
arg7[local16][local112] = local628;
} else {
local614 = anIntArrayArray8[arg1[local16][local112]];
- local574 = Static69.aBooleanArrayArray2[arg1[local16][local112]];
+ local574 = aBooleanArrayArray2[arg1[local16][local112]];
local628 = arg7[local16][local112];
if (local614.length == 0) {
continue;
@@ -3678,19 +3726,19 @@ public class SceneGraph {
@Pc(969) int local969 = (local655 >> 16) - 1;
@Pc(975) int local975 = (local712 >> 16) - 1;
@Pc(981) GlTile local981 = (GlTile) local103.get(local861);
- method1291(arg13, local655 <= local655, Static1.method588(local969, local883, local931), local981, local614, local112, local155, local16, local655 <= local712, arg8, local754 >= local655, arg4, local169, Static1.method588(local969, local925, local957), Static1.method588(local969, local901, local949), local655 <= local678, arg12, arg10, local628, Static1.method588(local969, local909, local939), local574);
+ method1291(arg13, local655 <= local655, method588(local969, local883, local931), local981, local614, local112, local155, local16, local655 <= local712, arg8, local754 >= local655, arg4, local169, method588(local969, local925, local957), method588(local969, local901, local949), local655 <= local678, arg12, arg10, local628, method588(local969, local909, local939), local574);
@Pc(1050) int local1050 = (local754 >> 16) - 1;
if (local869 != local861) {
local981 = (GlTile) local103.get(local869);
- method1291(arg13, local678 <= local655, Static1.method588(local963, local883, local931), local981, local614, local112, local155, local16, local712 >= local678, arg8, local678 <= local754, arg4, local169, Static1.method588(local963, local925, local957), Static1.method588(local963, local901, local949), local678 <= local678, arg12, arg10, local628, Static1.method588(local963, local909, local939), local574);
+ method1291(arg13, local678 <= local655, method588(local963, local883, local931), local981, local614, local112, local155, local16, local712 >= local678, arg8, local678 <= local754, arg4, local169, method588(local963, local925, local957), method588(local963, local901, local949), local678 <= local678, arg12, arg10, local628, method588(local963, local909, local939), local574);
}
if (local877 != local861 && local877 != local869) {
local981 = (GlTile) local103.get(local877);
- method1291(arg13, local655 >= local712, Static1.method588(local975, local883, local931), local981, local614, local112, local155, local16, local712 <= local712, arg8, local712 <= local754, arg4, local169, Static1.method588(local975, local925, local957), Static1.method588(local975, local901, local949), local678 >= local712, arg12, arg10, local628, Static1.method588(local975, local909, local939), local574);
+ method1291(arg13, local655 >= local712, method588(local975, local883, local931), local981, local614, local112, local155, local16, local712 <= local712, arg8, local712 <= local754, arg4, local169, method588(local975, local925, local957), method588(local975, local901, local949), local678 >= local712, arg12, arg10, local628, method588(local975, local909, local939), local574);
}
if (local917 != local861 && local917 != local869 && local917 != local877) {
local981 = (GlTile) local103.get(local917);
- method1291(arg13, local754 <= local655, Static1.method588(local1050, local883, local931), local981, local614, local112, local155, local16, local754 <= local712, arg8, local754 >= local754, arg4, local169, Static1.method588(local1050, local925, local957), Static1.method588(local1050, local901, local949), local678 >= local754, arg12, arg10, local628, Static1.method588(local1050, local909, local939), local574);
+ method1291(arg13, local754 <= local655, method588(local1050, local883, local931), local981, local614, local112, local155, local16, local754 <= local712, arg8, local754 >= local754, arg4, local169, method588(local1050, local925, local957), method588(local1050, local901, local949), local678 >= local754, arg12, arg10, local628, method588(local1050, local909, local939), local574);
}
}
}
@@ -3724,7 +3772,7 @@ public class SceneGraph {
@Pc(67) int local67 = arg4[local53 + local53];
@Pc(80) int[][] local80 = arg0 == null || arg20 == null || !arg20[local53] ? arg16 : arg0;
@Pc(88) int local88 = arg4[local53 + local53 + 1];
- local31[local53] = Static1.method3683(local41, (float) arg12, local11, local51, arg0, local80, arg7, arg17, local25, arg18, false, arg3, arg9, arg5, local67, arg11, local88);
+ local31[local53] = method3683(local41, (float) arg12, local11, local51, arg0, local80, arg7, arg17, local25, arg18, false, arg3, arg9, arg5, local67, arg11, local88);
}
arg3.method1945(arg6, arg7, arg5, local31, null, false);
}
@@ -3816,17 +3864,17 @@ public class SceneGraph {
@OriginalMember(owner = "client!ke", name = "a", descriptor = "(Lclient!rh;IIIIIIIZ)V")
public static void method2610(@OriginalArg(0) PlainTile arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7, @OriginalArg(8) boolean arg8) {
@Pc(6) int local6;
- @Pc(7) int local7 = local6 = (arg6 << 7) - Static123.anInt3555;
+ @Pc(7) int local7 = local6 = (arg6 << 7) - anInt3555;
@Pc(14) int local14;
@Pc(15) int local15 = local14 = (arg7 << 7) - anInt4903;
@Pc(20) int local20;
@Pc(21) int local21 = local20 = local7 + 128;
@Pc(26) int local26;
@Pc(27) int local27 = local26 = local15 + 128;
- @Pc(37) int local37 = tileHeights[arg1][arg6][arg7] - Static123.anInt3947;
- @Pc(49) int local49 = tileHeights[arg1][arg6 + 1][arg7] - Static123.anInt3947;
- @Pc(63) int local63 = tileHeights[arg1][arg6 + 1][arg7 + 1] - Static123.anInt3947;
- @Pc(75) int local75 = tileHeights[arg1][arg6][arg7 + 1] - Static123.anInt3947;
+ @Pc(37) int local37 = tileHeights[arg1][arg6][arg7] - anInt3947;
+ @Pc(49) int local49 = tileHeights[arg1][arg6 + 1][arg7] - anInt3947;
+ @Pc(63) int local63 = tileHeights[arg1][arg6 + 1][arg7 + 1] - anInt3947;
+ @Pc(75) int local75 = tileHeights[arg1][arg6][arg7 + 1] - anInt3947;
@Pc(85) int local85 = local15 * arg4 + local7 * arg5 >> 16;
@Pc(95) int local95 = local15 * arg5 - local7 * arg4 >> 16;
@Pc(97) int local97 = local85;
@@ -3873,7 +3921,7 @@ public class SceneGraph {
Rasteriser.alpha = 0;
@Pc(475) int local475;
if ((local307 - local323) * (local299 - local331) - (local315 - local331) * (local291 - local323) > 0) {
- if (MiniMenu.aBoolean187 && Static147.method583(MiniMenu.anInt2388 + Rasteriser.centerX, MiniMenu.anInt3259 + Rasteriser.centerY, local315, local331, local299, local307, local323, local291)) {
+ if (MiniMenu.aBoolean187 && method583(MiniMenu.anInt2388 + Rasteriser.centerX, MiniMenu.anInt3259 + Rasteriser.centerY, local315, local331, local299, local307, local323, local291)) {
MiniMenu.anInt1742 = arg6;
MiniMenu.anInt2954 = arg7;
}
@@ -3885,7 +3933,7 @@ public class SceneGraph {
}
} else if (!Preferences.manyGroundTextures) {
local475 = Rasteriser.textureProvider.getAverageColor(arg0.anInt4869);
- Rasteriser.fillGouraudTriangle(local315, local331, local299, local307, local323, local291, Static147.method1640(local475, arg0.anInt4865), Static147.method1640(local475, arg0.anInt4864), Static147.method1640(local475, arg0.anInt4867));
+ Rasteriser.fillGouraudTriangle(local315, local331, local299, local307, local323, local291, method1640(local475, arg0.anInt4865), method1640(local475, arg0.anInt4864), method1640(local475, arg0.anInt4867));
} else if (arg0.aBoolean241) {
Rasteriser.fillTexturedTriangle(local315, local331, local299, local307, local323, local291, arg0.anInt4865, arg0.anInt4864, arg0.anInt4867, local97, local21, local241, local119, local49, local85, local117, local165, local261, arg0.anInt4869);
} else {
@@ -3896,7 +3944,7 @@ public class SceneGraph {
if ((local275 - local291) * (local331 - local299) - (local283 - local299) * (local323 - local291) <= 0) {
return;
}
- if (MiniMenu.aBoolean187 && Static147.method583(MiniMenu.anInt2388 + Rasteriser.centerX, MiniMenu.anInt3259 + Rasteriser.centerY, local283, local299, local331, local275, local291, local323)) {
+ if (MiniMenu.aBoolean187 && method583(MiniMenu.anInt2388 + Rasteriser.centerX, MiniMenu.anInt3259 + Rasteriser.centerY, local283, local299, local331, local275, local291, local323)) {
MiniMenu.anInt1742 = arg6;
MiniMenu.anInt2954 = arg7;
}
@@ -3912,7 +3960,1112 @@ public class SceneGraph {
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);
- Rasteriser.fillGouraudTriangle(local283, local299, local331, local275, local291, local323, Static147.method1640(local475, arg0.anInt4872), Static147.method1640(local475, arg0.anInt4867), Static147.method1640(local475, arg0.anInt4864));
+ Rasteriser.fillGouraudTriangle(local283, local299, local331, local275, local291, local323, method1640(local475, arg0.anInt4872), method1640(local475, arg0.anInt4867), method1640(local475, arg0.anInt4864));
+ }
+ }
+
+ @OriginalMember(owner = "client!al", name = "a", descriptor = "(III)Z")
+ public static boolean method187(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
+ @Pc(7) int local7 = anIntArrayArrayArray12[arg0][arg1][arg2];
+ if (local7 == -anInt437) {
+ return false;
+ } else if (local7 == anInt437) {
+ return true;
+ } else {
+ @Pc(22) int local22 = arg1 << 7;
+ @Pc(26) int local26 = arg2 << 7;
+ if (method4394(local22 + 1, tileHeights[arg0][arg1][arg2], local26 + 1) && method4394(local22 + 128 - 1, tileHeights[arg0][arg1 + 1][arg2], local26 + 1) && method4394(local22 + 128 - 1, tileHeights[arg0][arg1 + 1][arg2 + 1], local26 + 128 - 1) && method4394(local22 + 1, tileHeights[arg0][arg1][arg2 + 1], local26 + 128 - 1)) {
+ anIntArrayArrayArray12[arg0][arg1][arg2] = anInt437;
+ return true;
+ } else {
+ anIntArrayArrayArray12[arg0][arg1][arg2] = -anInt437;
+ return false;
+ }
+ }
+ }
+
+ @OriginalMember(owner = "client!mj", name = "a", descriptor = "(IIIII)Z")
+ public static boolean method3049(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4) {
+ @Pc(9) int local9 = arg3 * anInt5205 + arg0 * anInt2222 >> 16;
+ @Pc(19) int local19 = arg3 * anInt2222 - arg0 * anInt5205 >> 16;
+ @Pc(29) int local29 = arg1 * anInt2886 + local19 * anInt3038 >> 16;
+ @Pc(39) int local39 = arg1 * anInt3038 - local19 * anInt2886 >> 16;
+ if (local29 < 1) {
+ local29 = 1;
+ }
+ @Pc(50) int local50 = (local9 << 9) / local29;
+ @Pc(56) int local56 = (local39 << 9) / local29;
+ @Pc(66) int local66 = arg2 * anInt2886 + local19 * anInt3038 >> 16;
+ @Pc(76) int local76 = arg2 * anInt3038 - local19 * anInt2886 >> 16;
+ if (local66 < 1) {
+ local66 = 1;
+ }
+ @Pc(87) int local87 = (local9 << 9) / local66;
+ @Pc(93) int local93 = (local76 << 9) / local66;
+ if (local29 < 50 && local66 < 50) {
+ return false;
+ } else if (local29 > arg4 && local66 > arg4) {
+ return false;
+ } else if (local50 < Rasteriser.screenLowerX && local87 < Rasteriser.screenLowerX) {
+ return false;
+ } else if (local50 > Rasteriser.screenUpperX && local87 > Rasteriser.screenUpperX) {
+ return false;
+ } else if (local56 < Rasteriser.screenLowerY && local93 < Rasteriser.screenLowerY) {
+ return false;
+ } else {
+ return local56 <= Rasteriser.screenUpperY || local93 <= Rasteriser.screenUpperY;
+ }
+ }
+
+ @OriginalMember(owner = "client!kd", name = "a", descriptor = "([[F[[II[[FI[ILclient!fj;BLclient!gi;[[FI)V")
+ public static void method2578(@OriginalArg(0) float[][] arg0, @OriginalArg(1) int[][] arg1, @OriginalArg(2) int arg2, @OriginalArg(3) float[][] arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int[] arg5, @OriginalArg(6) Light_Class45 arg6, @OriginalArg(8) Light arg7, @OriginalArg(9) float[][] arg8, @OriginalArg(10) int arg9) {
+ @Pc(7) int[] local7 = new int[arg5.length / 2];
+ for (@Pc(13) int local13 = 0; local13 < local7.length; local13++) {
+ @Pc(27) int local27 = arg5[local13 + local13];
+ @Pc(35) int local35 = arg5[local13 + local13 + 1];
+ @Pc(53) int local53;
+ if (arg9 == 1) {
+ local53 = local27;
+ local27 = local35;
+ local35 = 128 - local53;
+ } else if (arg9 == 2) {
+ local35 = 128 - local35;
+ local27 = 128 - local27;
+ } else if (arg9 == 3) {
+ local53 = local27;
+ local27 = 128 - local35;
+ local35 = local53;
+ }
+ @Pc(123) float local123;
+ @Pc(107) float local107;
+ @Pc(115) float local115;
+ if (local27 == 0 && local35 == 0) {
+ local123 = arg3[arg2][arg4];
+ local115 = arg8[arg2][arg4];
+ local107 = arg0[arg2][arg4];
+ } else if (local27 == 128 && local35 == 0) {
+ local107 = arg0[arg2 + 1][arg4];
+ local115 = arg8[arg2 + 1][arg4];
+ local123 = arg3[arg2 + 1][arg4];
+ } else if (local27 == 128 && local35 == 128) {
+ local123 = arg3[arg2 + 1][arg4 + 1];
+ local115 = arg8[arg2 + 1][arg4 + 1];
+ local107 = arg0[arg2 + 1][arg4 + 1];
+ } else if (local27 == 0 && local35 == 128) {
+ local107 = arg0[arg2][arg4 + 1];
+ local123 = arg3[arg2][arg4 + 1];
+ local115 = arg8[arg2][arg4 + 1];
+ } else {
+ local115 = arg8[arg2][arg4];
+ local107 = arg0[arg2][arg4];
+ @Pc(187) float local187 = (float) local27 / 128.0F;
+ local123 = arg3[arg2][arg4];
+ @Pc(208) float local208 = local123 + (arg3[arg2 + 1][arg4] - local123) * local187;
+ @Pc(222) float local222 = local107 + local187 * (arg0[arg2 + 1][arg4] - local107);
+ @Pc(237) float local237 = local115 + (arg8[arg2 + 1][arg4] - local115) * local187;
+ @Pc(245) float local245 = arg8[arg2][arg4 + 1];
+ @Pc(261) float local261 = local245 + (arg8[arg2 + 1][arg4 + 1] - local245) * local187;
+ @Pc(269) float local269 = arg3[arg2][arg4 + 1];
+ @Pc(274) float local274 = (float) local35 / 128.0F;
+ local115 = local237 + (local261 - local237) * local274;
+ @Pc(291) float local291 = arg0[arg2][arg4 + 1];
+ @Pc(307) float local307 = local291 + (arg0[arg2 + 1][arg4 + 1] - local291) * local187;
+ @Pc(324) float local324 = local269 + (arg3[arg2 + 1][arg4 + 1] - local269) * local187;
+ local123 = local208 + (local324 - local208) * local274;
+ local107 = local222 + (local307 - local222) * local274;
+ }
+ @Pc(393) int local393 = (arg2 << 7) + local27;
+ @Pc(400) int local400 = (arg4 << 7) + local35;
+ @Pc(408) int local408 = method3361(local27, arg4, arg1, arg2, local35);
+ local7[local13] = arg6.method1553(arg7, local393, local408, local400, local115, local123, local107);
+ }
+ arg6.method1557(local7);
+ }
+
+ @OriginalMember(owner = "client!jj", name = "a", descriptor = "()V")
+ public static void method2419() {
+ anInt4870 = 0;
+ label194:
+ for (@Pc(3) int local3 = 0; local3 < anInt917; local3++) {
+ @Pc(10) SceneGraph_Class120 local10 = aClass120Array1[local3];
+ @Pc(14) int local14;
+ if (anIntArray8 != null) {
+ for (local14 = 0; local14 < anIntArray8.length; local14++) {
+ if (anIntArray8[local14] != -1000000 && (local10.anInt4444 <= anIntArray8[local14] || local10.anInt4447 <= anIntArray8[local14]) && (local10.anInt4460 <= anIntArray234[local14] || local10.anInt4445 <= anIntArray234[local14]) && (local10.anInt4460 >= anIntArray292[local14] || local10.anInt4445 >= anIntArray292[local14]) && (local10.anInt4458 <= anIntArray454[local14] || local10.anInt4449 <= anIntArray454[local14]) && (local10.anInt4458 >= anIntArray427[local14] || local10.anInt4449 >= anIntArray427[local14])) {
+ continue label194;
+ }
+ }
+ }
+ @Pc(115) int local115;
+ @Pc(126) int local126;
+ @Pc(158) int local158;
+ @Pc(137) boolean local137;
+ if (local10.anInt4453 == 1) {
+ local14 = local10.anInt4452 + visibility - anInt4069;
+ if (local14 >= 0 && local14 <= visibility + visibility) {
+ local115 = local10.anInt4461 + visibility - anInt4539;
+ if (local115 < 0) {
+ local115 = 0;
+ }
+ local126 = local10.anInt4464 + visibility - anInt4539;
+ if (local126 > visibility + visibility) {
+ local126 = visibility + visibility;
+ }
+ local137 = false;
+ while (local115 <= local126) {
+ if (aBooleanArrayArray1[local14][local115++]) {
+ local137 = true;
+ break;
+ }
+ }
+ if (local137) {
+ local158 = anInt3555 - local10.anInt4460;
+ if (local158 > 32) {
+ local10.anInt4462 = 1;
+ } else {
+ if (local158 >= -32) {
+ continue;
+ }
+ local10.anInt4462 = 2;
+ local158 = -local158;
+ }
+ local10.anInt4454 = (local10.anInt4458 - anInt4903 << 8) / local158;
+ local10.anInt4450 = (local10.anInt4449 - anInt4903 << 8) / local158;
+ local10.anInt4459 = (local10.anInt4444 - anInt3947 << 8) / local158;
+ local10.anInt4463 = (local10.anInt4447 - anInt3947 << 8) / local158;
+ aClass120Array2[anInt4870++] = local10;
+ }
+ }
+ } else if (local10.anInt4453 == 2) {
+ local14 = local10.anInt4461 + visibility - anInt4539;
+ if (local14 >= 0 && local14 <= visibility + visibility) {
+ local115 = local10.anInt4452 + visibility - anInt4069;
+ if (local115 < 0) {
+ local115 = 0;
+ }
+ local126 = local10.anInt4446 + visibility - anInt4069;
+ if (local126 > visibility + visibility) {
+ local126 = visibility + visibility;
+ }
+ local137 = false;
+ while (local115 <= local126) {
+ if (aBooleanArrayArray1[local115++][local14]) {
+ local137 = true;
+ break;
+ }
+ }
+ if (local137) {
+ local158 = anInt4903 - local10.anInt4458;
+ if (local158 > 32) {
+ local10.anInt4462 = 3;
+ } else {
+ if (local158 >= -32) {
+ continue;
+ }
+ local10.anInt4462 = 4;
+ local158 = -local158;
+ }
+ local10.anInt4448 = (local10.anInt4460 - anInt3555 << 8) / local158;
+ local10.anInt4456 = (local10.anInt4445 - anInt3555 << 8) / local158;
+ local10.anInt4459 = (local10.anInt4444 - anInt3947 << 8) / local158;
+ local10.anInt4463 = (local10.anInt4447 - anInt3947 << 8) / local158;
+ aClass120Array2[anInt4870++] = local10;
+ }
+ }
+ } else if (local10.anInt4453 == 4) {
+ local14 = local10.anInt4444 - anInt3947;
+ if (local14 > 128) {
+ local115 = local10.anInt4461 + visibility - anInt4539;
+ if (local115 < 0) {
+ local115 = 0;
+ }
+ local126 = local10.anInt4464 + visibility - anInt4539;
+ if (local126 > visibility + visibility) {
+ local126 = visibility + visibility;
+ }
+ if (local115 <= local126) {
+ @Pc(408) int local408 = local10.anInt4452 + visibility - anInt4069;
+ if (local408 < 0) {
+ local408 = 0;
+ }
+ local158 = local10.anInt4446 + visibility - anInt4069;
+ if (local158 > visibility + visibility) {
+ local158 = visibility + visibility;
+ }
+ @Pc(430) boolean local430 = false;
+ label166:
+ for (@Pc(432) int local432 = local408; local432 <= local158; local432++) {
+ for (@Pc(437) int local437 = local115; local437 <= local126; local437++) {
+ if (aBooleanArrayArray1[local432][local437]) {
+ local430 = true;
+ break label166;
+ }
+ }
+ }
+ if (local430) {
+ local10.anInt4462 = 5;
+ local10.anInt4448 = (local10.anInt4460 - anInt3555 << 8) / local14;
+ local10.anInt4456 = (local10.anInt4445 - anInt3555 << 8) / local14;
+ local10.anInt4454 = (local10.anInt4458 - anInt4903 << 8) / local14;
+ local10.anInt4450 = (local10.anInt4449 - anInt4903 << 8) / local14;
+ aClass120Array2[anInt4870++] = local10;
+ }
+ }
+ }
+ }
+ }
+ }
+
+ @OriginalMember(owner = "client!bi", name = "a", descriptor = "(IIIIIIII)Z")
+ public static boolean method583(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7) {
+ if (arg1 < arg2 && arg1 < arg3 && arg1 < arg4) {
+ return false;
+ } else if (arg1 > arg2 && arg1 > arg3 && arg1 > arg4) {
+ return false;
+ } else if (arg0 < arg5 && arg0 < arg6 && arg0 < arg7) {
+ return false;
+ } else if (arg0 > arg5 && arg0 > arg6 && arg0 > arg7) {
+ return false;
+ } else {
+ @Pc(59) int local59 = (arg1 - arg2) * (arg6 - arg5) - (arg0 - arg5) * (arg3 - arg2);
+ @Pc(75) int local75 = (arg1 - arg4) * (arg5 - arg7) - (arg0 - arg7) * (arg2 - arg4);
+ @Pc(91) int local91 = (arg1 - arg3) * (arg7 - arg6) - (arg0 - arg6) * (arg4 - arg3);
+ return local59 * local91 > 0 && local91 * local75 > 0;
+ }
+ }
+
+ @OriginalMember(owner = "client!ri", name = "a", descriptor = "(II)I")
+ public static int method1640(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
+ arg1 = arg1 * (arg0 & 0x7F) >> 7;
+ if (arg1 < 2) {
+ arg1 = 2;
+ } else if (arg1 > 126) {
+ arg1 = 126;
+ }
+ return (arg0 & 0xFF80) + arg1;
+ }
+
+ @OriginalMember(owner = "client!lh", name = "a", descriptor = "(Lclient!fg;IIIIIIZ)V")
+ public static void method2762(@OriginalArg(0) ShapedTile arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) boolean arg7) {
+ @Pc(3) int local3 = arg0.anIntArray168.length;
+ @Pc(5) int local5;
+ @Pc(15) int local15;
+ @Pc(22) int local22;
+ @Pc(29) int local29;
+ @Pc(39) int local39;
+ for (local5 = 0; local5 < local3; local5++) {
+ local15 = arg0.anIntArray168[local5] - anInt3555;
+ local22 = arg0.anIntArray160[local5] - anInt3947;
+ local29 = arg0.anIntArray163[local5] - anInt4903;
+ local39 = local29 * arg3 + local15 * arg4 >> 16;
+ @Pc(49) int local49 = local29 * arg4 - local15 * arg3 >> 16;
+ @Pc(61) int local61 = local22 * arg2 - local49 * arg1 >> 16;
+ @Pc(71) int local71 = local22 * arg1 + local49 * arg2 >> 16;
+ if (local71 < 50) {
+ return;
+ }
+ if (arg0.anIntArray161 != null) {
+ anIntArray159[local5] = local39;
+ anIntArray170[local5] = local61;
+ anIntArray169[local5] = local71;
+ }
+ anIntArray165[local5] = Rasteriser.centerX + (local39 << 9) / local71;
+ anIntArray164[local5] = Rasteriser.centerY + (local61 << 9) / local71;
+ }
+ Rasteriser.alpha = 0;
+ local3 = arg0.anIntArray166.length;
+ for (local5 = 0; local5 < local3; local5++) {
+ local15 = arg0.anIntArray166[local5];
+ local22 = arg0.anIntArray162[local5];
+ local29 = arg0.anIntArray158[local5];
+ local39 = anIntArray165[local15];
+ @Pc(148) int local148 = anIntArray165[local22];
+ @Pc(152) int local152 = anIntArray165[local29];
+ @Pc(156) int local156 = anIntArray164[local15];
+ @Pc(160) int local160 = anIntArray164[local22];
+ @Pc(164) int local164 = anIntArray164[local29];
+ if ((local39 - local148) * (local164 - local160) - (local156 - local160) * (local152 - local148) > 0) {
+ if (MiniMenu.aBoolean187 && method583(MiniMenu.anInt2388 + Rasteriser.centerX, MiniMenu.anInt3259 + Rasteriser.centerY, local156, local160, local164, local39, local148, local152)) {
+ MiniMenu.anInt1742 = arg5;
+ MiniMenu.anInt2954 = arg6;
+ }
+ if (!GlRenderer.enabled && !arg7) {
+ Rasteriser.testX = local39 < 0 || local148 < 0 || local152 < 0 || local39 > Rasteriser.width || local148 > Rasteriser.width || local152 > Rasteriser.width;
+ if (arg0.anIntArray161 == null || arg0.anIntArray161[local5] == -1) {
+ if (arg0.anIntArray167[local5] != 12345678) {
+ Rasteriser.fillGouraudTriangle(local156, local160, local164, local39, local148, local152, arg0.anIntArray167[local5], arg0.anIntArray172[local5], arg0.anIntArray171[local5]);
+ }
+ } else if (!Preferences.manyGroundTextures) {
+ @Pc(373) int local373 = Rasteriser.textureProvider.getAverageColor(arg0.anIntArray161[local5]);
+ Rasteriser.fillGouraudTriangle(local156, local160, local164, local39, local148, local152, method1640(local373, arg0.anIntArray167[local5]), method1640(local373, arg0.anIntArray172[local5]), method1640(local373, arg0.anIntArray171[local5]));
+ } else if (arg0.aBoolean113) {
+ Rasteriser.fillTexturedTriangle(local156, local160, local164, local39, local148, local152, arg0.anIntArray167[local5], arg0.anIntArray172[local5], arg0.anIntArray171[local5], anIntArray159[0], anIntArray159[1], anIntArray159[3], anIntArray170[0], anIntArray170[1], anIntArray170[3], anIntArray169[0], anIntArray169[1], anIntArray169[3], arg0.anIntArray161[local5]);
+ } else {
+ Rasteriser.fillTexturedTriangle(local156, local160, local164, local39, local148, local152, arg0.anIntArray167[local5], arg0.anIntArray172[local5], arg0.anIntArray171[local5], anIntArray159[local15], anIntArray159[local22], anIntArray159[local29], anIntArray170[local15], anIntArray170[local22], anIntArray170[local29], anIntArray169[local15], anIntArray169[local22], anIntArray169[local29], arg0.anIntArray161[local5]);
+ }
+ }
+ }
+ }
+ }
+
+ @OriginalMember(owner = "client!a", name = "a", descriptor = "([[F[[F[[II[[F[[B[[II[[B[[B[[B[[[B)[Lclient!hg;")
+ public static GlTile[] method2(@OriginalArg(0) float[][] arg0, @OriginalArg(1) float[][] arg1, @OriginalArg(2) int[][] arg2, @OriginalArg(3) int arg3, @OriginalArg(4) float[][] arg4, @OriginalArg(5) byte[][] arg5, @OriginalArg(6) int[][] arg6, @OriginalArg(8) byte[][] arg7, @OriginalArg(9) byte[][] arg8, @OriginalArg(10) byte[][] arg9, @OriginalArg(11) byte[][][] arg10) {
+ @Pc(10) HashTable local10 = new HashTable(128);
+ @Pc(12) int local12;
+ @Pc(17) int local17;
+ @Pc(30) int local30;
+ @Pc(38) int local38;
+ @Pc(131) int local131;
+ @Pc(168) int local168;
+ @Pc(143) int local143;
+ @Pc(163) int local163;
+ @Pc(153) int local153;
+ @Pc(190) int local190;
+ @Pc(180) int local180;
+ @Pc(214) int local214;
+ @Pc(202) int local202;
+ @Pc(226) int local226;
+ @Pc(274) byte local274;
+ @Pc(299) int local299;
+ @Pc(317) int local317;
+ @Pc(127) int local127;
+ @Pc(133) int local133;
+ @Pc(777) int local777;
+ @Pc(1035) int local1035;
+ @Pc(1055) boolean[] local1055;
+ @Pc(1068) boolean[] local1068;
+ @Pc(1086) boolean[] local1086;
+ for (local12 = 1; local12 <= 102; local12++) {
+ for (local17 = 1; local17 <= 102; local17++) {
+ local30 = arg8[local12][local17] & 0xFF;
+ local38 = arg9[local12][local17] & 0xFF;
+ if (local38 != 0) {
+ @Pc(50) FloType local50 = FloTypeList.method4395(local38 - 1);
+ if (local50.anInt5899 == -1) {
+ continue;
+ }
+ @Pc(61) GlTile local61 = method4212(local10, local50);
+ @Pc(67) byte local67 = arg7[local12][local17];
+ @Pc(71) int[] local71 = anIntArrayArray35[local67];
+ local61.anInt2482 += local71.length / 2;
+ local61.anInt2484++;
+ if (local50.aBoolean310 && local30 != 0) {
+ local61.anInt2482 += anIntArray419[local67];
+ }
+ }
+ if ((arg8[local12][local17] & 0xFF) != 0 || local38 != 0 && arg7[local12][local17] == 0) {
+ local127 = 0;
+ @Pc(129) int local129 = 0;
+ local131 = 0;
+ local133 = 0;
+ local143 = arg9[local12][local17 + 1] & 0xFF;
+ local153 = arg9[local12][local17 - 1] & 0xFF;
+ local163 = arg9[local12 - 1][local17] & 0xFF;
+ @Pc(166) int[] local166 = new int[8];
+ local168 = 0;
+ local180 = arg9[local12 - 1][local17 + 1] & 0xFF;
+ local190 = arg9[local12 + 1][local17] & 0xFF;
+ local202 = arg9[local12 + 1][local17 - 1] & 0xFF;
+ local214 = arg9[local12 - 1][local17 - 1] & 0xFF;
+ local226 = arg9[local12 + 1][local17 + 1] & 0xFF;
+ @Pc(242) FloType local242;
+ @Pc(264) byte local264;
+ @Pc(287) int local287;
+ if (local180 != 0 && local38 != local180) {
+ local242 = FloTypeList.method4395(local180 - 1);
+ if (local242.aBoolean310 && local242.anInt5899 != -1) {
+ local264 = arg5[local12 - 1][local17 + 1];
+ local274 = arg7[local12 - 1][local17 + 1];
+ local287 = anIntArray300[local274 * 4 + (local264 + 2 & 0x3)];
+ local299 = anIntArray300[(local264 + 3 & 0x3) + local274 * 4];
+ if (!aBooleanArrayArray4[local299][1] || !aBooleanArrayArray4[local287][0]) {
+ for (local317 = 0; local317 < 8; local317++) {
+ if (local317 == 0) {
+ local127++;
+ local166[0] = local180;
+ break;
+ }
+ if (local180 == local166[local317]) {
+ break;
+ }
+ }
+ }
+ }
+ }
+ if (local214 != 0 && local214 != local38) {
+ local242 = FloTypeList.method4395(local214 - 1);
+ if (local242.aBoolean310 && local242.anInt5899 != -1) {
+ local264 = arg5[local12 - 1][local17 - 1];
+ local274 = arg7[local12 - 1][local17 - 1];
+ local287 = anIntArray300[local274 * 4 + (local264 & 0x3)];
+ local299 = anIntArray300[(local264 + 3 & 0x3) + local274 * 4];
+ if (!aBooleanArrayArray4[local287][1] || !aBooleanArrayArray4[local299][0]) {
+ for (local317 = 0; local317 < 8; local317++) {
+ if (local127 == local317) {
+ local166[local127++] = local214;
+ break;
+ }
+ if (local166[local317] == local214) {
+ break;
+ }
+ }
+ }
+ }
+ }
+ if (local202 != 0 && local38 != local202) {
+ local242 = FloTypeList.method4395(local202 - 1);
+ if (local242.aBoolean310 && local242.anInt5899 != -1) {
+ local264 = arg5[local12 + 1][local17 - 1];
+ local274 = arg7[local12 + 1][local17 - 1];
+ local299 = anIntArray300[local274 * 4 + (local264 + 1 & 0x3)];
+ local287 = anIntArray300[local274 * 4 + (local264 & 0x3)];
+ if (!aBooleanArrayArray4[local299][1] || !aBooleanArrayArray4[local287][0]) {
+ for (local317 = 0; local317 < 8; local317++) {
+ if (local127 == local317) {
+ local166[local127++] = local202;
+ break;
+ }
+ if (local202 == local166[local317]) {
+ break;
+ }
+ }
+ }
+ }
+ }
+ if (local226 != 0 && local226 != local38) {
+ local242 = FloTypeList.method4395(local226 - 1);
+ if (local242.aBoolean310 && local242.anInt5899 != -1) {
+ local264 = arg5[local12 + 1][local17 + 1];
+ local274 = arg7[local12 + 1][local17 + 1];
+ local299 = anIntArray300[local274 * 4 + (local264 + 1 & 0x3)];
+ local287 = anIntArray300[local274 * 4 + (local264 + 2 & 0x3)];
+ if (!aBooleanArrayArray4[local287][1] || !aBooleanArrayArray4[local299][0]) {
+ for (local317 = 0; local317 < 8; local317++) {
+ if (local127 == local317) {
+ local166[local127++] = local226;
+ break;
+ }
+ if (local226 == local166[local317]) {
+ break;
+ }
+ }
+ }
+ }
+ }
+ if (local143 != 0 && local38 != local143) {
+ local242 = FloTypeList.method4395(local143 - 1);
+ if (local242.aBoolean310 && local242.anInt5899 != -1) {
+ local129 = anIntArray300[arg7[local12][local17 + 1] * 4 + (arg5[local12][local17 + 1] + 2 & 0x3)];
+ for (local777 = 0; local777 < 8; local777++) {
+ if (local127 == local777) {
+ local166[local127++] = local143;
+ break;
+ }
+ if (local166[local777] == local143) {
+ break;
+ }
+ }
+ }
+ }
+ if (local163 != 0 && local38 != local163) {
+ local242 = FloTypeList.method4395(local163 - 1);
+ if (local242.aBoolean310 && local242.anInt5899 != -1) {
+ local133 = anIntArray300[(arg5[local12 - 1][local17] + 3 & 0x3) + arg7[local12 - 1][local17] * 4];
+ for (local777 = 0; local777 < 8; local777++) {
+ if (local127 == local777) {
+ local166[local127++] = local163;
+ break;
+ }
+ if (local163 == local166[local777]) {
+ break;
+ }
+ }
+ }
+ }
+ if (local153 != 0 && local38 != local153) {
+ local242 = FloTypeList.method4395(local153 - 1);
+ if (local242.aBoolean310 && local242.anInt5899 != -1) {
+ local131 = anIntArray300[(arg5[local12][local17 - 1] & 0x3) + arg7[local12][local17 - 1] * 4];
+ for (local777 = 0; local777 < 8; local777++) {
+ if (local777 == local127) {
+ local166[local127++] = local153;
+ break;
+ }
+ if (local153 == local166[local777]) {
+ break;
+ }
+ }
+ }
+ }
+ if (local190 != 0 && local38 != local190) {
+ local242 = FloTypeList.method4395(local190 - 1);
+ if (local242.aBoolean310 && local242.anInt5899 != -1) {
+ local168 = anIntArray300[(arg5[local12 + 1][local17] + 1 & 0x3) + arg7[local12 + 1][local17] * 4];
+ for (local777 = 0; local777 < 8; local777++) {
+ if (local127 == local777) {
+ local166[local127++] = local190;
+ break;
+ }
+ if (local166[local777] == local190) {
+ break;
+ }
+ }
+ }
+ }
+ for (local1035 = 0; local1035 < local127; local1035++) {
+ local777 = local166[local1035];
+ local1055 = aBooleanArrayArray4[local163 == local777 ? local133 : 0];
+ local1068 = aBooleanArrayArray4[local777 == local153 ? local131 : 0];
+ @Pc(1077) boolean[] local1077 = aBooleanArrayArray4[local143 == local777 ? local129 : 0];
+ local1086 = aBooleanArrayArray4[local190 == local777 ? local168 : 0];
+ @Pc(1092) FloType local1092 = FloTypeList.method4395(local777 - 1);
+ @Pc(1097) GlTile local1097 = method4212(local10, local1092);
+ local1097.anInt2482 += 5;
+ local1097.anInt2482 += local1077.length - 2;
+ local1097.anInt2482 += local1055.length - 2;
+ local1097.anInt2482 += local1068.length - 2;
+ local1097.anInt2482 += local1086.length - 2;
+ local1097.anInt2484++;
+ }
+ }
+ }
+ }
+ @Pc(1161) GlTile local1161;
+ for (local1161 = (GlTile) local10.head(); local1161 != null; local1161 = (GlTile) local10.next()) {
+ local1161.method1940();
+ }
+ for (local12 = 1; local12 <= 102; local12++) {
+ for (local17 = 1; local17 <= 102; local17++) {
+ local38 = arg8[local12][local17] & 0xFF;
+ local127 = arg9[local12][local17] & 0xFF;
+ if ((arg10[arg3][local12][local17] & 0x8) != 0) {
+ local30 = 0;
+ } else if ((arg10[1][local12][local17] & 0x2) == 2 && arg3 > 0) {
+ local30 = arg3 - 1;
+ } else {
+ local30 = arg3;
+ }
+ if (local127 != 0) {
+ @Pc(1250) FloType local1250 = FloTypeList.method4395(local127 - 1);
+ if (local1250.anInt5899 == -1) {
+ continue;
+ }
+ @Pc(1261) GlTile local1261 = method4212(local10, local1250);
+ @Pc(1267) byte local1267 = arg7[local12][local17];
+ @Pc(1273) byte local1273 = arg5[local12][local17];
+ local168 = method588(local1250.texture, local1250.anInt5899, arg6[local12][local17]);
+ local143 = method588(local1250.texture, local1250.anInt5899, arg6[local12 + 1][local17]);
+ local163 = method588(local1250.texture, local1250.anInt5899, arg6[local12 + 1][local17 + 1]);
+ local153 = method588(local1250.texture, local1250.anInt5899, arg6[local12][local17 + 1]);
+ method1324(local168, arg2, arg1, local12, arg0, local143, local1273, local30, local163, local38 != 0 && local1250.aBoolean310, local1267, local17, arg4, local153, local1261);
+ }
+ if ((arg8[local12][local17] & 0xFF) != 0 || local127 != 0 && arg7[local12][local17] == 0) {
+ @Pc(1382) int[] local1382 = new int[8];
+ local133 = 0;
+ @Pc(1386) int local1386 = 0;
+ local131 = 0;
+ local168 = 0;
+ local163 = arg9[local12][local17 + 1] & 0xFF;
+ local143 = 0;
+ local153 = arg9[local12 - 1][local17] & 0xFF;
+ local180 = arg9[local12 + 1][local17] & 0xFF;
+ local190 = arg9[local12][local17 - 1] & 0xFF;
+ local214 = arg9[local12 - 1][local17 + 1] & 0xFF;
+ local202 = arg9[local12 - 1][local17 - 1] & 0xFF;
+ local226 = arg9[local12 + 1][local17 - 1] & 0xFF;
+ local1035 = arg9[local12 + 1][local17 + 1] & 0xFF;
+ @Pc(1527) byte local1527;
+ @Pc(1496) FloType local1496;
+ @Pc(1571) int local1571;
+ if (local214 == 0 || local214 == local127) {
+ local214 = 0;
+ } else {
+ local1496 = FloTypeList.method4395(local214 - 1);
+ if (local1496.aBoolean310 && local1496.anInt5899 != -1) {
+ local274 = arg5[local12 - 1][local17 + 1];
+ local1527 = arg7[local12 - 1][local17 + 1];
+ local299 = anIntArray300[local1527 * 4 + (local274 + 2 & 0x3)];
+ local317 = anIntArray300[local1527 * 4 + (local274 + 3 & 0x3)];
+ if (aBooleanArrayArray4[local317][1] && aBooleanArrayArray4[local299][0]) {
+ local214 = 0;
+ } else {
+ for (local1571 = 0; local1571 < 8; local1571++) {
+ if (local1571 == 0) {
+ local1386++;
+ local1382[0] = local214;
+ break;
+ }
+ if (local1382[local1571] == local214) {
+ break;
+ }
+ }
+ }
+ } else {
+ local214 = 0;
+ }
+ }
+ if (local202 == 0 || local127 == local202) {
+ local202 = 0;
+ } else {
+ local1496 = FloTypeList.method4395(local202 - 1);
+ if (local1496.aBoolean310 && local1496.anInt5899 != -1) {
+ local274 = arg5[local12 - 1][local17 - 1];
+ local1527 = arg7[local12 - 1][local17 - 1];
+ local299 = anIntArray300[(local274 & 0x3) + local1527 * 4];
+ local317 = anIntArray300[(local274 + 3 & 0x3) + local1527 * 4];
+ if (aBooleanArrayArray4[local299][1] && aBooleanArrayArray4[local317][0]) {
+ local202 = 0;
+ } else {
+ for (local1571 = 0; local1571 < 8; local1571++) {
+ if (local1571 == local1386) {
+ local1382[local1386++] = local202;
+ break;
+ }
+ if (local202 == local1382[local1571]) {
+ break;
+ }
+ }
+ }
+ } else {
+ local202 = 0;
+ }
+ }
+ if (local226 == 0 || local226 == local127) {
+ local226 = 0;
+ } else {
+ local1496 = FloTypeList.method4395(local226 - 1);
+ if (local1496.aBoolean310 && local1496.anInt5899 != -1) {
+ local274 = arg5[local12 + 1][local17 - 1];
+ local1527 = arg7[local12 + 1][local17 - 1];
+ local317 = anIntArray300[(local274 + 1 & 0x3) + local1527 * 4];
+ local299 = anIntArray300[local1527 * 4 + (local274 & 0x3)];
+ if (aBooleanArrayArray4[local317][1] && aBooleanArrayArray4[local299][0]) {
+ local226 = 0;
+ } else {
+ for (local1571 = 0; local1571 < 8; local1571++) {
+ if (local1571 == local1386) {
+ local1382[local1386++] = local226;
+ break;
+ }
+ if (local1382[local1571] == local226) {
+ break;
+ }
+ }
+ }
+ } else {
+ local226 = 0;
+ }
+ }
+ if (local1035 == 0 || local127 == local1035) {
+ local1035 = 0;
+ } else {
+ local1496 = FloTypeList.method4395(local1035 - 1);
+ if (local1496.aBoolean310 && local1496.anInt5899 != -1) {
+ local1527 = arg7[local12 + 1][local17 + 1];
+ local274 = arg5[local12 + 1][local17 + 1];
+ local299 = anIntArray300[(local274 + 2 & 0x3) + local1527 * 4];
+ local317 = anIntArray300[(local274 + 1 & 0x3) + local1527 * 4];
+ if (aBooleanArrayArray4[local299][1] && aBooleanArrayArray4[local317][0]) {
+ local1035 = 0;
+ } else {
+ for (local1571 = 0; local1571 < 8; local1571++) {
+ if (local1571 == local1386) {
+ local1382[local1386++] = local1035;
+ break;
+ }
+ if (local1382[local1571] == local1035) {
+ break;
+ }
+ }
+ }
+ } else {
+ local1035 = 0;
+ }
+ }
+ @Pc(2003) int local2003;
+ if (local163 != 0 && local163 != local127) {
+ local1496 = FloTypeList.method4395(local163 - 1);
+ if (local1496.aBoolean310 && local1496.anInt5899 != -1) {
+ local133 = anIntArray300[arg7[local12][local17 + 1] * 4 + (arg5[local12][local17 + 1] + 2 & 0x3)];
+ for (local2003 = 0; local2003 < 8; local2003++) {
+ if (local2003 == local1386) {
+ local1382[local1386++] = local163;
+ break;
+ }
+ if (local1382[local2003] == local163) {
+ break;
+ }
+ }
+ }
+ }
+ if (local153 != 0 && local127 != local153) {
+ local1496 = FloTypeList.method4395(local153 - 1);
+ if (local1496.aBoolean310 && local1496.anInt5899 != -1) {
+ local131 = anIntArray300[(arg5[local12 - 1][local17] + 3 & 0x3) + arg7[local12 - 1][local17] * 4];
+ for (local2003 = 0; local2003 < 8; local2003++) {
+ if (local1386 == local2003) {
+ local1382[local1386++] = local153;
+ break;
+ }
+ if (local153 == local1382[local2003]) {
+ break;
+ }
+ }
+ }
+ }
+ if (local190 != 0 && local190 != local127) {
+ local1496 = FloTypeList.method4395(local190 - 1);
+ if (local1496.aBoolean310 && local1496.anInt5899 != -1) {
+ local168 = anIntArray300[(arg5[local12][local17 - 1] & 0x3) + arg7[local12][local17 - 1] * 4];
+ for (local2003 = 0; local2003 < 8; local2003++) {
+ if (local1386 == local2003) {
+ local1382[local1386++] = local190;
+ break;
+ }
+ if (local190 == local1382[local2003]) {
+ break;
+ }
+ }
+ }
+ }
+ if (local180 != 0 && local180 != local127) {
+ local1496 = FloTypeList.method4395(local180 - 1);
+ if (local1496.aBoolean310 && local1496.anInt5899 != -1) {
+ local143 = anIntArray300[arg7[local12 + 1][local17] * 4 + (arg5[local12 + 1][local17] + 1 & 0x3)];
+ for (local2003 = 0; local2003 < 8; local2003++) {
+ if (local2003 == local1386) {
+ local1382[local1386++] = local180;
+ break;
+ }
+ if (local1382[local2003] == local180) {
+ break;
+ }
+ }
+ }
+ }
+ for (local777 = 0; local777 < local1386; local777++) {
+ local2003 = local1382[local777];
+ local1055 = aBooleanArrayArray4[local2003 == local163 ? local133 : 0];
+ local1068 = aBooleanArrayArray4[local153 == local2003 ? local131 : 0];
+ local1086 = aBooleanArrayArray4[local2003 == local190 ? local168 : 0];
+ @Pc(2318) boolean[] local2318 = aBooleanArrayArray4[local2003 == local180 ? local143 : 0];
+ @Pc(2324) FloType local2324 = FloTypeList.method4395(local2003 - 1);
+ @Pc(2329) GlTile local2329 = method4212(local10, local2324);
+ @Pc(2345) int local2345 = method588(local2324.texture, local2324.anInt5899, arg6[local12][local17]) << 8 | 0xFF;
+ @Pc(2365) int local2365 = method588(local2324.texture, local2324.anInt5899, arg6[local12 + 1][local17]) << 8 | 0xFF;
+ @Pc(2385) int local2385 = method588(local2324.texture, local2324.anInt5899, arg6[local12 + 1][local17 + 1]) << 8 | 0xFF;
+ @Pc(2403) int local2403 = method588(local2324.texture, local2324.anInt5899, arg6[local12][local17 + 1]) << 8 | 0xFF;
+ @Pc(2422) boolean local2422 = local2003 != local202 && local1086[0] && local1068[1];
+ @Pc(2441) boolean local2441 = local2003 != local1035 && local1055[0] && local2318[1];
+ @Pc(2456) boolean local2456 = local214 != local2003 && local1068[0] && local1055[1];
+ @Pc(2463) int local2463 = local1055.length + 6 - 2;
+ @Pc(2482) boolean local2482 = local2003 != local226 && local2318[0] && local1086[1];
+ @Pc(2489) int local2489 = local2463 + local1068.length - 2;
+ @Pc(2496) int local2496 = local2489 + local1086.length - 2;
+ @Pc(2503) int local2503 = local2496 + local2318.length - 2;
+ @Pc(2524) int local2524 = method3683(local2403, 0.0F, local2345, local2365, null, arg2, local12, arg4, local2385, 0, true, local2329, arg1, local17, 64, arg0, 64);
+ @Pc(2527) int[] local2527 = new int[local2503];
+ @Pc(2529) byte local2529 = 0;
+ @Pc(2550) int local2550 = method3683(local2403, 0.0F, local2345, local2365, null, arg2, local12, arg4, local2385, 0, local2456, local2329, arg1, local17, 0, arg0, 128);
+ @Pc(2571) int local2571 = method3683(local2403, 0.0F, local2345, local2365, null, arg2, local12, arg4, local2385, 0, local2441, local2329, arg1, local17, 128, arg0, 128);
+ @Pc(2592) int local2592 = method3683(local2403, 0.0F, local2345, local2365, null, arg2, local12, arg4, local2385, 0, local2422, local2329, arg1, local17, 0, arg0, 0);
+ @Pc(2613) int local2613 = method3683(local2403, 0.0F, local2345, local2365, null, arg2, local12, arg4, local2385, 0, local2482, local2329, arg1, local17, 128, arg0, 0);
+ @Pc(2616) int local2616 = local2529 + 1;
+ local2527[0] = local2524;
+ @Pc(2621) int local2621 = local2616 + 1;
+ local2527[1] = local2571;
+ if (local1055.length > 2) {
+ local2621++;
+ local2527[2] = method3683(local2403, 0.0F, local2345, local2365, null, arg2, local12, arg4, local2385, 0, local1055[2], local2329, arg1, local17, 64, arg0, 128);
+ }
+ local2527[local2621++] = local2550;
+ if (local1068.length > 2) {
+ local2527[local2621++] = method3683(local2403, 0.0F, local2345, local2365, null, arg2, local12, arg4, local2385, 0, local1068[2], local2329, arg1, local17, 0, arg0, 64);
+ }
+ local2527[local2621++] = local2592;
+ if (local1086.length > 2) {
+ local2527[local2621++] = method3683(local2403, 0.0F, local2345, local2365, null, arg2, local12, arg4, local2385, 0, local1086[2], local2329, arg1, local17, 64, arg0, 0);
+ }
+ local2527[local2621++] = local2613;
+ if (local2318.length > 2) {
+ local2527[local2621++] = method3683(local2403, 0.0F, local2345, local2365, null, arg2, local12, arg4, local2385, 0, local2318[2], local2329, arg1, local17, 128, arg0, 64);
+ }
+ local2527[local2621++] = local2571;
+ local2329.method1945(local30, local12, local17, local2527, null, true);
+ }
+ }
+ }
+ }
+ for (local1161 = (GlTile) local10.head(); local1161 != null; local1161 = (GlTile) local10.next()) {
+ if (local1161.anInt2483 == 0) {
+ local1161.unlink();
+ } else {
+ local1161.method1943();
+ }
+ }
+ local12 = local10.size();
+ @Pc(2823) GlTile[] local2823 = new GlTile[local12];
+ @Pc(2826) long[] local2826 = new long[local12];
+ local10.method3865(local2823);
+ for (local38 = 0; local38 < local12; local38++) {
+ local2826[local38] = local2823[local38].key;
+ }
+ method23(local2826, local2823);
+ return local2823;
+ }
+
+ @OriginalMember(owner = "client!tk", name = "a", descriptor = "(Lclient!sc;ZLclient!wl;)Lclient!hg;")
+ public static GlTile method4212(@OriginalArg(0) HashTable arg0, @OriginalArg(2) FloType arg1) {
+ @Pc(23) long local23 = ((long) arg1.texture + 1 << 16) + arg1.anInt5885 + ((long) arg1.anInt5897 << 56) + ((long) arg1.anInt5889 << 32);
+ @Pc(38) GlTile local38 = (GlTile) arg0.get(local23);
+ if (local38 == null) {
+ local38 = new GlTile(arg1.texture, (float) arg1.anInt5885, true, false, arg1.anInt5889);
+ arg0.put(local38, local23);
+ }
+ return local38;
+ }
+
+ @OriginalMember(owner = "client!bi", name = "a", descriptor = "(IIBI)I")
+ public static int method588(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2) {
+ @Pc(19) int local19 = Rasteriser.palette[SoftwareModel.method4585(arg1, arg2)];
+ if (arg0 > 0) {
+ @Pc(31) int local31 = Rasteriser.textureProvider.method3238(arg0 & 0xFFFF);
+ @Pc(49) int local49;
+ @Pc(73) int local73;
+ if (local31 != 0) {
+ if (arg2 < 0) {
+ local49 = 0;
+ } else if (arg2 > 127) {
+ local49 = 16777215;
+ } else {
+ local49 = arg2 * 131586;
+ }
+ if (local31 == 256) {
+ local19 = local49;
+ } else {
+ local73 = 256 - local31;
+ local19 = ((local49 & 0xFF00) * local31 + local73 * (local19 & 0xFF00) & 0xFF0000) + (local31 * (local49 & 0xFF00FF) + ((local19 & 0xFF00FF) * local73) & 0xFF00FF00) >> 8;
+ }
+ }
+ local49 = Rasteriser.textureProvider.method3229(arg0 & 0xFFFF);
+ if (local49 != 0) {
+ local49 += 256;
+ @Pc(125) int local125 = (local19 >> 16 & 0xFF) * local49;
+ if (local125 > 65535) {
+ local125 = 65535;
+ }
+ local73 = (local19 >> 8 & 0xFF) * local49;
+ if (local73 > 65535) {
+ local73 = 65535;
+ }
+ @Pc(150) int local150 = local49 * (local19 & 0xFF);
+ if (local150 > 65535) {
+ local150 = 65535;
+ }
+ local19 = (local150 >> 8) + (local73 & 0xFF00) + (local125 << 8 & 0xFF001F);
+ }
+ }
+ return local19;
+ }
+
+ @OriginalMember(owner = "client!eh", name = "a", descriptor = "(I[[I[[FI[[FIBIIBZBI[[FILclient!hg;)V")
+ public static void method1324(@OriginalArg(0) int arg0, @OriginalArg(1) int[][] arg1, @OriginalArg(2) float[][] arg2, @OriginalArg(3) int arg3, @OriginalArg(4) float[][] arg4, @OriginalArg(5) int arg5, @OriginalArg(6) byte arg6, @OriginalArg(7) int arg7, @OriginalArg(8) int arg8, @OriginalArg(10) boolean arg9, @OriginalArg(11) byte arg10, @OriginalArg(12) int arg11, @OriginalArg(13) float[][] arg12, @OriginalArg(14) int arg13, @OriginalArg(15) GlTile arg14) {
+ @Pc(11) int local11 = (arg0 << 8) + 255;
+ @Pc(17) int local17 = (arg5 << 8) + 255;
+ @Pc(23) int local23 = (arg8 << 8) + 255;
+ @Pc(29) int local29 = (arg13 << 8) + 255;
+ @Pc(33) int[] local33 = anIntArrayArray35[arg10];
+ @Pc(39) int[] local39 = new int[local33.length >> 1];
+ @Pc(41) int local41;
+ for (local41 = 0; local41 < local39.length; local41++) {
+ local39[local41] = method3683(local29, 0.0F, local11, local17, null, arg1, arg3, arg12, local23, arg6, false, arg14, arg2, arg11, local33[local41 + local41], arg4, local33[local41 + local41 + 1]);
+ }
+ @Pc(87) int[] local87 = null;
+ if (arg9) {
+ @Pc(191) int local191;
+ if (arg10 == 1) {
+ local41 = method3683(local29, 0.0F, local11, local17, null, arg1, arg3, arg12, local23, arg6, true, arg14, arg2, arg11, 64, arg4, 128);
+ local191 = method3683(local29, 0.0F, local11, local17, null, arg1, arg3, arg12, local23, arg6, true, arg14, arg2, arg11, 128, arg4, 64);
+ local87 = new int[]{local191, local41, local39[2], local41, local39[0], local39[2]};
+ } else if (arg10 == 2) {
+ local87 = new int[6];
+ local41 = method3683(local29, 0.0F, local11, local17, null, arg1, arg3, arg12, local23, arg6, true, arg14, arg2, arg11, 128, arg4, 128);
+ local191 = method3683(local29, 0.0F, local11, local17, null, arg1, arg3, arg12, local23, arg6, true, arg14, arg2, arg11, 64, arg4, 0);
+ local87[2] = local41;
+ local87[0] = local39[0];
+ local87[5] = local39[0];
+ local87[3] = local41;
+ local87[1] = local191;
+ local87[4] = local39[1];
+ } else if (arg10 == 3) {
+ local87 = new int[6];
+ local41 = method3683(local29, 0.0F, local11, local17, null, arg1, arg3, arg12, local23, arg6, true, arg14, arg2, arg11, 0, arg4, 128);
+ local191 = method3683(local29, 0.0F, local11, local17, null, arg1, arg3, arg12, local23, arg6, true, arg14, arg2, arg11, 64, arg4, 0);
+ local87[4] = local191;
+ local87[1] = local39[1];
+ local87[0] = local39[2];
+ local87[3] = local41;
+ local87[2] = local41;
+ local87[5] = local39[2];
+ } else if (arg10 == 4) {
+ local87 = new int[3];
+ local41 = method3683(local29, 0.0F, local11, local17, null, arg1, arg3, arg12, local23, arg6, true, arg14, arg2, arg11, 0, arg4, 128);
+ local87[0] = local39[3];
+ local87[2] = local39[0];
+ local87[1] = local41;
+ } else if (arg10 == 5) {
+ local87 = new int[3];
+ local41 = method3683(local29, 0.0F, local11, local17, null, arg1, arg3, arg12, local23, arg6, true, arg14, arg2, arg11, 128, arg4, 128);
+ local87[1] = local41;
+ local87[0] = local39[2];
+ local87[2] = local39[3];
+ } else if (arg10 == 6) {
+ local87 = new int[6];
+ local41 = method3683(local29, 0.0F, local11, local17, null, arg1, arg3, arg12, local23, arg6, true, arg14, arg2, arg11, 128, arg4, 0);
+ local191 = method3683(local29, 0.0F, local11, local17, null, arg1, arg3, arg12, local23, arg6, true, arg14, arg2, arg11, 128, arg4, 128);
+ local87[1] = local41;
+ local87[0] = local39[3];
+ local87[2] = local191;
+ local87[4] = local39[0];
+ local87[3] = local191;
+ local87[5] = local39[3];
+ } else if (arg10 == 7) {
+ local87 = new int[6];
+ local41 = method3683(local29, 0.0F, local11, local17, null, arg1, arg3, arg12, local23, arg6, true, arg14, arg2, arg11, 0, arg4, 128);
+ local191 = method3683(local29, 0.0F, local11, local17, null, arg1, arg3, arg12, local23, arg6, true, arg14, arg2, arg11, 128, arg4, 0);
+ local87[3] = local41;
+ local87[2] = local41;
+ local87[0] = local39[1];
+ local87[4] = local39[2];
+ local87[1] = local191;
+ local87[5] = local39[1];
+ } else if (arg10 == 8) {
+ local87 = new int[3];
+ local41 = method3683(local29, 0.0F, local11, local17, null, arg1, arg3, arg12, local23, arg6, true, arg14, arg2, arg11, 0, arg4, 0);
+ local87[2] = local39[4];
+ local87[0] = local39[3];
+ local87[1] = local41;
+ } else if (arg10 == 9) {
+ local41 = method3683(local29, 0.0F, local11, local17, null, arg1, arg3, arg12, local23, arg6, true, arg14, arg2, arg11, 128, arg4, 64);
+ local191 = method3683(local29, 0.0F, local11, local17, null, arg1, arg3, arg12, local23, arg6, true, arg14, arg2, arg11, 96, arg4, 32);
+ @Pc(715) int local715 = method3683(local29, 0.0F, local11, local17, null, arg1, arg3, arg12, local23, arg6, true, arg14, arg2, arg11, 64, arg4, 0);
+ local87 = new int[]{local191, local41, local39[4], local191, local39[4], local39[3], local191, local39[3], local39[2], local191, local39[2], local39[1], local191, local39[1], local715};
+ } else if (arg10 == 10) {
+ local87 = new int[9];
+ local41 = method3683(local29, 0.0F, local11, local17, null, arg1, arg3, arg12, local23, arg6, true, arg14, arg2, arg11, 0, arg4, 128);
+ local87[0] = local39[2];
+ local87[8] = local39[0];
+ local87[1] = local41;
+ local87[4] = local41;
+ local87[2] = local39[3];
+ local87[7] = local41;
+ local87[3] = local39[3];
+ local87[5] = local39[4];
+ local87[6] = local39[4];
+ } else if (arg10 == 11) {
+ local87 = new int[12];
+ local41 = method3683(local29, 0.0F, local11, local17, null, arg1, arg3, arg12, local23, arg6, true, arg14, arg2, arg11, 0, arg4, 64);
+ local191 = method3683(local29, 0.0F, local11, local17, null, arg1, arg3, arg12, local23, arg6, true, arg14, arg2, arg11, 128, arg4, 64);
+ local87[5] = local41;
+ local87[1] = local41;
+ local87[8] = local41;
+ local87[0] = local39[3];
+ local87[2] = local39[0];
+ local87[11] = local191;
+ local87[6] = local39[2];
+ local87[7] = local191;
+ local87[10] = local39[1];
+ local87[3] = local39[3];
+ local87[4] = local39[2];
+ local87[9] = local39[2];
+ }
+ }
+ arg14.method1945(arg7, arg3, arg11, local39, local87, false);
+ }
+
+ @OriginalMember(owner = "client!ql", name = "a", descriptor = "(IFII[[I[[II[[FIBIZLclient!hg;[[FII[[FI)I")
+ public static int method3683(@OriginalArg(0) int arg0, @OriginalArg(1) float arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int[][] arg4, @OriginalArg(5) int[][] arg5, @OriginalArg(6) int arg6, @OriginalArg(7) float[][] arg7, @OriginalArg(8) int arg8, @OriginalArg(10) int arg9, @OriginalArg(11) boolean arg10, @OriginalArg(12) GlTile arg11, @OriginalArg(13) float[][] arg12, @OriginalArg(14) int arg13, @OriginalArg(15) int arg14, @OriginalArg(16) float[][] arg15, @OriginalArg(17) int arg16) {
+ @Pc(20) int local20;
+ if (arg9 == 1) {
+ local20 = arg14;
+ arg14 = arg16;
+ arg16 = 128 - local20;
+ } else if (arg9 == 2) {
+ arg16 = 128 - arg16;
+ arg14 = 128 - arg14;
+ } else if (arg9 == 3) {
+ local20 = arg14;
+ arg14 = 128 - arg16;
+ arg16 = local20;
+ }
+ @Pc(66) float local66;
+ @Pc(72) float local72;
+ @Pc(80) int local80;
+ @Pc(78) float local78;
+ if (arg14 == 0 && arg16 == 0) {
+ local66 = arg15[arg6][arg13];
+ local72 = arg7[arg6][arg13];
+ local78 = arg12[arg6][arg13];
+ local80 = arg2;
+ } else if (arg14 == 128 && arg16 == 0) {
+ local80 = arg3;
+ local66 = arg15[arg6 + 1][arg13];
+ local72 = arg7[arg6 + 1][arg13];
+ local78 = arg12[arg6 + 1][arg13];
+ } else if (arg14 == 128 && arg16 == 128) {
+ local72 = arg7[arg6 + 1][arg13 + 1];
+ local78 = arg12[arg6 + 1][arg13 + 1];
+ local66 = arg15[arg6 + 1][arg13 + 1];
+ local80 = arg8;
+ } else if (arg14 == 0 && arg16 == 128) {
+ local72 = arg7[arg6][arg13 + 1];
+ local66 = arg15[arg6][arg13 + 1];
+ local78 = arg12[arg6][arg13 + 1];
+ local80 = arg0;
+ } else {
+ local78 = arg12[arg6][arg13];
+ local66 = arg15[arg6][arg13];
+ @Pc(219) float local219 = (float) arg16 / 128.0F;
+ @Pc(224) float local224 = (float) arg14 / 128.0F;
+ @Pc(238) float local238 = local78 + (arg12[arg6 + 1][arg13] - local78) * local224;
+ @Pc(253) float local253 = local66 + (arg15[arg6 + 1][arg13] - local66) * local224;
+ @Pc(261) float local261 = arg12[arg6][arg13 + 1];
+ @Pc(269) float local269 = arg15[arg6][arg13 + 1];
+ @Pc(286) float local286 = local269 + (arg15[arg6 + 1][arg13 + 1] - local269) * local224;
+ local72 = arg7[arg6][arg13];
+ local66 = local253 + local219 * (local286 - local253);
+ @Pc(309) float local309 = arg7[arg6][arg13 + 1];
+ @Pc(326) float local326 = local261 + (arg12[arg6 + 1][arg13 + 1] - local261) * local224;
+ local78 = local238 + local219 * (local326 - local238);
+ @Pc(352) float local352 = local309 + (arg7[arg6 + 1][arg13 + 1] - local309) * local224;
+ @Pc(367) float local367 = local72 + (arg7[arg6 + 1][arg13] - local72) * local224;
+ local72 = local367 + (local352 - local367) * local219;
+ @Pc(382) int local382 = method1540(arg14, arg2, arg3);
+ @Pc(388) int local388 = method1540(arg14, arg0, arg8);
+ local80 = method1540(arg16, local382, local388);
+ }
+ @Pc(405) int local405 = arg16 + (arg13 << 7);
+ @Pc(413) int local413 = method3361(arg14, arg13, arg5, arg6, arg16);
+ @Pc(420) int local420 = (arg6 << 7) + arg14;
+ return arg11.method1941(local420, local413, local405, local78, local66, local72, arg10 ? local80 & 0xFFFFFF00 : local80, arg4 == null ? 0.0F : (float) (local413 - method3361(arg14, arg13, arg4, arg6, arg16)) / arg1);
+ }
+
+ @OriginalMember(owner = "client!oj", name = "a", descriptor = "(IBI[[III)I")
+ public static int method3361(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int[][] arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4) {
+ @Pc(25) int local25 = arg0 * arg2[arg3 + 1][arg1] + (128 - arg0) * arg2[arg3][arg1] >> 7;
+ @Pc(52) int local52 = arg2[arg3][arg1 + 1] * (128 - arg0) + arg2[arg3 + 1][arg1 + 1] * arg0 >> 7;
+ return local25 * (128 - arg4) + arg4 * local52 >> 7;
+ }
+
+ @OriginalMember(owner = "client!fh", name = "a", descriptor = "(IIII)I")
+ public static int method1540(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2) {
+ if (arg1 == arg2) {
+ return arg1;
+ } else {
+ @Pc(17) int local17 = 128 - arg0;
+ @Pc(50) int local50 = arg0 * (arg2 >>> 7 & 0x1FE01FE) + local17 * (arg1 >>> 7 & 0x1FE01FE) & 0xFF00FF00;
+ @Pc(65) int local65 = local17 * (arg1 & 0xFF00FF) + (arg2 & 0xFF00FF) * arg0 & 0xFF00FF00;
+ return local50 + (local65 >> 7);
}
}
}
diff --git a/client/src/main/java/rt4/ScriptRunner.java b/client/src/main/java/rt4/ScriptRunner.java
index 082a2ed..096b1e3 100644
--- a/client/src/main/java/rt4/ScriptRunner.java
+++ b/client/src/main/java/rt4/ScriptRunner.java
@@ -284,7 +284,7 @@ public final class ScriptRunner {
SoftwareRaster.setClip(arg2, arg4, arg3 + arg2, arg0 + arg4);
Rasteriser.prepare();
}
- if (Static40.aBoolean108 || anInt3751 < arg2 || anInt3751 >= arg3 + arg2 || arg4 > anInt1892 || arg0 + arg4 <= anInt1892) {
+ if (Cs1ScriptRunner.aBoolean108 || anInt3751 < arg2 || anInt3751 >= arg3 + arg2 || arg4 > anInt1892 || arg0 + arg4 <= anInt1892) {
aBoolean77 = false;
MiniMenu.anInt7 = 0;
} else {
@@ -319,14 +319,14 @@ public final class ScriptRunner {
client.audioLoop();
method3858();
method2726(arg4, arg3, arg2, anInt5029, arg0, anInt5029);
- Static233.method4000(arg3, arg2, arg0, anInt5029, anInt5029, arg4);
+ MiniMap.method4000(arg3, arg2, arg0, anInt5029, anInt5029, arg4);
} else {
SoftwareRaster.fillRect(arg2, arg4, arg3, arg0, 0);
SceneGraph.method2954(Camera.renderX, Camera.anInt40, Camera.renderZ, Camera.cameraPitch, Camera.cameraYaw, aByteArrayArrayArray15, anIntArray205, anIntArray338, anIntArray518, anIntArray134, anIntArray476, Player.level + 1, local387, PlayerList.self.xFine >> 7, PlayerList.self.zFine >> 7);
client.audioLoop();
method3858();
method2726(arg4, arg3, arg2, 256, arg0, 256);
- Static233.method4000(arg3, arg2, arg0, 256, 256, arg4);
+ MiniMap.method4000(arg3, arg2, arg0, 256, 256, arg4);
}
((Js5GlTextureProvider) Rasteriser.textureProvider).method3239(Protocol.anInt4247);
Player.method2310(arg3, arg4, arg0, arg2);
@@ -346,7 +346,7 @@ public final class ScriptRunner {
}
Fonts.drawTextOnScreen(false, LocalizedText.LOADING);
}
- if (!arg1 && !aBoolean43 && !Static40.aBoolean108 && arg2 <= anInt3751 && arg3 + arg2 > anInt3751 && arg4 <= anInt1892 && arg0 + arg4 > anInt1892) {
+ if (!arg1 && !aBoolean43 && !Cs1ScriptRunner.aBoolean108 && arg2 <= anInt3751 && arg3 + arg2 > anInt3751 && arg4 <= anInt1892 && arg0 + arg4 > anInt1892) {
MiniMenu.addEntries(arg4, arg3, arg0, arg2, anInt1892, anInt3751);
}
}
@@ -1420,6 +1420,73 @@ public final class ScriptRunner {
}
}
+ @OriginalMember(owner = "client!lf", name = "a", descriptor = "(I)V")
+ public static void method2742() {
+ if (client.gameState == 10 && GlRenderer.enabled) {
+ client.setGameState(28);
+ }
+ if (client.gameState == 30) {
+ client.setGameState(25);
+ }
+ }
+
+ @OriginalMember(owner = "client!sf", name = "b", descriptor = "(B)V")
+ public static void method3901() {
+ @Pc(16) int local16 = Fonts.b12Full.getStringWidth(LocalizedText.CHOOSE_OPTION);
+ @Pc(18) int local18;
+ @Pc(27) int local27;
+ for (local18 = 0; local18 < MiniMenu.size; local18++) {
+ local27 = Fonts.b12Full.getStringWidth(MiniMenu.getOp(local18));
+ if (local27 > local16) {
+ local16 = local27;
+ }
+ }
+ local18 = MiniMenu.size * 15 + 21;
+ @Pc(43) int local43 = anInt1892;
+ local16 += 8;
+ local27 = anInt3751 - local16 / 2;
+ if (local43 + local18 > GameShell.canvasHeight) {
+ local43 = GameShell.canvasHeight - local18;
+ }
+ if (GameShell.canvasWidth < local27 + local16) {
+ local27 = GameShell.canvasWidth - local16;
+ }
+ if (local27 < 0) {
+ local27 = 0;
+ }
+ if (local43 < 0) {
+ local43 = 0;
+ }
+ if (MiniMenu.anInt3953 == 1) {
+ if (anInt3751 == Mouse.anInt5850 && Mouse.anInt5895 == anInt1892) {
+ InterfaceList.anInt436 = MiniMenu.size * 15 + (InterfaceList.aBoolean298 ? 26 : 22);
+ MiniMenu.anInt3953 = 0;
+ InterfaceList.anInt5138 = local43;
+ InterfaceList.anInt4271 = local27;
+ Cs1ScriptRunner.aBoolean108 = true;
+ InterfaceList.anInt761 = local16;
+ }
+ } else if (anInt3751 == Mouse.clickX && anInt1892 == Mouse.clickY) {
+ InterfaceList.anInt4271 = local27;
+ MiniMenu.anInt3953 = 0;
+ InterfaceList.anInt761 = local16;
+ InterfaceList.anInt5138 = local43;
+ InterfaceList.anInt436 = (InterfaceList.aBoolean298 ? 26 : 22) + MiniMenu.size * 15;
+ Cs1ScriptRunner.aBoolean108 = true;
+ } else {
+ Mouse.anInt5895 = Mouse.clickY;
+ Mouse.anInt5850 = Mouse.clickX;
+ MiniMenu.anInt3953 = 1;
+ }
+ }
+
+ @OriginalMember(owner = "client!gn", name = "b", descriptor = "(Z)V")
+ public static void method1807() {
+ for (@Pc(11) int local11 = 0; local11 < 100; local11++) {
+ InterfaceList.aBooleanArray100[local11] = true;
+ }
+ }
+
public static class Cs2Opcodes {
// Component setters
public static final int setPosition = 1000;
@@ -2997,7 +3064,7 @@ public final class ScriptRunner {
int1 = intStack[isp];
int2 = intStack[isp + 2];
local1063 = InterfaceList.getComponent(int2);
- Static40.method1015(int3, int1, local1063);
+ Cs1ScriptRunner.method1015(int3, int1, local1063);
continue;
}
if (opcode == 3109) {
@@ -3005,7 +3072,7 @@ public final class ScriptRunner {
int1 = intStack[isp];
local1256 = local1020 ? staticActiveComponent1 : staticActiveComponent2;
int3 = intStack[isp + 1];
- Static40.method1015(int3, int1, local1256);
+ Cs1ScriptRunner.method1015(int3, int1, local1256);
continue;
}
if (opcode == 3110) {
@@ -4625,7 +4692,7 @@ public final class ScriptRunner {
ObjTypeList.clearSprites();
NpcTypeList.clearModels();
NpcTypeList.clearHeadModels();
- Static87.method1807();
+ method1807();
continue;
}
if (opcode == 5405) {
@@ -4695,7 +4762,7 @@ public final class ScriptRunner {
string = stringStack[ssp];
@Pc(8356) JagString local8356 = JagString.concatenate(new JagString[]{method479(), string});
if (GameShell.frame != null || local1552 && SignLink.anInt5928 != 3 && SignLink.osName.startsWith("win") && !client.haveIe6) {
- Static164.newTab = local1552;
+ Protocol.newTab = local1552;
url = local8356;
Protocol.openUrlRequest = GameShell.signLink.openUrl(new String(local8356.method3148(), StandardCharsets.ISO_8859_1));
continue;
@@ -4730,28 +4797,28 @@ public final class ScriptRunner {
}
if (opcode == 5424) {
isp -= 11;
- Static40.anInt1275 = intStack[isp];
- Static40.anInt2910 = intStack[isp + 1];
- Static40.anInt5457 = intStack[isp + 2];
- Static40.anInt5208 = intStack[isp + 3];
- Static40.anInt1736 = intStack[isp + 4];
- Static40.anInt4073 = intStack[isp + 5];
- Static40.anInt2261 = intStack[isp + 6];
- Static40.anInt3324 = intStack[isp + 7];
- Static40.anInt5556 = intStack[isp + 8];
- Static40.anInt4581 = intStack[isp + 9];
- Static40.anInt5752 = intStack[isp + 10];
- client.js5Archive8.isFileReady(Static40.anInt1736);
- client.js5Archive8.isFileReady(Static40.anInt4073);
- client.js5Archive8.isFileReady(Static40.anInt2261);
- client.js5Archive8.isFileReady(Static40.anInt3324);
- client.js5Archive8.isFileReady(Static40.anInt5556);
- Static40.aBoolean298 = true;
+ LoginManager.anInt1275 = intStack[isp];
+ LoginManager.anInt2910 = intStack[isp + 1];
+ LoginManager.anInt5457 = intStack[isp + 2];
+ LoginManager.anInt5208 = intStack[isp + 3];
+ LoginManager.anInt1736 = intStack[isp + 4];
+ LoginManager.anInt4073 = intStack[isp + 5];
+ LoginManager.anInt2261 = intStack[isp + 6];
+ LoginManager.anInt3324 = intStack[isp + 7];
+ LoginManager.anInt5556 = intStack[isp + 8];
+ LoginManager.anInt4581 = intStack[isp + 9];
+ LoginManager.anInt5752 = intStack[isp + 10];
+ client.js5Archive8.isFileReady(LoginManager.anInt1736);
+ client.js5Archive8.isFileReady(LoginManager.anInt4073);
+ client.js5Archive8.isFileReady(LoginManager.anInt2261);
+ client.js5Archive8.isFileReady(LoginManager.anInt3324);
+ client.js5Archive8.isFileReady(LoginManager.anInt5556);
+ InterfaceList.aBoolean298 = true;
continue;
}
if (opcode == 5425) {
- Static40.method4637();
- Static40.aBoolean298 = false;
+ LoginManager.method4637();
+ InterfaceList.aBoolean298 = false;
continue;
}
if (opcode == 5426) {
@@ -4936,7 +5003,7 @@ public final class ScriptRunner {
if (GlRenderer.enabled) {
FogManager.setInstantFade();
if (!Preferences.highDetailLighting) {
- Static145.method2742();
+ method2742();
}
}
ObjTypeList.clearSprites();
@@ -4948,7 +5015,7 @@ public final class ScriptRunner {
isp--;
Preferences.setAllVisibleLevels(intStack[isp] == 1);
LocTypeList.clear();
- Static145.method2742();
+ method2742();
method2218();
Preferences.write(GameShell.signLink);
Preferences.sentToServer = false;
@@ -4965,7 +5032,7 @@ public final class ScriptRunner {
if (opcode == 6005) {
isp--;
Preferences.showGroundDecorations = intStack[isp] == 1;
- Static145.method2742();
+ method2742();
Preferences.write(GameShell.signLink);
Preferences.sentToServer = false;
continue;
@@ -5039,7 +5106,7 @@ public final class ScriptRunner {
Rasteriser.setBrightness(0.6F);
}
}
- Static145.method2742();
+ method2742();
Preferences.write(GameShell.signLink);
Preferences.sentToServer = false;
continue;
@@ -5048,7 +5115,7 @@ public final class ScriptRunner {
isp--;
Preferences.highWaterDetail = intStack[isp] == 1;
if (GlRenderer.enabled) {
- Static145.method2742();
+ method2742();
}
Preferences.write(GameShell.signLink);
Preferences.sentToServer = false;
@@ -5383,7 +5450,7 @@ public final class ScriptRunner {
}
} else if (opcode < 6500) {
if (opcode == Cs2Opcodes.canShowVideoAd) {
- intStack[isp++] = Static87.showVideoAd() ? 1 : 0;
+ intStack[isp++] = client.showVideoAd() ? 1 : 0;
continue;
}
if (opcode == Cs2Opcodes.isShowingVideoAd) {
@@ -5640,25 +5707,25 @@ public final class ScriptRunner {
if (opcode == Cs2Opcodes.isValidChar) {
isp--;
int1 = intStack[isp];
- intStack[isp++] = StringUtils.isValidChar(int1) ? 1 : 0;
+ intStack[isp++] = CharUtils.isValidChar(int1) ? 1 : 0;
continue;
}
if (opcode == Cs2Opcodes.isAlphaNumeric) {
isp--;
int1 = intStack[isp];
- intStack[isp++] = StringUtils.isAlphaNumeric(int1) ? 1 : 0;
+ intStack[isp++] = CharUtils.isLetterOrDigit(int1) ? 1 : 0;
continue;
}
if (opcode == Cs2Opcodes.isLetter) {
isp--;
int1 = intStack[isp];
- intStack[isp++] = StringUtils.isLetter(int1) ? 1 : 0;
+ intStack[isp++] = CharUtils.isLetter(int1) ? 1 : 0;
continue;
}
if (opcode == Cs2Opcodes.isDigit) {
isp--;
int1 = intStack[isp];
- intStack[isp++] = StringUtils.isDigit(int1) ? 1 : 0;
+ intStack[isp++] = CharUtils.isDigit(int1) ? 1 : 0;
continue;
}
if (opcode == Cs2Opcodes.length) {
@@ -5683,7 +5750,7 @@ public final class ScriptRunner {
if (opcode == Cs2Opcodes.removeTags) {
ssp--;
string = stringStack[ssp];
- str1 = Static87.allocate(string.length());
+ str1 = JagString.allocate(string.length());
@Pc(12220) boolean local12220 = false;
for (local652 = 0; local652 < string.length(); local652++) {
c = string.charAt(local652);
@@ -5720,13 +5787,13 @@ public final class ScriptRunner {
if (opcode == Cs2Opcodes.toLower) {
isp--;
int1 = intStack[isp];
- intStack[isp++] = StringUtils.toLowerCase(int1);
+ intStack[isp++] = CharUtils.toLowerCase(int1);
continue;
}
if (opcode == Cs2Opcodes.toUpper) {
isp--;
int1 = intStack[isp];
- intStack[isp++] = StringUtils.toUpperCase(int1);
+ intStack[isp++] = CharUtils.toUpperCase(int1);
continue;
}
if (opcode == Cs2Opcodes.formatNumber) {
@@ -5839,7 +5906,7 @@ public final class ScriptRunner {
}
TracingException.report("CS2 - scr:" + script.key + " op:" + op, ex);
} else {
- @Pc(14385) JagString str = Static87.allocate(30);
+ @Pc(14385) JagString str = JagString.allocate(30);
str.method3113(aClass100_928).method3113(script.name);
for (cycles = fp - 1; cycles >= 0; cycles--) {
str.method3113(aClass100_253).method3113(callStack[cycles].script.name);
diff --git a/client/src/main/java/rt4/Static1.java b/client/src/main/java/rt4/Static1.java
deleted file mode 100644
index 3d264ec..0000000
--- a/client/src/main/java/rt4/Static1.java
+++ /dev/null
@@ -1,843 +0,0 @@
-package rt4;
-
-import org.openrs2.deob.annotation.OriginalArg;
-import org.openrs2.deob.annotation.OriginalMember;
-import org.openrs2.deob.annotation.Pc;
-
-public final class Static1 {
-
- @OriginalMember(owner = "client!wi", name = "hb", descriptor = "[[Z")
- public static final boolean[][] aBooleanArrayArray4 = new boolean[][]{{true, true, true}, {false, false}, {false, true}, {true, false}, {false, true, true}, {true, false, true}, {false, true, false}, {true, false, false}};
- @OriginalMember(owner = "client!kc", name = "s", descriptor = "[I")
- 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!sh", name = "i", descriptor = "[[I")
- public static final int[][] anIntArrayArray35 = new int[][]{{0, 128, 0, 0, 128, 0, 128, 128}, {0, 128, 0, 0, 128, 0}, {0, 0, 64, 128, 0, 128}, {128, 128, 64, 128, 128, 0}, {0, 0, 128, 0, 128, 128, 64, 128}, {0, 128, 0, 0, 128, 0, 64, 128}, {64, 128, 0, 128, 0, 0, 64, 0}, {0, 0, 64, 0, 0, 64}, {128, 0, 128, 128, 0, 128, 0, 64, 64, 0}, {0, 128, 0, 0, 32, 64, 64, 96, 128, 128}, {0, 0, 128, 0, 128, 128, 64, 96, 32, 64}, {0, 0, 128, 0, 96, 32, 32, 32}};
- @OriginalMember(owner = "client!gf", name = "S", descriptor = "[I")
- public static final int[] anIntArray419 = new int[]{0, 2, 2, 2, 1, 1, 2, 2, 1, 3, 1, 1};
- @OriginalMember(owner = "client!a", name = "h", descriptor = "I")
- public static int anInt5;
-
- @OriginalMember(owner = "client!a", name = "e", descriptor = "Lclient!na;")
- public static final JagString TITLE_SONG = JagString.parse("scape main");
-
- @OriginalMember(owner = "client!ig", name = "b", descriptor = "I")
- public static int anInt2882;
- @OriginalMember(owner = "client!ig", name = "f", descriptor = "I")
- public static int anInt2884;
- @OriginalMember(owner = "client!hc", name = "P", descriptor = "I")
- public static int anInt2428;
-
- @OriginalMember(owner = "client!a", name = "a", descriptor = "([[F[[F[[II[[F[[B[[II[[B[[B[[B[[[B)[Lclient!hg;")
- public static GlTile[] method2(@OriginalArg(0) float[][] arg0, @OriginalArg(1) float[][] arg1, @OriginalArg(2) int[][] arg2, @OriginalArg(3) int arg3, @OriginalArg(4) float[][] arg4, @OriginalArg(5) byte[][] arg5, @OriginalArg(6) int[][] arg6, @OriginalArg(8) byte[][] arg7, @OriginalArg(9) byte[][] arg8, @OriginalArg(10) byte[][] arg9, @OriginalArg(11) byte[][][] arg10) {
- @Pc(10) HashTable local10 = new HashTable(128);
- @Pc(12) int local12;
- @Pc(17) int local17;
- @Pc(30) int local30;
- @Pc(38) int local38;
- @Pc(131) int local131;
- @Pc(168) int local168;
- @Pc(143) int local143;
- @Pc(163) int local163;
- @Pc(153) int local153;
- @Pc(190) int local190;
- @Pc(180) int local180;
- @Pc(214) int local214;
- @Pc(202) int local202;
- @Pc(226) int local226;
- @Pc(274) byte local274;
- @Pc(299) int local299;
- @Pc(317) int local317;
- @Pc(127) int local127;
- @Pc(133) int local133;
- @Pc(777) int local777;
- @Pc(1035) int local1035;
- @Pc(1055) boolean[] local1055;
- @Pc(1068) boolean[] local1068;
- @Pc(1086) boolean[] local1086;
- for (local12 = 1; local12 <= 102; local12++) {
- for (local17 = 1; local17 <= 102; local17++) {
- local30 = arg8[local12][local17] & 0xFF;
- local38 = arg9[local12][local17] & 0xFF;
- if (local38 != 0) {
- @Pc(50) FloType local50 = FloTypeList.method4395(local38 - 1);
- if (local50.anInt5899 == -1) {
- continue;
- }
- @Pc(61) GlTile local61 = method4212(local10, local50);
- @Pc(67) byte local67 = arg7[local12][local17];
- @Pc(71) int[] local71 = anIntArrayArray35[local67];
- local61.anInt2482 += local71.length / 2;
- local61.anInt2484++;
- if (local50.aBoolean310 && local30 != 0) {
- local61.anInt2482 += anIntArray419[local67];
- }
- }
- if ((arg8[local12][local17] & 0xFF) != 0 || local38 != 0 && arg7[local12][local17] == 0) {
- local127 = 0;
- @Pc(129) int local129 = 0;
- local131 = 0;
- local133 = 0;
- local143 = arg9[local12][local17 + 1] & 0xFF;
- local153 = arg9[local12][local17 - 1] & 0xFF;
- local163 = arg9[local12 - 1][local17] & 0xFF;
- @Pc(166) int[] local166 = new int[8];
- local168 = 0;
- local180 = arg9[local12 - 1][local17 + 1] & 0xFF;
- local190 = arg9[local12 + 1][local17] & 0xFF;
- local202 = arg9[local12 + 1][local17 - 1] & 0xFF;
- local214 = arg9[local12 - 1][local17 - 1] & 0xFF;
- local226 = arg9[local12 + 1][local17 + 1] & 0xFF;
- @Pc(242) FloType local242;
- @Pc(264) byte local264;
- @Pc(287) int local287;
- if (local180 != 0 && local38 != local180) {
- local242 = FloTypeList.method4395(local180 - 1);
- if (local242.aBoolean310 && local242.anInt5899 != -1) {
- local264 = arg5[local12 - 1][local17 + 1];
- local274 = arg7[local12 - 1][local17 + 1];
- local287 = anIntArray300[local274 * 4 + (local264 + 2 & 0x3)];
- local299 = anIntArray300[(local264 + 3 & 0x3) + local274 * 4];
- if (!aBooleanArrayArray4[local299][1] || !aBooleanArrayArray4[local287][0]) {
- for (local317 = 0; local317 < 8; local317++) {
- if (local317 == 0) {
- local127++;
- local166[0] = local180;
- break;
- }
- if (local180 == local166[local317]) {
- break;
- }
- }
- }
- }
- }
- if (local214 != 0 && local214 != local38) {
- local242 = FloTypeList.method4395(local214 - 1);
- if (local242.aBoolean310 && local242.anInt5899 != -1) {
- local264 = arg5[local12 - 1][local17 - 1];
- local274 = arg7[local12 - 1][local17 - 1];
- local287 = anIntArray300[local274 * 4 + (local264 & 0x3)];
- local299 = anIntArray300[(local264 + 3 & 0x3) + local274 * 4];
- if (!aBooleanArrayArray4[local287][1] || !aBooleanArrayArray4[local299][0]) {
- for (local317 = 0; local317 < 8; local317++) {
- if (local127 == local317) {
- local166[local127++] = local214;
- break;
- }
- if (local166[local317] == local214) {
- break;
- }
- }
- }
- }
- }
- if (local202 != 0 && local38 != local202) {
- local242 = FloTypeList.method4395(local202 - 1);
- if (local242.aBoolean310 && local242.anInt5899 != -1) {
- local264 = arg5[local12 + 1][local17 - 1];
- local274 = arg7[local12 + 1][local17 - 1];
- local299 = anIntArray300[local274 * 4 + (local264 + 1 & 0x3)];
- local287 = anIntArray300[local274 * 4 + (local264 & 0x3)];
- if (!aBooleanArrayArray4[local299][1] || !aBooleanArrayArray4[local287][0]) {
- for (local317 = 0; local317 < 8; local317++) {
- if (local127 == local317) {
- local166[local127++] = local202;
- break;
- }
- if (local202 == local166[local317]) {
- break;
- }
- }
- }
- }
- }
- if (local226 != 0 && local226 != local38) {
- local242 = FloTypeList.method4395(local226 - 1);
- if (local242.aBoolean310 && local242.anInt5899 != -1) {
- local264 = arg5[local12 + 1][local17 + 1];
- local274 = arg7[local12 + 1][local17 + 1];
- local299 = anIntArray300[local274 * 4 + (local264 + 1 & 0x3)];
- local287 = anIntArray300[local274 * 4 + (local264 + 2 & 0x3)];
- if (!aBooleanArrayArray4[local287][1] || !aBooleanArrayArray4[local299][0]) {
- for (local317 = 0; local317 < 8; local317++) {
- if (local127 == local317) {
- local166[local127++] = local226;
- break;
- }
- if (local226 == local166[local317]) {
- break;
- }
- }
- }
- }
- }
- if (local143 != 0 && local38 != local143) {
- local242 = FloTypeList.method4395(local143 - 1);
- if (local242.aBoolean310 && local242.anInt5899 != -1) {
- local129 = anIntArray300[arg7[local12][local17 + 1] * 4 + (arg5[local12][local17 + 1] + 2 & 0x3)];
- for (local777 = 0; local777 < 8; local777++) {
- if (local127 == local777) {
- local166[local127++] = local143;
- break;
- }
- if (local166[local777] == local143) {
- break;
- }
- }
- }
- }
- if (local163 != 0 && local38 != local163) {
- local242 = FloTypeList.method4395(local163 - 1);
- if (local242.aBoolean310 && local242.anInt5899 != -1) {
- local133 = anIntArray300[(arg5[local12 - 1][local17] + 3 & 0x3) + arg7[local12 - 1][local17] * 4];
- for (local777 = 0; local777 < 8; local777++) {
- if (local127 == local777) {
- local166[local127++] = local163;
- break;
- }
- if (local163 == local166[local777]) {
- break;
- }
- }
- }
- }
- if (local153 != 0 && local38 != local153) {
- local242 = FloTypeList.method4395(local153 - 1);
- if (local242.aBoolean310 && local242.anInt5899 != -1) {
- local131 = anIntArray300[(arg5[local12][local17 - 1] & 0x3) + arg7[local12][local17 - 1] * 4];
- for (local777 = 0; local777 < 8; local777++) {
- if (local777 == local127) {
- local166[local127++] = local153;
- break;
- }
- if (local153 == local166[local777]) {
- break;
- }
- }
- }
- }
- if (local190 != 0 && local38 != local190) {
- local242 = FloTypeList.method4395(local190 - 1);
- if (local242.aBoolean310 && local242.anInt5899 != -1) {
- local168 = anIntArray300[(arg5[local12 + 1][local17] + 1 & 0x3) + arg7[local12 + 1][local17] * 4];
- for (local777 = 0; local777 < 8; local777++) {
- if (local127 == local777) {
- local166[local127++] = local190;
- break;
- }
- if (local166[local777] == local190) {
- break;
- }
- }
- }
- }
- for (local1035 = 0; local1035 < local127; local1035++) {
- local777 = local166[local1035];
- local1055 = aBooleanArrayArray4[local163 == local777 ? local133 : 0];
- local1068 = aBooleanArrayArray4[local777 == local153 ? local131 : 0];
- @Pc(1077) boolean[] local1077 = aBooleanArrayArray4[local143 == local777 ? local129 : 0];
- local1086 = aBooleanArrayArray4[local190 == local777 ? local168 : 0];
- @Pc(1092) FloType local1092 = FloTypeList.method4395(local777 - 1);
- @Pc(1097) GlTile local1097 = method4212(local10, local1092);
- local1097.anInt2482 += 5;
- local1097.anInt2482 += local1077.length - 2;
- local1097.anInt2482 += local1055.length - 2;
- local1097.anInt2482 += local1068.length - 2;
- local1097.anInt2482 += local1086.length - 2;
- local1097.anInt2484++;
- }
- }
- }
- }
- @Pc(1161) GlTile local1161;
- for (local1161 = (GlTile) local10.head(); local1161 != null; local1161 = (GlTile) local10.next()) {
- local1161.method1940();
- }
- for (local12 = 1; local12 <= 102; local12++) {
- for (local17 = 1; local17 <= 102; local17++) {
- local38 = arg8[local12][local17] & 0xFF;
- local127 = arg9[local12][local17] & 0xFF;
- if ((arg10[arg3][local12][local17] & 0x8) != 0) {
- local30 = 0;
- } else if ((arg10[1][local12][local17] & 0x2) == 2 && arg3 > 0) {
- local30 = arg3 - 1;
- } else {
- local30 = arg3;
- }
- if (local127 != 0) {
- @Pc(1250) FloType local1250 = FloTypeList.method4395(local127 - 1);
- if (local1250.anInt5899 == -1) {
- continue;
- }
- @Pc(1261) GlTile local1261 = method4212(local10, local1250);
- @Pc(1267) byte local1267 = arg7[local12][local17];
- @Pc(1273) byte local1273 = arg5[local12][local17];
- local168 = method588(local1250.texture, local1250.anInt5899, arg6[local12][local17]);
- local143 = method588(local1250.texture, local1250.anInt5899, arg6[local12 + 1][local17]);
- local163 = method588(local1250.texture, local1250.anInt5899, arg6[local12 + 1][local17 + 1]);
- local153 = method588(local1250.texture, local1250.anInt5899, arg6[local12][local17 + 1]);
- method1324(local168, arg2, arg1, local12, arg0, local143, local1273, local30, local163, local38 != 0 && local1250.aBoolean310, local1267, local17, arg4, local153, local1261);
- }
- if ((arg8[local12][local17] & 0xFF) != 0 || local127 != 0 && arg7[local12][local17] == 0) {
- @Pc(1382) int[] local1382 = new int[8];
- local133 = 0;
- @Pc(1386) int local1386 = 0;
- local131 = 0;
- local168 = 0;
- local163 = arg9[local12][local17 + 1] & 0xFF;
- local143 = 0;
- local153 = arg9[local12 - 1][local17] & 0xFF;
- local180 = arg9[local12 + 1][local17] & 0xFF;
- local190 = arg9[local12][local17 - 1] & 0xFF;
- local214 = arg9[local12 - 1][local17 + 1] & 0xFF;
- local202 = arg9[local12 - 1][local17 - 1] & 0xFF;
- local226 = arg9[local12 + 1][local17 - 1] & 0xFF;
- local1035 = arg9[local12 + 1][local17 + 1] & 0xFF;
- @Pc(1527) byte local1527;
- @Pc(1496) FloType local1496;
- @Pc(1571) int local1571;
- if (local214 == 0 || local214 == local127) {
- local214 = 0;
- } else {
- local1496 = FloTypeList.method4395(local214 - 1);
- if (local1496.aBoolean310 && local1496.anInt5899 != -1) {
- local274 = arg5[local12 - 1][local17 + 1];
- local1527 = arg7[local12 - 1][local17 + 1];
- local299 = anIntArray300[local1527 * 4 + (local274 + 2 & 0x3)];
- local317 = anIntArray300[local1527 * 4 + (local274 + 3 & 0x3)];
- if (aBooleanArrayArray4[local317][1] && aBooleanArrayArray4[local299][0]) {
- local214 = 0;
- } else {
- for (local1571 = 0; local1571 < 8; local1571++) {
- if (local1571 == 0) {
- local1386++;
- local1382[0] = local214;
- break;
- }
- if (local1382[local1571] == local214) {
- break;
- }
- }
- }
- } else {
- local214 = 0;
- }
- }
- if (local202 == 0 || local127 == local202) {
- local202 = 0;
- } else {
- local1496 = FloTypeList.method4395(local202 - 1);
- if (local1496.aBoolean310 && local1496.anInt5899 != -1) {
- local274 = arg5[local12 - 1][local17 - 1];
- local1527 = arg7[local12 - 1][local17 - 1];
- local299 = anIntArray300[(local274 & 0x3) + local1527 * 4];
- local317 = anIntArray300[(local274 + 3 & 0x3) + local1527 * 4];
- if (aBooleanArrayArray4[local299][1] && aBooleanArrayArray4[local317][0]) {
- local202 = 0;
- } else {
- for (local1571 = 0; local1571 < 8; local1571++) {
- if (local1571 == local1386) {
- local1382[local1386++] = local202;
- break;
- }
- if (local202 == local1382[local1571]) {
- break;
- }
- }
- }
- } else {
- local202 = 0;
- }
- }
- if (local226 == 0 || local226 == local127) {
- local226 = 0;
- } else {
- local1496 = FloTypeList.method4395(local226 - 1);
- if (local1496.aBoolean310 && local1496.anInt5899 != -1) {
- local274 = arg5[local12 + 1][local17 - 1];
- local1527 = arg7[local12 + 1][local17 - 1];
- local317 = anIntArray300[(local274 + 1 & 0x3) + local1527 * 4];
- local299 = anIntArray300[local1527 * 4 + (local274 & 0x3)];
- if (aBooleanArrayArray4[local317][1] && aBooleanArrayArray4[local299][0]) {
- local226 = 0;
- } else {
- for (local1571 = 0; local1571 < 8; local1571++) {
- if (local1571 == local1386) {
- local1382[local1386++] = local226;
- break;
- }
- if (local1382[local1571] == local226) {
- break;
- }
- }
- }
- } else {
- local226 = 0;
- }
- }
- if (local1035 == 0 || local127 == local1035) {
- local1035 = 0;
- } else {
- local1496 = FloTypeList.method4395(local1035 - 1);
- if (local1496.aBoolean310 && local1496.anInt5899 != -1) {
- local1527 = arg7[local12 + 1][local17 + 1];
- local274 = arg5[local12 + 1][local17 + 1];
- local299 = anIntArray300[(local274 + 2 & 0x3) + local1527 * 4];
- local317 = anIntArray300[(local274 + 1 & 0x3) + local1527 * 4];
- if (aBooleanArrayArray4[local299][1] && aBooleanArrayArray4[local317][0]) {
- local1035 = 0;
- } else {
- for (local1571 = 0; local1571 < 8; local1571++) {
- if (local1571 == local1386) {
- local1382[local1386++] = local1035;
- break;
- }
- if (local1382[local1571] == local1035) {
- break;
- }
- }
- }
- } else {
- local1035 = 0;
- }
- }
- @Pc(2003) int local2003;
- if (local163 != 0 && local163 != local127) {
- local1496 = FloTypeList.method4395(local163 - 1);
- if (local1496.aBoolean310 && local1496.anInt5899 != -1) {
- local133 = anIntArray300[arg7[local12][local17 + 1] * 4 + (arg5[local12][local17 + 1] + 2 & 0x3)];
- for (local2003 = 0; local2003 < 8; local2003++) {
- if (local2003 == local1386) {
- local1382[local1386++] = local163;
- break;
- }
- if (local1382[local2003] == local163) {
- break;
- }
- }
- }
- }
- if (local153 != 0 && local127 != local153) {
- local1496 = FloTypeList.method4395(local153 - 1);
- if (local1496.aBoolean310 && local1496.anInt5899 != -1) {
- local131 = anIntArray300[(arg5[local12 - 1][local17] + 3 & 0x3) + arg7[local12 - 1][local17] * 4];
- for (local2003 = 0; local2003 < 8; local2003++) {
- if (local1386 == local2003) {
- local1382[local1386++] = local153;
- break;
- }
- if (local153 == local1382[local2003]) {
- break;
- }
- }
- }
- }
- if (local190 != 0 && local190 != local127) {
- local1496 = FloTypeList.method4395(local190 - 1);
- if (local1496.aBoolean310 && local1496.anInt5899 != -1) {
- local168 = anIntArray300[(arg5[local12][local17 - 1] & 0x3) + arg7[local12][local17 - 1] * 4];
- for (local2003 = 0; local2003 < 8; local2003++) {
- if (local1386 == local2003) {
- local1382[local1386++] = local190;
- break;
- }
- if (local190 == local1382[local2003]) {
- break;
- }
- }
- }
- }
- if (local180 != 0 && local180 != local127) {
- local1496 = FloTypeList.method4395(local180 - 1);
- if (local1496.aBoolean310 && local1496.anInt5899 != -1) {
- local143 = anIntArray300[arg7[local12 + 1][local17] * 4 + (arg5[local12 + 1][local17] + 1 & 0x3)];
- for (local2003 = 0; local2003 < 8; local2003++) {
- if (local2003 == local1386) {
- local1382[local1386++] = local180;
- break;
- }
- if (local1382[local2003] == local180) {
- break;
- }
- }
- }
- }
- for (local777 = 0; local777 < local1386; local777++) {
- local2003 = local1382[local777];
- local1055 = aBooleanArrayArray4[local2003 == local163 ? local133 : 0];
- local1068 = aBooleanArrayArray4[local153 == local2003 ? local131 : 0];
- local1086 = aBooleanArrayArray4[local2003 == local190 ? local168 : 0];
- @Pc(2318) boolean[] local2318 = aBooleanArrayArray4[local2003 == local180 ? local143 : 0];
- @Pc(2324) FloType local2324 = FloTypeList.method4395(local2003 - 1);
- @Pc(2329) GlTile local2329 = method4212(local10, local2324);
- @Pc(2345) int local2345 = method588(local2324.texture, local2324.anInt5899, arg6[local12][local17]) << 8 | 0xFF;
- @Pc(2365) int local2365 = method588(local2324.texture, local2324.anInt5899, arg6[local12 + 1][local17]) << 8 | 0xFF;
- @Pc(2385) int local2385 = method588(local2324.texture, local2324.anInt5899, arg6[local12 + 1][local17 + 1]) << 8 | 0xFF;
- @Pc(2403) int local2403 = method588(local2324.texture, local2324.anInt5899, arg6[local12][local17 + 1]) << 8 | 0xFF;
- @Pc(2422) boolean local2422 = local2003 != local202 && local1086[0] && local1068[1];
- @Pc(2441) boolean local2441 = local2003 != local1035 && local1055[0] && local2318[1];
- @Pc(2456) boolean local2456 = local214 != local2003 && local1068[0] && local1055[1];
- @Pc(2463) int local2463 = local1055.length + 6 - 2;
- @Pc(2482) boolean local2482 = local2003 != local226 && local2318[0] && local1086[1];
- @Pc(2489) int local2489 = local2463 + local1068.length - 2;
- @Pc(2496) int local2496 = local2489 + local1086.length - 2;
- @Pc(2503) int local2503 = local2496 + local2318.length - 2;
- @Pc(2524) int local2524 = method3683(local2403, 0.0F, local2345, local2365, null, arg2, local12, arg4, local2385, 0, true, local2329, arg1, local17, 64, arg0, 64);
- @Pc(2527) int[] local2527 = new int[local2503];
- @Pc(2529) byte local2529 = 0;
- @Pc(2550) int local2550 = method3683(local2403, 0.0F, local2345, local2365, null, arg2, local12, arg4, local2385, 0, local2456, local2329, arg1, local17, 0, arg0, 128);
- @Pc(2571) int local2571 = method3683(local2403, 0.0F, local2345, local2365, null, arg2, local12, arg4, local2385, 0, local2441, local2329, arg1, local17, 128, arg0, 128);
- @Pc(2592) int local2592 = method3683(local2403, 0.0F, local2345, local2365, null, arg2, local12, arg4, local2385, 0, local2422, local2329, arg1, local17, 0, arg0, 0);
- @Pc(2613) int local2613 = method3683(local2403, 0.0F, local2345, local2365, null, arg2, local12, arg4, local2385, 0, local2482, local2329, arg1, local17, 128, arg0, 0);
- @Pc(2616) int local2616 = local2529 + 1;
- local2527[0] = local2524;
- @Pc(2621) int local2621 = local2616 + 1;
- local2527[1] = local2571;
- if (local1055.length > 2) {
- local2621++;
- local2527[2] = method3683(local2403, 0.0F, local2345, local2365, null, arg2, local12, arg4, local2385, 0, local1055[2], local2329, arg1, local17, 64, arg0, 128);
- }
- local2527[local2621++] = local2550;
- if (local1068.length > 2) {
- local2527[local2621++] = method3683(local2403, 0.0F, local2345, local2365, null, arg2, local12, arg4, local2385, 0, local1068[2], local2329, arg1, local17, 0, arg0, 64);
- }
- local2527[local2621++] = local2592;
- if (local1086.length > 2) {
- local2527[local2621++] = method3683(local2403, 0.0F, local2345, local2365, null, arg2, local12, arg4, local2385, 0, local1086[2], local2329, arg1, local17, 64, arg0, 0);
- }
- local2527[local2621++] = local2613;
- if (local2318.length > 2) {
- local2527[local2621++] = method3683(local2403, 0.0F, local2345, local2365, null, arg2, local12, arg4, local2385, 0, local2318[2], local2329, arg1, local17, 128, arg0, 64);
- }
- local2527[local2621++] = local2571;
- local2329.method1945(local30, local12, local17, local2527, null, true);
- }
- }
- }
- }
- for (local1161 = (GlTile) local10.head(); local1161 != null; local1161 = (GlTile) local10.next()) {
- if (local1161.anInt2483 == 0) {
- local1161.unlink();
- } else {
- local1161.method1943();
- }
- }
- local12 = local10.size();
- @Pc(2823) GlTile[] local2823 = new GlTile[local12];
- @Pc(2826) long[] local2826 = new long[local12];
- local10.method3865(local2823);
- for (local38 = 0; local38 < local12; local38++) {
- local2826[local38] = local2823[local38].key;
- }
- SceneGraph.method23(local2826, local2823);
- return local2823;
- }
-
- @OriginalMember(owner = "client!a", name = "a", descriptor = "(IIIII)V")
- public static void method4(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(4) int arg3) {
- if (GlRenderer.enabled) {
- GlRaster.setClip(arg0, arg3, arg2 + arg0, arg1 + arg3);
- GlRaster.fillRect(arg0, arg3, arg2, arg1, 0);
- } else {
- SoftwareRaster.setClip(arg0, arg3, arg2 + arg0, arg3 + arg1);
- SoftwareRaster.fillRect(arg0, arg3, arg2, arg1, 0);
- }
- if (WorldMap.loadPercentage < 100) {
- return;
- }
- if (WorldMap.aClass3_Sub2_Sub1_2 == null || arg2 != WorldMap.aClass3_Sub2_Sub1_2.width || WorldMap.aClass3_Sub2_Sub1_2.height != arg1) {
- @Pc(63) SoftwareSprite local63 = new SoftwareSprite(arg2, arg1);
- SoftwareRaster.setSize(local63.pixels, arg2, arg1);
- WorldMap.method4364(arg2, 0, WorldMap.width, 0, 0, WorldMap.length, arg1, 0);
- if (GlRenderer.enabled) {
- WorldMap.aClass3_Sub2_Sub1_2 = new GlSprite(local63);
- } else {
- WorldMap.aClass3_Sub2_Sub1_2 = local63;
- }
- if (GlRenderer.enabled) {
- SoftwareRaster.pixels = null;
- } else {
- SoftwareRaster.frameBuffer.makeTarget();
- }
- }
- WorldMap.aClass3_Sub2_Sub1_2.drawPixels(arg0, arg3);
- @Pc(147) int local147 = arg1 * anInt2884 / WorldMap.length + arg3;
- @Pc(153) int local153 = WorldMap.anInt1176 * arg1 / WorldMap.length;
- @Pc(161) int local161 = arg0 + arg2 * anInt2882 / WorldMap.width;
- @Pc(167) int local167 = arg2 * WorldMap.anInt2387 / WorldMap.width;
- @Pc(169) int local169 = 16711680;
- if (client.game == 1) {
- local169 = 16777215;
- }
- if (GlRenderer.enabled) {
- GlRaster.fillRectAlpha(local161, local147, local167, local153, local169, 128);
- GlRaster.drawRect(local161, local147, local167, local153, local169);
- } else {
- SoftwareRaster.fillRectAlpha(local161, local147, local167, local153, local169, 128);
- SoftwareRaster.drawRect(local161, local147, local167, local153, local169);
- }
- if (WorldMap.anInt1864 <= 0) {
- return;
- }
- @Pc(225) int local225;
- if (anInt2428 > 10) {
- local225 = (20 - anInt2428) * 25;
- } else {
- local225 = anInt2428 * 25;
- }
- for (@Pc(238) MapElement local238 = (MapElement) WorldMap.mapElements.head(); local238 != null; local238 = (MapElement) WorldMap.mapElements.next()) {
- if (local238.id == Static9.anInt172) {
- @Pc(258) int local258 = arg3 + local238.anInt4314 * arg1 / WorldMap.length;
- @Pc(267) int local267 = arg2 * local238.anInt4307 / WorldMap.width + arg0;
- if (GlRenderer.enabled) {
- GlRaster.fillRectAlpha(local267 - 2, local258 + -2, 4, 4, 16776960, local225);
- } else {
- SoftwareRaster.fillRectAlpha(local267 - 2, local258 + -2, 4, 4, 16776960, local225);
- }
- }
- }
- }
-
- @OriginalMember(owner = "client!tk", name = "a", descriptor = "(Lclient!sc;ZLclient!wl;)Lclient!hg;")
- public static GlTile method4212(@OriginalArg(0) HashTable arg0, @OriginalArg(2) FloType arg1) {
- @Pc(23) long local23 = (long) ((arg1.texture + 1 << 16) + arg1.anInt5885) + ((long) arg1.anInt5897 << 56) + ((long) arg1.anInt5889 << 32);
- @Pc(38) GlTile local38 = (GlTile) arg0.get(local23);
- if (local38 == null) {
- local38 = new GlTile(arg1.texture, (float) arg1.anInt5885, true, false, arg1.anInt5889);
- arg0.put(local38, local23);
- }
- return local38;
- }
-
- @OriginalMember(owner = "client!bi", name = "a", descriptor = "(IIBI)I")
- public static int method588(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2) {
- @Pc(19) int local19 = Rasteriser.palette[SoftwareModel.method4585(arg1, arg2)];
- if (arg0 > 0) {
- @Pc(31) int local31 = Rasteriser.textureProvider.method3238(arg0 & 0xFFFF);
- @Pc(49) int local49;
- @Pc(73) int local73;
- if (local31 != 0) {
- if (arg2 < 0) {
- local49 = 0;
- } else if (arg2 > 127) {
- local49 = 16777215;
- } else {
- local49 = arg2 * 131586;
- }
- if (local31 == 256) {
- local19 = local49;
- } else {
- local73 = 256 - local31;
- local19 = ((local49 & 0xFF00) * local31 + local73 * (local19 & 0xFF00) & 0xFF0000) + (local31 * (local49 & 0xFF00FF) + ((local19 & 0xFF00FF) * local73) & 0xFF00FF00) >> 8;
- }
- }
- local49 = Rasteriser.textureProvider.method3229(arg0 & 0xFFFF);
- if (local49 != 0) {
- local49 += 256;
- @Pc(125) int local125 = (local19 >> 16 & 0xFF) * local49;
- if (local125 > 65535) {
- local125 = 65535;
- }
- local73 = (local19 >> 8 & 0xFF) * local49;
- if (local73 > 65535) {
- local73 = 65535;
- }
- @Pc(150) int local150 = local49 * (local19 & 0xFF);
- if (local150 > 65535) {
- local150 = 65535;
- }
- local19 = (local150 >> 8) + (local73 & 0xFF00) + (local125 << 8 & 0xFF001F);
- }
- }
- return local19;
- }
-
- @OriginalMember(owner = "client!eh", name = "a", descriptor = "(I[[I[[FI[[FIBIIBZBI[[FILclient!hg;)V")
- public static void method1324(@OriginalArg(0) int arg0, @OriginalArg(1) int[][] arg1, @OriginalArg(2) float[][] arg2, @OriginalArg(3) int arg3, @OriginalArg(4) float[][] arg4, @OriginalArg(5) int arg5, @OriginalArg(6) byte arg6, @OriginalArg(7) int arg7, @OriginalArg(8) int arg8, @OriginalArg(10) boolean arg9, @OriginalArg(11) byte arg10, @OriginalArg(12) int arg11, @OriginalArg(13) float[][] arg12, @OriginalArg(14) int arg13, @OriginalArg(15) GlTile arg14) {
- @Pc(11) int local11 = (arg0 << 8) + 255;
- @Pc(17) int local17 = (arg5 << 8) + 255;
- @Pc(23) int local23 = (arg8 << 8) + 255;
- @Pc(29) int local29 = (arg13 << 8) + 255;
- @Pc(33) int[] local33 = anIntArrayArray35[arg10];
- @Pc(39) int[] local39 = new int[local33.length >> 1];
- @Pc(41) int local41;
- for (local41 = 0; local41 < local39.length; local41++) {
- local39[local41] = method3683(local29, 0.0F, local11, local17, null, arg1, arg3, arg12, local23, arg6, false, arg14, arg2, arg11, local33[local41 + local41], arg4, local33[local41 + local41 + 1]);
- }
- @Pc(87) int[] local87 = null;
- if (arg9) {
- @Pc(191) int local191;
- if (arg10 == 1) {
- local41 = method3683(local29, 0.0F, local11, local17, null, arg1, arg3, arg12, local23, arg6, true, arg14, arg2, arg11, 64, arg4, 128);
- local191 = method3683(local29, 0.0F, local11, local17, null, arg1, arg3, arg12, local23, arg6, true, arg14, arg2, arg11, 128, arg4, 64);
- local87 = new int[]{local191, local41, local39[2], local41, local39[0], local39[2]};
- } else if (arg10 == 2) {
- local87 = new int[6];
- local41 = method3683(local29, 0.0F, local11, local17, null, arg1, arg3, arg12, local23, arg6, true, arg14, arg2, arg11, 128, arg4, 128);
- local191 = method3683(local29, 0.0F, local11, local17, null, arg1, arg3, arg12, local23, arg6, true, arg14, arg2, arg11, 64, arg4, 0);
- local87[2] = local41;
- local87[0] = local39[0];
- local87[5] = local39[0];
- local87[3] = local41;
- local87[1] = local191;
- local87[4] = local39[1];
- } else if (arg10 == 3) {
- local87 = new int[6];
- local41 = method3683(local29, 0.0F, local11, local17, null, arg1, arg3, arg12, local23, arg6, true, arg14, arg2, arg11, 0, arg4, 128);
- local191 = method3683(local29, 0.0F, local11, local17, null, arg1, arg3, arg12, local23, arg6, true, arg14, arg2, arg11, 64, arg4, 0);
- local87[4] = local191;
- local87[1] = local39[1];
- local87[0] = local39[2];
- local87[3] = local41;
- local87[2] = local41;
- local87[5] = local39[2];
- } else if (arg10 == 4) {
- local87 = new int[3];
- local41 = method3683(local29, 0.0F, local11, local17, null, arg1, arg3, arg12, local23, arg6, true, arg14, arg2, arg11, 0, arg4, 128);
- local87[0] = local39[3];
- local87[2] = local39[0];
- local87[1] = local41;
- } else if (arg10 == 5) {
- local87 = new int[3];
- local41 = method3683(local29, 0.0F, local11, local17, null, arg1, arg3, arg12, local23, arg6, true, arg14, arg2, arg11, 128, arg4, 128);
- local87[1] = local41;
- local87[0] = local39[2];
- local87[2] = local39[3];
- } else if (arg10 == 6) {
- local87 = new int[6];
- local41 = method3683(local29, 0.0F, local11, local17, null, arg1, arg3, arg12, local23, arg6, true, arg14, arg2, arg11, 128, arg4, 0);
- local191 = method3683(local29, 0.0F, local11, local17, null, arg1, arg3, arg12, local23, arg6, true, arg14, arg2, arg11, 128, arg4, 128);
- local87[1] = local41;
- local87[0] = local39[3];
- local87[2] = local191;
- local87[4] = local39[0];
- local87[3] = local191;
- local87[5] = local39[3];
- } else if (arg10 == 7) {
- local87 = new int[6];
- local41 = method3683(local29, 0.0F, local11, local17, null, arg1, arg3, arg12, local23, arg6, true, arg14, arg2, arg11, 0, arg4, 128);
- local191 = method3683(local29, 0.0F, local11, local17, null, arg1, arg3, arg12, local23, arg6, true, arg14, arg2, arg11, 128, arg4, 0);
- local87[3] = local41;
- local87[2] = local41;
- local87[0] = local39[1];
- local87[4] = local39[2];
- local87[1] = local191;
- local87[5] = local39[1];
- } else if (arg10 == 8) {
- local87 = new int[3];
- local41 = method3683(local29, 0.0F, local11, local17, null, arg1, arg3, arg12, local23, arg6, true, arg14, arg2, arg11, 0, arg4, 0);
- local87[2] = local39[4];
- local87[0] = local39[3];
- local87[1] = local41;
- } else if (arg10 == 9) {
- local41 = method3683(local29, 0.0F, local11, local17, null, arg1, arg3, arg12, local23, arg6, true, arg14, arg2, arg11, 128, arg4, 64);
- local191 = method3683(local29, 0.0F, local11, local17, null, arg1, arg3, arg12, local23, arg6, true, arg14, arg2, arg11, 96, arg4, 32);
- @Pc(715) int local715 = method3683(local29, 0.0F, local11, local17, null, arg1, arg3, arg12, local23, arg6, true, arg14, arg2, arg11, 64, arg4, 0);
- local87 = new int[]{local191, local41, local39[4], local191, local39[4], local39[3], local191, local39[3], local39[2], local191, local39[2], local39[1], local191, local39[1], local715};
- } else if (arg10 == 10) {
- local87 = new int[9];
- local41 = method3683(local29, 0.0F, local11, local17, null, arg1, arg3, arg12, local23, arg6, true, arg14, arg2, arg11, 0, arg4, 128);
- local87[0] = local39[2];
- local87[8] = local39[0];
- local87[1] = local41;
- local87[4] = local41;
- local87[2] = local39[3];
- local87[7] = local41;
- local87[3] = local39[3];
- local87[5] = local39[4];
- local87[6] = local39[4];
- } else if (arg10 == 11) {
- local87 = new int[12];
- local41 = method3683(local29, 0.0F, local11, local17, null, arg1, arg3, arg12, local23, arg6, true, arg14, arg2, arg11, 0, arg4, 64);
- local191 = method3683(local29, 0.0F, local11, local17, null, arg1, arg3, arg12, local23, arg6, true, arg14, arg2, arg11, 128, arg4, 64);
- local87[5] = local41;
- local87[1] = local41;
- local87[8] = local41;
- local87[0] = local39[3];
- local87[2] = local39[0];
- local87[11] = local191;
- local87[6] = local39[2];
- local87[7] = local191;
- local87[10] = local39[1];
- local87[3] = local39[3];
- local87[4] = local39[2];
- local87[9] = local39[2];
- }
- }
- arg14.method1945(arg7, arg3, arg11, local39, local87, false);
- }
-
- @OriginalMember(owner = "client!ql", name = "a", descriptor = "(IFII[[I[[II[[FIBIZLclient!hg;[[FII[[FI)I")
- public static int method3683(@OriginalArg(0) int arg0, @OriginalArg(1) float arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int[][] arg4, @OriginalArg(5) int[][] arg5, @OriginalArg(6) int arg6, @OriginalArg(7) float[][] arg7, @OriginalArg(8) int arg8, @OriginalArg(10) int arg9, @OriginalArg(11) boolean arg10, @OriginalArg(12) GlTile arg11, @OriginalArg(13) float[][] arg12, @OriginalArg(14) int arg13, @OriginalArg(15) int arg14, @OriginalArg(16) float[][] arg15, @OriginalArg(17) int arg16) {
- @Pc(20) int local20;
- if (arg9 == 1) {
- local20 = arg14;
- arg14 = arg16;
- arg16 = 128 - local20;
- } else if (arg9 == 2) {
- arg16 = 128 - arg16;
- arg14 = 128 - arg14;
- } else if (arg9 == 3) {
- local20 = arg14;
- arg14 = 128 - arg16;
- arg16 = local20;
- }
- @Pc(66) float local66;
- @Pc(72) float local72;
- @Pc(80) int local80;
- @Pc(78) float local78;
- if (arg14 == 0 && arg16 == 0) {
- local66 = arg15[arg6][arg13];
- local72 = arg7[arg6][arg13];
- local78 = arg12[arg6][arg13];
- local80 = arg2;
- } else if (arg14 == 128 && arg16 == 0) {
- local80 = arg3;
- local66 = arg15[arg6 + 1][arg13];
- local72 = arg7[arg6 + 1][arg13];
- local78 = arg12[arg6 + 1][arg13];
- } else if (arg14 == 128 && arg16 == 128) {
- local72 = arg7[arg6 + 1][arg13 + 1];
- local78 = arg12[arg6 + 1][arg13 + 1];
- local66 = arg15[arg6 + 1][arg13 + 1];
- local80 = arg8;
- } else if (arg14 == 0 && arg16 == 128) {
- local72 = arg7[arg6][arg13 + 1];
- local66 = arg15[arg6][arg13 + 1];
- local78 = arg12[arg6][arg13 + 1];
- local80 = arg0;
- } else {
- local78 = arg12[arg6][arg13];
- local66 = arg15[arg6][arg13];
- @Pc(219) float local219 = (float) arg16 / 128.0F;
- @Pc(224) float local224 = (float) arg14 / 128.0F;
- @Pc(238) float local238 = local78 + (arg12[arg6 + 1][arg13] - local78) * local224;
- @Pc(253) float local253 = local66 + (arg15[arg6 + 1][arg13] - local66) * local224;
- @Pc(261) float local261 = arg12[arg6][arg13 + 1];
- @Pc(269) float local269 = arg15[arg6][arg13 + 1];
- @Pc(286) float local286 = local269 + (arg15[arg6 + 1][arg13 + 1] - local269) * local224;
- local72 = arg7[arg6][arg13];
- local66 = local253 + local219 * (local286 - local253);
- @Pc(309) float local309 = arg7[arg6][arg13 + 1];
- @Pc(326) float local326 = local261 + (arg12[arg6 + 1][arg13 + 1] - local261) * local224;
- local78 = local238 + local219 * (local326 - local238);
- @Pc(352) float local352 = local309 + (arg7[arg6 + 1][arg13 + 1] - local309) * local224;
- @Pc(367) float local367 = local72 + (arg7[arg6 + 1][arg13] - local72) * local224;
- local72 = local367 + (local352 - local367) * local219;
- @Pc(382) int local382 = Static69.method1540(arg14, arg2, arg3);
- @Pc(388) int local388 = Static69.method1540(arg14, arg0, arg8);
- local80 = Static69.method1540(arg16, local382, local388);
- }
- @Pc(405) int local405 = arg16 + (arg13 << 7);
- @Pc(413) int local413 = method3361(arg14, arg13, arg5, arg6, arg16);
- @Pc(420) int local420 = (arg6 << 7) + arg14;
- return arg11.method1941(local420, local413, local405, local78, local66, local72, arg10 ? local80 & 0xFFFFFF00 : local80, arg4 == null ? 0.0F : (float) (local413 - method3361(arg14, arg13, arg4, arg6, arg16)) / arg1);
- }
-
- @OriginalMember(owner = "client!oj", name = "a", descriptor = "(IBI[[III)I")
- public static int method3361(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int[][] arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4) {
- @Pc(25) int local25 = arg0 * arg2[arg3 + 1][arg1] + (128 - arg0) * arg2[arg3][arg1] >> 7;
- @Pc(52) int local52 = arg2[arg3][arg1 + 1] * (128 - arg0) + arg2[arg3 + 1][arg1 + 1] * arg0 >> 7;
- return local25 * (128 - arg4) + arg4 * local52 >> 7;
- }
-}
diff --git a/client/src/main/java/rt4/Static112.java b/client/src/main/java/rt4/Static112.java
deleted file mode 100644
index 40bd805..0000000
--- a/client/src/main/java/rt4/Static112.java
+++ /dev/null
@@ -1,122 +0,0 @@
-package rt4;
-
-import org.openrs2.deob.annotation.OriginalMember;
-import org.openrs2.deob.annotation.Pc;
-
-public final class Static112 {
-
- @OriginalMember(owner = "client!hd", name = "e", descriptor = "Lclient!qf;")
- public static Sprite aClass3_Sub2_Sub1_6;
- @OriginalMember(owner = "client!d", name = "ib", descriptor = "Lclient!qf;")
- public static Sprite aClass3_Sub2_Sub1_1;
- @OriginalMember(owner = "client!oi", name = "h", descriptor = "Lclient!qf;")
- public static Sprite aClass3_Sub2_Sub1_9;
- @OriginalMember(owner = "client!qi", name = "z", descriptor = "Lclient!qf;")
- public static Sprite aClass3_Sub2_Sub1_10;
-
- @OriginalMember(owner = "client!ij", name = "a", descriptor = "(B)V")
- public static void method2297() {
- @Pc(3) int local3 = InterfaceList.anInt4271;
- @Pc(9) int local9 = InterfaceList.anInt5138;
- @Pc(11) int local11 = InterfaceList.anInt436;
- @Pc(13) int local13 = InterfaceList.anInt761;
- if (aClass3_Sub2_Sub1_1 == null || aClass3_Sub2_Sub1_9 == null) {
- if (client.js5Archive8.isFileReady(Static40.anInt1736) && client.js5Archive8.isFileReady(Static40.anInt4073)) {
- aClass3_Sub2_Sub1_1 = SoftwareSprite.loadSoftwareAlphaSprite(client.js5Archive8, Static40.anInt1736);
- aClass3_Sub2_Sub1_9 = SoftwareSprite.loadSoftwareAlphaSprite(client.js5Archive8, Static40.anInt4073);
- if (GlRenderer.enabled) {
- if (aClass3_Sub2_Sub1_1 instanceof SoftwareAlphaSprite) {
- aClass3_Sub2_Sub1_1 = new GlAlphaSprite((SoftwareSprite) aClass3_Sub2_Sub1_1);
- } else {
- aClass3_Sub2_Sub1_1 = new GlSprite((SoftwareSprite) aClass3_Sub2_Sub1_1);
- }
- if (aClass3_Sub2_Sub1_9 instanceof SoftwareAlphaSprite) {
- aClass3_Sub2_Sub1_9 = new GlAlphaSprite((SoftwareSprite) aClass3_Sub2_Sub1_9);
- } else {
- aClass3_Sub2_Sub1_9 = new GlSprite((SoftwareSprite) aClass3_Sub2_Sub1_9);
- }
- }
- } else if (GlRenderer.enabled) {
- GlRaster.fillRectAlpha(local3, local9, local13, 20, Static40.anInt1275, 256 - Static40.anInt2910);
- } else {
- SoftwareRaster.fillRectAlpha(local3, local9, local13, 20, Static40.anInt1275, 256 - Static40.anInt2910);
- }
- }
- @Pc(112) int local112;
- @Pc(114) int local114;
- if (aClass3_Sub2_Sub1_1 != null && aClass3_Sub2_Sub1_9 != null) {
- local112 = local13 / aClass3_Sub2_Sub1_1.width;
- for (local114 = 0; local114 < local112; local114++) {
- aClass3_Sub2_Sub1_1.render(local114 * aClass3_Sub2_Sub1_1.width + local3, local9);
- }
- aClass3_Sub2_Sub1_9.render(local3, local9);
- aClass3_Sub2_Sub1_9.renderHorizontalFlip(local3 + local13 - aClass3_Sub2_Sub1_9.width, local9);
- }
- Fonts.b12Full.renderLeft(LocalizedText.CHOOSE_OPTION, local3 + 3, local9 + 14, Static40.anInt4581, -1);
- if (GlRenderer.enabled) {
- GlRaster.fillRectAlpha(local3, local9 + 20, local13, local11 - 20, Static40.anInt1275, 256 - Static40.anInt2910);
- } else {
- SoftwareRaster.fillRectAlpha(local3, local9 + 20, local13, local11 - 20, Static40.anInt1275, 256 - Static40.anInt2910);
- }
- local114 = Mouse.lastMouseY;
- local112 = Mouse.lastMouseX;
- @Pc(203) int local203;
- @Pc(219) int local219;
- for (local203 = 0; local203 < MiniMenu.size; local203++) {
- local219 = (MiniMenu.size - local203 - 1) * 15 + local9 + 35;
- if (local3 < local112 && local112 < local3 + local13 && local114 > local219 - 13 && local114 < local219 + 3) {
- if (GlRenderer.enabled) {
- GlRaster.fillRectAlpha(local3, local219 - 13, local13, 16, Static40.anInt5457, 256 - Static40.anInt5208);
- } else {
- SoftwareRaster.fillRectAlpha(local3, local219 - 13, local13, 16, Static40.anInt5457, 256 - Static40.anInt5208);
- }
- }
- }
- if ((Static165.aClass3_Sub2_Sub1_8 == null || aClass3_Sub2_Sub1_6 == null || aClass3_Sub2_Sub1_10 == null) && client.js5Archive8.isFileReady(Static40.anInt2261) && client.js5Archive8.isFileReady(Static40.anInt3324) && client.js5Archive8.isFileReady(Static40.anInt5556)) {
- Static165.aClass3_Sub2_Sub1_8 = SoftwareSprite.loadSoftwareAlphaSprite(client.js5Archive8, Static40.anInt2261);
- aClass3_Sub2_Sub1_6 = SoftwareSprite.loadSoftwareAlphaSprite(client.js5Archive8, Static40.anInt3324);
- aClass3_Sub2_Sub1_10 = SoftwareSprite.loadSoftwareAlphaSprite(client.js5Archive8, Static40.anInt5556);
- if (GlRenderer.enabled) {
- if (Static165.aClass3_Sub2_Sub1_8 instanceof SoftwareAlphaSprite) {
- Static165.aClass3_Sub2_Sub1_8 = new GlAlphaSprite((SoftwareSprite) Static165.aClass3_Sub2_Sub1_8);
- } else {
- Static165.aClass3_Sub2_Sub1_8 = new GlSprite((SoftwareSprite) Static165.aClass3_Sub2_Sub1_8);
- }
- if (aClass3_Sub2_Sub1_6 instanceof SoftwareAlphaSprite) {
- aClass3_Sub2_Sub1_6 = new GlAlphaSprite((SoftwareSprite) aClass3_Sub2_Sub1_6);
- } else {
- aClass3_Sub2_Sub1_6 = new GlSprite((SoftwareSprite) aClass3_Sub2_Sub1_6);
- }
- if (aClass3_Sub2_Sub1_10 instanceof SoftwareAlphaSprite) {
- aClass3_Sub2_Sub1_10 = new GlAlphaSprite((SoftwareSprite) aClass3_Sub2_Sub1_10);
- } else {
- aClass3_Sub2_Sub1_10 = new GlSprite((SoftwareSprite) aClass3_Sub2_Sub1_10);
- }
- }
- }
- @Pc(418) int local418;
- if (Static165.aClass3_Sub2_Sub1_8 != null && aClass3_Sub2_Sub1_6 != null && aClass3_Sub2_Sub1_10 != null) {
- local203 = local13 / Static165.aClass3_Sub2_Sub1_8.width;
- for (local219 = 0; local219 < local203; local219++) {
- Static165.aClass3_Sub2_Sub1_8.render(local3 + Static165.aClass3_Sub2_Sub1_8.width * local219, local11 + local9 + -Static165.aClass3_Sub2_Sub1_8.height);
- }
- local219 = (local11 - 20) / aClass3_Sub2_Sub1_6.height;
- for (local418 = 0; local418 < local219; local418++) {
- aClass3_Sub2_Sub1_6.render(local3, local9 + local418 * aClass3_Sub2_Sub1_6.height + 20);
- aClass3_Sub2_Sub1_6.renderHorizontalFlip(local3 + local13 - aClass3_Sub2_Sub1_6.width, local9 + 20 + local418 * aClass3_Sub2_Sub1_6.height);
- }
- aClass3_Sub2_Sub1_10.render(local3, local11 + local9 - aClass3_Sub2_Sub1_10.height);
- aClass3_Sub2_Sub1_10.renderHorizontalFlip(local3 + local13 - aClass3_Sub2_Sub1_10.width, local9 - -local11 + -aClass3_Sub2_Sub1_10.height);
- }
- for (local203 = 0; local203 < MiniMenu.size; local203++) {
- local219 = (MiniMenu.size - local203 - 1) * 15 + local9 + 35;
- local418 = Static40.anInt4581;
- if (local3 < local112 && local13 + local3 > local112 && local219 - 13 < local114 && local114 < local219 + 3) {
- local418 = Static40.anInt5752;
- }
- Fonts.b12Full.renderLeft(MiniMenu.getOp(local203), local3 + 3, local219, local418, 0);
- }
- InterfaceList.forceRedrawScreen(InterfaceList.anInt4271, InterfaceList.anInt5138, InterfaceList.anInt436, InterfaceList.anInt761);
- }
-
-}
diff --git a/client/src/main/java/rt4/Static123.java b/client/src/main/java/rt4/Static123.java
deleted file mode 100644
index 7c50700..0000000
--- a/client/src/main/java/rt4/Static123.java
+++ /dev/null
@@ -1,168 +0,0 @@
-package rt4;
-
-import org.openrs2.deob.annotation.OriginalMember;
-import org.openrs2.deob.annotation.Pc;
-
-public final class Static123 {
-
- @OriginalMember(owner = "client!qk", name = "b", descriptor = "Lclient!na;")
- public static final JagString aClass100_900 = JagString.parse("tbrefresh");
-
- @OriginalMember(owner = "client!ml", name = "K", descriptor = "I")
- public static int anInt3947;
- @OriginalMember(owner = "client!k", name = "l", descriptor = "[I")
- public static int[] anIntArray292;
- @OriginalMember(owner = "client!ta", name = "o", descriptor = "[I")
- public static int[] anIntArray454;
- @OriginalMember(owner = "client!nd", name = "s", descriptor = "I")
- public static int anInt4069;
- @OriginalMember(owner = "client!qk", name = "c", descriptor = "[I")
- public static int[] anIntArray427;
- @OriginalMember(owner = "client!lj", name = "B", descriptor = "I")
- public static int anInt3555;
-
- @OriginalMember(owner = "client!jj", name = "a", descriptor = "(Z)V")
- public static void topBannerRefresh() {
- if (!client.advertSuppressed && client.modeWhere != 2) {
- try {
- aClass100_900.browserControlCall(client.instance);
- } catch (@Pc(26) Throwable local26) {
- }
- }
- }
-
- @OriginalMember(owner = "client!jj", name = "a", descriptor = "()V")
- public static void method2419() {
- SceneGraph.anInt4870 = 0;
- label194:
- for (@Pc(3) int local3 = 0; local3 < SceneGraph.anInt917; local3++) {
- @Pc(10) SceneGraph_Class120 local10 = SceneGraph.aClass120Array1[local3];
- @Pc(14) int local14;
- if (SceneGraph.anIntArray8 != null) {
- for (local14 = 0; local14 < SceneGraph.anIntArray8.length; local14++) {
- if (SceneGraph.anIntArray8[local14] != -1000000 && (local10.anInt4444 <= SceneGraph.anIntArray8[local14] || local10.anInt4447 <= SceneGraph.anIntArray8[local14]) && (local10.anInt4460 <= Static96.anIntArray234[local14] || local10.anInt4445 <= Static96.anIntArray234[local14]) && (local10.anInt4460 >= anIntArray292[local14] || local10.anInt4445 >= anIntArray292[local14]) && (local10.anInt4458 <= anIntArray454[local14] || local10.anInt4449 <= anIntArray454[local14]) && (local10.anInt4458 >= anIntArray427[local14] || local10.anInt4449 >= anIntArray427[local14])) {
- continue label194;
- }
- }
- }
- @Pc(115) int local115;
- @Pc(126) int local126;
- @Pc(158) int local158;
- @Pc(137) boolean local137;
- if (local10.anInt4453 == 1) {
- local14 = local10.anInt4452 + SceneGraph.visibility - anInt4069;
- if (local14 >= 0 && local14 <= SceneGraph.visibility + SceneGraph.visibility) {
- local115 = local10.anInt4461 + SceneGraph.visibility - SceneGraph.anInt4539;
- if (local115 < 0) {
- local115 = 0;
- }
- local126 = local10.anInt4464 + SceneGraph.visibility - SceneGraph.anInt4539;
- if (local126 > SceneGraph.visibility + SceneGraph.visibility) {
- local126 = SceneGraph.visibility + SceneGraph.visibility;
- }
- local137 = false;
- while (local115 <= local126) {
- if (SceneGraph.aBooleanArrayArray1[local14][local115++]) {
- local137 = true;
- break;
- }
- }
- if (local137) {
- local158 = anInt3555 - local10.anInt4460;
- if (local158 > 32) {
- local10.anInt4462 = 1;
- } else {
- if (local158 >= -32) {
- continue;
- }
- local10.anInt4462 = 2;
- local158 = -local158;
- }
- local10.anInt4454 = (local10.anInt4458 - SceneGraph.anInt4903 << 8) / local158;
- local10.anInt4450 = (local10.anInt4449 - SceneGraph.anInt4903 << 8) / local158;
- local10.anInt4459 = (local10.anInt4444 - anInt3947 << 8) / local158;
- local10.anInt4463 = (local10.anInt4447 - anInt3947 << 8) / local158;
- SceneGraph.aClass120Array2[SceneGraph.anInt4870++] = local10;
- }
- }
- } else if (local10.anInt4453 == 2) {
- local14 = local10.anInt4461 + SceneGraph.visibility - SceneGraph.anInt4539;
- if (local14 >= 0 && local14 <= SceneGraph.visibility + SceneGraph.visibility) {
- local115 = local10.anInt4452 + SceneGraph.visibility - anInt4069;
- if (local115 < 0) {
- local115 = 0;
- }
- local126 = local10.anInt4446 + SceneGraph.visibility - anInt4069;
- if (local126 > SceneGraph.visibility + SceneGraph.visibility) {
- local126 = SceneGraph.visibility + SceneGraph.visibility;
- }
- local137 = false;
- while (local115 <= local126) {
- if (SceneGraph.aBooleanArrayArray1[local115++][local14]) {
- local137 = true;
- break;
- }
- }
- if (local137) {
- local158 = SceneGraph.anInt4903 - local10.anInt4458;
- if (local158 > 32) {
- local10.anInt4462 = 3;
- } else {
- if (local158 >= -32) {
- continue;
- }
- local10.anInt4462 = 4;
- local158 = -local158;
- }
- local10.anInt4448 = (local10.anInt4460 - anInt3555 << 8) / local158;
- local10.anInt4456 = (local10.anInt4445 - anInt3555 << 8) / local158;
- local10.anInt4459 = (local10.anInt4444 - anInt3947 << 8) / local158;
- local10.anInt4463 = (local10.anInt4447 - anInt3947 << 8) / local158;
- SceneGraph.aClass120Array2[SceneGraph.anInt4870++] = local10;
- }
- }
- } else if (local10.anInt4453 == 4) {
- local14 = local10.anInt4444 - anInt3947;
- if (local14 > 128) {
- local115 = local10.anInt4461 + SceneGraph.visibility - SceneGraph.anInt4539;
- if (local115 < 0) {
- local115 = 0;
- }
- local126 = local10.anInt4464 + SceneGraph.visibility - SceneGraph.anInt4539;
- if (local126 > SceneGraph.visibility + SceneGraph.visibility) {
- local126 = SceneGraph.visibility + SceneGraph.visibility;
- }
- if (local115 <= local126) {
- @Pc(408) int local408 = local10.anInt4452 + SceneGraph.visibility - anInt4069;
- if (local408 < 0) {
- local408 = 0;
- }
- local158 = local10.anInt4446 + SceneGraph.visibility - anInt4069;
- if (local158 > SceneGraph.visibility + SceneGraph.visibility) {
- local158 = SceneGraph.visibility + SceneGraph.visibility;
- }
- @Pc(430) boolean local430 = false;
- label166:
- for (@Pc(432) int local432 = local408; local432 <= local158; local432++) {
- for (@Pc(437) int local437 = local115; local437 <= local126; local437++) {
- if (SceneGraph.aBooleanArrayArray1[local432][local437]) {
- local430 = true;
- break label166;
- }
- }
- }
- if (local430) {
- local10.anInt4462 = 5;
- local10.anInt4448 = (local10.anInt4460 - anInt3555 << 8) / local14;
- local10.anInt4456 = (local10.anInt4445 - anInt3555 << 8) / local14;
- local10.anInt4454 = (local10.anInt4458 - SceneGraph.anInt4903 << 8) / local14;
- local10.anInt4450 = (local10.anInt4449 - SceneGraph.anInt4903 << 8) / local14;
- SceneGraph.aClass120Array2[SceneGraph.anInt4870++] = local10;
- }
- }
- }
- }
- }
- }
-
-}
diff --git a/client/src/main/java/rt4/Static131.java b/client/src/main/java/rt4/Static131.java
deleted file mode 100644
index 65e2a2b..0000000
--- a/client/src/main/java/rt4/Static131.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package rt4;
-
-import org.openrs2.deob.annotation.OriginalArg;
-import org.openrs2.deob.annotation.OriginalMember;
-import org.openrs2.deob.annotation.Pc;
-
-import java.awt.Component;
-
-public final class Static131 {
-
- @OriginalMember(owner = "client!kd", name = "ob", descriptor = "I")
- public static int anInt3251 = 0;
-
- @OriginalMember(owner = "client!kd", name = "Bb", descriptor = "I")
- public static int anInt3260 = -1;
-
- @OriginalMember(owner = "client!kd", name = "a", descriptor = "([[F[[II[[FI[ILclient!fj;BLclient!gi;[[FI)V")
- public static void method2578(@OriginalArg(0) float[][] arg0, @OriginalArg(1) int[][] arg1, @OriginalArg(2) int arg2, @OriginalArg(3) float[][] arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int[] arg5, @OriginalArg(6) Light_Class45 arg6, @OriginalArg(8) Light arg7, @OriginalArg(9) float[][] arg8, @OriginalArg(10) int arg9) {
- @Pc(7) int[] local7 = new int[arg5.length / 2];
- for (@Pc(13) int local13 = 0; local13 < local7.length; local13++) {
- @Pc(27) int local27 = arg5[local13 + local13];
- @Pc(35) int local35 = arg5[local13 + local13 + 1];
- @Pc(53) int local53;
- if (arg9 == 1) {
- local53 = local27;
- local27 = local35;
- local35 = 128 - local53;
- } else if (arg9 == 2) {
- local35 = 128 - local35;
- local27 = 128 - local27;
- } else if (arg9 == 3) {
- local53 = local27;
- local27 = 128 - local35;
- local35 = local53;
- }
- @Pc(123) float local123;
- @Pc(107) float local107;
- @Pc(115) float local115;
- if (local27 == 0 && local35 == 0) {
- local123 = arg3[arg2][arg4];
- local115 = arg8[arg2][arg4];
- local107 = arg0[arg2][arg4];
- } else if (local27 == 128 && local35 == 0) {
- local107 = arg0[arg2 + 1][arg4];
- local115 = arg8[arg2 + 1][arg4];
- local123 = arg3[arg2 + 1][arg4];
- } else if (local27 == 128 && local35 == 128) {
- local123 = arg3[arg2 + 1][arg4 + 1];
- local115 = arg8[arg2 + 1][arg4 + 1];
- local107 = arg0[arg2 + 1][arg4 + 1];
- } else if (local27 == 0 && local35 == 128) {
- local107 = arg0[arg2][arg4 + 1];
- local123 = arg3[arg2][arg4 + 1];
- local115 = arg8[arg2][arg4 + 1];
- } else {
- local115 = arg8[arg2][arg4];
- local107 = arg0[arg2][arg4];
- @Pc(187) float local187 = (float) local27 / 128.0F;
- local123 = arg3[arg2][arg4];
- @Pc(208) float local208 = local123 + (arg3[arg2 + 1][arg4] - local123) * local187;
- @Pc(222) float local222 = local107 + local187 * (arg0[arg2 + 1][arg4] - local107);
- @Pc(237) float local237 = local115 + (arg8[arg2 + 1][arg4] - local115) * local187;
- @Pc(245) float local245 = arg8[arg2][arg4 + 1];
- @Pc(261) float local261 = local245 + (arg8[arg2 + 1][arg4 + 1] - local245) * local187;
- @Pc(269) float local269 = arg3[arg2][arg4 + 1];
- @Pc(274) float local274 = (float) local35 / 128.0F;
- local115 = local237 + (local261 - local237) * local274;
- @Pc(291) float local291 = arg0[arg2][arg4 + 1];
- @Pc(307) float local307 = local291 + (arg0[arg2 + 1][arg4 + 1] - local291) * local187;
- @Pc(324) float local324 = local269 + (arg3[arg2 + 1][arg4 + 1] - local269) * local187;
- local123 = local208 + (local324 - local208) * local274;
- local107 = local222 + (local307 - local222) * local274;
- }
- @Pc(393) int local393 = (arg2 << 7) + local27;
- @Pc(400) int local400 = (arg4 << 7) + local35;
- @Pc(408) int local408 = Static1.method3361(local27, arg4, arg1, arg2, local35);
- local7[local13] = arg6.method1553(arg7, local393, local408, local400, local115, local123, local107);
- }
- arg6.method1557(local7);
- }
-
- @OriginalMember(owner = "client!kd", name = "a", descriptor = "(IIZLjava/awt/Component;)Lclient!vk;")
- public static FrameBuffer create(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(3) Component arg2) {
- try {
- @Pc(16) FrameBuffer local16 = new BufferedImageFrameBuffer();
- local16.init(arg0, arg1, arg2);
- return local16;
- } catch (@Pc(25) Throwable local25) {
- @Pc(29) ImageProducerFrameBuffer local29 = new ImageProducerFrameBuffer();
- local29.init(arg0, arg1, arg2);
- return local29;
- }
- }
-
-}
diff --git a/client/src/main/java/rt4/Static139.java b/client/src/main/java/rt4/Static139.java
deleted file mode 100644
index 35b610d..0000000
--- a/client/src/main/java/rt4/Static139.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package rt4;
-
-import org.openrs2.deob.annotation.OriginalMember;
-import org.openrs2.deob.annotation.Pc;
-
-import java.awt.*;
-
-public final class Static139 {
-
- @OriginalMember(owner = "client!l", name = "b", descriptor = "(I)V")
- public static void method2704() {
- @Pc(7) int local7 = GameShell.topMargin;
- @Pc(9) int local9 = GameShell.leftMargin;
- @Pc(16) int local16 = GameShell.frameHeight - GameShell.canvasHeight - local7;
- @Pc(23) int local23 = GameShell.frameWidth - local9 - GameShell.canvasWidth;
- if (local9 <= 0 && local23 <= 0 && local7 <= 0 && local16 <= 0) {
- return;
- }
- try {
- @Pc(46) Container local46;
- if (GameShell.fullScreenFrame != null) {
- local46 = GameShell.fullScreenFrame;
- } else if (GameShell.frame == null) {
- local46 = GameShell.signLink.applet;
- } else {
- local46 = GameShell.frame;
- }
- @Pc(59) int local59 = 0;
- @Pc(61) int local61 = 0;
- if (GameShell.frame == local46) {
- @Pc(68) Insets local68 = GameShell.frame.getInsets();
- local61 = local68.left;
- local59 = local68.top;
- }
- @Pc(77) Graphics local77 = local46.getGraphics();
- local77.setColor(Color.black);
- if (local9 > 0) {
- local77.fillRect(local61, local59, local9, GameShell.frameHeight);
- }
- if (local7 > 0) {
- local77.fillRect(local61, local59, GameShell.frameWidth, local7);
- }
- if (local23 > 0) {
- local77.fillRect(local61 + GameShell.frameWidth - local23, local59, local23, GameShell.frameHeight);
- }
- if (local16 > 0) {
- local77.fillRect(local61, local59 + GameShell.frameHeight - local16, GameShell.frameWidth, local16);
- }
- } catch (@Pc(132) Exception local132) {
- }
- }
-}
diff --git a/client/src/main/java/rt4/Static145.java b/client/src/main/java/rt4/Static145.java
deleted file mode 100644
index d0d562f..0000000
--- a/client/src/main/java/rt4/Static145.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package rt4;
-
-import org.openrs2.deob.annotation.OriginalMember;
-import org.openrs2.deob.annotation.Pc;
-
-public final class Static145 {
-
- @OriginalMember(owner = "client!lf", name = "k", descriptor = "I")
- public static int anInt3502 = -1;
-
- @OriginalMember(owner = "client!lf", name = "a", descriptor = "(I)V")
- public static void method2742() {
- if (client.gameState == 10 && GlRenderer.enabled) {
- client.setGameState(28);
- }
- if (client.gameState == 30) {
- client.setGameState(25);
- }
- }
-
- @OriginalMember(owner = "client!lf", name = "b", descriptor = "(I)V")
- public static void method2744() {
- @Pc(3) int local3 = InterfaceList.anInt5138;
- @Pc(9) int local9 = InterfaceList.anInt761;
- @Pc(11) int local11 = InterfaceList.anInt4271;
- @Pc(15) int local15 = InterfaceList.anInt436;
- if (GlRenderer.enabled) {
- GlRaster.fillRect(local11, local3, local9, local15, 6116423);
- GlRaster.fillRect(local11 + 1, local3 + 1, local9 - 2, 16, 0);
- GlRaster.drawRect(local11 + 1, local3 + 18, local9 - 2, local15 + -19, 0);
- } else {
- SoftwareRaster.fillRect(local11, local3, local9, local15, 6116423);
- SoftwareRaster.fillRect(local11 + 1, local3 + 1, local9 - 2, 16, 0);
- SoftwareRaster.drawRect(local11 + 1, local3 + 18, local9 - 2, local15 + -19, 0);
- }
- Fonts.b12Full.renderLeft(LocalizedText.CHOOSE_OPTION, local11 + 3, local3 + 14, 6116423, -1);
- @Pc(96) int local96 = Mouse.lastMouseY;
- @Pc(98) int local98 = Mouse.lastMouseX;
- for (@Pc(107) int local107 = 0; local107 < MiniMenu.size; local107++) {
- @Pc(127) int local127 = (MiniMenu.size - local107 - 1) * 15 + local3 + 31;
- @Pc(129) int local129 = 16777215;
- if (local11 < local98 && local98 < local11 + local9 && local127 - 13 < local96 && local96 < local127 + 3) {
- local129 = 16776960;
- }
- Fonts.b12Full.renderLeft(MiniMenu.getOp(local107), local11 + 3, local127, local129, 0);
- }
- InterfaceList.forceRedrawScreen(InterfaceList.anInt4271, InterfaceList.anInt5138, InterfaceList.anInt436, InterfaceList.anInt761);
- }
-
-}
diff --git a/client/src/main/java/rt4/Static147.java b/client/src/main/java/rt4/Static147.java
deleted file mode 100644
index 2485d95..0000000
--- a/client/src/main/java/rt4/Static147.java
+++ /dev/null
@@ -1,127 +0,0 @@
-package rt4;
-
-import org.openrs2.deob.annotation.OriginalArg;
-import org.openrs2.deob.annotation.OriginalMember;
-import org.openrs2.deob.annotation.Pc;
-
-public final class Static147 {
-
- @OriginalMember(owner = "client!lh", name = "z", descriptor = "Lclient!na;")
- public static final JagString aClass100_672 = JagString.parse("(U (X");
- @OriginalMember(owner = "client!fg", name = "d", descriptor = "[I")
- public static final int[] anIntArray159 = new int[6];
- @OriginalMember(owner = "client!fg", name = "l", descriptor = "[I")
- public static final int[] anIntArray164 = new int[6];
- @OriginalMember(owner = "client!fg", name = "m", descriptor = "[I")
- public static final int[] anIntArray165 = new int[6];
- @OriginalMember(owner = "client!fg", name = "r", descriptor = "[I")
- public static final int[] anIntArray169 = new int[6];
- @OriginalMember(owner = "client!fg", name = "t", descriptor = "[I")
- public static final int[] anIntArray170 = new int[6];
-
- @OriginalMember(owner = "client!lh", name = "b", descriptor = "(II)V")
- public static void method2761(@OriginalArg(0) int arg0) {
- UnderwaterMaterialRenderer.anInt3241 = arg0;
- MaterialManager.resetArgument(3);
- MaterialManager.resetArgument(4);
- }
-
- @OriginalMember(owner = "client!lh", name = "a", descriptor = "(Lclient!fg;IIIIIIZ)V")
- public static void method2762(@OriginalArg(0) ShapedTile arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) boolean arg7) {
- @Pc(3) int local3 = arg0.anIntArray168.length;
- @Pc(5) int local5;
- @Pc(15) int local15;
- @Pc(22) int local22;
- @Pc(29) int local29;
- @Pc(39) int local39;
- for (local5 = 0; local5 < local3; local5++) {
- local15 = arg0.anIntArray168[local5] - Static123.anInt3555;
- local22 = arg0.anIntArray160[local5] - Static123.anInt3947;
- local29 = arg0.anIntArray163[local5] - SceneGraph.anInt4903;
- local39 = local29 * arg3 + local15 * arg4 >> 16;
- @Pc(49) int local49 = local29 * arg4 - local15 * arg3 >> 16;
- @Pc(61) int local61 = local22 * arg2 - local49 * arg1 >> 16;
- @Pc(71) int local71 = local22 * arg1 + local49 * arg2 >> 16;
- if (local71 < 50) {
- return;
- }
- if (arg0.anIntArray161 != null) {
- anIntArray159[local5] = local39;
- anIntArray170[local5] = local61;
- anIntArray169[local5] = local71;
- }
- anIntArray165[local5] = Rasteriser.centerX + (local39 << 9) / local71;
- anIntArray164[local5] = Rasteriser.centerY + (local61 << 9) / local71;
- }
- Rasteriser.alpha = 0;
- local3 = arg0.anIntArray166.length;
- for (local5 = 0; local5 < local3; local5++) {
- local15 = arg0.anIntArray166[local5];
- local22 = arg0.anIntArray162[local5];
- local29 = arg0.anIntArray158[local5];
- local39 = anIntArray165[local15];
- @Pc(148) int local148 = anIntArray165[local22];
- @Pc(152) int local152 = anIntArray165[local29];
- @Pc(156) int local156 = anIntArray164[local15];
- @Pc(160) int local160 = anIntArray164[local22];
- @Pc(164) int local164 = anIntArray164[local29];
- if ((local39 - local148) * (local164 - local160) - (local156 - local160) * (local152 - local148) > 0) {
- if (MiniMenu.aBoolean187 && method583(MiniMenu.anInt2388 + Rasteriser.centerX, MiniMenu.anInt3259 + Rasteriser.centerY, local156, local160, local164, local39, local148, local152)) {
- MiniMenu.anInt1742 = arg5;
- MiniMenu.anInt2954 = arg6;
- }
- if (!GlRenderer.enabled && !arg7) {
- Rasteriser.testX = local39 < 0 || local148 < 0 || local152 < 0 || local39 > Rasteriser.width || local148 > Rasteriser.width || local152 > Rasteriser.width;
- if (arg0.anIntArray161 == null || arg0.anIntArray161[local5] == -1) {
- if (arg0.anIntArray167[local5] != 12345678) {
- Rasteriser.fillGouraudTriangle(local156, local160, local164, local39, local148, local152, arg0.anIntArray167[local5], arg0.anIntArray172[local5], arg0.anIntArray171[local5]);
- }
- } else if (!Preferences.manyGroundTextures) {
- @Pc(373) int local373 = Rasteriser.textureProvider.getAverageColor(arg0.anIntArray161[local5]);
- Rasteriser.fillGouraudTriangle(local156, local160, local164, local39, local148, local152, method1640(local373, arg0.anIntArray167[local5]), method1640(local373, arg0.anIntArray172[local5]), method1640(local373, arg0.anIntArray171[local5]));
- } else if (arg0.aBoolean113) {
- Rasteriser.fillTexturedTriangle(local156, local160, local164, local39, local148, local152, arg0.anIntArray167[local5], arg0.anIntArray172[local5], arg0.anIntArray171[local5], anIntArray159[0], anIntArray159[1], anIntArray159[3], anIntArray170[0], anIntArray170[1], anIntArray170[3], anIntArray169[0], anIntArray169[1], anIntArray169[3], arg0.anIntArray161[local5]);
- } else {
- Rasteriser.fillTexturedTriangle(local156, local160, local164, local39, local148, local152, arg0.anIntArray167[local5], arg0.anIntArray172[local5], arg0.anIntArray171[local5], anIntArray159[local15], anIntArray159[local22], anIntArray159[local29], anIntArray170[local15], anIntArray170[local22], anIntArray170[local29], anIntArray169[local15], anIntArray169[local22], anIntArray169[local29], arg0.anIntArray161[local5]);
- }
- }
- }
- }
- }
-
- @OriginalMember(owner = "client!lh", name = "d", descriptor = "(B)V")
- public static void method2764() {
- Component.sprites.clear();
- Component.models.clear();
- Component.fonts.clear();
- }
-
- @OriginalMember(owner = "client!bi", name = "a", descriptor = "(IIIIIIII)Z")
- public static boolean method583(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7) {
- if (arg1 < arg2 && arg1 < arg3 && arg1 < arg4) {
- return false;
- } else if (arg1 > arg2 && arg1 > arg3 && arg1 > arg4) {
- return false;
- } else if (arg0 < arg5 && arg0 < arg6 && arg0 < arg7) {
- return false;
- } else if (arg0 > arg5 && arg0 > arg6 && arg0 > arg7) {
- return false;
- } else {
- @Pc(59) int local59 = (arg1 - arg2) * (arg6 - arg5) - (arg0 - arg5) * (arg3 - arg2);
- @Pc(75) int local75 = (arg1 - arg4) * (arg5 - arg7) - (arg0 - arg7) * (arg2 - arg4);
- @Pc(91) int local91 = (arg1 - arg3) * (arg7 - arg6) - (arg0 - arg6) * (arg4 - arg3);
- return local59 * local91 > 0 && local91 * local75 > 0;
- }
- }
-
- @OriginalMember(owner = "client!ri", name = "a", descriptor = "(II)I")
- public static int method1640(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
- arg1 = arg1 * (arg0 & 0x7F) >> 7;
- if (arg1 < 2) {
- arg1 = 2;
- } else if (arg1 > 126) {
- arg1 = 126;
- }
- return (arg0 & 0xFF80) + arg1;
- }
-}
diff --git a/client/src/main/java/rt4/Static156.java b/client/src/main/java/rt4/Static156.java
deleted file mode 100644
index 95d63d0..0000000
--- a/client/src/main/java/rt4/Static156.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package rt4;
-
-import org.openrs2.deob.annotation.OriginalMember;
-
-public final class Static156 {
-
- @OriginalMember(owner = "client!mf", name = "X", descriptor = "I")
- public static int loginScreenId;
- @OriginalMember(owner = "client!tb", name = "Q", descriptor = "I")
- public static int anInt5276 = 0;
- @OriginalMember(owner = "client!bc", name = "Z", descriptor = "I")
- public static int anInt437;
- @OriginalMember(owner = "client!rc", name = "p", descriptor = "I")
- public static int anInt1142 = 0;
-
-}
diff --git a/client/src/main/java/rt4/Static158.java b/client/src/main/java/rt4/Static158.java
deleted file mode 100644
index 95a75b1..0000000
--- a/client/src/main/java/rt4/Static158.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package rt4;
-
-import org.openrs2.deob.annotation.OriginalMember;
-import org.openrs2.deob.annotation.Pc;
-
-public final class Static158 {
-
- @OriginalMember(owner = "client!rj", name = "Z", descriptor = "[I")
- public static final int[] anIntArray434 = new int[64];
- @OriginalMember(owner = "client!mh", name = "X", descriptor = "I")
- public static int anInt3851 = -1;
- @OriginalMember(owner = "client!mg", name = "Q", descriptor = "I")
- public static int anInt3811 = 0;
-
- @OriginalMember(owner = "client!mh", name = "h", descriptor = "(B)V")
- public static void decodeNpcFiles() {
- @Pc(10) int local10 = LoginManager.npcSpawnsFilesBuffer.length;
- for (@Pc(16) int local16 = 0; local16 < local10; local16++) {
- if (LoginManager.npcSpawnsFilesBuffer[local16] != null) {
- @Pc(25) int local25 = -1;
- for (@Pc(27) int local27 = 0; local27 < anInt3811; local27++) {
- if (anIntArray434[local27] == LoginManager.regionBitPacked[local16]) {
- local25 = local27;
- break;
- }
- }
- if (local25 == -1) {
- anIntArray434[anInt3811] = LoginManager.regionBitPacked[local16];
- local25 = anInt3811++;
- }
- @Pc(67) int local67 = 0;
- @Pc(74) Buffer local74 = new Buffer(LoginManager.npcSpawnsFilesBuffer[local16]);
- while (local74.offset < LoginManager.npcSpawnsFilesBuffer[local16].length && local67 < 511) {
- @Pc(97) int local97 = local67++ << 6 | local25;
- @Pc(103) int local103 = local74.g2();
- @Pc(107) int local107 = local103 >> 14;
- @Pc(113) int local113 = local103 >> 7 & 0x3F;
- @Pc(125) int local125 = local113 + (LoginManager.regionBitPacked[local16] >> 8) * 64 - Camera.originX;
- @Pc(129) int local129 = local103 & 0x3F;
- @Pc(142) int local142 = local129 + (LoginManager.regionBitPacked[local16] & 0xFF) * 64 - Camera.originZ;
- @Pc(148) NpcType local148 = NpcTypeList.get(local74.g2());
- if (NpcList.npcs[local97] == null && (local148.aByte10 & 0x1) > 0 && local107 == LoginManager.centralPlane && local125 >= 0 && local148.size + local125 < 104 && local142 >= 0 && local142 + local148.size < 104) {
- NpcList.npcs[local97] = new Npc();
- @Pc(198) Npc local198 = NpcList.npcs[local97];
- NpcList.ids[NpcList.size++] = local97;
- local198.lastSeenLoop = client.loop;
- local198.setNpcType(local148);
- local198.setSize(local198.type.size);
- local198.anInt3400 = local198.anInt3381 = PathingEntity.ANGLES[local198.type.aByte11];
- local198.anInt3376 = local198.type.anInt3733;
- if (local198.anInt3376 == 0) {
- local198.anInt3381 = 0;
- }
- local198.anInt3365 = local198.type.basId;
- local198.method2683(local198.getSize(), local125, local142, true);
- }
- }
- }
- }
- }
-}
diff --git a/client/src/main/java/rt4/Static160.java b/client/src/main/java/rt4/Static160.java
deleted file mode 100644
index c2e7751..0000000
--- a/client/src/main/java/rt4/Static160.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package rt4;
-
-import org.openrs2.deob.annotation.OriginalArg;
-import org.openrs2.deob.annotation.OriginalMember;
-import org.openrs2.deob.annotation.Pc;
-
-public final class Static160 {
-
- @OriginalMember(owner = "client!ig", name = "i", descriptor = "I")
- public static int anInt2886;
-
- @OriginalMember(owner = "client!mj", name = "a", descriptor = "(IILclient!be;IB)V")
- public static void method3047(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) Component arg2, @OriginalArg(3) int arg3) {
- if (GlRenderer.enabled) {
- GlRaster.setClip(arg0, arg1, arg2.width + arg0, arg2.height + arg1);
- }
- if (MiniMap.state >= 3) {
- if (GlRenderer.enabled) {
- @Pc(44) Sprite local44 = arg2.method489(false);
- if (local44 != null) {
- local44.render(arg0, arg1);
- }
- } else {
- SoftwareRaster.method2504(arg0, arg1, arg2.anIntArray37, arg2.anIntArray45);
- }
- } else if (GlRenderer.enabled) {
- ((GlSprite) Sprites.compass).renderRotatedTransparent(arg0, arg1, arg2.width, arg2.height, Sprites.compass.width / 2, Sprites.compass.height / 2, (int) Camera.yawTarget, 256, (GlSprite) arg2.method489(false));
- } else {
- ((SoftwareSprite) Sprites.compass).renderRotated(arg0, arg1, arg2.width, arg2.height, Sprites.compass.width / 2, Sprites.compass.height / 2, (int) Camera.yawTarget, arg2.anIntArray37, arg2.anIntArray45);
- }
- InterfaceList.rectangleRedraw[arg3] = true;
- }
-
- @OriginalMember(owner = "client!mj", name = "a", descriptor = "(IIIII)Z")
- public static boolean method3049(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4) {
- @Pc(9) int local9 = arg3 * SceneGraph.anInt5205 + arg0 * Static81.anInt2222 >> 16;
- @Pc(19) int local19 = arg3 * Static81.anInt2222 - arg0 * SceneGraph.anInt5205 >> 16;
- @Pc(29) int local29 = arg1 * anInt2886 + local19 * SceneGraph.anInt3038 >> 16;
- @Pc(39) int local39 = arg1 * SceneGraph.anInt3038 - local19 * anInt2886 >> 16;
- if (local29 < 1) {
- local29 = 1;
- }
- @Pc(50) int local50 = (local9 << 9) / local29;
- @Pc(56) int local56 = (local39 << 9) / local29;
- @Pc(66) int local66 = arg2 * anInt2886 + local19 * SceneGraph.anInt3038 >> 16;
- @Pc(76) int local76 = arg2 * SceneGraph.anInt3038 - local19 * anInt2886 >> 16;
- if (local66 < 1) {
- local66 = 1;
- }
- @Pc(87) int local87 = (local9 << 9) / local66;
- @Pc(93) int local93 = (local76 << 9) / local66;
- if (local29 < 50 && local66 < 50) {
- return false;
- } else if (local29 > arg4 && local66 > arg4) {
- return false;
- } else if (local50 < Rasteriser.screenLowerX && local87 < Rasteriser.screenLowerX) {
- return false;
- } else if (local50 > Rasteriser.screenUpperX && local87 > Rasteriser.screenUpperX) {
- return false;
- } else if (local56 < Rasteriser.screenLowerY && local93 < Rasteriser.screenLowerY) {
- return false;
- } else {
- return local56 <= Rasteriser.screenUpperY || local93 <= Rasteriser.screenUpperY;
- }
- }
-}
diff --git a/client/src/main/java/rt4/Static164.java b/client/src/main/java/rt4/Static164.java
deleted file mode 100644
index 5fecd6c..0000000
--- a/client/src/main/java/rt4/Static164.java
+++ /dev/null
@@ -1,195 +0,0 @@
-package rt4;
-
-import org.openrs2.deob.annotation.OriginalArg;
-import org.openrs2.deob.annotation.OriginalMember;
-import org.openrs2.deob.annotation.Pc;
-
-public final class Static164 {
-
- @OriginalMember(owner = "client!ii", name = "e", descriptor = "Lclient!na;")
- public static final JagString aClass100_570 = JagString.parse(")2");
- @OriginalMember(owner = "client!na", name = "W", descriptor = "Z")
- public static boolean newTab;
-
- @OriginalMember(owner = "client!na", name = "cb", descriptor = "Lclient!na;")
- public static final JagString aClass100_770 = JagString.parse(":allyreq:");
-
- @OriginalMember(owner = "client!na", name = "a", descriptor = "(IIIIIIIZ)Z")
- public static boolean method3109(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(6) int arg4) {
- @Pc(14) long local14 = SceneGraph.getWallKey(arg4, arg0 + 0, arg2);
- @Pc(28) int local28;
- @Pc(35) int local35;
- @Pc(42) int local42;
- @Pc(46) LocType local46;
- @Pc(65) int local65;
- @Pc(75) int[] local75;
- @Pc(90) int local90;
- if (local14 != 0L) {
- local28 = (int) local14 >> 20 & 0x3;
- local35 = (int) local14 >> 14 & 0x1F;
- local42 = Integer.MAX_VALUE & (int) (local14 >>> 32);
- local46 = LocTypeList.get(local42);
- if (local46.mapSceneId == -1) {
- local65 = arg1;
- if (local14 > 0L) {
- local65 = arg3;
- }
- local75 = SoftwareRaster.pixels;
- local90 = (52736 - arg2 * 512) * 4 + arg0 * 4 + 24624;
- if (local35 == 0 || local35 == 2) {
- if (local28 == 0) {
- local75[local90] = local65;
- local75[local90 + 512] = local65;
- local75[local90 + 1024] = local65;
- local75[local90 + 1536] = local65;
- } else if (local28 == 1) {
- local75[local90] = local65;
- local75[local90 + 1] = local65;
- local75[local90 + 2] = local65;
- local75[local90 + 3] = local65;
- } else if (local28 == 2) {
- local75[local90 + 3] = local65;
- local75[local90 + 3 + 512] = local65;
- local75[local90 + 3 + 1024] = local65;
- local75[local90 + 3 + 1536] = local65;
- } else if (local28 == 3) {
- local75[local90 + 1536] = local65;
- local75[local90 + 1536 + 1] = local65;
- local75[local90 + 1538] = local65;
- local75[local90 + 3 + 1536] = local65;
- }
- }
- if (local35 == 3) {
- if (local28 == 0) {
- local75[local90] = local65;
- } else if (local28 == 1) {
- local75[local90 + 3] = local65;
- } else if (local28 == 2) {
- local75[local90 + 3 + 1536] = local65;
- } else if (local28 == 3) {
- local75[local90 + 1536] = local65;
- }
- }
- if (local35 == 2) {
- if (local28 == 3) {
- local75[local90] = local65;
- local75[local90 + 512] = local65;
- local75[local90 + 1024] = local65;
- local75[local90 + 1536] = local65;
- } else if (local28 == 0) {
- local75[local90] = local65;
- local75[local90 + 1] = local65;
- local75[local90 + 2] = local65;
- local75[local90 + 3] = local65;
- } else if (local28 == 1) {
- local75[local90 + 3] = local65;
- local75[local90 + 512 + 3] = local65;
- local75[local90 + 1024 + 3] = local65;
- local75[local90 + 1536 + 3] = local65;
- } else if (local28 == 2) {
- local75[local90 + 1536] = local65;
- local75[local90 + 1536 + 1] = local65;
- local75[local90 + 1536 + 2] = local65;
- local75[local90 + 1539] = local65;
- }
- }
- } else if (!MiniMap.renderScenery(arg0, local46, arg2, local28)) {
- return false;
- }
- }
- local14 = SceneGraph.getSceneryKey(arg4, arg0 + 0, arg2);
- if (local14 != 0L) {
- local28 = (int) local14 >> 20 & 0x3;
- local35 = (int) local14 >> 14 & 0x1F;
- local42 = (int) (local14 >>> 32) & Integer.MAX_VALUE;
- local46 = LocTypeList.get(local42);
- if (local46.mapSceneId == -1) {
- if (local35 == 9) {
- local65 = 15658734;
- if (local14 > 0L) {
- local65 = 15597568;
- }
- local90 = arg0 * 4 + (103 - arg2) * 2048 + 24624;
- local75 = SoftwareRaster.pixels;
- if (local28 == 0 || local28 == 2) {
- local75[local90 + 1536] = local65;
- local75[local90 + 1025] = local65;
- local75[local90 + 512 + 2] = local65;
- local75[local90 + 3] = local65;
- } else {
- local75[local90] = local65;
- local75[local90 + 512 + 1] = local65;
- local75[local90 + 1024 + 2] = local65;
- local75[local90 + 1536 + 3] = local65;
- }
- }
- } else if (!MiniMap.renderScenery(arg0, local46, arg2, local28)) {
- return false;
- }
- }
- local14 = SceneGraph.getGroundDecorKey(arg4, arg0 + 0, arg2);
- if (local14 != 0L) {
- local28 = (int) local14 >> 20 & 0x3;
- local35 = (int) (local14 >>> 32) & Integer.MAX_VALUE;
- @Pc(586) LocType local586 = LocTypeList.get(local35);
- return local586.mapSceneId == -1 || MiniMap.renderScenery(arg0, local586, arg2, local28);
- }
- return true;
- }
-
- @OriginalMember(owner = "client!na", name = "a", descriptor = "(Lclient!ba;Lclient!ba;IIIZZ)I")
- public static int method3115(@OriginalArg(0) World arg0, @OriginalArg(1) World arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) boolean arg4, @OriginalArg(6) boolean arg5) {
- @Pc(8) int local8 = method4595(arg1, arg3, arg0, arg5);
- if (local8 != 0) {
- return arg5 ? -local8 : local8;
- } else if (arg2 == -1) {
- return 0;
- } else {
- @Pc(42) int local42 = method4595(arg1, arg2, arg0, arg4);
- return arg4 ? -local42 : local42;
- }
- }
-
- @OriginalMember(owner = "client!wb", name = "a", descriptor = "(Lclient!ba;IILclient!ba;Z)I")
- public static int method4595(@OriginalArg(0) World arg0, @OriginalArg(1) int arg1, @OriginalArg(3) World arg2, @OriginalArg(4) boolean arg3) {
- if (arg1 == 1) {
- @Pc(11) int local11 = arg0.players;
- @Pc(14) int local14 = arg2.players;
- if (!arg3) {
- if (local14 == -1) {
- local14 = 2001;
- }
- if (local11 == -1) {
- local11 = 2001;
- }
- }
- return local11 - local14;
- } else if (arg1 == 2) {
- return arg0.getWorldInfo().name.compare(arg2.getWorldInfo().name);
- } else if (arg1 == 3) {
- if (arg0.activity.strEquals(aClass100_570)) {
- if (arg2.activity.strEquals(aClass100_570)) {
- return 0;
- } else if (arg3) {
- return -1;
- } else {
- return 1;
- }
- } else if (arg2.activity.strEquals(aClass100_570)) {
- return arg3 ? 1 : -1;
- } else {
- return arg0.activity.compare(arg2.activity);
- }
- } else if (arg1 == 4) {
- return arg0.isLootShare() ? (arg2.isLootShare() ? 0 : 1) : arg2.isLootShare() ? -1 : 0;
- } else if (arg1 == 5) {
- return arg0.isQuickChat() ? (arg2.isQuickChat() ? 0 : 1) : (arg2.isQuickChat() ? -1 : 0);
- } else if (arg1 == 6) {
- return arg0.isPvp() ? (arg2.isPvp() ? 0 : 1) : (arg2.isPvp() ? -1 : 0);
- } else if (arg1 == 7) {
- return arg0.isMembers() ? (arg2.isMembers() ? 0 : 1) : (arg2.isMembers() ? -1 : 0);
- } else {
- return arg0.id - arg2.id;
- }
- }
-}
diff --git a/client/src/main/java/rt4/Static165.java b/client/src/main/java/rt4/Static165.java
deleted file mode 100644
index f56f68c..0000000
--- a/client/src/main/java/rt4/Static165.java
+++ /dev/null
@@ -1,181 +0,0 @@
-package rt4;
-
-import org.openrs2.deob.annotation.OriginalArg;
-import org.openrs2.deob.annotation.OriginalMember;
-import org.openrs2.deob.annotation.Pc;
-
-public final class Static165 {
-
- @OriginalMember(owner = "client!nb", name = "i", descriptor = "Lclient!qf;")
- public static Sprite aClass3_Sub2_Sub1_8;
-
- @OriginalMember(owner = "client!nb", name = "n", descriptor = "Lclient!na;")
- public static final JagString DETAILS = JagString.parse("details");
-
- @OriginalMember(owner = "client!nb", name = "a", descriptor = "(IIIIIIIIII)V")
- public static void method3162(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5, @OriginalArg(7) int arg6, @OriginalArg(8) int arg7, @OriginalArg(9) int arg8) {
- if (arg0 == arg1 && arg8 == arg2 && arg7 == arg6 && arg4 == arg5) {
- TextureOp29.method3982(arg3, arg4, arg0, arg8, arg6);
- return;
- }
- @Pc(32) int local32 = arg0;
- @Pc(36) int local36 = arg8 * 3;
- @Pc(40) int local40 = arg0 * 3;
- @Pc(42) int local42 = arg8;
- @Pc(46) int local46 = arg1 * 3;
- @Pc(50) int local50 = arg2 * 3;
- @Pc(54) int local54 = arg7 * 3;
- @Pc(58) int local58 = arg5 * 3;
- @Pc(66) int local66 = local46 + arg6 - local54 - arg0;
- @Pc(76) int local76 = local54 + local40 - local46 - local46;
- @Pc(85) int local85 = local50 + arg4 - local58 - arg8;
- @Pc(95) int local95 = local36 + local58 - local50 - local50;
- @Pc(100) int local100 = local46 - local40;
- @Pc(105) int local105 = local50 - local36;
- for (@Pc(107) int local107 = 128; local107 <= 4096; local107 += 128) {
- @Pc(118) int local118 = local107 * local107 >> 12;
- @Pc(124) int local124 = local107 * local118 >> 12;
- @Pc(128) int local128 = local95 * local118;
- @Pc(132) int local132 = local124 * local85;
- @Pc(136) int local136 = local118 * local76;
- @Pc(140) int local140 = local66 * local124;
- @Pc(144) int local144 = local100 * local107;
- @Pc(156) int local156 = arg0 + (local136 + local140 + local144 >> 12);
- @Pc(160) int local160 = local107 * local105;
- @Pc(172) int local172 = arg8 + (local160 + local132 + local128 >> 12);
- TextureOp29.method3982(arg3, local172, local32, local42, local156);
- local32 = local156;
- local42 = local172;
- }
- }
-
- @OriginalMember(owner = "client!nb", name = "a", descriptor = "(IIIIII)V")
- public static void method3163(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(5) int arg4) {
- if (arg1 == arg4) {
- method1760(arg4, arg2, arg0, arg3);
- } else if (TextureOp29.anInt4164 <= arg2 - arg4 && arg2 + arg4 <= TextureOp29.anInt5063 && arg3 - arg1 >= TextureOp29.anInt5773 && arg3 + arg1 <= TextureOp29.anInt2869) {
- method1568(arg3, arg2, arg4, arg1, arg0);
- } else {
- method898(arg0, arg1, arg4, arg2, arg3);
- }
- }
-
- @OriginalMember(owner = "client!gi", name = "a", descriptor = "(IIIIB)V")
- public static void method1760(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) {
- if (arg1 - arg0 >= TextureOp29.anInt4164 && TextureOp29.anInt5063 >= arg0 + arg1 && arg3 - arg0 >= TextureOp29.anInt5773 && TextureOp29.anInt2869 >= arg0 + arg3) {
- TextureOp29SubOp4.method1206(arg1, arg0, arg2, arg3);
- } else {
- Static89.method1843(arg2, arg3, arg0, arg1);
- }
- }
-
- @OriginalMember(owner = "client!fl", name = "a", descriptor = "(IIIIII)V")
- public static void method1568(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4) {
- ArrayUtils.fillRange(TextureOp29SubOp4.anIntArrayArray10[arg0], arg1 - arg2, arg2 + arg1, arg4);
- @Pc(17) int local17 = 0;
- @Pc(21) int local21 = arg2 * arg2;
- @Pc(25) int local25 = arg3 * arg3;
- @Pc(27) int local27 = arg3;
- @Pc(31) int local31 = local25 << 1;
- @Pc(35) int local35 = local21 << 1;
- @Pc(39) int local39 = arg3 << 1;
- @Pc(48) int local48 = local31 + (1 - local39) * local21;
- @Pc(56) int local56 = local25 - local35 * (local39 - 1);
- @Pc(60) int local60 = local21 << 2;
- @Pc(70) int local70 = local25 << 2;
- @Pc(78) int local78 = local31 * 3;
- @Pc(86) int local86 = local35 * ((arg3 << 1) - 3);
- @Pc(92) int local92 = local70;
- @Pc(98) int local98 = local60 * (arg3 - 1);
- while (local27 > 0) {
- local27--;
- @Pc(105) int local105 = local27 + arg0;
- @Pc(109) int local109 = arg0 - local27;
- if (local48 < 0) {
- while (local48 < 0) {
- local17++;
- local48 += local78;
- local56 += local92;
- local92 += local70;
- local78 += local70;
- }
- }
- if (local56 < 0) {
- local48 += local78;
- local78 += local70;
- local56 += local92;
- local17++;
- local92 += local70;
- }
- @Pc(160) int local160 = local17 + arg1;
- local56 += -local86;
- local86 -= local60;
- local48 += -local98;
- @Pc(179) int local179 = arg1 - local17;
- local98 -= local60;
- ArrayUtils.fillRange(TextureOp29SubOp4.anIntArrayArray10[local109], local179, local160, arg4);
- ArrayUtils.fillRange(TextureOp29SubOp4.anIntArrayArray10[local105], local179, local160, arg4);
- }
- }
-
- @OriginalMember(owner = "client!cl", name = "a", descriptor = "(IIIBII)V")
- public static void method898(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4) {
- @Pc(13) int local13 = arg2 * arg2;
- @Pc(15) int local15 = 0;
- @Pc(17) int local17 = arg1;
- @Pc(21) int local21 = local13 << 1;
- @Pc(25) int local25 = arg1 * arg1;
- @Pc(29) int local29 = arg1 << 1;
- @Pc(33) int local33 = local25 << 1;
- @Pc(42) int local42 = local13 * (1 - local29) + local33;
- @Pc(51) int local51 = local25 - local21 * (local29 - 1);
- @Pc(55) int local55 = local25 << 2;
- @Pc(63) int local63 = local33 * 3;
- @Pc(67) int local67 = local13 << 2;
- @Pc(75) int local75 = ((arg1 << 1) - 3) * local21;
- @Pc(81) int local81 = local55;
- @Pc(95) int local95;
- @Pc(104) int local104;
- if (arg4 >= TextureOp29.anInt5773 && TextureOp29.anInt2869 >= arg4) {
- local95 = IntUtils.clamp(TextureOp29.anInt5063, arg2 + arg3, TextureOp29.anInt4164);
- local104 = IntUtils.clamp(TextureOp29.anInt5063, arg3 - arg2, TextureOp29.anInt4164);
- ArrayUtils.fillRange(TextureOp29SubOp4.anIntArrayArray10[arg4], local104, local95, arg0);
- }
- @Pc(118) int local118 = local67 * (arg1 - 1);
- while (local17 > 0) {
- local17--;
- if (local42 < 0) {
- while (local42 < 0) {
- local15++;
- local42 += local63;
- local51 += local81;
- local81 += local55;
- local63 += local55;
- }
- }
- local95 = arg4 - local17;
- if (local51 < 0) {
- local51 += local81;
- local42 += local63;
- local63 += local55;
- local81 += local55;
- local15++;
- }
- local51 += -local75;
- local75 -= local67;
- local42 += -local118;
- local104 = local17 + arg4;
- if (TextureOp29.anInt5773 <= local104 && TextureOp29.anInt2869 >= local95) {
- @Pc(213) int local213 = IntUtils.clamp(TextureOp29.anInt5063, local15 + arg3, TextureOp29.anInt4164);
- @Pc(222) int local222 = IntUtils.clamp(TextureOp29.anInt5063, arg3 - local15, TextureOp29.anInt4164);
- if (local95 >= TextureOp29.anInt5773) {
- ArrayUtils.fillRange(TextureOp29SubOp4.anIntArrayArray10[local95], local222, local213, arg0);
- }
- if (TextureOp29.anInt2869 >= local104) {
- ArrayUtils.fillRange(TextureOp29SubOp4.anIntArrayArray10[local104], local222, local213, arg0);
- }
- }
- local118 -= local67;
- }
- }
-}
diff --git a/client/src/main/java/rt4/Static226.java b/client/src/main/java/rt4/Static226.java
deleted file mode 100644
index de1166a..0000000
--- a/client/src/main/java/rt4/Static226.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package rt4;
-
-import org.openrs2.deob.annotation.OriginalMember;
-import org.openrs2.deob.annotation.Pc;
-
-public final class Static226 {
-
- @OriginalMember(owner = "client!ml", name = "Q", descriptor = "I")
- public static int anInt3953 = 0;
- @OriginalMember(owner = "client!wl", name = "u", descriptor = "I")
- public static int anInt5895 = 0;
-
- @OriginalMember(owner = "client!sf", name = "b", descriptor = "(B)V")
- public static void method3901() {
- @Pc(16) int local16 = Fonts.b12Full.getStringWidth(LocalizedText.CHOOSE_OPTION);
- @Pc(18) int local18;
- @Pc(27) int local27;
- for (local18 = 0; local18 < MiniMenu.size; local18++) {
- local27 = Fonts.b12Full.getStringWidth(MiniMenu.getOp(local18));
- if (local27 > local16) {
- local16 = local27;
- }
- }
- local18 = MiniMenu.size * 15 + 21;
- @Pc(43) int local43 = ScriptRunner.anInt1892;
- local16 += 8;
- local27 = ScriptRunner.anInt3751 - local16 / 2;
- if (local43 + local18 > GameShell.canvasHeight) {
- local43 = GameShell.canvasHeight - local18;
- }
- if (GameShell.canvasWidth < local27 + local16) {
- local27 = GameShell.canvasWidth - local16;
- }
- if (local27 < 0) {
- local27 = 0;
- }
- if (local43 < 0) {
- local43 = 0;
- }
- if (anInt3953 == 1) {
- if (ScriptRunner.anInt3751 == Mouse.anInt5850 && anInt5895 == ScriptRunner.anInt1892) {
- InterfaceList.anInt436 = MiniMenu.size * 15 + (Static40.aBoolean298 ? 26 : 22);
- anInt3953 = 0;
- InterfaceList.anInt5138 = local43;
- InterfaceList.anInt4271 = local27;
- Static40.aBoolean108 = true;
- InterfaceList.anInt761 = local16;
- }
- } else if (ScriptRunner.anInt3751 == Mouse.clickX && ScriptRunner.anInt1892 == Mouse.clickY) {
- InterfaceList.anInt4271 = local27;
- anInt3953 = 0;
- InterfaceList.anInt761 = local16;
- InterfaceList.anInt5138 = local43;
- InterfaceList.anInt436 = (Static40.aBoolean298 ? 26 : 22) + MiniMenu.size * 15;
- Static40.aBoolean108 = true;
- } else {
- anInt5895 = Mouse.clickY;
- Mouse.anInt5850 = Mouse.clickX;
- anInt3953 = 1;
- }
- }
-}
diff --git a/client/src/main/java/rt4/Static233.java b/client/src/main/java/rt4/Static233.java
deleted file mode 100644
index 1e243ec..0000000
--- a/client/src/main/java/rt4/Static233.java
+++ /dev/null
@@ -1,149 +0,0 @@
-package rt4;
-
-import org.openrs2.deob.annotation.OriginalArg;
-import org.openrs2.deob.annotation.OriginalMember;
-import org.openrs2.deob.annotation.Pc;
-
-public final class Static233 {
-
- @OriginalMember(owner = "client!t", name = "o", descriptor = "I")
- public static int anInt5217;
-
- @OriginalMember(owner = "client!t", name = "A", descriptor = "I")
- public static int anInt5225;
-
- @OriginalMember(owner = "client!t", name = "a", descriptor = "(IIIZIII)V")
- public static void method4000(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5) {
- @Pc(3) int local3 = 0;
- @Pc(5) MapMarker[] local5 = MiniMap.hintMapMarkers;
- while (local5.length > local3) {
- @Pc(17) MapMarker local17 = local5[local3];
- if (local17 != null && local17.type == 2) {
- ScriptRunner.method1026(arg0 >> 1, arg4, (local17.anInt4046 - Camera.originZ << 7) + local17.anInt4047, local17.anInt4050 * 2, arg2 >> 1, local17.anInt4045 + (local17.targetX - Camera.originX << 7), arg3);
- if (ScriptRunner.anInt1951 > -1 && client.loop % 20 < 10) {
- Sprites.headhints[local17.anInt4048].render(arg1 + ScriptRunner.anInt1951 - 12, arg5 + -28 - -ScriptRunner.anInt548);
- }
- }
- local3++;
- }
- }
-
- @OriginalMember(owner = "client!t", name = "a", descriptor = "(ZB)V")
- public static void method4002(@OriginalArg(0) boolean arg0) {
- @Pc(19) byte local19;
- @Pc(21) byte[][] local21;
- if (GlRenderer.enabled && arg0) {
- local21 = LoginManager.underWaterLocationsMapFilesBuffer;
- local19 = 1;
- } else {
- local19 = 4;
- local21 = LoginManager.locationMapFilesBuffer;
- }
- for (@Pc(29) int local29 = 0; local29 < local19; local29++) {
- client.audioLoop();
- for (@Pc(36) int local36 = 0; local36 < 13; local36++) {
- for (@Pc(43) int local43 = 0; local43 < 13; local43++) {
- @Pc(56) int local56 = Protocol.anIntArrayArrayArray18[local29][local36][local43];
- if (local56 != -1) {
- @Pc(67) int local67 = local56 >> 24 & 0x3;
- if (!arg0 || local67 == 0) {
- @Pc(77) int local77 = local56 >> 1 & 0x3;
- @Pc(83) int local83 = local56 >> 14 & 0x3FF;
- @Pc(89) int local89 = local56 >> 3 & 0x7FF;
- @Pc(99) int local99 = local89 / 8 + (local83 / 8 << 8);
- for (@Pc(101) int local101 = 0; local101 < LoginManager.regionBitPacked.length; local101++) {
- if (LoginManager.regionBitPacked[local101] == local99 && local21[local101] != null) {
- method3771(PathFinder.collisionMaps, local29, local21[local101], local67, local77, local36 * 8, local43 * 8, arg0, (local83 & 0x7) * 8, (local89 & 0x7) * 8);
- break;
- }
- }
- }
- }
- }
- }
- }
- }
-
- @OriginalMember(owner = "client!rj", name = "a", descriptor = "([Lclient!mj;I[BIIIIZIIB)V")
- public static void method3771(@OriginalArg(0) CollisionMap[] arg0, @OriginalArg(1) int arg1, @OriginalArg(2) byte[] arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) boolean arg7, @OriginalArg(8) int arg8, @OriginalArg(9) int arg9) {
- @Pc(7) int local7 = -1;
- @Pc(12) Buffer local12 = new Buffer(arg2);
- while (true) {
- @Pc(20) int local20 = local12.gVarSmart();
- if (local20 == 0) {
- return;
- }
- local7 += local20;
- @Pc(31) int local31 = 0;
- while (true) {
- @Pc(35) int local35 = local12.gsmarts();
- if (local35 == 0) {
- break;
- }
- local31 += local35 - 1;
- @Pc(50) int local50 = local31 & 0x3F;
- @Pc(56) int local56 = local31 >> 6 & 0x3F;
- @Pc(60) int local60 = local31 >> 12;
- @Pc(64) int local64 = local12.g1();
- @Pc(68) int local68 = local64 >> 2;
- @Pc(72) int local72 = local64 & 0x3;
- if (arg3 == local60 && local56 >= arg8 && local56 < arg8 + 8 && arg9 <= local50 && arg9 + 8 > local50) {
- @Pc(103) LocType local103 = LocTypeList.get(local7);
- @Pc(120) int local120 = method1286(local50 & 0x7, arg4, local72, local103.length, local103.width, local56 & 0x7) + arg5;
- @Pc(137) int local137 = method4541(local103.width, arg4, local103.length, local56 & 0x7, local72, local50 & 0x7) + arg6;
- if (local120 > 0 && local137 > 0 && local120 < 103 && local137 < 103) {
- @Pc(154) CollisionMap local154 = null;
- if (!arg7) {
- @Pc(159) int local159 = arg1;
- if ((SceneGraph.tileFlags[1][local120][local137] & 0x2) == 2) {
- local159 = arg1 - 1;
- }
- if (local159 >= 0) {
- local154 = arg0[local159];
- }
- }
- SceneGraph.method3397(arg1, !arg7, arg1, arg7, local154, local7, local68, local120, local137, local72 + arg4 & 0x3);
- }
- }
- }
- }
- }
-
- @OriginalMember(owner = "client!eb", name = "a", descriptor = "(IIIIIII)I")
- public static int method1286(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(6) int arg5) {
- if ((arg2 & 0x1) == 1) {
- @Pc(10) int local10 = arg4;
- arg4 = arg3;
- arg3 = local10;
- }
- @Pc(18) int local18 = arg1 & 0x3;
- if (local18 == 0) {
- return arg5;
- } else if (local18 == 1) {
- return arg0;
- } else if (local18 == 2) {
- return 7 + 1 - arg5 - arg4;
- } else {
- return 7 + 1 - arg0 - arg3;
- }
- }
-
- @OriginalMember(owner = "client!th", name = "a", descriptor = "(IIBIIII)I")
- public static int method4541(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5) {
- if ((arg4 & 0x1) == 1) {
- @Pc(9) int local9 = arg0;
- arg0 = arg2;
- arg2 = local9;
- }
- @Pc(29) int local29 = arg1 & 0x3;
- if (local29 == 0) {
- return arg5;
- } else if (local29 == 1) {
- return 7 + 1 - arg3 - arg0;
- } else if (local29 == 2) {
- return 1 + 7 - arg2 - arg5;
- } else {
- return arg3;
- }
- }
-}
diff --git a/client/src/main/java/rt4/Static36.java b/client/src/main/java/rt4/Static36.java
deleted file mode 100644
index 061dce7..0000000
--- a/client/src/main/java/rt4/Static36.java
+++ /dev/null
@@ -1,89 +0,0 @@
-package rt4;
-
-import org.openrs2.deob.annotation.OriginalArg;
-import org.openrs2.deob.annotation.OriginalMember;
-import org.openrs2.deob.annotation.Pc;
-
-public final class Static36 {
-
- @OriginalMember(owner = "client!fk", name = "e", descriptor = "I")
- public static int anInt1885;
- @OriginalMember(owner = "client!bj", name = "s", descriptor = "I")
- public static int anInt660 = -1;
- @OriginalMember(owner = "client!kl", name = "s", descriptor = "I")
- public static int anInt3337 = 0;
- @OriginalMember(owner = "client!jk", name = "p", descriptor = "I")
- public static int anInt3075 = -1;
- @OriginalMember(owner = "client!df", name = "n", descriptor = "I")
- public static int anInt1396 = 0;
- @OriginalMember(owner = "client!di", name = "H", descriptor = "Z")
- public static boolean aBoolean84 = false;
- @OriginalMember(owner = "client!pm", name = "hb", descriptor = "I")
- public static int anInt4620;
-
- @OriginalMember(owner = "client!client", name = "a", descriptor = "(Lclient!be;)Lclient!be;")
- public static Component method938(@OriginalArg(0) Component arg0) {
- @Pc(4) int local4 = InterfaceList.getServerActiveProperties(arg0).getDragDepth();
- if (local4 == 0) {
- return null;
- }
- for (@Pc(10) int local10 = 0; local10 < local4; local10++) {
- arg0 = InterfaceList.getComponent(arg0.layer);
- if (arg0 == null) {
- return null;
- }
- }
- return arg0;
- }
-
- @OriginalMember(owner = "client!client", name = "c", descriptor = "(Lclient!be;)Z")
- public static boolean method947(@OriginalArg(0) Component arg0) {
- if (Cheat.qaOpTest) {
- if (InterfaceList.getServerActiveProperties(arg0).events != 0) {
- return false;
- }
- if (arg0.type == 0) {
- return false;
- }
- }
- return arg0.hidden;
- }
-
- @OriginalMember(owner = "client!tc", name = "a", descriptor = "(IILclient!be;BIIII)V")
- public static void method4049(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) Component arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5, @OriginalArg(7) int arg6) {
- if (aBoolean84) {
- anInt1396 = 32;
- } else {
- anInt1396 = 0;
- }
- aBoolean84 = false;
- @Pc(139) int local139;
- if (Mouse.pressedButton != 0) {
- if (arg4 <= arg3 && arg4 + 16 > arg3 && arg0 >= arg5 && arg5 + 16 > arg0) {
- arg2.scrollY -= 4;
- InterfaceList.redraw(arg2);
- } else if (arg3 >= arg4 && arg3 < arg4 + 16 && arg0 >= arg1 + arg5 - 16 && arg1 + arg5 > arg0) {
- arg2.scrollY += 4;
- InterfaceList.redraw(arg2);
- } else if (arg3 >= arg4 - anInt1396 && arg3 < arg4 + anInt1396 + 16 && arg0 >= arg5 + 16 && arg1 + arg5 - 16 > arg0) {
- local139 = arg1 * (arg1 - 32) / arg6;
- if (local139 < 8) {
- local139 = 8;
- }
- @Pc(150) int local150 = arg1 - local139 - 32;
- @Pc(162) int local162 = arg0 - local139 / 2 - arg5 - 16;
- arg2.scrollY = (arg6 - arg1) * local162 / local150;
- InterfaceList.redraw(arg2);
- aBoolean84 = true;
- }
- }
- if (MouseWheel.wheelRotation == 0) {
- return;
- }
- local139 = arg2.width;
- if (arg4 - local139 <= arg3 && arg5 <= arg0 && arg3 < arg4 + 16 && arg1 + arg5 >= arg0) {
- arg2.scrollY += MouseWheel.wheelRotation * 45;
- InterfaceList.redraw(arg2);
- }
- }
-}
diff --git a/client/src/main/java/rt4/Static38.java b/client/src/main/java/rt4/Static38.java
deleted file mode 100644
index 77bc197..0000000
--- a/client/src/main/java/rt4/Static38.java
+++ /dev/null
@@ -1,145 +0,0 @@
-package rt4;
-
-import org.openrs2.deob.annotation.OriginalArg;
-import org.openrs2.deob.annotation.OriginalMember;
-import org.openrs2.deob.annotation.Pc;
-
-public final class Static38 {
-
- @OriginalMember(owner = "client!di", name = "q", descriptor = "[Lclient!na;")
- public static final JagString[] aClass100Array53 = new JagString[5];
- @OriginalMember(owner = "client!cn", name = "B", descriptor = "I")
- public static int anInt1196 = 1;
-
- @OriginalMember(owner = "client!cn", name = "L", descriptor = "I")
- public static double yawAccel = 0;
-
- @OriginalMember(owner = "client!cn", name = "a", descriptor = "(BIIIIIIII)V")
- public static void method959(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5, @OriginalArg(7) int arg6, @OriginalArg(8) int arg7) {
- for (@Pc(11) int local11 = 0; local11 < WorldMap.labels.anInt5074; local11++) {
- if (WorldMap.labels.method3890(local11)) {
- @Pc(32) int local32 = WorldMap.labels.aShortArray73[local11] - WorldMap.originX;
- @Pc(43) int local43 = WorldMap.originZ + WorldMap.length - WorldMap.labels.aShortArray72[local11] - 1;
- @Pc(59) int local59 = arg0 + (arg3 - arg0) * (local32 - arg2) / (arg6 - arg2);
- @Pc(64) int local64 = WorldMap.labels.method3894(local11);
- @Pc(80) int local80 = (arg7 - arg1) * (local43 - arg5) / (arg4 - arg5) + arg1;
- @Pc(82) int local82 = 16777215;
- @Pc(84) WorldMapFont local84 = null;
- if (local64 == 0) {
- if ((double) WorldMap.zoom == 3.0D) {
- local84 = WorldMap.font11;
- }
- if ((double) WorldMap.zoom == 4.0D) {
- local84 = WorldMap.font12;
- }
- if ((double) WorldMap.zoom == 6.0D) {
- local84 = WorldMap.font14;
- }
- if ((double) WorldMap.zoom >= 8.0D) {
- local84 = WorldMap.font17;
- }
- }
- if (local64 == 1) {
- if ((double) WorldMap.zoom == 3.0D) {
- local84 = WorldMap.font14;
- }
- if ((double) WorldMap.zoom == 4.0D) {
- local84 = WorldMap.font17;
- }
- if ((double) WorldMap.zoom == 6.0D) {
- local84 = WorldMap.font19;
- }
- if ((double) WorldMap.zoom >= 8.0D) {
- local84 = WorldMap.font22;
- }
- }
- if (local64 == 2) {
- if ((double) WorldMap.zoom == 3.0D) {
- local84 = WorldMap.font19;
- }
- local82 = 16755200;
- if ((double) WorldMap.zoom == 4.0D) {
- local84 = WorldMap.font22;
- }
- if ((double) WorldMap.zoom == 6.0D) {
- local84 = WorldMap.font26;
- }
- if ((double) WorldMap.zoom >= 8.0D) {
- local84 = WorldMap.font30;
- }
- }
- if (WorldMap.labels.anIntArray444[local11] != -1) {
- local82 = WorldMap.labels.anIntArray444[local11];
- }
- if (local84 != null) {
- @Pc(211) int local211 = Fonts.p11Full.splitParagraph(WorldMap.labels.aClass100Array153[local11], null, aClass100Array53);
- local80 -= local84.method1503() * (local211 - 1) / 2;
- local80 += local84.method1511() / 2;
- for (@Pc(231) int local231 = 0; local231 < local211; local231++) {
- @Pc(242) JagString local242 = aClass100Array53[local231];
- if (local211 - 1 > local231) {
- local242.method3133(local242.length() - 4);
- }
- local84.renderStringCenter(local242, local59, local80, local82);
- local80 += local84.method1503();
- }
- }
- }
- }
- }
-
- @OriginalMember(owner = "client!cn", name = "a", descriptor = "(IIIIIIIIII)V")
- public static void method962(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5, @OriginalArg(7) int arg6, @OriginalArg(8) int arg7, @OriginalArg(9) int arg8) {
- if (arg8 == arg7 && arg2 == arg6 && arg4 == arg3 && arg0 == arg5) {
- TextureOp29SubOp4.method4547(arg1, arg5, arg6, arg4, arg8);
- return;
- }
- @Pc(37) int local37 = arg6;
- @Pc(39) int local39 = arg8;
- @Pc(43) int local43 = arg8 * 3;
- @Pc(47) int local47 = arg6 * 3;
- @Pc(51) int local51 = arg7 * 3;
- @Pc(55) int local55 = arg2 * 3;
- @Pc(59) int local59 = arg3 * 3;
- @Pc(63) int local63 = arg0 * 3;
- @Pc(73) int local73 = arg4 + local51 - local59 - arg8;
- @Pc(83) int local83 = arg5 + local55 - arg6 - local63;
- @Pc(93) int local93 = local43 + local59 - local51 - local51;
- @Pc(103) int local103 = local47 + local63 - local55 - local55;
- @Pc(108) int local108 = local51 - local43;
- @Pc(113) int local113 = local55 - local47;
- for (@Pc(115) int local115 = 128; local115 <= 4096; local115 += 128) {
- @Pc(126) int local126 = local115 * local115 >> 12;
- @Pc(132) int local132 = local115 * local126 >> 12;
- @Pc(136) int local136 = local83 * local132;
- @Pc(140) int local140 = local126 * local93;
- @Pc(144) int local144 = local73 * local132;
- @Pc(148) int local148 = local126 * local103;
- @Pc(152) int local152 = local108 * local115;
- @Pc(156) int local156 = local113 * local115;
- @Pc(167) int local167 = (local152 + local144 + local140 >> 12) + arg8;
- @Pc(177) int local177 = arg6 + (local156 + local136 + local148 >> 12);
- TextureOp29SubOp4.method4547(arg1, local177, local37, local167, local39);
- local39 = local167;
- local37 = local177;
- }
- }
-
- @OriginalMember(owner = "client!cn", name = "a", descriptor = "(ZI)I")
- public static int poll(@OriginalArg(0) boolean arg0) {
- @Pc(4) long local4 = MonotonicClock.currentTimeMillis();
- for (@Pc(28) LongNode local28 = arg0 ? (LongNode) VarpDomain.aClass133_20.head() : (LongNode) VarpDomain.aClass133_20.next(); local28 != null; local28 = (LongNode) VarpDomain.aClass133_20.next()) {
- if ((local28.value & 0x3FFFFFFFFFFFFFFFL) < local4) {
- if ((local28.value & 0x4000000000000000L) != 0L) {
- @Pc(58) int local58 = (int) local28.key;
- VarpDomain.activeVarps[local58] = VarpDomain.varp[local58];
- local28.unlink();
- return local58;
- }
- local28.unlink();
- }
- }
- return -1;
- }
-
-}
diff --git a/client/src/main/java/rt4/Static40.java b/client/src/main/java/rt4/Static40.java
deleted file mode 100644
index 487a21e..0000000
--- a/client/src/main/java/rt4/Static40.java
+++ /dev/null
@@ -1,93 +0,0 @@
-package rt4;
-
-import org.openrs2.deob.annotation.OriginalArg;
-import org.openrs2.deob.annotation.OriginalMember;
-import org.openrs2.deob.annotation.Pc;
-
-public final class Static40 {
-
- @OriginalMember(owner = "client!da", name = "ab", descriptor = "I")
- public static int anInt1275;
- @OriginalMember(owner = "client!ib", name = "e", descriptor = "Lclient!be;")
- public static Component aClass13_14 = null;
- @OriginalMember(owner = "client!ac", name = "p", descriptor = "Lclient!be;")
- public static Component aClass13_1 = null;
- @OriginalMember(owner = "client!u", name = "a", descriptor = "I")
- public static int anInt5388 = 0;
- @OriginalMember(owner = "client!km", name = "pc", descriptor = "Z")
- public static boolean aBoolean172 = false;
- @OriginalMember(owner = "client!re", name = "y", descriptor = "I")
- public static int anInt4851;
- @OriginalMember(owner = "client!nb", name = "d", descriptor = "I")
- public static int anInt4035 = 0;
- @OriginalMember(owner = "client!em", name = "z", descriptor = "Z")
- public static boolean aBoolean108 = false;
- @OriginalMember(owner = "client!ii", name = "y", descriptor = "I")
- public static int anInt2910;
- @OriginalMember(owner = "client!ug", name = "p", descriptor = "I")
- public static int anInt5457;
- @OriginalMember(owner = "client!sm", name = "b", descriptor = "I")
- public static int anInt5208;
- @OriginalMember(owner = "client!ee", name = "c", descriptor = "I")
- public static int anInt1736;
- @OriginalMember(owner = "client!gl", name = "d", descriptor = "I")
- public static int anInt2261;
- @OriginalMember(owner = "client!nf", name = "e", descriptor = "I")
- public static int anInt4073;
- @OriginalMember(owner = "client!kk", name = "i", descriptor = "I")
- public static int anInt3324;
- @OriginalMember(owner = "client!uj", name = "E", descriptor = "I")
- public static int anInt5556;
- @OriginalMember(owner = "client!pk", name = "Y", descriptor = "I")
- public static int anInt4581;
- @OriginalMember(owner = "client!vf", name = "c", descriptor = "I")
- public static int anInt5752;
- @OriginalMember(owner = "client!ve", name = "w", descriptor = "Z")
- public static boolean aBoolean298 = false;
-
- @OriginalMember(owner = "client!da", name = "a", descriptor = "(Ljava/lang/String;Ljava/lang/String;ILjava/lang/String;)Ljava/lang/String;")
- public static String method1014(@OriginalArg(0) String arg0, @OriginalArg(1) String arg1, @OriginalArg(3) String arg2) {
- for (@Pc(5) int local5 = arg2.indexOf(arg0); local5 != -1; local5 = arg2.indexOf(arg0, local5 + arg1.length())) {
- arg2 = arg2.substring(0, local5) + arg1 + arg2.substring(arg0.length() + local5);
- }
- return arg2;
- }
-
- @OriginalMember(owner = "client!da", name = "a", descriptor = "(IIILclient!be;)V")
- public static void method1015(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(3) Component arg2) {
- if (aClass13_14 != null || aBoolean108 || (arg2 == null || method1836(arg2) == null)) {
- return;
- }
- aClass13_14 = arg2;
- aClass13_1 = method1836(arg2);
- anInt5388 = arg1;
- aBoolean172 = false;
- anInt4851 = 0;
- anInt4035 = arg0;
- }
-
- @OriginalMember(owner = "client!da", name = "h", descriptor = "(B)V")
- public static void method1019() {
- Component.sprites.removeSoft();
- Component.models.removeSoft();
- Component.fonts.removeSoft();
- }
-
- @OriginalMember(owner = "client!ha", name = "a", descriptor = "(ILclient!be;)Lclient!be;")
- public static Component method1836(@OriginalArg(1) Component arg0) {
- @Pc(12) Component local12 = Static36.method938(arg0);
- if (local12 == null) {
- local12 = arg0.aClass13_5;
- }
- return local12;
- }
-
- @OriginalMember(owner = "client!j", name = "g", descriptor = "(I)V")
- public static void method4637() {
- Static165.aClass3_Sub2_Sub1_8 = null;
- Static112.aClass3_Sub2_Sub1_1 = null;
- Static112.aClass3_Sub2_Sub1_6 = null;
- Static112.aClass3_Sub2_Sub1_9 = null;
- Static112.aClass3_Sub2_Sub1_10 = null;
- }
-}
diff --git a/client/src/main/java/rt4/Static44.java b/client/src/main/java/rt4/Static44.java
deleted file mode 100644
index bea24ca..0000000
--- a/client/src/main/java/rt4/Static44.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package rt4;
-
-import org.openrs2.deob.annotation.OriginalArg;
-import org.openrs2.deob.annotation.OriginalMember;
-import org.openrs2.deob.annotation.Pc;
-
-public final class Static44 {
-
- @OriginalMember(owner = "client!dh", name = "a", descriptor = "Z")
- public static boolean aBoolean83 = false;
-
- @OriginalMember(owner = "client!dh", name = "i", descriptor = "Lclient!na;")
- public static final JagString IMG1 = JagString.parse("");
- @OriginalMember(owner = "client!d", name = "R", descriptor = "Lclient!be;")
- public static Component aClass13_10 = null;
-
- @OriginalMember(owner = "client!dh", name = "a", descriptor = "(IIII)Lclient!wk;")
- public static ComponentPointer method1148(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2) {
- @Pc(9) ComponentPointer local9 = new ComponentPointer();
- local9.anInt5879 = arg2;
- local9.anInt5878 = arg0;
- InterfaceList.openInterfaces.put(local9, arg1);
- InterfaceList.method1753(arg0);
- @Pc(28) Component local28 = InterfaceList.getComponent(arg1);
- if (local28 != null) {
- InterfaceList.redraw(local28);
- }
- if (aClass13_10 != null) {
- InterfaceList.redraw(aClass13_10);
- aClass13_10 = null;
- }
- @Pc(45) int local45 = MiniMenu.size;
- @Pc(53) int local53;
- for (local53 = 0; local53 < local45; local53++) {
- if (InterfaceList.method5(MiniMenu.actions[local53])) {
- MiniMenu.remove(local53);
- }
- }
- if (MiniMenu.size == 1) {
- Static40.aBoolean108 = false;
- InterfaceList.redrawScreen(InterfaceList.anInt4271, InterfaceList.anInt761, InterfaceList.anInt5138, InterfaceList.anInt436);
- } else {
- InterfaceList.redrawScreen(InterfaceList.anInt4271, InterfaceList.anInt761, InterfaceList.anInt5138, InterfaceList.anInt436);
- local53 = Fonts.b12Full.getStringWidth(LocalizedText.CHOOSE_OPTION);
- for (@Pc(95) int local95 = 0; local95 < MiniMenu.size; local95++) {
- @Pc(104) int local104 = Fonts.b12Full.getStringWidth(MiniMenu.getOp(local95));
- if (local104 > local53) {
- local53 = local104;
- }
- }
- InterfaceList.anInt761 = local53 + 8;
- InterfaceList.anInt436 = MiniMenu.size * 15 + (Static40.aBoolean298 ? 26 : 22);
- }
- if (local28 != null) {
- InterfaceList.method531(local28, false);
- }
- InterfaceList.method1626(arg0);
- if (InterfaceList.topLevelInterface != -1) {
- InterfaceList.runScripts(1, InterfaceList.topLevelInterface);
- }
- return local9;
- }
-
-}
diff --git a/client/src/main/java/rt4/Static59.java b/client/src/main/java/rt4/Static59.java
deleted file mode 100644
index 5ac1c9c..0000000
--- a/client/src/main/java/rt4/Static59.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package rt4;
-
-import org.openrs2.deob.annotation.OriginalMember;
-
-public final class Static59 {
-
- @OriginalMember(owner = "client!ej", name = "h", descriptor = "(I)V")
- public static void method1372() {
- if (Static226.anInt3953 == 2) {
- if (ScriptRunner.anInt3751 == Mouse.anInt5850 && ScriptRunner.anInt1892 == Static226.anInt5895) {
- Static226.anInt3953 = 0;
- if (Cheat.shiftClick && Keyboard.pressedKeys[Keyboard.KEY_SHIFT] && MiniMenu.size > 2) {
- MiniMenu.doAction(MiniMenu.size - 2);
- } else {
- MiniMenu.doAction(MiniMenu.size - 1);
- }
- }
- } else if (ScriptRunner.anInt3751 == Mouse.clickX && ScriptRunner.anInt1892 == Mouse.clickY) {
- Static226.anInt3953 = 0;
- if (Cheat.shiftClick && Keyboard.pressedKeys[Keyboard.KEY_SHIFT] && MiniMenu.size > 2) {
- MiniMenu.doAction(MiniMenu.size - 2);
- } else {
- MiniMenu.doAction(MiniMenu.size - 1);
- }
- } else {
- Static226.anInt5895 = Mouse.clickY;
- Static226.anInt3953 = 2;
- Mouse.anInt5850 = Mouse.clickX;
- }
- }
-
-}
diff --git a/client/src/main/java/rt4/Static69.java b/client/src/main/java/rt4/Static69.java
deleted file mode 100644
index 9d00b64..0000000
--- a/client/src/main/java/rt4/Static69.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package rt4;
-
-import org.openrs2.deob.annotation.OriginalArg;
-import org.openrs2.deob.annotation.OriginalMember;
-import org.openrs2.deob.annotation.Pc;
-
-public final class Static69 {
-
- @OriginalMember(owner = "client!fh", name = "cb", descriptor = "Lsignlink!ll;")
- public static SignLink signLink;
-
- @OriginalMember(owner = "client!fh", name = "U", descriptor = "[[Z")
- public static final boolean[][] aBooleanArrayArray2 = new boolean[][]{new boolean[0], {true, false, true}, {true, false, false, true}, {false, false, true, true}, {true, true, false}, {false, true, true}, {true, false, false, true}, {false, false, false, true, true}, {false, true, true}, {true, false, true, true, true}, {false, true, true, true, true}, {false, true, true, true, true, false}};
-
- @OriginalMember(owner = "client!fh", name = "a", descriptor = "(IIII)I")
- public static int method1540(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2) {
- if (arg1 == arg2) {
- return arg1;
- } else {
- @Pc(17) int local17 = 128 - arg0;
- @Pc(50) int local50 = arg0 * (arg2 >>> 7 & 0x1FE01FE) + local17 * (arg1 >>> 7 & 0x1FE01FE) & 0xFF00FF00;
- @Pc(65) int local65 = local17 * (arg1 & 0xFF00FF) + (arg2 & 0xFF00FF) * arg0 & 0xFF00FF00;
- return local50 + (local65 >> 7);
- }
- }
-
-}
diff --git a/client/src/main/java/rt4/Static7.java b/client/src/main/java/rt4/Static7.java
deleted file mode 100644
index 69f6e18..0000000
--- a/client/src/main/java/rt4/Static7.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package rt4;
-
-import org.openrs2.deob.annotation.OriginalMember;
-import org.openrs2.deob.annotation.Pc;
-
-public final class Static7 {
-
- @OriginalMember(owner = "client!ah", name = "t", descriptor = "I")
- public static int anInt986;
-
- @OriginalMember(owner = "client!ah", name = "p", descriptor = "Lclient!ih;")
- public static final LinkedList aClass69_32 = new LinkedList();
-
- @OriginalMember(owner = "client!ah", name = "b", descriptor = "(I)V")
- public static void method843() {
- if (InterfaceList.clickedInventoryComponent != null || Static40.aClass13_14 != null) {
- return;
- }
- @Pc(20) int local20 = Mouse.clickButton;
- @Pc(93) int local93;
- @Pc(99) int local99;
- if (!Static40.aBoolean108) {
- if (local20 == 1 && MiniMenu.size > 0) {
- @Pc(37) short local37 = MiniMenu.actions[MiniMenu.size - 1];
- if (local37 == 25 || local37 == 23 || local37 == 48 || local37 == 7 || local37 == 13 || local37 == 47 || local37 == 5 || local37 == 43 || local37 == 35 || local37 == 58 || local37 == 22 || local37 == 1006) {
- local93 = MiniMenu.intArgs1[MiniMenu.size - 1];
- local99 = MiniMenu.intArgs2[MiniMenu.size - 1];
- @Pc(103) Component local103 = InterfaceList.getComponent(local99);
- @Pc(106) ServerActiveProperties local106 = InterfaceList.getServerActiveProperties(local103);
- if (local106.isObjSwapEnabled() || local106.isObjReplaceEnabled()) {
- InterfaceList.clickedInventoryComponentCycle = 0;
- InterfaceList.draggingClickedInventoryObject = false;
- if (InterfaceList.clickedInventoryComponent != null) {
- InterfaceList.redraw(InterfaceList.clickedInventoryComponent);
- }
- InterfaceList.clickedInventoryComponent = InterfaceList.getComponent(local99);
- InterfaceList.clickedInventoryComponentX = Mouse.clickX;
- InterfaceList.clickedInventoryComponentY = Mouse.clickY;
- InterfaceList.mouseOverInventoryObjectIndex = local93;
- InterfaceList.redraw(InterfaceList.clickedInventoryComponent);
- return;
- }
- }
- }
- if (local20 == 1 && (VarpDomain.anInt2952 == 1 && MiniMenu.size > 2 || MiniMenu.method4640(MiniMenu.size - 1))) {
- local20 = 2;
- }
- if (local20 == 2 && MiniMenu.size > 0 || Static226.anInt3953 == 1) {
- Static226.method3901();
- }
- if (local20 == 1 && MiniMenu.size > 0 || Static226.anInt3953 == 2) {
- Static59.method1372();
- }
- return;
- }
- @Pc(204) int local204;
- if (local20 != 1) {
- local93 = Mouse.lastMouseY;
- local204 = Mouse.lastMouseX;
- if (local204 < InterfaceList.anInt4271 - 10 || local204 > InterfaceList.anInt761 + InterfaceList.anInt4271 + 10 || InterfaceList.anInt5138 - 10 > local93 || local93 > InterfaceList.anInt436 + InterfaceList.anInt5138 + 10) {
- Static40.aBoolean108 = false;
- InterfaceList.redrawScreen(InterfaceList.anInt4271, InterfaceList.anInt761, InterfaceList.anInt5138, InterfaceList.anInt436);
- }
- }
- if (local20 != 1) {
- return;
- }
- local204 = InterfaceList.anInt4271;
- local93 = InterfaceList.anInt5138;
- local99 = InterfaceList.anInt761;
- @Pc(265) int local265 = Mouse.clickX;
- @Pc(267) int local267 = Mouse.clickY;
- @Pc(269) int local269 = -1;
- for (@Pc(271) int local271 = 0; local271 < MiniMenu.size; local271++) {
- @Pc(289) int local289;
- if (Static40.aBoolean298) {
- local289 = (MiniMenu.size - local271 - 1) * 15 + local93 + 35;
- } else {
- local289 = (MiniMenu.size - local271 - 1) * 15 + local93 + 31;
- }
- if (local265 > local204 && local204 + local99 > local265 && local289 - 13 < local267 && local289 + 3 > local267) {
- local269 = local271;
- }
- }
- if (local269 != -1) {
- MiniMenu.doAction(local269);
- }
- Static40.aBoolean108 = false;
- InterfaceList.redrawScreen(InterfaceList.anInt4271, InterfaceList.anInt761, InterfaceList.anInt5138, InterfaceList.anInt436);
- }
-}
diff --git a/client/src/main/java/rt4/Static70.java b/client/src/main/java/rt4/Static70.java
deleted file mode 100644
index e37de3e..0000000
--- a/client/src/main/java/rt4/Static70.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package rt4;
-
-import org.openrs2.deob.annotation.OriginalArg;
-import org.openrs2.deob.annotation.OriginalMember;
-import org.openrs2.deob.annotation.Pc;
-
-public final class Static70 {
-
- @OriginalMember(owner = "client!je", name = "db", descriptor = "Lclient!na;")
- public static final JagString aClass100_589 = JagString.parse(" ");
- @OriginalMember(owner = "client!uf", name = "s", descriptor = "Lclient!na;")
- public static final JagString aClass100_1043 = JagString.parse(" ");
- @OriginalMember(owner = "client!wj", name = "b", descriptor = "Lclient!na;")
- public static final JagString aClass100_1101 = JagString.parse(" ");
- @OriginalMember(owner = "client!mi", name = "R", descriptor = "Lclient!na;")
- public static final JagString aClass100_760 = JagString.parse(")1");
- @OriginalMember(owner = "client!sj", name = "w", descriptor = "Lclient!na;")
- public static final JagString aClass100_978 = JagString.parse("<)4col>");
- @OriginalMember(owner = "client!jb", name = "c", descriptor = "Lclient!na;")
- public static final JagString aClass100_583 = JagString.parse("(Y<)4col>");
-
- @OriginalMember(owner = "client!fi", name = "a", descriptor = "(BI)Lclient!na;")
- public static JagString method1548(@OriginalArg(1) int arg0) {
- @Pc(9) JagString local9 = JagString.parseInt(arg0);
- for (@Pc(21) int local21 = local9.length() - 3; local21 > 0; local21 -= 3) {
- local9 = JagString.concatenate(new JagString[]{local9.substring(local21, 0), aClass100_760, local9.substring(local21)});
- }
- if (local9.length() > 9) {
- return JagString.concatenate(new JagString[]{aClass100_1043, local9.substring(local9.length() - 8, 0), LocalizedText.MILLION_SHORT, MiniMenu.OPEN_PARENTHESIS, local9, aClass100_583});
- } else if (local9.length() > 6) {
- return JagString.concatenate(new JagString[]{aClass100_589, local9.substring(local9.length() - 4, 0), LocalizedText.THOUSAND_SHORT, MiniMenu.OPEN_PARENTHESIS, local9, aClass100_583});
- } else {
- return JagString.concatenate(new JagString[]{aClass100_1101, local9, aClass100_978});
- }
- }
-
-}
diff --git a/client/src/main/java/rt4/Static81.java b/client/src/main/java/rt4/Static81.java
deleted file mode 100644
index 904ccf9..0000000
--- a/client/src/main/java/rt4/Static81.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package rt4;
-
-import org.openrs2.deob.annotation.OriginalArg;
-import org.openrs2.deob.annotation.OriginalMember;
-import org.openrs2.deob.annotation.Pc;
-
-import java.awt.*;
-
-public final class Static81 {
-
- @OriginalMember(owner = "client!gg", name = "Z", descriptor = "I")
- public static int anInt2222;
-
- @OriginalMember(owner = "client!gg", name = "db", descriptor = "I")
- public static int anInt2225 = -1;
- @OriginalMember(owner = "client!ja", name = "r", descriptor = "I")
- public static int anInt2941 = -1;
-
- @OriginalMember(owner = "client!gg", name = "c", descriptor = "(II)V")
- public static void method1750(@OriginalArg(0) int arg0) {
- if (!Preferences.cursorsEnabled) {
- arg0 = -1;
- }
- if (arg0 == anInt2941) {
- return;
- }
- if (arg0 != -1) {
- @Pc(24) CursorType local24 = CursorTypeList.get(arg0);
- @Pc(28) SoftwareSprite local28 = local24.getSprite();
- if (local28 == null) {
- arg0 = -1;
- } else {
- GameShell.signLink.setCursor(local28.method301(), local28.anInt1860, GameShell.canvas, new Point(local24.hotSpotX, local24.hotSpotY), local28.anInt1866);
- anInt2941 = arg0;
- }
- }
- if (arg0 == -1 && anInt2941 != -1) {
- GameShell.signLink.setCursor(null, -1, GameShell.canvas, new Point(), -1);
- anInt2941 = -1;
- }
- }
-
- @OriginalMember(owner = "client!gg", name = "a", descriptor = "([[IZ)V")
- public static void method1751(@OriginalArg(0) int[][] arg0) {
- TextureOp29SubOp4.anIntArrayArray10 = arg0;
- }
-
-}
diff --git a/client/src/main/java/rt4/Static89.java b/client/src/main/java/rt4/Static89.java
deleted file mode 100644
index 2bb07bd..0000000
--- a/client/src/main/java/rt4/Static89.java
+++ /dev/null
@@ -1,448 +0,0 @@
-package rt4;
-
-import org.openrs2.deob.annotation.OriginalArg;
-import org.openrs2.deob.annotation.OriginalMember;
-import org.openrs2.deob.annotation.Pc;
-
-import java.util.Random;
-
-public final class Static89 {
-
- @OriginalMember(owner = "client!ec", name = "d", descriptor = "Lclient!gn;")
- public static final LruHashTable aClass54_5 = new LruHashTable(16);
-
- @OriginalMember(owner = "client!ha", name = "a", descriptor = "(ZB)V")
- public static void method1835(@OriginalArg(0) boolean arg0) {
- @Pc(11) byte local11;
- @Pc(13) byte[][] local13;
- if (GlRenderer.enabled && arg0) {
- local11 = 1;
- local13 = LoginManager.underWaterMapFilesBuffer;
- } else {
- local13 = LoginManager.mapFilesBuffer;
- local11 = 4;
- }
- for (@Pc(21) int local21 = 0; local21 < local11; local21++) {
- client.audioLoop();
- for (@Pc(32) int local32 = 0; local32 < 13; local32++) {
- for (@Pc(39) int local39 = 0; local39 < 13; local39++) {
- @Pc(52) int local52 = Protocol.anIntArrayArrayArray18[local21][local32][local39];
- @Pc(54) boolean local54 = false;
- if (local52 != -1) {
- @Pc(65) int local65 = local52 >> 24 & 0x3;
- if (!arg0 || local65 == 0) {
- @Pc(76) int local76 = local52 >> 3 & 0x7FF;
- @Pc(82) int local82 = local52 >> 1 & 0x3;
- @Pc(88) int local88 = local52 >> 14 & 0x3FF;
- @Pc(98) int local98 = (local88 / 8 << 8) + local76 / 8;
- for (@Pc(100) int local100 = 0; local100 < LoginManager.regionBitPacked.length; local100++) {
- if (LoginManager.regionBitPacked[local100] == local98 && local13[local100] != null) {
- method4228(local82, local32 * 8, local21, PathFinder.collisionMaps, local39 * 8, local13[local100], local65, (local76 & 0x7) * 8, (local88 & 0x7) * 8, arg0);
- local54 = true;
- break;
- }
- }
- }
- }
- if (!local54) {
- Static87.method645(local21, local39 * 8, local32 * 8, 8, 8);
- }
- }
- }
- }
- }
-
- @OriginalMember(owner = "client!ha", name = "a", descriptor = "(II)[B")
- public static byte[] method1837(@OriginalArg(1) int arg0) {
- @Pc(10) ByteArrayNodeSecondary local10 = (ByteArrayNodeSecondary) aClass54_5.get(arg0);
- if (local10 == null) {
- @Pc(24) Random local24 = new Random(arg0);
- @Pc(27) byte[] local27 = new byte[512];
- @Pc(29) int local29;
- for (local29 = 0; local29 < 255; local29++) {
- local27[local29] = (byte) local29;
- }
- for (local29 = 0; local29 < 255; local29++) {
- @Pc(53) int local53 = 255 - local29;
- @Pc(58) int local58 = Texture.method3219(local53, local24);
- @Pc(62) byte local62 = local27[local58];
- local27[local58] = local27[local53];
- local27[local53] = local27[511 - local29] = local62;
- }
- local10 = new ByteArrayNodeSecondary(local27);
- aClass54_5.put(local10, arg0);
- }
- return local10.value;
- }
-
- @OriginalMember(owner = "client!ha", name = "a", descriptor = "([IJIZ)Lclient!na;")
- public static JagString method1838(@OriginalArg(0) int[] arg0, @OriginalArg(1) long arg1, @OriginalArg(2) int arg2) {
- if (QuickChatPhraseTypeList.decoder != null) {
- @Pc(17) JagString local17 = QuickChatPhraseTypeList.decoder.decode(arg2, arg0, arg1);
- if (local17 != null) {
- return local17;
- }
- }
- return Protocol.method2929(arg1);
- }
-
- @OriginalMember(owner = "client!ha", name = "a", descriptor = "(I)V")
- public static void method1841() {
- if (!Static40.aBoolean108) {
- if (Static226.anInt3953 != 0) {
- ScriptRunner.anInt3751 = Mouse.anInt5850;
- ScriptRunner.anInt1892 = Static226.anInt5895;
- } else if (Mouse.clickButton == 0) {
- ScriptRunner.anInt3751 = Mouse.lastMouseX;
- ScriptRunner.anInt1892 = Mouse.lastMouseY;
- } else {
- ScriptRunner.anInt3751 = Mouse.clickX;
- ScriptRunner.anInt1892 = Mouse.clickY;
- }
- MiniMenu.size = 1;
- MiniMenu.ops[0] = LocalizedText.CANCEL;
- MiniMenu.opBases[0] = JagString.EMPTY;
- MiniMenu.actions[0] = 1005;
- MiniMenu.cursors[0] = MiniMenu.anInt1092;
- }
- if (InterfaceList.topLevelInterface != -1) {
- Static96.method1949(InterfaceList.topLevelInterface);
- }
- @Pc(60) int local60;
- for (local60 = 0; local60 < InterfaceList.rectangles; local60++) {
- if (InterfaceList.aBooleanArray100[local60]) {
- InterfaceList.rectangleRedraw[local60] = true;
- }
- InterfaceList.aBooleanArray116[local60] = InterfaceList.aBooleanArray100[local60];
- InterfaceList.aBooleanArray100[local60] = false;
- }
- Static87.aClass13_13 = null;
- Static87.anInt2503 = -1;
- InterfaceList.anInt5574 = -1;
- InterfaceList.mouseOverInventoryInterface = null;
- if (GlRenderer.enabled) {
- ScriptRunner.aBoolean299 = true;
- }
- InterfaceList.anInt4311 = client.loop;
- if (InterfaceList.topLevelInterface != -1) {
- InterfaceList.rectangles = 0;
- Static9.method182();
- }
- if (GlRenderer.enabled) {
- GlRaster.method1177();
- } else {
- SoftwareRaster.method2503();
- }
- MiniMenu.sort();
- if (Static40.aBoolean108) {
- if (Static40.aBoolean298) {
- Static112.method2297();
- } else {
- Static145.method2744();
- }
- } else if (Static87.aClass13_13 != null) {
- MiniMenu.method1207(Static87.aClass13_13, Static87.anInt3484, Static131.anInt3260);
- } else if (Static87.anInt2503 != -1) {
- MiniMenu.method1207(null, InterfaceList.anInt5574, Static87.anInt2503);
- }
- local60 = Static40.aBoolean108 ? -1 : method4044();
- if (local60 == -1) {
- local60 = ScriptRunner.anInt5794;
- }
- Static81.method1750(local60);
- if (MiniMenu.anInt3096 == 1) {
- MiniMenu.anInt3096 = 2;
- }
- if (Protocol.anInt4422 == 1) {
- Protocol.anInt4422 = 2;
- }
- if (Cheat.rectDebug == 3) {
- for (@Pc(189) int local189 = 0; local189 < InterfaceList.rectangles; local189++) {
- if (InterfaceList.aBooleanArray116[local189]) {
- if (GlRenderer.enabled) {
- GlRaster.fillRectAlpha(InterfaceList.rectangleX[local189], InterfaceList.rectangleY[local189], InterfaceList.rectangleWidth[local189], InterfaceList.rectangleHeight[local189], 16711935, 128);
- } else {
- SoftwareRaster.fillRectAlpha(InterfaceList.rectangleX[local189], InterfaceList.rectangleY[local189], InterfaceList.rectangleWidth[local189], InterfaceList.rectangleHeight[local189], 16711935, 128);
- }
- } else if (InterfaceList.rectangleRedraw[local189]) {
- if (GlRenderer.enabled) {
- GlRaster.fillRectAlpha(InterfaceList.rectangleX[local189], InterfaceList.rectangleY[local189], InterfaceList.rectangleWidth[local189], InterfaceList.rectangleHeight[local189], 16711680, 128);
- } else {
- SoftwareRaster.fillRectAlpha(InterfaceList.rectangleX[local189], InterfaceList.rectangleY[local189], InterfaceList.rectangleWidth[local189], InterfaceList.rectangleHeight[local189], 16711680, 128);
- }
- }
- }
- }
- AreaSoundManager.redraw(Protocol.anInt4247, PlayerList.self.xFine, PlayerList.self.zFine, Player.level);
- Protocol.anInt4247 = 0;
- }
-
- @OriginalMember(owner = "client!ha", name = "a", descriptor = "(IIIII)V")
- public static void method1843(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(4) int arg3) {
- @Pc(7) int local7 = 0;
- @Pc(9) int local9 = arg2;
- @Pc(12) int local12 = -arg2;
- @Pc(14) int local14 = -1;
- @Pc(22) int local22 = IntUtils.clamp(TextureOp29.anInt5063, arg2 + arg3, TextureOp29.anInt4164);
- @Pc(30) int local30 = IntUtils.clamp(TextureOp29.anInt5063, arg3 - arg2, TextureOp29.anInt4164);
- ArrayUtils.fillRange(TextureOp29SubOp4.anIntArrayArray10[arg1], local30, local22, arg0);
- while (local7 < local9) {
- local14 += 2;
- local12 += local14;
- @Pc(58) int local58;
- @Pc(68) int local68;
- @Pc(84) int local84;
- @Pc(93) int local93;
- if (local12 > 0) {
- local9--;
- local58 = arg1 - local9;
- local12 -= local9 << 1;
- local68 = arg1 + local9;
- if (local68 >= TextureOp29.anInt5773 && local58 <= TextureOp29.anInt2869) {
- local84 = IntUtils.clamp(TextureOp29.anInt5063, arg3 + local7, TextureOp29.anInt4164);
- local93 = IntUtils.clamp(TextureOp29.anInt5063, arg3 - local7, TextureOp29.anInt4164);
- if (TextureOp29.anInt2869 >= local68) {
- ArrayUtils.fillRange(TextureOp29SubOp4.anIntArrayArray10[local68], local93, local84, arg0);
- }
- if (TextureOp29.anInt5773 <= local58) {
- ArrayUtils.fillRange(TextureOp29SubOp4.anIntArrayArray10[local58], local93, local84, arg0);
- }
- }
- }
- local7++;
- local58 = arg1 - local7;
- local68 = local7 + arg1;
- if (local68 >= TextureOp29.anInt5773 && TextureOp29.anInt2869 >= local58) {
- local84 = IntUtils.clamp(TextureOp29.anInt5063, arg3 + local9, TextureOp29.anInt4164);
- local93 = IntUtils.clamp(TextureOp29.anInt5063, arg3 - local9, TextureOp29.anInt4164);
- if (local68 <= TextureOp29.anInt2869) {
- ArrayUtils.fillRange(TextureOp29SubOp4.anIntArrayArray10[local68], local93, local84, arg0);
- }
- if (local58 >= TextureOp29.anInt5773) {
- ArrayUtils.fillRange(TextureOp29SubOp4.anIntArrayArray10[local58], local93, local84, arg0);
- }
- }
- }
- }
-
- @OriginalMember(owner = "client!tm", name = "a", descriptor = "(III[Lclient!mj;IB[BIIIZ)V")
- public static void method4228(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) CollisionMap[] arg3, @OriginalArg(4) int arg4, @OriginalArg(6) byte[] arg5, @OriginalArg(7) int arg6, @OriginalArg(8) int arg7, @OriginalArg(9) int arg8, @OriginalArg(10) boolean arg9) {
- @Pc(17) int local17;
- if (!arg9) {
- for (@Pc(10) int local10 = 0; local10 < 8; local10++) {
- for (local17 = 0; local17 < 8; local17++) {
- if (arg1 + local10 > 0 && local10 + arg1 < 103 && local17 + arg4 > 0 && arg4 + local17 < 103) {
- arg3[arg2].flags[local10 + arg1][local17 + arg4] &= 0xFEFFFFFF;
- }
- }
- }
- }
- @Pc(87) byte local87;
- if (arg9) {
- local87 = 1;
- } else {
- local87 = 4;
- }
- @Pc(96) Buffer local96 = new Buffer(arg5);
- @Pc(103) int local103;
- @Pc(108) int local108;
- for (local17 = 0; local17 < local87; local17++) {
- for (local103 = 0; local103 < 64; local103++) {
- for (local108 = 0; local108 < 64; local108++) {
- if (arg6 == local17 && arg8 <= local103 && arg8 + 8 > local103 && arg7 <= local108 && local108 < arg7 + 8) {
- SceneGraph.readTile(0, 0, arg9, local96, method3659(arg0, local103 & 0x7, local108 & 0x7) + arg4, method4360(arg0, local108 & 0x7, local103 & 0x7) + arg1, arg0, arg2);
- } else {
- SceneGraph.readTile(0, 0, arg9, local96, -1, -1, 0, 0);
- }
- }
- }
- }
- @Pc(232) int local232;
- @Pc(417) int local417;
- @Pc(255) int local255;
- @Pc(266) int local266;
- @Pc(316) int local316;
- while (local96.data.length > local96.offset) {
- local103 = local96.g1();
- if (local103 != 129) {
- local96.offset--;
- break;
- }
- for (local108 = 0; local108 < 4; local108++) {
- @Pc(223) byte local223 = local96.g1b();
- @Pc(237) int local237;
- if (local223 == 0) {
- if (local108 <= arg6) {
- local237 = arg1 + 7;
- local232 = arg1;
- local255 = arg4 + 7;
- if (local255 < 0) {
- local255 = 0;
- } else if (local255 >= 104) {
- local255 = 104;
- }
- if (local237 < 0) {
- local237 = 0;
- } else if (local237 >= 104) {
- local237 = 104;
- }
- local417 = arg4;
- if (arg4 < 0) {
- local417 = 0;
- } else if (arg4 >= 104) {
- local417 = 104;
- }
- if (arg1 < 0) {
- local232 = 0;
- } else if (arg1 >= 104) {
- local232 = 104;
- }
- while (local237 > local232) {
- while (local417 < local255) {
- SceneGraph.aByteArrayArrayArray13[arg2][local232][local417] = 0;
- local417++;
- }
- local232++;
- }
- }
- } else if (local223 == 1) {
- for (local232 = 0; local232 < 64; local232 += 4) {
- for (local237 = 0; local237 < 64; local237 += 4) {
- @Pc(246) byte local246 = local96.g1b();
- if (local108 <= arg6) {
- for (local255 = local232; local255 < local232 + 4; local255++) {
- for (local266 = local237; local266 < local237 + 4; local266++) {
- if (local255 >= arg8 && local255 < arg8 + 8 && local266 >= arg7 && arg7 + 8 > arg7) {
- local316 = arg1 + method4360(arg0, local266 & 0x7, local255 & 0x7);
- @Pc(328) int local328 = method3659(arg0, local255 & 0x7, local266 & 0x7) + arg4;
- if (local316 >= 0 && local316 < 104 && local328 >= 0 && local328 < 104) {
- SceneGraph.aByteArrayArrayArray13[arg2][local316][local328] = local246;
- }
- }
- }
- }
- }
- }
- }
- } else if (local223 == 2) {
- }
- }
- }
- @Pc(497) int local497;
- if (GlRenderer.enabled && !arg9) {
- @Pc(472) Environment local472 = null;
- label207:
- while (true) {
- label200:
- do {
- while (local96.data.length > local96.offset) {
- local108 = local96.g1();
- if (local108 != 0) {
- if (local108 != 1) {
- throw new IllegalStateException();
- }
- local497 = local96.g1();
- continue label200;
- }
- local472 = new Environment(local96);
- }
- if (local472 == null) {
- local472 = new Environment();
- }
- FogManager.chunksAtmosphere[arg1 >> 3][arg4 >> 3] = local472;
- break label207;
- } while (local497 <= 0);
- for (local232 = 0; local232 < local497; local232++) {
- @Pc(517) Light local517 = new Light(local96);
- if (local517.anInt2243 == 31) {
- @Pc(529) LightType local529 = LightTypeList.get(local96.g2());
- local517.method1762(local529.anInt2865, local529.anInt2873, local529.anInt2867, local529.anInt2872);
- }
- local417 = local517.x >> 7;
- local255 = local517.z >> 7;
- if (arg6 == local517.level && local417 >= arg8 && arg8 + 8 > local417 && arg7 <= local255 && arg7 + 8 > local255) {
- local266 = method3675(arg0, local517.x & 0x3FF, local517.z & 0x3FF) + (arg1 << 7);
- local316 = method3388(local517.x & 0x3FF, arg0, local517.z & 0x3FF) + (arg4 << 7);
- local517.x = local266;
- local517.z = local316;
- local417 = local517.x >> 7;
- local255 = local517.z >> 7;
- if (local417 >= 0 && local255 >= 0 && local417 < 104 && local255 < 104) {
- local517.aBoolean125 = (SceneGraph.tileFlags[1][local417][local255] & 0x2) != 0;
- local517.y = SceneGraph.tileHeights[local517.level][local417][local255] - local517.y;
- LightingManager.method2389(local517);
- }
- }
- }
- }
- }
- local103 = arg1 + 7;
- local108 = arg4 + 7;
- for (local497 = arg1; local497 < local103; local497++) {
- for (local232 = arg4; local232 < local108; local232++) {
- SceneGraph.aByteArrayArrayArray13[arg2][local497][local232] = 0;
- }
- }
- }
-
- @OriginalMember(owner = "client!tb", name = "h", descriptor = "(I)I")
- public static int method4044() {
- return Cheat.shiftClick && Keyboard.pressedKeys[Keyboard.KEY_SHIFT] && MiniMenu.size > 2 ? MiniMenu.cursors[MiniMenu.size - 2] : MiniMenu.cursors[MiniMenu.size - 1];
- }
-
- @OriginalMember(owner = "client!rg", name = "a", descriptor = "(IZII)I")
- public static int method4360(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2) {
- @Pc(3) int local3 = arg0 & 0x3;
- if (local3 == 0) {
- return arg2;
- } else if (local3 == 1) {
- return arg1;
- } else if (local3 == 2) {
- return 7 - arg2;
- } else {
- return 7 - arg1;
- }
- }
-
- @OriginalMember(owner = "client!qg", name = "a", descriptor = "(IBII)I")
- public static int method3659(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2) {
- @Pc(3) int local3 = arg0 & 0x3;
- if (local3 == 0) {
- return arg2;
- } else if (local3 == 1) {
- return 7 - arg1;
- } else if (local3 == 2) {
- return 7 - arg2;
- } else {
- return arg1;
- }
- }
-
- @OriginalMember(owner = "client!qi", name = "a", descriptor = "(IIBI)I")
- public static int method3675(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2) {
- @Pc(3) int local3 = arg0 & 0x3;
- if (local3 == 0) {
- return arg1;
- } else if (local3 == 1) {
- return arg2;
- } else if (local3 == 2) {
- return 1023 - arg1;
- } else {
- return 1023 - arg2;
- }
- }
-
- @OriginalMember(owner = "client!ol", name = "a", descriptor = "(IIZI)I")
- public static int method3388(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2) {
- @Pc(3) int local3 = arg1 & 0x3;
- if (local3 == 0) {
- return arg2;
- } else if (local3 == 1) {
- return 1023 - arg0;
- } else if (local3 == 2) {
- return 1023 - arg2;
- } else {
- return arg0;
- }
- }
-}
diff --git a/client/src/main/java/rt4/Static9.java b/client/src/main/java/rt4/Static9.java
deleted file mode 100644
index 5a8d328..0000000
--- a/client/src/main/java/rt4/Static9.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package rt4;
-
-import org.openrs2.deob.annotation.OriginalArg;
-import org.openrs2.deob.annotation.OriginalMember;
-import org.openrs2.deob.annotation.Pc;
-
-public final class Static9 {
-
- @OriginalMember(owner = "client!al", name = "e", descriptor = "I")
- public static int anInt172;
-
- @OriginalMember(owner = "client!al", name = "r", descriptor = "Lclient!na;")
- public static final JagString aClass100_35 = JagString.parse("showVideoAd");
- @OriginalMember(owner = "client!th", name = "m", descriptor = "[Lclient!be;")
- public static Component[] aClass13Array13;
-
- @OriginalMember(owner = "client!al", name = "a", descriptor = "(Z)V")
- public static void method182() {
- aClass13Array13 = null;
- Static87.method86(InterfaceList.topLevelInterface, 0, GameShell.canvasWidth, 0, -1, GameShell.canvasHeight, 0, 0);
- if (aClass13Array13 != null) {
- Static87.method1809(0, Static87.anInt3126, Static87.anInt4696, aClass13Array13, GameShell.canvasWidth, -1412584499, 0, GameShell.canvasHeight, Static40.aClass13_1.rectangle);
- aClass13Array13 = null;
- }
- }
-
- @OriginalMember(owner = "client!al", name = "a", descriptor = "(ILclient!wa;)Lclient!ci;")
- public static TextureOp29SubOp1 method184(@OriginalArg(1) Buffer arg0) {
- return new TextureOp29SubOp1(arg0.g2b(), arg0.g2b(), arg0.g2b(), arg0.g2b(), arg0.g3(), arg0.g1());
- }
-
- @OriginalMember(owner = "client!al", name = "a", descriptor = "(III)Z")
- public static boolean method187(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
- @Pc(7) int local7 = SceneGraph.anIntArrayArrayArray12[arg0][arg1][arg2];
- if (local7 == -Static156.anInt437) {
- return false;
- } else if (local7 == Static156.anInt437) {
- return true;
- } else {
- @Pc(22) int local22 = arg1 << 7;
- @Pc(26) int local26 = arg2 << 7;
- if (SceneGraph.method4394(local22 + 1, SceneGraph.tileHeights[arg0][arg1][arg2], local26 + 1) && SceneGraph.method4394(local22 + 128 - 1, SceneGraph.tileHeights[arg0][arg1 + 1][arg2], local26 + 1) && SceneGraph.method4394(local22 + 128 - 1, SceneGraph.tileHeights[arg0][arg1 + 1][arg2 + 1], local26 + 128 - 1) && SceneGraph.method4394(local22 + 1, SceneGraph.tileHeights[arg0][arg1][arg2 + 1], local26 + 128 - 1)) {
- SceneGraph.anIntArrayArrayArray12[arg0][arg1][arg2] = Static156.anInt437;
- return true;
- } else {
- SceneGraph.anIntArrayArrayArray12[arg0][arg1][arg2] = -Static156.anInt437;
- return false;
- }
- }
- }
-}
diff --git a/client/src/main/java/rt4/Static96.java b/client/src/main/java/rt4/Static96.java
deleted file mode 100644
index 350d407..0000000
--- a/client/src/main/java/rt4/Static96.java
+++ /dev/null
@@ -1,84 +0,0 @@
-package rt4;
-
-import org.openrs2.deob.annotation.OriginalArg;
-import org.openrs2.deob.annotation.OriginalMember;
-import org.openrs2.deob.annotation.Pc;
-
-public final class Static96 {
-
- @OriginalMember(owner = "client!hh", name = "p", descriptor = "[I")
- public static int[] anIntArray234;
-
- @OriginalMember(owner = "client!hh", name = "a", descriptor = "(II)V")
- public static void method1949(@OriginalArg(1) int arg0) {
- if (InterfaceList.load(arg0)) {
- method2354(-1, InterfaceList.components[arg0]);
- }
- }
-
- @OriginalMember(owner = "client!jd", name = "a", descriptor = "(II[Lclient!be;)V")
- public static void method2354(@OriginalArg(1) int arg0, @OriginalArg(2) Component[] arg1) {
- for (@Pc(7) int local7 = 0; local7 < arg1.length; local7++) {
- @Pc(15) Component local15 = arg1[local7];
- if (local15 != null && local15.layer == arg0 && (!local15.if3 || !Static36.method947(local15))) {
- if (local15.type == 0) {
- if (!local15.if3 && Static36.method947(local15) && local15 != InterfaceList.aClass13_22) {
- continue;
- }
- method2354(local15.id, arg1);
- if (local15.createdComponents != null) {
- method2354(local15.id, local15.createdComponents);
- }
- @Pc(73) ComponentPointer local73 = (ComponentPointer) InterfaceList.openInterfaces.get(local15.id);
- if (local73 != null) {
- method1949(local73.anInt5878);
- }
- }
- if (local15.type == 6) {
- @Pc(105) int local105;
- if (local15.modelSeqId != -1 || local15.anInt462 != -1) {
- @Pc(100) boolean local100 = Static87.method2926(local15);
- if (local100) {
- local105 = local15.anInt462;
- } else {
- local105 = local15.modelSeqId;
- }
- if (local105 != -1) {
- @Pc(118) SeqType local118 = SeqTypeList.get(local105);
- if (local118 != null) {
- local15.anInt500 += Protocol.anInt4247;
- while (local15.anInt500 > local118.anIntArray474[local15.anInt510]) {
- local15.anInt500 -= local118.anIntArray474[local15.anInt510];
- local15.anInt510++;
- if (local118.frames.length <= local15.anInt510) {
- local15.anInt510 -= local118.anInt5362;
- if (local15.anInt510 < 0 || local118.frames.length <= local15.anInt510) {
- local15.anInt510 = 0;
- }
- }
- local15.anInt496 = local15.anInt510 + 1;
- if (local118.frames.length <= local15.anInt496) {
- local15.anInt496 -= local118.anInt5362;
- if (local15.anInt496 < 0 || local118.frames.length <= local15.anInt496) {
- local15.anInt496 = -1;
- }
- }
- InterfaceList.redraw(local15);
- }
- }
- }
- }
- if (local15.modelRotationSpeed != 0 && !local15.if3) {
- @Pc(239) int local239 = local15.modelRotationSpeed >> 16;
- @Pc(243) int local243 = local239 * Protocol.anInt4247;
- local105 = local15.modelRotationSpeed << 16 >> 16;
- local15.modelXAngle = local243 + local15.modelXAngle & 0x7FF;
- local105 *= Protocol.anInt4247;
- local15.modelYAngle = local15.modelYAngle + local105 & 0x7FF;
- InterfaceList.redraw(local15);
- }
- }
- }
- }
- }
-}
diff --git a/client/src/main/java/rt4/StringUtils.java b/client/src/main/java/rt4/StringUtils.java
index 03e4dcc..f01a4e0 100644
--- a/client/src/main/java/rt4/StringUtils.java
+++ b/client/src/main/java/rt4/StringUtils.java
@@ -10,7 +10,7 @@ public class StringUtils {
@OriginalMember(owner = "client!ca", name = "cb", descriptor = "Lclient!na;")
public static final JagString nonBreakingSpace = JagString.getNbsp();
@OriginalMember(owner = "client!rm", name = "i", descriptor = "Lclient!na;")
- public static final JagString aClass100_930 = JagString.parse("(Z");
+ public static final JagString ASTERISK = JagString.parse("(Z");
@OriginalMember(owner = "client!fm", name = "W", descriptor = "Lclient!na;")
public static final JagString aClass100_453 = JagString.parse(")2");
@OriginalMember(owner = "client!cg", name = "h", descriptor = "Lclient!na;")
@@ -18,72 +18,14 @@ public class StringUtils {
@OriginalMember(owner = "client!tl", name = "i", descriptor = "Lclient!na;")
public static final JagString aClass100_1017 = JagString.parse(")1");
- @OriginalMember(owner = "client!gj", name = "a", descriptor = "(II)Z")
- public static boolean isAlphaNumeric(@OriginalArg(0) int arg0) {
- if (arg0 >= 97 && arg0 <= 122) {
- return true;
- } else if (arg0 >= 65 && arg0 <= 90) {
- return true;
- } else {
- return arg0 >= 48 && arg0 <= 57;
- }
- }
-
- @OriginalMember(owner = "client!va", name = "a", descriptor = "(IB)Z")
- public static boolean isLetter(@OriginalArg(0) int arg0) {
- return arg0 >= 97 && arg0 <= 122 || arg0 >= 65 && arg0 <= 90;
- }
-
- @OriginalMember(owner = "client!bn", name = "d", descriptor = "(II)Z")
- public static boolean isDigit(@OriginalArg(1) int arg0) {
- return arg0 >= 48 && arg0 <= 57;
- }
-
- @OriginalMember(owner = "client!we", name = "b", descriptor = "(II)Z")
- public static boolean isValidChar(@OriginalArg(1) int arg0) {
- if (arg0 >= 32 && arg0 <= 126) {
- return true;
- } else if (arg0 >= 160 && arg0 <= 255) {
- return true;
- } else {
- return arg0 == 128 || arg0 == 140 || arg0 == 151 || arg0 == 156 || arg0 == 159;
- }
- }
-
@OriginalMember(owner = "client!vf", name = "a", descriptor = "(IB)Lclient!na;")
- public static JagString method4510(@OriginalArg(0) int arg0) {
- return arg0 >= 999999999 ? aClass100_930 : JagString.parseInt(arg0);
- }
-
- @OriginalMember(owner = "client!ld", name = "a", descriptor = "(IB)I")
- public static int toUpperCase(@OriginalArg(0) int c) {
- if (c >= 97 && c <= 122 || c >= 224 && c <= 254 && c != 247) {
- return c - 32;
- } else if (c == 255) {
- return 159;
- } else if (c == 156) {
- return 140;
- } else {
- return c;
- }
- }
-
- @OriginalMember(owner = "client!sk", name = "c", descriptor = "(II)I")
- public static int toLowerCase(@OriginalArg(1) int c) {
- if (c >= 65 && c <= 90 || c >= 192 && c <= 222 && c != 215) {
- return c + 32;
- } else if (c == 159) {
- return 255;
- } else if (c == 140) {
- return 156;
- } else {
- return c;
- }
+ public static JagString toString(@OriginalArg(0) int arg0) {
+ return arg0 >= 999999999 ? ASTERISK : JagString.parseInt(arg0);
}
@OriginalMember(owner = "client!oj", name = "a", descriptor = "(IZIJI)Lclient!na;")
public static JagString formatNumber(@OriginalArg(0) int arg0, @OriginalArg(1) boolean arg1, @OriginalArg(2) int arg2, @OriginalArg(3) long arg3) {
- @Pc(9) JagString local9 = Static87.allocate(0);
+ @Pc(9) JagString local9 = JagString.allocate(0);
if (arg3 < 0L) {
arg3 = -arg3;
local9.method3113(aClass100_453);
@@ -102,7 +44,7 @@ public class StringUtils {
local26 = aClass100_185;
local28 = aClass100_1017;
}
- @Pc(59) JagString local59 = Static87.allocate(0);
+ @Pc(59) JagString local59 = JagString.allocate(0);
@Pc(61) int local61;
for (local61 = 0; local61 < arg2; local61++) {
local59.method3113(JagString.parseInt((int) (arg3 % 10L)));
@@ -113,7 +55,7 @@ public class StringUtils {
if (arg3 == 0L) {
local137 = aClass100_17;
} else {
- @Pc(95) JagString local95 = Static87.allocate(0);
+ @Pc(95) JagString local95 = JagString.allocate(0);
while (arg3 > 0L) {
if (arg1 && local61 != 0 && local61 % 3 == 0) {
local95.method3113(local26);
diff --git a/client/src/main/java/rt4/TextureOp15.java b/client/src/main/java/rt4/TextureOp15.java
index 58180a3..0795152 100644
--- a/client/src/main/java/rt4/TextureOp15.java
+++ b/client/src/main/java/rt4/TextureOp15.java
@@ -10,6 +10,8 @@ import java.util.Random;
@OriginalClass("client!hm")
public final class TextureOp15 extends TextureOp {
+ @OriginalMember(owner = "client!ec", name = "d", descriptor = "Lclient!gn;")
+ public static final LruHashTable aClass54_5 = new LruHashTable(16);
@OriginalMember(owner = "client!ui", name = "Q", descriptor = "I")
public static int anInt5526;
@OriginalMember(owner = "client!uf", name = "p", descriptor = "I")
@@ -47,6 +49,29 @@ public final class TextureOp15 extends TextureOp {
super(0, true);
}
+ @OriginalMember(owner = "client!ha", name = "a", descriptor = "(II)[B")
+ public static byte[] method1837(@OriginalArg(1) int arg0) {
+ @Pc(10) ByteArrayNodeSecondary local10 = (ByteArrayNodeSecondary) aClass54_5.get(arg0);
+ if (local10 == null) {
+ @Pc(24) Random local24 = new Random(arg0);
+ @Pc(27) byte[] local27 = new byte[512];
+ @Pc(29) int local29;
+ for (local29 = 0; local29 < 255; local29++) {
+ local27[local29] = (byte) local29;
+ }
+ for (local29 = 0; local29 < 255; local29++) {
+ @Pc(53) int local53 = 255 - local29;
+ @Pc(58) int local58 = Texture.method3219(local53, local24);
+ @Pc(62) byte local62 = local27[local58];
+ local27[local58] = local27[local53];
+ local27[local53] = local27[511 - local29] = local62;
+ }
+ local10 = new ByteArrayNodeSecondary(local27);
+ aClass54_5.put(local10, arg0);
+ }
+ return local10.value;
+ }
+
@OriginalMember(owner = "client!hm", name = "f", descriptor = "(B)V")
private void method2052() {
@Pc(12) Random local12 = new Random(this.anInt2639);
@@ -61,7 +86,7 @@ public final class TextureOp15 extends TextureOp {
@OriginalMember(owner = "client!hm", name = "e", descriptor = "(I)V")
@Override
public final void postDecode() {
- this.aByteArray38 = Static89.method1837(this.anInt2639);
+ this.aByteArray38 = method1837(this.anInt2639);
this.method2052();
}
diff --git a/client/src/main/java/rt4/TextureOp29.java b/client/src/main/java/rt4/TextureOp29.java
index 802e463..ffb1194 100644
--- a/client/src/main/java/rt4/TextureOp29.java
+++ b/client/src/main/java/rt4/TextureOp29.java
@@ -244,7 +244,7 @@ public final class TextureOp29 extends TextureOp {
private void method3934(@OriginalArg(1) int[][] arg0) {
@Pc(7) int local7 = Texture.height;
@Pc(9) int local9 = Texture.width;
- Static81.method1751(arg0);
+ TextureOp29SubOp4.method1751(arg0);
method2263(Texture.heightMask, Texture.widthMask);
if (this.aClass18Array1 == null) {
return;
@@ -273,13 +273,13 @@ public final class TextureOp29 extends TextureOp {
for (@Pc(11) int local11 = 0; local11 < this.aClass18Array1.length; local11++) {
@Pc(24) int local24 = arg1.g1();
if (local24 == 0) {
- this.aClass18Array1[local11] = Static9.method184(arg1);
+ this.aClass18Array1[local11] = TextureOp29SubOp1.create(arg1);
} else if (local24 == 1) {
this.aClass18Array1[local11] = TextureOp29SubOp3.create(arg1);
} else if (local24 == 2) {
- this.aClass18Array1[local11] = TextureOp29SubOp4.method2960(arg1);
+ this.aClass18Array1[local11] = TextureOp29SubOp4.create(arg1);
} else if (local24 == 3) {
- this.aClass18Array1[local11] = TextureOp29SubOp2.method2664(arg1);
+ this.aClass18Array1[local11] = TextureOp29SubOp2.create(arg1);
}
}
} else if (arg0 == 1) {
diff --git a/client/src/main/java/rt4/TextureOp29SubOp1.java b/client/src/main/java/rt4/TextureOp29SubOp1.java
index f712c00..177e086 100644
--- a/client/src/main/java/rt4/TextureOp29SubOp1.java
+++ b/client/src/main/java/rt4/TextureOp29SubOp1.java
@@ -29,6 +29,11 @@ public final class TextureOp29SubOp1 extends TextureOp29SubOp {
this.anInt1017 = arg2;
}
+ @OriginalMember(owner = "client!al", name = "a", descriptor = "(ILclient!wa;)Lclient!ci;")
+ public static TextureOp29SubOp1 create(@OriginalArg(1) Buffer arg0) {
+ return new TextureOp29SubOp1(arg0.g2b(), arg0.g2b(), arg0.g2b(), arg0.g2b(), arg0.g3(), arg0.g1());
+ }
+
@OriginalMember(owner = "client!ci", name = "a", descriptor = "(III)V")
@Override
public final void method4007(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
diff --git a/client/src/main/java/rt4/TextureOp29SubOp2.java b/client/src/main/java/rt4/TextureOp29SubOp2.java
index e5e655f..1fe86a8 100644
--- a/client/src/main/java/rt4/TextureOp29SubOp2.java
+++ b/client/src/main/java/rt4/TextureOp29SubOp2.java
@@ -32,7 +32,7 @@ public final class TextureOp29SubOp2 extends TextureOp29SubOp {
}
@OriginalMember(owner = "client!kl", name = "a", descriptor = "(Lclient!wa;B)Lclient!kc;")
- public static TextureOp29SubOp2 method2664(@OriginalArg(0) Buffer arg0) {
+ public static TextureOp29SubOp2 create(@OriginalArg(0) Buffer arg0) {
return new TextureOp29SubOp2(arg0.g2b(), arg0.g2b(), arg0.g2b(), arg0.g2b(), arg0.g3(), arg0.g3(), arg0.g1());
}
@@ -366,6 +366,184 @@ public final class TextureOp29SubOp2 extends TextureOp29SubOp {
}
}
+ @OriginalMember(owner = "client!nb", name = "a", descriptor = "(IIIIII)V")
+ public static void method3163(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(5) int arg4) {
+ if (arg1 == arg4) {
+ method1760(arg4, arg2, arg0, arg3);
+ } else if (TextureOp29.anInt4164 <= arg2 - arg4 && arg2 + arg4 <= TextureOp29.anInt5063 && arg3 - arg1 >= TextureOp29.anInt5773 && arg3 + arg1 <= TextureOp29.anInt2869) {
+ method1568(arg3, arg2, arg4, arg1, arg0);
+ } else {
+ method898(arg0, arg1, arg4, arg2, arg3);
+ }
+ }
+
+ @OriginalMember(owner = "client!gi", name = "a", descriptor = "(IIIIB)V")
+ public static void method1760(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) {
+ if (arg1 - arg0 >= TextureOp29.anInt4164 && TextureOp29.anInt5063 >= arg0 + arg1 && arg3 - arg0 >= TextureOp29.anInt5773 && TextureOp29.anInt2869 >= arg0 + arg3) {
+ TextureOp29SubOp4.method1206(arg1, arg0, arg2, arg3);
+ } else {
+ method1843(arg2, arg3, arg0, arg1);
+ }
+ }
+
+ @OriginalMember(owner = "client!ha", name = "a", descriptor = "(IIIII)V")
+ public static void method1843(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(4) int arg3) {
+ @Pc(7) int local7 = 0;
+ @Pc(9) int local9 = arg2;
+ @Pc(12) int local12 = -arg2;
+ @Pc(14) int local14 = -1;
+ @Pc(22) int local22 = IntUtils.clamp(TextureOp29.anInt5063, arg2 + arg3, TextureOp29.anInt4164);
+ @Pc(30) int local30 = IntUtils.clamp(TextureOp29.anInt5063, arg3 - arg2, TextureOp29.anInt4164);
+ ArrayUtils.fillRange(TextureOp29SubOp4.anIntArrayArray10[arg1], local30, local22, arg0);
+ while (local7 < local9) {
+ local14 += 2;
+ local12 += local14;
+ @Pc(58) int local58;
+ @Pc(68) int local68;
+ @Pc(84) int local84;
+ @Pc(93) int local93;
+ if (local12 > 0) {
+ local9--;
+ local58 = arg1 - local9;
+ local12 -= local9 << 1;
+ local68 = arg1 + local9;
+ if (local68 >= TextureOp29.anInt5773 && local58 <= TextureOp29.anInt2869) {
+ local84 = IntUtils.clamp(TextureOp29.anInt5063, arg3 + local7, TextureOp29.anInt4164);
+ local93 = IntUtils.clamp(TextureOp29.anInt5063, arg3 - local7, TextureOp29.anInt4164);
+ if (TextureOp29.anInt2869 >= local68) {
+ ArrayUtils.fillRange(TextureOp29SubOp4.anIntArrayArray10[local68], local93, local84, arg0);
+ }
+ if (TextureOp29.anInt5773 <= local58) {
+ ArrayUtils.fillRange(TextureOp29SubOp4.anIntArrayArray10[local58], local93, local84, arg0);
+ }
+ }
+ }
+ local7++;
+ local58 = arg1 - local7;
+ local68 = local7 + arg1;
+ if (local68 >= TextureOp29.anInt5773 && TextureOp29.anInt2869 >= local58) {
+ local84 = IntUtils.clamp(TextureOp29.anInt5063, arg3 + local9, TextureOp29.anInt4164);
+ local93 = IntUtils.clamp(TextureOp29.anInt5063, arg3 - local9, TextureOp29.anInt4164);
+ if (local68 <= TextureOp29.anInt2869) {
+ ArrayUtils.fillRange(TextureOp29SubOp4.anIntArrayArray10[local68], local93, local84, arg0);
+ }
+ if (local58 >= TextureOp29.anInt5773) {
+ ArrayUtils.fillRange(TextureOp29SubOp4.anIntArrayArray10[local58], local93, local84, arg0);
+ }
+ }
+ }
+ }
+
+ @OriginalMember(owner = "client!fl", name = "a", descriptor = "(IIIIII)V")
+ public static void method1568(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4) {
+ ArrayUtils.fillRange(TextureOp29SubOp4.anIntArrayArray10[arg0], arg1 - arg2, arg2 + arg1, arg4);
+ @Pc(17) int local17 = 0;
+ @Pc(21) int local21 = arg2 * arg2;
+ @Pc(25) int local25 = arg3 * arg3;
+ @Pc(27) int local27 = arg3;
+ @Pc(31) int local31 = local25 << 1;
+ @Pc(35) int local35 = local21 << 1;
+ @Pc(39) int local39 = arg3 << 1;
+ @Pc(48) int local48 = local31 + (1 - local39) * local21;
+ @Pc(56) int local56 = local25 - local35 * (local39 - 1);
+ @Pc(60) int local60 = local21 << 2;
+ @Pc(70) int local70 = local25 << 2;
+ @Pc(78) int local78 = local31 * 3;
+ @Pc(86) int local86 = local35 * ((arg3 << 1) - 3);
+ @Pc(92) int local92 = local70;
+ @Pc(98) int local98 = local60 * (arg3 - 1);
+ while (local27 > 0) {
+ local27--;
+ @Pc(105) int local105 = local27 + arg0;
+ @Pc(109) int local109 = arg0 - local27;
+ if (local48 < 0) {
+ while (local48 < 0) {
+ local17++;
+ local48 += local78;
+ local56 += local92;
+ local92 += local70;
+ local78 += local70;
+ }
+ }
+ if (local56 < 0) {
+ local48 += local78;
+ local78 += local70;
+ local56 += local92;
+ local17++;
+ local92 += local70;
+ }
+ @Pc(160) int local160 = local17 + arg1;
+ local56 += -local86;
+ local86 -= local60;
+ local48 += -local98;
+ @Pc(179) int local179 = arg1 - local17;
+ local98 -= local60;
+ ArrayUtils.fillRange(TextureOp29SubOp4.anIntArrayArray10[local109], local179, local160, arg4);
+ ArrayUtils.fillRange(TextureOp29SubOp4.anIntArrayArray10[local105], local179, local160, arg4);
+ }
+ }
+
+ @OriginalMember(owner = "client!cl", name = "a", descriptor = "(IIIBII)V")
+ public static void method898(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4) {
+ @Pc(13) int local13 = arg2 * arg2;
+ @Pc(15) int local15 = 0;
+ @Pc(17) int local17 = arg1;
+ @Pc(21) int local21 = local13 << 1;
+ @Pc(25) int local25 = arg1 * arg1;
+ @Pc(29) int local29 = arg1 << 1;
+ @Pc(33) int local33 = local25 << 1;
+ @Pc(42) int local42 = local13 * (1 - local29) + local33;
+ @Pc(51) int local51 = local25 - local21 * (local29 - 1);
+ @Pc(55) int local55 = local25 << 2;
+ @Pc(63) int local63 = local33 * 3;
+ @Pc(67) int local67 = local13 << 2;
+ @Pc(75) int local75 = ((arg1 << 1) - 3) * local21;
+ @Pc(81) int local81 = local55;
+ @Pc(95) int local95;
+ @Pc(104) int local104;
+ if (arg4 >= TextureOp29.anInt5773 && TextureOp29.anInt2869 >= arg4) {
+ local95 = IntUtils.clamp(TextureOp29.anInt5063, arg2 + arg3, TextureOp29.anInt4164);
+ local104 = IntUtils.clamp(TextureOp29.anInt5063, arg3 - arg2, TextureOp29.anInt4164);
+ ArrayUtils.fillRange(TextureOp29SubOp4.anIntArrayArray10[arg4], local104, local95, arg0);
+ }
+ @Pc(118) int local118 = local67 * (arg1 - 1);
+ while (local17 > 0) {
+ local17--;
+ if (local42 < 0) {
+ while (local42 < 0) {
+ local15++;
+ local42 += local63;
+ local51 += local81;
+ local81 += local55;
+ local63 += local55;
+ }
+ }
+ local95 = arg4 - local17;
+ if (local51 < 0) {
+ local51 += local81;
+ local42 += local63;
+ local63 += local55;
+ local81 += local55;
+ local15++;
+ }
+ local51 += -local75;
+ local75 -= local67;
+ local42 += -local118;
+ local104 = local17 + arg4;
+ if (TextureOp29.anInt5773 <= local104 && TextureOp29.anInt2869 >= local95) {
+ @Pc(213) int local213 = IntUtils.clamp(TextureOp29.anInt5063, local15 + arg3, TextureOp29.anInt4164);
+ @Pc(222) int local222 = IntUtils.clamp(TextureOp29.anInt5063, arg3 - local15, TextureOp29.anInt4164);
+ if (local95 >= TextureOp29.anInt5773) {
+ ArrayUtils.fillRange(TextureOp29SubOp4.anIntArrayArray10[local95], local222, local213, arg0);
+ }
+ if (TextureOp29.anInt2869 >= local104) {
+ ArrayUtils.fillRange(TextureOp29SubOp4.anIntArrayArray10[local104], local222, local213, arg0);
+ }
+ }
+ local118 -= local67;
+ }
+ }
+
@OriginalMember(owner = "client!kc", name = "c", descriptor = "(III)V")
@Override
public final void method4013(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) {
@@ -373,7 +551,7 @@ public final class TextureOp29SubOp2 extends TextureOp29SubOp {
@Pc(17) int local17 = arg0 * this.anInt3159 >> 12;
@Pc(24) int local24 = this.anInt3163 * arg1 >> 12;
@Pc(31) int local31 = this.anInt3168 * arg1 >> 12;
- Static165.method3163(this.anInt5228, local31, local10, local24, local17);
+ method3163(this.anInt5228, local31, local10, local24, local17);
}
@OriginalMember(owner = "client!kc", name = "a", descriptor = "(IZI)V")
diff --git a/client/src/main/java/rt4/TextureOp29SubOp3.java b/client/src/main/java/rt4/TextureOp29SubOp3.java
index 51f9964..d6370b6 100644
--- a/client/src/main/java/rt4/TextureOp29SubOp3.java
+++ b/client/src/main/java/rt4/TextureOp29SubOp3.java
@@ -53,9 +53,83 @@ public final class TextureOp29SubOp3 extends TextureOp29SubOp {
@OriginalMember(owner = "client!oi", name = "a", descriptor = "(IIIIIIIIII)V")
public static void method3340(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7, @OriginalArg(8) int arg8) {
if (arg5 >= TextureOp29.anInt4164 && arg5 <= TextureOp29.anInt5063 && arg0 >= TextureOp29.anInt4164 && arg0 <= TextureOp29.anInt5063 && arg6 >= TextureOp29.anInt4164 && TextureOp29.anInt5063 >= arg6 && TextureOp29.anInt4164 <= arg1 && arg1 <= TextureOp29.anInt5063 && TextureOp29.anInt5773 <= arg4 && arg4 <= TextureOp29.anInt2869 && arg7 >= TextureOp29.anInt5773 && TextureOp29.anInt2869 >= arg7 && arg2 >= TextureOp29.anInt5773 && TextureOp29.anInt2869 >= arg2 && arg3 >= TextureOp29.anInt5773 && arg3 <= TextureOp29.anInt2869) {
- Static38.method962(arg2, arg8, arg7, arg6, arg1, arg3, arg4, arg0, arg5);
+ method962(arg2, arg8, arg7, arg6, arg1, arg3, arg4, arg0, arg5);
} else {
- Static165.method3162(arg5, arg0, arg7, arg8, arg3, arg2, arg1, arg6, arg4);
+ method3162(arg5, arg0, arg7, arg8, arg3, arg2, arg1, arg6, arg4);
+ }
+ }
+
+ @OriginalMember(owner = "client!cn", name = "a", descriptor = "(IIIIIIIIII)V")
+ public static void method962(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5, @OriginalArg(7) int arg6, @OriginalArg(8) int arg7, @OriginalArg(9) int arg8) {
+ if (arg8 == arg7 && arg2 == arg6 && arg4 == arg3 && arg0 == arg5) {
+ TextureOp29SubOp4.method4547(arg1, arg5, arg6, arg4, arg8);
+ return;
+ }
+ @Pc(37) int local37 = arg6;
+ @Pc(39) int local39 = arg8;
+ @Pc(43) int local43 = arg8 * 3;
+ @Pc(47) int local47 = arg6 * 3;
+ @Pc(51) int local51 = arg7 * 3;
+ @Pc(55) int local55 = arg2 * 3;
+ @Pc(59) int local59 = arg3 * 3;
+ @Pc(63) int local63 = arg0 * 3;
+ @Pc(73) int local73 = arg4 + local51 - local59 - arg8;
+ @Pc(83) int local83 = arg5 + local55 - arg6 - local63;
+ @Pc(93) int local93 = local43 + local59 - local51 - local51;
+ @Pc(103) int local103 = local47 + local63 - local55 - local55;
+ @Pc(108) int local108 = local51 - local43;
+ @Pc(113) int local113 = local55 - local47;
+ for (@Pc(115) int local115 = 128; local115 <= 4096; local115 += 128) {
+ @Pc(126) int local126 = local115 * local115 >> 12;
+ @Pc(132) int local132 = local115 * local126 >> 12;
+ @Pc(136) int local136 = local83 * local132;
+ @Pc(140) int local140 = local126 * local93;
+ @Pc(144) int local144 = local73 * local132;
+ @Pc(148) int local148 = local126 * local103;
+ @Pc(152) int local152 = local108 * local115;
+ @Pc(156) int local156 = local113 * local115;
+ @Pc(167) int local167 = (local152 + local144 + local140 >> 12) + arg8;
+ @Pc(177) int local177 = arg6 + (local156 + local136 + local148 >> 12);
+ TextureOp29SubOp4.method4547(arg1, local177, local37, local167, local39);
+ local39 = local167;
+ local37 = local177;
+ }
+ }
+
+ @OriginalMember(owner = "client!nb", name = "a", descriptor = "(IIIIIIIIII)V")
+ public static void method3162(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5, @OriginalArg(7) int arg6, @OriginalArg(8) int arg7, @OriginalArg(9) int arg8) {
+ if (arg0 == arg1 && arg8 == arg2 && arg7 == arg6 && arg4 == arg5) {
+ TextureOp29.method3982(arg3, arg4, arg0, arg8, arg6);
+ return;
+ }
+ @Pc(32) int local32 = arg0;
+ @Pc(36) int local36 = arg8 * 3;
+ @Pc(40) int local40 = arg0 * 3;
+ @Pc(42) int local42 = arg8;
+ @Pc(46) int local46 = arg1 * 3;
+ @Pc(50) int local50 = arg2 * 3;
+ @Pc(54) int local54 = arg7 * 3;
+ @Pc(58) int local58 = arg5 * 3;
+ @Pc(66) int local66 = local46 + arg6 - local54 - arg0;
+ @Pc(76) int local76 = local54 + local40 - local46 - local46;
+ @Pc(85) int local85 = local50 + arg4 - local58 - arg8;
+ @Pc(95) int local95 = local36 + local58 - local50 - local50;
+ @Pc(100) int local100 = local46 - local40;
+ @Pc(105) int local105 = local50 - local36;
+ for (@Pc(107) int local107 = 128; local107 <= 4096; local107 += 128) {
+ @Pc(118) int local118 = local107 * local107 >> 12;
+ @Pc(124) int local124 = local107 * local118 >> 12;
+ @Pc(128) int local128 = local95 * local118;
+ @Pc(132) int local132 = local124 * local85;
+ @Pc(136) int local136 = local118 * local76;
+ @Pc(140) int local140 = local66 * local124;
+ @Pc(144) int local144 = local100 * local107;
+ @Pc(156) int local156 = arg0 + (local136 + local140 + local144 >> 12);
+ @Pc(160) int local160 = local107 * local105;
+ @Pc(172) int local172 = arg8 + (local160 + local132 + local128 >> 12);
+ TextureOp29.method3982(arg3, local172, local32, local42, local156);
+ local32 = local156;
+ local42 = local172;
}
}
diff --git a/client/src/main/java/rt4/TextureOp29SubOp4.java b/client/src/main/java/rt4/TextureOp29SubOp4.java
index 3ea0cec..212ef9c 100644
--- a/client/src/main/java/rt4/TextureOp29SubOp4.java
+++ b/client/src/main/java/rt4/TextureOp29SubOp4.java
@@ -115,7 +115,7 @@ public final class TextureOp29SubOp4 extends TextureOp29SubOp {
}
@OriginalMember(owner = "client!mf", name = "a", descriptor = "(BLclient!wa;)Lclient!ta;")
- public static TextureOp29SubOp4 method2960(@OriginalArg(1) Buffer arg0) {
+ public static TextureOp29SubOp4 create(@OriginalArg(1) Buffer arg0) {
return new TextureOp29SubOp4(arg0.g2b(), arg0.g2b(), arg0.g2b(), arg0.g2b(), arg0.g3(), arg0.g3(), arg0.g1());
}
@@ -362,6 +362,11 @@ public final class TextureOp29SubOp4 extends TextureOp29SubOp {
}
}
+ @OriginalMember(owner = "client!gg", name = "a", descriptor = "([[IZ)V")
+ public static void method1751(@OriginalArg(0) int[][] arg0) {
+ anIntArrayArray10 = arg0;
+ }
+
@OriginalMember(owner = "client!ta", name = "a", descriptor = "(IZI)V")
@Override
public final void method4009(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) {
diff --git a/client/src/main/java/rt4/TextureOp34.java b/client/src/main/java/rt4/TextureOp34.java
index 785925e..306dfb7 100644
--- a/client/src/main/java/rt4/TextureOp34.java
+++ b/client/src/main/java/rt4/TextureOp34.java
@@ -145,7 +145,7 @@ public final class TextureOp34 extends TextureOp {
@OriginalMember(owner = "client!bi", name = "e", descriptor = "(I)V")
@Override
public final void postDecode() {
- this.aByteArray10 = Static89.method1837(this.anInt650);
+ this.aByteArray10 = TextureOp15.method1837(this.anInt650);
this.method589();
for (@Pc(15) int local15 = this.anInt642 - 1; local15 >= 1; local15--) {
@Pc(23) short local23 = this.aShortArray4[local15];
diff --git a/client/src/main/java/rt4/TracingException.java b/client/src/main/java/rt4/TracingException.java
index 08ab589..e250e23 100644
--- a/client/src/main/java/rt4/TracingException.java
+++ b/client/src/main/java/rt4/TracingException.java
@@ -31,14 +31,14 @@ public final class TracingException extends RuntimeException {
local13 = local13 + arg0;
}
method31(local13);
- local13 = Static40.method1014(":", "%3a", local13);
- local13 = Static40.method1014("@", "%40", local13);
- local13 = Static40.method1014("&", "%26", local13);
- local13 = Static40.method1014("#", "%23", local13);
- if (Static69.signLink.applet == null) {
+ local13 = method1014(":", "%3a", local13);
+ local13 = method1014("@", "%40", local13);
+ local13 = method1014("&", "%26", local13);
+ local13 = method1014("#", "%23", local13);
+ if (GameShell.signLink2.applet == null) {
return;
}
- @Pc(109) PrivilegedRequest local109 = Static69.signLink.openUrlStream(new URL(Static69.signLink.applet.getCodeBase(), "clienterror.ws?c=" + GameShell.clientBuild + "&u=" + Player.name37 + "&v1=" + SignLink.javaVendor + "&v2=" + SignLink.javaVersion + "&e=" + local13));
+ @Pc(109) PrivilegedRequest local109 = GameShell.signLink2.openUrlStream(new URL(GameShell.signLink2.applet.getCodeBase(), "clienterror.ws?c=" + GameShell.clientBuild + "&u=" + Player.name37 + "&v1=" + SignLink.javaVendor + "&v2=" + SignLink.javaVersion + "&e=" + local13));
while (local109.status == 0) {
ThreadUtils.sleep(1L);
}
@@ -53,7 +53,7 @@ public final class TracingException extends RuntimeException {
@OriginalMember(owner = "client!af", name = "a", descriptor = "(ILjava/lang/String;)V")
public static void method31(@OriginalArg(1) String arg0) {
- System.out.println("Error: " + Static40.method1014("%0a", "\n", arg0));
+ System.out.println("Error: " + method1014("%0a", "\n", arg0));
}
@OriginalMember(owner = "client!hi", name = "a", descriptor = "(ILjava/lang/Throwable;)Ljava/lang/String;")
@@ -99,4 +99,12 @@ public final class TracingException extends RuntimeException {
local24 = local24 + ' ';
}
}
+
+ @OriginalMember(owner = "client!da", name = "a", descriptor = "(Ljava/lang/String;Ljava/lang/String;ILjava/lang/String;)Ljava/lang/String;")
+ public static String method1014(@OriginalArg(0) String arg0, @OriginalArg(1) String arg1, @OriginalArg(3) String arg2) {
+ for (@Pc(5) int local5 = arg2.indexOf(arg0); local5 != -1; local5 = arg2.indexOf(arg0, local5 + arg1.length())) {
+ arg2 = arg2.substring(0, local5) + arg1 + arg2.substring(arg0.length() + local5);
+ }
+ return arg2;
+ }
}
diff --git a/client/src/main/java/rt4/VarpDomain.java b/client/src/main/java/rt4/VarpDomain.java
index 6ba802b..cca6610 100644
--- a/client/src/main/java/rt4/VarpDomain.java
+++ b/client/src/main/java/rt4/VarpDomain.java
@@ -127,4 +127,21 @@ public class VarpDomain {
inserting = local25;
}
}
+
+ @OriginalMember(owner = "client!cn", name = "a", descriptor = "(ZI)I")
+ public static int poll(@OriginalArg(0) boolean arg0) {
+ @Pc(4) long local4 = MonotonicClock.currentTimeMillis();
+ for (@Pc(28) LongNode local28 = arg0 ? (LongNode) aClass133_20.head() : (LongNode) aClass133_20.next(); local28 != null; local28 = (LongNode) aClass133_20.next()) {
+ if ((local28.value & 0x3FFFFFFFFFFFFFFFL) < local4) {
+ if ((local28.value & 0x4000000000000000L) != 0L) {
+ @Pc(58) int local58 = (int) local28.key;
+ activeVarps[local58] = varp[local58];
+ local28.unlink();
+ return local58;
+ }
+ local28.unlink();
+ }
+ }
+ return -1;
+ }
}
diff --git a/client/src/main/java/rt4/WorldList.java b/client/src/main/java/rt4/WorldList.java
index daa4c0f..acce237 100644
--- a/client/src/main/java/rt4/WorldList.java
+++ b/client/src/main/java/rt4/WorldList.java
@@ -30,6 +30,8 @@ public class WorldList {
public static final JagString aClass100_260 = JagString.parse(")1a2)1m");
@OriginalMember(owner = "client!ch", name = "x", descriptor = "Lclient!na;")
public static final JagString aClass100_193 = JagString.parse(":");
+ @OriginalMember(owner = "client!ii", name = "e", descriptor = "Lclient!na;")
+ public static final JagString aClass100_570 = JagString.parse(")2");
@OriginalMember(owner = "client!gi", name = "c", descriptor = "I")
public static int step = 0;
@OriginalMember(owner = "client!be", name = "kc", descriptor = "J")
@@ -265,7 +267,7 @@ public class WorldList {
sorted[local13] = sorted[arg2];
sorted[arg2] = local19;
for (@Pc(31) int local31 = arg4; local31 < arg2; local31++) {
- if (Static164.method3115(local19, sorted[local31], arg0, arg1, arg3, arg5) <= 0) {
+ if (method3115(local19, sorted[local31], arg0, arg1, arg3, arg5) <= 0) {
@Pc(53) World local53 = sorted[local31];
sorted[local31] = sorted[local15];
sorted[local15++] = local53;
@@ -316,4 +318,60 @@ public class WorldList {
}
}
}
+
+ @OriginalMember(owner = "client!na", name = "a", descriptor = "(Lclient!ba;Lclient!ba;IIIZZ)I")
+ public static int method3115(@OriginalArg(0) World arg0, @OriginalArg(1) World arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) boolean arg4, @OriginalArg(6) boolean arg5) {
+ @Pc(8) int local8 = method4595(arg1, arg3, arg0, arg5);
+ if (local8 != 0) {
+ return arg5 ? -local8 : local8;
+ } else if (arg2 == -1) {
+ return 0;
+ } else {
+ @Pc(42) int local42 = method4595(arg1, arg2, arg0, arg4);
+ return arg4 ? -local42 : local42;
+ }
+ }
+
+ @OriginalMember(owner = "client!wb", name = "a", descriptor = "(Lclient!ba;IILclient!ba;Z)I")
+ public static int method4595(@OriginalArg(0) World arg0, @OriginalArg(1) int arg1, @OriginalArg(3) World arg2, @OriginalArg(4) boolean arg3) {
+ if (arg1 == 1) {
+ @Pc(11) int local11 = arg0.players;
+ @Pc(14) int local14 = arg2.players;
+ if (!arg3) {
+ if (local14 == -1) {
+ local14 = 2001;
+ }
+ if (local11 == -1) {
+ local11 = 2001;
+ }
+ }
+ return local11 - local14;
+ } else if (arg1 == 2) {
+ return arg0.getWorldInfo().name.compare(arg2.getWorldInfo().name);
+ } else if (arg1 == 3) {
+ if (arg0.activity.strEquals(aClass100_570)) {
+ if (arg2.activity.strEquals(aClass100_570)) {
+ return 0;
+ } else if (arg3) {
+ return -1;
+ } else {
+ return 1;
+ }
+ } else if (arg2.activity.strEquals(aClass100_570)) {
+ return arg3 ? 1 : -1;
+ } else {
+ return arg0.activity.compare(arg2.activity);
+ }
+ } else if (arg1 == 4) {
+ return arg0.isLootShare() ? (arg2.isLootShare() ? 0 : 1) : arg2.isLootShare() ? -1 : 0;
+ } else if (arg1 == 5) {
+ return arg0.isQuickChat() ? (arg2.isQuickChat() ? 0 : 1) : (arg2.isQuickChat() ? -1 : 0);
+ } else if (arg1 == 6) {
+ return arg0.isPvp() ? (arg2.isPvp() ? 0 : 1) : (arg2.isPvp() ? -1 : 0);
+ } else if (arg1 == 7) {
+ return arg0.isMembers() ? (arg2.isMembers() ? 0 : 1) : (arg2.isMembers() ? -1 : 0);
+ } else {
+ return arg0.id - arg2.id;
+ }
+ }
}
diff --git a/client/src/main/java/rt4/WorldMap.java b/client/src/main/java/rt4/WorldMap.java
index 0f91606..07722cc 100644
--- a/client/src/main/java/rt4/WorldMap.java
+++ b/client/src/main/java/rt4/WorldMap.java
@@ -29,6 +29,8 @@ public class WorldMap {
public static final JagString aClass100_872 = JagString.parse("
");
@OriginalMember(owner = "client!nj", name = "h", descriptor = "Lclient!ih;")
public static final LinkedList aClass69_97 = new LinkedList();
+ @OriginalMember(owner = "client!di", name = "q", descriptor = "[Lclient!na;")
+ public static final JagString[] aClass100Array53 = new JagString[5];
@OriginalMember(owner = "client!wa", name = "ub", descriptor = "Lclient!bn;")
public static Map currentMap;
@OriginalMember(owner = "client!dc", name = "O", descriptor = "I")
@@ -105,6 +107,8 @@ public class WorldMap {
public static int anInt5212;
@OriginalMember(owner = "client!qf", name = "S", descriptor = "I")
public static int anInt1864;
+ @OriginalMember(owner = "client!al", name = "e", descriptor = "I")
+ public static int anInt172;
@OriginalMember(owner = "client!pa", name = "d", descriptor = "(I)V")
public static void load() {
@@ -1020,8 +1024,8 @@ public class WorldMap {
@OriginalMember(owner = "client!va", name = "c", descriptor = "(BI)V")
public static void method4444(@OriginalArg(1) int arg0) {
- Static9.anInt172 = arg0;
- Static1.anInt2428 = 20;
+ anInt172 = arg0;
+ Cs1ScriptRunner.anInt2428 = 20;
anInt1864 = 3;
}
@@ -1632,10 +1636,10 @@ public class WorldMap {
return;
}
anInt1176 = (int) ((float) (arg2 * 2) / zoom);
- Static1.anInt2882 = anInt435 - (int) ((float) arg3 / zoom);
+ Cs1ScriptRunner.anInt2882 = anInt435 - (int) ((float) arg3 / zoom);
@Pc(211) int local211 = anInt435 - (int) ((float) arg3 / zoom);
local50 = anInt919 - (int) ((float) arg2 / zoom);
- Static1.anInt2884 = anInt919 - (int) ((float) arg2 / zoom);
+ Cs1ScriptRunner.anInt2884 = anInt919 - (int) ((float) arg2 / zoom);
@Pc(236) int local236 = anInt919 + (int) ((float) arg2 / zoom);
local61 = (int) ((float) arg3 / zoom) + anInt435;
anInt2387 = (int) ((float) (arg3 * 2) / zoom);
@@ -1647,18 +1651,18 @@ public class WorldMap {
SoftwareRaster.setSize(aClass3_Sub2_Sub1_Sub1_2.pixels, arg3, arg2);
method4364(arg3, 0, local61, local50, 0, local236, arg2, local211);
method1195(arg3, 0, local61, local236, arg2, 0, local211, local50);
- Static38.method959(0, 0, local211, arg3, local236, local50, local61, arg2);
+ method959(0, 0, local211, arg3, local236, local50, local61, arg2);
GlRaster.drawPixels(aClass3_Sub2_Sub1_Sub1_2.pixels, arg0, arg1, arg3, arg2);
SoftwareRaster.pixels = null;
} else {
method4364(arg3 + arg0, arg1, local61, local50, arg0, local236, arg1 + arg2, local211);
method1195(arg0 + arg3, arg0, local61, local236, arg2 + arg1, arg1, local211, local50);
- Static38.method959(arg0, arg1, local211, arg0 + arg3, local236, local50, local61, arg2 + arg1);
+ method959(arg0, arg1, local211, arg0 + arg3, local236, local50, local61, arg2 + arg1);
}
if (anInt1864 > 0) {
- Static1.anInt2428--;
- if (Static1.anInt2428 == 0) {
- Static1.anInt2428 = 20;
+ Cs1ScriptRunner.anInt2428--;
+ if (Cs1ScriptRunner.anInt2428 == 0) {
+ Cs1ScriptRunner.anInt2428 = 20;
anInt1864--;
}
}
@@ -1693,10 +1697,10 @@ public class WorldMap {
@Pc(9) int local9 = arg2 - arg4;
@Pc(11) int local11 = -1;
if (anInt1864 > 0) {
- if (Static1.anInt2428 <= 10) {
- local11 = Static1.anInt2428 * 5;
+ if (Cs1ScriptRunner.anInt2428 <= 10) {
+ local11 = Cs1ScriptRunner.anInt2428 * 5;
} else {
- local11 = 50 - (Static1.anInt2428 - 10) * 5;
+ local11 = 50 - (Cs1ScriptRunner.anInt2428 - 10) * 5;
}
}
@Pc(39) int local39 = arg1 - arg6;
@@ -1724,7 +1728,7 @@ public class WorldMap {
if (local209 != 0) {
@Pc(222) LocType local222 = LocTypeList.get(local209 - 1);
if (!MapList.aBooleanArray130[local222.mapElement]) {
- if (local11 != -1 && local222.mapElement == Static9.anInt172) {
+ if (local11 != -1 && local222.mapElement == anInt172) {
@Pc(243) MapElement local243 = new MapElement();
local243.anInt4307 = local65;
local243.anInt4314 = local144;
@@ -1806,4 +1810,78 @@ public class WorldMap {
}
return -1;
}
+
+ @OriginalMember(owner = "client!cn", name = "a", descriptor = "(BIIIIIIII)V")
+ public static void method959(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5, @OriginalArg(7) int arg6, @OriginalArg(8) int arg7) {
+ for (@Pc(11) int local11 = 0; local11 < labels.anInt5074; local11++) {
+ if (labels.method3890(local11)) {
+ @Pc(32) int local32 = labels.aShortArray73[local11] - originX;
+ @Pc(43) int local43 = originZ + length - labels.aShortArray72[local11] - 1;
+ @Pc(59) int local59 = arg0 + (arg3 - arg0) * (local32 - arg2) / (arg6 - arg2);
+ @Pc(64) int local64 = labels.method3894(local11);
+ @Pc(80) int local80 = (arg7 - arg1) * (local43 - arg5) / (arg4 - arg5) + arg1;
+ @Pc(82) int local82 = 16777215;
+ @Pc(84) WorldMapFont local84 = null;
+ if (local64 == 0) {
+ if ((double) zoom == 3.0D) {
+ local84 = font11;
+ }
+ if ((double) zoom == 4.0D) {
+ local84 = font12;
+ }
+ if ((double) zoom == 6.0D) {
+ local84 = font14;
+ }
+ if ((double) zoom >= 8.0D) {
+ local84 = font17;
+ }
+ }
+ if (local64 == 1) {
+ if ((double) zoom == 3.0D) {
+ local84 = font14;
+ }
+ if ((double) zoom == 4.0D) {
+ local84 = font17;
+ }
+ if ((double) zoom == 6.0D) {
+ local84 = font19;
+ }
+ if ((double) zoom >= 8.0D) {
+ local84 = font22;
+ }
+ }
+ if (local64 == 2) {
+ if ((double) zoom == 3.0D) {
+ local84 = font19;
+ }
+ local82 = 16755200;
+ if ((double) zoom == 4.0D) {
+ local84 = font22;
+ }
+ if ((double) zoom == 6.0D) {
+ local84 = font26;
+ }
+ if ((double) zoom >= 8.0D) {
+ local84 = font30;
+ }
+ }
+ if (labels.anIntArray444[local11] != -1) {
+ local82 = labels.anIntArray444[local11];
+ }
+ if (local84 != null) {
+ @Pc(211) int local211 = Fonts.p11Full.splitParagraph(labels.aClass100Array153[local11], null, aClass100Array53);
+ local80 -= local84.method1503() * (local211 - 1) / 2;
+ local80 += local84.method1511() / 2;
+ for (@Pc(231) int local231 = 0; local231 < local211; local231++) {
+ @Pc(242) JagString local242 = aClass100Array53[local231];
+ if (local211 - 1 > local231) {
+ local242.method3133(local242.length() - 4);
+ }
+ local84.renderStringCenter(local242, local59, local80, local82);
+ local80 += local84.method1503();
+ }
+ }
+ }
+ }
+ }
}
diff --git a/client/src/main/java/rt4/client.java b/client/src/main/java/rt4/client.java
index af5ef1d..b2d86b1 100644
--- a/client/src/main/java/rt4/client.java
+++ b/client/src/main/java/rt4/client.java
@@ -34,6 +34,14 @@ public final class client extends GameShell {
public static final JagString aClass100_899 = JagString.parse("0(U");
@OriginalMember(owner = "client!uh", name = "Y", descriptor = "Lclient!na;")
public static final JagString HUFFMAN_GROUP = JagString.parse("huffman");
+ @OriginalMember(owner = "client!nb", name = "n", descriptor = "Lclient!na;")
+ public static final JagString DETAILS = JagString.parse("details");
+ @OriginalMember(owner = "client!qk", name = "b", descriptor = "Lclient!na;")
+ public static final JagString aClass100_900 = JagString.parse("tbrefresh");
+ @OriginalMember(owner = "client!al", name = "r", descriptor = "Lclient!na;")
+ public static final JagString aClass100_35 = JagString.parse("showVideoAd");
+ @OriginalMember(owner = "client!a", name = "e", descriptor = "Lclient!na;")
+ public static final JagString TITLE_SONG = JagString.parse("scape main");
@OriginalMember(owner = "client!jm", name = "A", descriptor = "Lclient!na;")
static final JagString aClass100_603 = JagString.parse("");
@OriginalMember(owner = "client!jm", name = "z", descriptor = "Lclient!na;")
@@ -200,6 +208,10 @@ public final class client extends GameShell {
public static JagString mainLoadPrimaryText = null;
@OriginalMember(owner = "client!sj", name = "p", descriptor = "I")
public static int anInt5150 = 1;
+ @OriginalMember(owner = "client!cn", name = "B", descriptor = "I")
+ public static int anInt1196 = 1;
+ @OriginalMember(owner = "client!ah", name = "t", descriptor = "I")
+ public static int anInt986;
@OriginalMember(owner = "client!client", name = "main", descriptor = "([Ljava/lang/String;)V")
public static void main(@OriginalArg(0) String[] arg0) {
@@ -321,12 +333,12 @@ public final class client extends GameShell {
ClientProt.anInt5804 = 0;
anInt5150 = 1;
LoginManager.loadingScreenState = 0;
- Static38.anInt1196 = 1;
+ anInt1196 = 1;
LoginManager.mapFilesMissingCount = 0;
WorldMap.clear(true);
}
if (arg0 == 25 || arg0 == 10) {
- Static123.topBannerRefresh();
+ topBannerRefresh();
}
if (arg0 == 5) {
TitleScreen.load(js5Archive8);
@@ -384,7 +396,7 @@ public final class client extends GameShell {
LightTypeList.method1882();
CursorTypeList.method741();
PlayerAppearance.method3474();
- Static40.method1019();
+ Component.method1019();
HintArrowManager.removeSoft();
ShadowModelList.method4276();
HitBarList.hitBars.removeSoft();
@@ -408,7 +420,7 @@ public final class client extends GameShell {
LightTypeList.method1695();
CursorTypeList.method351();
PlayerAppearance.method3947();
- Static147.method2764();
+ Component.clear();
if (modeWhat != 0) {
for (@Pc(54) int local54 = 0; local54 < Player.aByteArrayArray8.length; local54++) {
Player.aByteArrayArray8[local54] = null;
@@ -496,11 +508,11 @@ public final class client extends GameShell {
}
Fonts.load(js5Archive13, js5Archive8);
Sprites.load(js5Archive8);
- Static112.aClass3_Sub2_Sub1_10 = null;
- Static112.aClass3_Sub2_Sub1_1 = null;
- Static112.aClass3_Sub2_Sub1_6 = null;
- Static165.aClass3_Sub2_Sub1_8 = null;
- Static112.aClass3_Sub2_Sub1_9 = null;
+ LoginManager.aClass3_Sub2_Sub1_10 = null;
+ LoginManager.aClass3_Sub2_Sub1_1 = null;
+ LoginManager.aClass3_Sub2_Sub1_6 = null;
+ LoginManager.aClass3_Sub2_Sub1_8 = null;
+ LoginManager.aClass3_Sub2_Sub1_9 = null;
if (gameState == 5) {
TitleScreen.load(js5Archive8);
}
@@ -534,7 +546,7 @@ public final class client extends GameShell {
MiniMap.hintMapMarkers[local3506] = null;
}
MiniMenu.size = 0;
- Static40.aBoolean108 = false;
+ Cs1ScriptRunner.aBoolean108 = false;
Mouse.setIdleLoops(0);
for (local3506 = 0; local3506 < 100; local3506++) {
Chat.messages[local3506] = null;
@@ -580,7 +592,7 @@ public final class client extends GameShell {
VarpDomain.reset();
DelayedStateChange.clear();
Camera.anInt5230 = 0;
- Static233.anInt5217 = 0;
+ Camera.anInt5217 = 0;
Camera.anInt5765 = 0;
Camera.anInt5203 = 0;
Camera.anInt4232 = 0;
@@ -588,7 +600,7 @@ public final class client extends GameShell {
Camera.anInt1744 = 0;
Camera.anInt5449 = 0;
Camera.anInt4612 = 0;
- Static233.anInt5225 = 0;
+ Camera.anInt5225 = 0;
for (local3506 = 0; local3506 < VarcDomain.varcs.length; local3506++) {
VarcDomain.varcs[local3506] = -1;
}
@@ -601,8 +613,8 @@ public final class client extends GameShell {
InterfaceList.topLevelInterface = -1;
InterfaceList.openInterfaces = new HashTable(8);
InterfaceList.method1287();
- Static44.aClass13_10 = null;
- Static40.aBoolean108 = false;
+ Cs1ScriptRunner.aClass13_10 = null;
+ Cs1ScriptRunner.aBoolean108 = false;
MiniMenu.size = 0;
PlayerAppearance.DEFAULT.set(new int[]{0, 0, 0, 0, 0}, -1, false, null, -1);
for (local3506 = 0; local3506 < 8; local3506++) {
@@ -634,8 +646,8 @@ public final class client extends GameShell {
MiniMenu.walkText = LocalizedText.WALKHERE;
ScriptRunner.neverRemoveRoofs = false;
aShortArray88 = aShortArray19 = aShortArray74 = aShortArray87 = new short[256];
- Static40.method4637();
- Static40.aBoolean298 = false;
+ LoginManager.method4637();
+ InterfaceList.aBoolean298 = false;
ClientProt.method1373();
}
@@ -663,6 +675,28 @@ public final class client extends GameShell {
System.gc();
}
+ @OriginalMember(owner = "client!jj", name = "a", descriptor = "(Z)V")
+ public static void topBannerRefresh() {
+ if (!advertSuppressed && modeWhere != 2) {
+ try {
+ aClass100_900.browserControlCall(instance);
+ } catch (@Pc(26) Throwable local26) {
+ }
+ }
+ }
+
+ @OriginalMember(owner = "client!gn", name = "a", descriptor = "(Z)Z")
+ public static boolean showVideoAd() {
+ if (objectTag) {
+ try {
+ aClass100_35.browserControlCall(signLink.applet);
+ return true;
+ } catch (@Pc(14) Throwable local14) {
+ }
+ }
+ return false;
+ }
+
@OriginalMember(owner = "client!client", name = "f", descriptor = "(I)V")
@Override
protected final void mainRedraw() {
@@ -708,7 +742,7 @@ public final class client extends GameShell {
GameShell.fullRedraw = false;
}
if (local158) {
- Static139.method2704();
+ GameShell.method2704();
}
if (GlRenderer.enabled) {
for (local80 = 0; local80 < 100; local80++) {
@@ -727,20 +761,20 @@ public final class client extends GameShell {
anInt5150 = LoginManager.mapFilesMissingCount;
}
local80 = (anInt5150 - LoginManager.mapFilesMissingCount) * 50 / anInt5150;
- Fonts.drawTextOnScreen(false, JagString.concatenate(new JagString[]{LocalizedText.LOADING, aClass100_974, JagString.parseInt(local80), Static87.aClass100_80}));
+ Fonts.drawTextOnScreen(false, JagString.concatenate(new JagString[]{LocalizedText.LOADING, aClass100_974, JagString.parseInt(local80), Cs1ScriptRunner.aClass100_80}));
} else if (LoginManager.loadingScreenState == 2) {
- if (Static38.anInt1196 < ClientProt.anInt5804) {
- Static38.anInt1196 = ClientProt.anInt5804;
+ if (anInt1196 < ClientProt.anInt5804) {
+ anInt1196 = ClientProt.anInt5804;
}
- local80 = (Static38.anInt1196 - ClientProt.anInt5804) * 50 / Static38.anInt1196 + 50;
- Fonts.drawTextOnScreen(false, JagString.concatenate(new JagString[]{LocalizedText.LOADING, aClass100_974, JagString.parseInt(local80), Static87.aClass100_80}));
+ local80 = (anInt1196 - ClientProt.anInt5804) * 50 / anInt1196 + 50;
+ Fonts.drawTextOnScreen(false, JagString.concatenate(new JagString[]{LocalizedText.LOADING, aClass100_974, JagString.parseInt(local80), Cs1ScriptRunner.aClass100_80}));
} else {
Fonts.drawTextOnScreen(false, LocalizedText.LOADING);
}
} else if (gameState == 30) {
- Static89.method1841();
+ LoginManager.method1841();
} else if (gameState == 40) {
- Fonts.drawTextOnScreen(false, JagString.concatenate(new JagString[]{LocalizedText.CONLOST, Static87.aClass100_556, LocalizedText.ATTEMPT_TO_REESTABLISH}));
+ Fonts.drawTextOnScreen(false, JagString.concatenate(new JagString[]{LocalizedText.CONLOST, Cs1ScriptRunner.aClass100_556, LocalizedText.ATTEMPT_TO_REESTABLISH}));
}
if (GlRenderer.enabled && gameState != 0) {
GlRenderer.swapBuffers();
@@ -961,7 +995,7 @@ public final class client extends GameShell {
if (mouseWheel != null) {
mouseWheel.start(GameShell.canvas);
}
- Static7.anInt986 = SignLink.anInt5928;
+ anInt986 = SignLink.anInt5928;
try {
if (GameShell.signLink.cacheData != null) {
cacheData = new BufferedFile(GameShell.signLink.cacheData, 5200, 0);
@@ -1075,19 +1109,19 @@ public final class client extends GameShell {
do {
priorityRequest = (HookRequest) InterfaceList.lowPriorityRequests.removeHead();
if (priorityRequest == null) {
- if (Static40.aClass13_14 != null) {
+ if (Cs1ScriptRunner.aClass13_14 != null) {
ClientProt.method28();
}
if (Protocol.openUrlRequest != null && Protocol.openUrlRequest.status == 1) {
if (Protocol.openUrlRequest.result != null) {
- ScriptRunner.openUrl(ScriptRunner.url, Static164.newTab);
+ ScriptRunner.openUrl(ScriptRunner.url, Protocol.newTab);
}
- Static164.newTab = false;
+ Protocol.newTab = false;
ScriptRunner.url = null;
Protocol.openUrlRequest = null;
}
if (loop % 1500 == 0) {
- Static123.topBannerRefresh();
+ topBannerRefresh();
}
return;
}
@@ -1332,7 +1366,7 @@ public final class client extends GameShell {
soundStream = new MixerPcmStream();
soundChannel.setStream(soundStream);
resampler = new PcmResampler(22050, AudioChannel.sampleRate);
- MusicPlayer.titleSong = js5Archive6.getGroupId(Static1.TITLE_SONG);
+ MusicPlayer.titleSong = js5Archive6.getGroupId(TITLE_SONG);
mainLoadPercentage = 30;
mainLoadState = 50;
mainLoadSecondaryText = LocalizedText.MAINLOAD45B;
@@ -1483,13 +1517,13 @@ public final class client extends GameShell {
} else if (!js5Archive13.fetchAll()) {
mainLoadSecondaryText = JagString.concatenate(new JagString[]{LocalizedText.MAINLOAD130, JagString.parseInt(js5Archive13.getPercentageComplete() / 20 + 85), JagString.PERCENT_SIGN});
mainLoadPercentage = 85;
- } else if (js5Archive23.isGroupReady(Static165.DETAILS)) {
+ } else if (js5Archive23.isGroupReady(DETAILS)) {
MapList.init(Sprites.mapfunctions, js5Archive23);
mainLoadPercentage = 95;
mainLoadSecondaryText = LocalizedText.MAINLOAD130B;
mainLoadState = 135;
} else {
- mainLoadSecondaryText = JagString.concatenate(new JagString[]{LocalizedText.MAINLOAD130, JagString.parseInt(js5Archive23.getPercentageComplete(Static165.DETAILS) / 10 + 90), JagString.PERCENT_SIGN});
+ mainLoadSecondaryText = JagString.concatenate(new JagString[]{LocalizedText.MAINLOAD130, JagString.parseInt(js5Archive23.getPercentageComplete(DETAILS) / 10 + 90), JagString.PERCENT_SIGN});
mainLoadPercentage = 85;
}
} else if (mainLoadState == 135) {
@@ -1509,7 +1543,7 @@ public final class client extends GameShell {
setGameState(1000);
}
} else if (mainLoadState == 140) {
- Static156.loginScreenId = js5Archive3.getGroupId(LOGINSCREEN);
+ LoginManager.loginScreenId = js5Archive3.getGroupId(LOGINSCREEN);
js5Archive5.discardNames(false);
js5Archive6.discardNames(true);
js5Archive8.discardNames(true);