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

Consolidated a LOT of static classes (first pass)

Browse source
This commit is contained in:
Pazaz 2022-06-27 14:24:48 -04:00
parent 9789c5b66e
commit 7ffd30e31c
264 changed files with 7190 additions and 8201 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -69,6 +69,22 @@ public class Camera {
@OriginalMember(owner = "client!gk", name = "d", descriptor = "F")
public static float aFloat10;
public static int ZOOM = 600;
@OriginalMember(owner = "client!il", name = "O", descriptor = "I")
public static int anInt4612;
@OriginalMember(owner = "client!eg", name = "a", descriptor = "I")
public static int anInt1744;
@OriginalMember(owner = "client!kf", name = "f", descriptor = "I")
public static int anInt5230;
@OriginalMember(owner = "client!ke", name = "U", descriptor = "I")
public static int anInt3291 = 0;
@OriginalMember(owner = "client!uc", name = "a", descriptor = "I")
public static int anInt4229 = 2;
@OriginalMember(owner = "client!ta", name = "B", descriptor = "I")
public static int anInt5245 = 0;
@OriginalMember(owner = "client!qk", name = "h", descriptor = "I")
public static int anInt4774 = 0;
@OriginalMember(owner = "client!sj", name = "H", descriptor = "I")
public static int anInt5161 = 0;
public static double mod(double a, double b) {
return ((a % b) + b) % b;
@ -109,10 +125,10 @@ public class Camera {
if (local64 < 32768) {
local64 = 32768;
}
if (Static234.anInt5245 < local64) {
Static234.anInt5245 += (local64 - Static234.anInt5245) / 24;
} else if (local64 < Static234.anInt5245) {
Static234.anInt5245 += (local64 - Static234.anInt5245) / 80;
if (anInt5245 < local64) {
anInt5245 += (local64 - anInt5245) / 24;
} else if (local64 < anInt5245) {
anInt5245 += (local64 - anInt5245) / 80;
}
}
@ -121,43 +137,43 @@ public class Camera {
@Pc(9) int local9 = anInt4232 * 128 + 64;
@Pc(15) int local15 = anInt5375 * 128 + 64;
@Pc(23) int local23 = SceneGraph.getTileHeight(Player.level, local15, local9) - Static231.anInt5203;
if (Static113.anInt4612 >= 100) {
if (anInt4612 >= 100) {
renderX = anInt5375 * 128 + 64;
renderZ = anInt4232 * 128 + 64;
Static5.anInt40 = SceneGraph.getTileHeight(Player.level, renderX, renderZ) - Static231.anInt5203;
} else {
if (renderX < local15) {
renderX += Static233.anInt5225 + Static113.anInt4612 * (local15 - renderX) / 1000;
renderX += Static233.anInt5225 + anInt4612 * (local15 - renderX) / 1000;
if (renderX > local15) {
renderX = local15;
}
}
if (Static5.anInt40 < local23) {
Static5.anInt40 += (local23 - Static5.anInt40) * Static113.anInt4612 / 1000 + Static233.anInt5225;
Static5.anInt40 += (local23 - Static5.anInt40) * anInt4612 / 1000 + Static233.anInt5225;
if (Static5.anInt40 > local23) {
Static5.anInt40 = local23;
}
}
if (renderX > local15) {
renderX -= Static233.anInt5225 + (renderX - local15) * Static113.anInt4612 / 1000;
renderX -= Static233.anInt5225 + (renderX - local15) * anInt4612 / 1000;
if (renderX < local15) {
renderX = local15;
}
}
if (renderZ < local9) {
renderZ += Static233.anInt5225 + Static113.anInt4612 * (local9 - renderZ) / 1000;
renderZ += Static233.anInt5225 + anInt4612 * (local9 - renderZ) / 1000;
if (local9 < renderZ) {
renderZ = local9;
}
}
if (local23 < Static5.anInt40) {
Static5.anInt40 -= (Static5.anInt40 - local23) * Static113.anInt4612 / 1000 + Static233.anInt5225;
Static5.anInt40 -= (Static5.anInt40 - local23) * anInt4612 / 1000 + Static233.anInt5225;
if (local23 > Static5.anInt40) {
Static5.anInt40 = local23;
}
}
if (renderZ > local9) {
renderZ -= Static233.anInt5225 + (renderZ - local9) * Static113.anInt4612 / 1000;
renderZ -= Static233.anInt5225 + (renderZ - local9) * anInt4612 / 1000;
if (local9 > renderZ) {
renderZ = local9;
}
@ -165,7 +181,7 @@ public class Camera {
}
local9 = anInt5765 * 128 + 64;
local15 = anInt5449 * 128 + 64;
local23 = SceneGraph.getTileHeight(Player.level, local15, local9) - Static260.anInt1744;
local23 = SceneGraph.getTileHeight(Player.level, local15, local9) - anInt1744;
@Pc(236) int local236 = local23 - Static5.anInt40;
@Pc(241) int local241 = local9 - renderZ;
@Pc(246) int local246 = local15 - renderX;
@ -179,13 +195,13 @@ public class Camera {
}
@Pc(292) int local292 = (int) (-325.949D * Math.atan2((double) local246, (double) local241)) & 0x7FF;
if (cameraPitch < local268) {
cameraPitch += Static133.anInt5230 + Static233.anInt5217 * (local268 - cameraPitch) / 1000;
cameraPitch += anInt5230 + Static233.anInt5217 * (local268 - cameraPitch) / 1000;
if (cameraPitch > local268) {
cameraPitch = local268;
}
}
if (cameraPitch > local268) {
cameraPitch -= (cameraPitch - local268) * Static233.anInt5217 / 1000 + Static133.anInt5230;
cameraPitch -= (cameraPitch - local268) * Static233.anInt5217 / 1000 + anInt5230;
if (cameraPitch < local268) {
cameraPitch = local268;
}
@ -198,11 +214,11 @@ public class Camera {
local350 += 2048;
}
if (local350 > 0) {
cameraYaw += local350 * Static233.anInt5217 / 1000 + Static133.anInt5230;
cameraYaw += local350 * Static233.anInt5217 / 1000 + anInt5230;
cameraYaw &= 0x7FF;
}
if (local350 < 0) {
cameraYaw -= Static233.anInt5217 * -local350 / 1000 + Static133.anInt5230;
cameraYaw -= Static233.anInt5217 * -local350 / 1000 + anInt5230;
cameraYaw &= 0x7FF;
}
@Pc(404) int local404 = local292 - cameraYaw;
@ -283,15 +299,15 @@ public class Camera {
@OriginalMember(owner = "client!vd", name = "a", descriptor = "(IIIIBI)V")
public static void method3849(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(5) int arg4) {
Static133.anInt5230 = arg2;
anInt5230 = arg2;
anInt5765 = arg1;
Static233.anInt5217 = arg4;
anInt5449 = arg3;
Static260.anInt1744 = arg0;
anInt1744 = arg0;
if (Static233.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) - Static260.anInt1744;
@Pc(44) int local44 = SceneGraph.getTileHeight(Player.level, local30, local36) - anInt1744;
@Pc(49) int local49 = local44 - Static5.anInt40;
@Pc(54) int local54 = local30 - renderX;
@Pc(59) int local59 = local36 - renderZ;
@ -310,12 +326,12 @@ public class Camera {
@OriginalMember(owner = "client!lb", name = "a", descriptor = "(ZIIIBII)V")
public static void method2722(@OriginalArg(0) boolean arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5) {
Static113.anInt4612 = arg3;
anInt4612 = arg3;
Static231.anInt5203 = arg2;
anInt5375 = arg5;
Static233.anInt5225 = arg1;
anInt4232 = arg4;
if (arg0 && Static113.anInt4612 >= 100) {
if (arg0 && anInt4612 >= 100) {
renderX = anInt5375 * 128 + 64;
renderZ = anInt4232 * 128 + 64;
Static5.anInt40 = SceneGraph.getTileHeight(Player.level, renderX, renderZ) - Static231.anInt5203;
@ -328,7 +344,7 @@ public class Camera {
for (@Pc(3) int local3 = 0; local3 < 5; local3++) {
Static176.customCameraActive[local3] = false;
}
Static133.anInt5230 = 0;
anInt5230 = 0;
Static233.anInt5217 = 0;
anInt3718 = -1;
anInt1694 = -1;
@ -337,8 +353,8 @@ public class Camera {
@OriginalMember(owner = "client!uf", name = "a", descriptor = "(B)V")
public static void method4273() {
@Pc(14) int playerX = PlayerList.self.xFine + Static132.anInt3291;
@Pc(20) int playerZ = PlayerList.self.zFine + Static206.anInt4774;
@Pc(14) int playerX = PlayerList.self.xFine + anInt3291;
@Pc(20) int playerZ = PlayerList.self.zFine + anInt4774;
if (cameraX - playerX < -500 || cameraX - playerX > 500 || cameraZ - playerZ < -500 || cameraZ - playerZ > 500) {
cameraX = playerX;
cameraZ = playerZ;

15
client/src/main/java/rt4/ChangeLocRequest.java
View file

@ -57,7 +57,7 @@ public final class ChangeLocRequest extends Node {
if (local10.setLoops > 0) {
local10.setLoops--;
}
if (local10.setLoops == 0 && local10.x >= 1 && local10.z >= 1 && local10.x <= 102 && local10.z <= 102 && (local10.anInt929 < 0 || Static113.method3557(local10.anInt929, local10.anInt926))) {
if (local10.setLoops == 0 && local10.x >= 1 && local10.z >= 1 && local10.x <= 102 && local10.z <= 102 && (local10.anInt929 < 0 || method3557(local10.anInt929, local10.anInt926))) {
Static79.method1698(local10.anInt929, local10.x, local10.level, local10.anInt922, local10.z, local10.anInt926, local10.layer);
local10.setLoops = -1;
if (local10.originalId == local10.anInt929 && local10.originalId == -1) {
@ -66,7 +66,7 @@ public final class ChangeLocRequest extends Node {
local10.unlink();
}
}
} else if (local10.originalId < 0 || Static113.method3557(local10.originalId, local10.originalShape)) {
} else if (local10.originalId < 0 || method3557(local10.originalId, local10.originalShape)) {
Static79.method1698(local10.originalId, local10.x, local10.level, local10.originalAngle, local10.z, local10.originalShape, local10.layer);
local10.unlink();
}
@ -138,4 +138,15 @@ public final class ChangeLocRequest extends Node {
}
}
@OriginalMember(owner = "client!il", name = "a", descriptor = "(BII)Z")
public static boolean method3557(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) {
if (arg1 == 11) {
arg1 = 10;
}
if (arg1 >= 5 && arg1 <= 8) {
arg1 = 4;
}
@Pc(30) LocType local30 = LocTypeList.get(arg0);
return local30.isReady(arg1);
}
}

7
client/src/main/java/rt4/Cheat.java
View file

@ -127,7 +127,7 @@ public class Cheat {
local29 = Runtime.getRuntime();
local38 = (int) ((local29.totalMemory() - local29.freeMemory()) / 1024L);
Chat.add(null, 0, JagString.concatenate(new JagString[] { aClass100_893, JagString.parseInt(local38), DEBUG_MEM_UNIT}));
Static16.method501();
Player.method501();
client.method2380();
for (local117 = 0; local117 < 10; local117++) {
System.gc();
@ -136,7 +136,7 @@ public class Cheat {
Chat.add(null, 0, JagString.concatenate(new JagString[] {aClass100_1093, JagString.parseInt(local38), DEBUG_MEM_UNIT}));
}
if (arg0.equalsIgnoreCase(PCACHESIZE)) {
Chat.add(null, 0, JagString.concatenate(new JagString[] { aClass100_335, JagString.parseInt(Static198.method1029()) }));
Chat.add(null, 0, JagString.concatenate(new JagString[] { aClass100_335, JagString.parseInt(PlayerAppearance.method1029()) }));
}
if (GlRenderer.enabled && arg0.equalsIgnoreCase(CARDMEM)) {
System.out.println("oncard_geometry:" + GlCleaner.onCardGeometry);
@ -144,7 +144,7 @@ public class Cheat {
System.out.println("oncard_texture:" + GlCleaner.onCardTexture);
}
if (arg0.equalsIgnoreCase(CLIENTDROP)) {
Static175.method3279();
Protocol.method3279();
}
if (arg0.equalsIgnoreCase(CLIENTJS5DROP)) {
client.js5NetQueue.quit();
@ -231,4 +231,5 @@ public class Cheat {
Protocol.outboundBuffer.p1(arg0.length() - 1);
Protocol.outboundBuffer.pjstr(arg0.substring(2));
}
}

26
client/src/main/java/rt4/Class106.java
View file

@ -41,7 +41,15 @@ public abstract class Class106 {
this.method3847();
}
@OriginalMember(owner = "client!wf", name = "a", descriptor = "(IIII)V")
@OriginalMember(owner = "client!se", name = "a", descriptor = "(IIIIZ)I")
public static int method3891(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) {
@Pc(8) int local8 = arg3 & 0xF;
@Pc(29) int local29 = local8 >= 4 ? (local8 == 12 || local8 == 14 ? arg0 : arg1) : arg2;
@Pc(42) int local42 = local8 < 8 ? arg0 : arg2;
return ((local8 & 0x1) == 0 ? local42 : -local42) + ((local8 & 0x2) == 0 ? local29 : -local29);
}
@OriginalMember(owner = "client!wf", name = "a", descriptor = "(IIII)V")
protected final void method3841() {
@Pc(8) int[] local8 = new int[64];
@Pc(11) int[] local11 = new int[64];
@ -110,18 +118,18 @@ public abstract class Class106 {
@Pc(304) int local304 = MonochromeImageCache.anIntArray1[local190];
@Pc(308) int local308 = local126 - 4096;
@Pc(315) short local315 = this.aShortArray69[local227 + local236];
@Pc(327) int local327 = Static225.method3891(local166, local126, local190, this.aShortArray69[local285 + local207]);
@Pc(340) int local340 = Static225.method3891(local174, local126, local190, this.aShortArray69[local178 + local285]);
@Pc(327) int local327 = method3891(local166, local126, local190, this.aShortArray69[local285 + local207]);
@Pc(340) int local340 = method3891(local174, local126, local190, this.aShortArray69[local178 + local285]);
@Pc(351) int local351 = local327 + (local194 * (local340 - local327) >> 12);
@Pc(363) int local363 = Static225.method3891(local166, local126, local300, this.aShortArray69[local315 + local207]);
@Pc(375) int local375 = Static225.method3891(local174, local126, local300, this.aShortArray69[local178 + local315]);
@Pc(363) int local363 = method3891(local166, local126, local300, this.aShortArray69[local315 + local207]);
@Pc(375) int local375 = method3891(local174, local126, local300, this.aShortArray69[local178 + local315]);
@Pc(386) int local386 = local363 + (local194 * (local375 - local363) >> 12);
@Pc(397) int local397 = ((local386 - local351) * local304 >> 12) + local351;
@Pc(409) int local409 = Static225.method3891(local166, local308, local190, this.aShortArray69[local207 + local278]);
@Pc(421) int local421 = Static225.method3891(local174, local308, local190, this.aShortArray69[local178 + local278]);
@Pc(409) int local409 = method3891(local166, local308, local190, this.aShortArray69[local207 + local278]);
@Pc(421) int local421 = method3891(local174, local308, local190, this.aShortArray69[local178 + local278]);
@Pc(432) int local432 = (local194 * (local421 - local409) >> 12) + local409;
@Pc(445) int local445 = Static225.method3891(local166, local308, local300, this.aShortArray69[local207 + local259]);
@Pc(457) int local457 = Static225.method3891(local174, local308, local300, this.aShortArray69[local178 + local259]);
@Pc(445) int local445 = method3891(local166, local308, local300, this.aShortArray69[local207 + local259]);
@Pc(457) int local457 = method3891(local174, local308, local300, this.aShortArray69[local178 + local259]);
@Pc(468) int local468 = local445 + ((local457 - local445) * local194 >> 12);
@Pc(480) int local480 = local432 + ((local468 - local432) * local304 >> 12);
this.method3848(((local480 - local397) * local271 >> 12) + local397, local96);

86
client/src/main/java/rt4/ClientProt.java
View file

@ -7,8 +7,12 @@ import org.openrs2.deob.annotation.Pc;
import java.io.IOException;
public class ClientProt {
@OriginalMember(owner = "client!e", name = "Dc", descriptor = "Lclient!na;")
public static final JagString aClass100_363 = JagString.parse("_labels");
@OriginalMember(owner = "client!wc", name = "g", descriptor = "I")
public static int anInt5804 = 0;
@OriginalMember(owner = "client!nm", name = "U", descriptor = "I")
public static int mapFilesMissingCount = 0;
@OriginalMember(owner = "client!vg", name = "a", descriptor = "(Lclient!na;IIBI)V")
public static void method4512(@OriginalArg(0) JagString arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(4) int arg3) {
@ -124,9 +128,9 @@ public class ClientProt {
InterfaceList.closeInterface(true, local18);
}
}
if (Static39.aClass13_10 != null) {
InterfaceList.redraw(Static39.aClass13_10);
Static39.aClass13_10 = null;
if (Static44.aClass13_10 != null) {
InterfaceList.redraw(Static44.aClass13_10);
Static44.aClass13_10 = null;
}
}
@ -166,14 +170,14 @@ public class ClientProt {
@OriginalMember(owner = "client!gd", name = "c", descriptor = "(I)V")
public static void rebuildMap() {
ping(false);
Static175.mapFilesMissingCount = 0;
mapFilesMissingCount = 0;
@Pc(12) boolean fileExists = true;
@Pc(14) int id;
for (id = 0; id < LoginManager.mapFilesBuffer.length; id++) {
if (LoginManager.mapFileIds[id] != -1 && LoginManager.mapFilesBuffer[id] == null) {
LoginManager.mapFilesBuffer[id] = client.js5Archive5.fetchFile(LoginManager.mapFileIds[id], 0);
if (LoginManager.mapFilesBuffer[id] == null) {
Static175.mapFilesMissingCount++;
mapFilesMissingCount++;
fileExists = false;
}
}
@ -181,7 +185,7 @@ public class ClientProt {
LoginManager.locationMapFilesBuffer[id] = client.js5Archive5.fetchFile(LoginManager.locationsMapFileIds[id], LoginManager.regionsXteaKeys[id], 0);
if (LoginManager.locationMapFilesBuffer[id] == null) {
fileExists = false;
Static175.mapFilesMissingCount++;
mapFilesMissingCount++;
}
}
@ -190,13 +194,13 @@ public class ClientProt {
LoginManager.underWaterMapFilesBuffer[id] = client.js5Archive5.fetchFile(LoginManager.underWaterMapFileIds[id], 0);
if (LoginManager.underWaterMapFilesBuffer[id] == null) {
fileExists = false;
Static175.mapFilesMissingCount++;
mapFilesMissingCount++;
}
}
if (LoginManager.underWaterLocationsMapFileIds[id] != -1 && LoginManager.underWaterLocationsMapFilesBuffer[id] == null) {
LoginManager.underWaterLocationsMapFilesBuffer[id] = client.js5Archive5.fetchFile(LoginManager.underWaterLocationsMapFileIds[id], 0);
if (LoginManager.underWaterLocationsMapFilesBuffer[id] == null) {
Static175.mapFilesMissingCount++;
mapFilesMissingCount++;
fileExists = false;
}
}
@ -205,20 +209,20 @@ public class ClientProt {
if (LoginManager.npcSpawnsFileIds != null && LoginManager.npcSpawnsFilesBuffer[id] == null && LoginManager.npcSpawnsFileIds[id] != -1) {
LoginManager.npcSpawnsFilesBuffer[id] = client.js5Archive5.fetchFile(LoginManager.npcSpawnsFileIds[id], LoginManager.regionsXteaKeys[id], 0);
if (LoginManager.npcSpawnsFilesBuffer[id] == null) {
Static175.mapFilesMissingCount++;
mapFilesMissingCount++;
fileExists = false;
}
}
}
if (LoginManager.mapElementList == null) {
if (LoginManager.map == null || !client.js5Archive23.isGroupNameValid(JagString.concatenate(new JagString[] { LoginManager.map.group, Static50.aClass100_363 }))) {
if (LoginManager.map == null || !client.js5Archive23.isGroupNameValid(JagString.concatenate(new JagString[] { LoginManager.map.group, aClass100_363 }))) {
LoginManager.mapElementList = new MapElementList(0);
} else if (client.js5Archive23.isGroupReady(JagString.concatenate(new JagString[] { LoginManager.map.group, Static50.aClass100_363 }))) {
LoginManager.mapElementList = MapElementList.create(JagString.concatenate(new JagString[] { LoginManager.map.group, Static50.aClass100_363 }), client.js5Archive23);
} else if (client.js5Archive23.isGroupReady(JagString.concatenate(new JagString[] { LoginManager.map.group, aClass100_363 }))) {
LoginManager.mapElementList = MapElementList.create(JagString.concatenate(new JagString[] { LoginManager.map.group, aClass100_363 }), client.js5Archive23);
} else {
fileExists = false;
Static175.mapFilesMissingCount++;
mapFilesMissingCount++;
}
}
@ -236,7 +240,7 @@ public class ClientProt {
if (local294 != null) {
chunkZ = (LoginManager.regionBitPacked[id] & 0xFF) * 64 - Camera.originZ;
chunkX = (LoginManager.regionBitPacked[id] >> 8) * 64 - Camera.originX;
if (Static230.dynamicMapRegion) {
if (LoginManager.dynamicMapRegion) {
chunkZ = 10;
chunkX = 10;
}
@ -247,7 +251,7 @@ public class ClientProt {
if (local294 != null) {
chunkX = (LoginManager.regionBitPacked[id] >> 8) * 64 - Camera.originX;
chunkZ = (LoginManager.regionBitPacked[id] & 0xFF) * 64 - Camera.originZ;
if (Static230.dynamicMapRegion) {
if (LoginManager.dynamicMapRegion) {
chunkZ = 10;
chunkX = 10;
}
@ -289,10 +293,10 @@ public class ClientProt {
}
AreaSoundManager.clear(false);
if (GlRenderer.enabled) {
Static242.shadowMapImage.clear();
ShadowManager.shadowMapImage.clear();
for (i = 0; i < 13; i++) {
for (chunkX = 0; chunkX < 13; chunkX++) {
Static242.shadows[i][chunkX].outputToSprite = true;
ShadowManager.shadows[i][chunkX].outputToSprite = true;
}
}
}
@ -300,13 +304,13 @@ public class ClientProt {
LightingManager.method2404();
}
if (GlRenderer.enabled) {
Static75.setDefaultChunksAtmosphere();
setDefaultChunksAtmosphere();
}
client.audioLoop();
System.gc();
ping(true);
SceneGraph.load(false);
if (!Static230.dynamicMapRegion) {
if (!LoginManager.dynamicMapRegion) {
Static87.method1805(false);
ping(true);
if (GlRenderer.enabled) {
@ -314,12 +318,12 @@ public class ClientProt {
chunkX = PlayerList.self.movementQueueZ[0] >> 3;
Static73.setLightPosition(chunkX, i);
}
Static26.method743(false);
LoginManager.method743(false);
if (LoginManager.npcSpawnsFilesBuffer != null) {
Static158.decodeNpcFiles();
}
}
if (Static230.dynamicMapRegion) {
if (LoginManager.dynamicMapRegion) {
Static89.method1835(false);
ping(true);
if (GlRenderer.enabled) {
@ -351,12 +355,12 @@ public class ClientProt {
if (GlRenderer.enabled && hasUnderWaterMap) {
SceneGraph.setUnderwater(true);
SceneGraph.load(true);
if (!Static230.dynamicMapRegion) {
if (!LoginManager.dynamicMapRegion) {
Static87.method1805(true);
ping(true);
Static26.method743(true);
LoginManager.method743(true);
}
if (Static230.dynamicMapRegion) {
if (LoginManager.dynamicMapRegion) {
Static89.method1835(true);
ping(true);
Static233.method4002(true);
@ -371,7 +375,7 @@ public class ClientProt {
if (GlRenderer.enabled) {
for (chunkX = 0; chunkX < 13; chunkX++) {
for (chunkZ = 0; chunkZ < 13; chunkZ++) {
Static242.shadows[chunkX][chunkZ].method4676(SceneGraph.tileHeights[0], chunkX * 8, chunkZ * 8);
ShadowManager.shadows[chunkX][chunkZ].method4676(SceneGraph.tileHeights[0], chunkX * 8, chunkZ * 8);
}
}
}
@ -380,7 +384,7 @@ public class ClientProt {
Static220.spawnGroundObject(chunkZ, chunkX);
}
}
Static269.method2218();
ScriptRunner.method2218();
client.audioLoop();
ChangeLocRequest.flush();
client.method3768();
@ -389,7 +393,7 @@ public class ClientProt {
Protocol.outboundBuffer.p1isaac(20);
Protocol.outboundBuffer.p4(1057001181);
}
if (!Static230.dynamicMapRegion) {
if (!LoginManager.dynamicMapRegion) {
@Pc(815) int local815 = (LoginManager.centralZoneZ + 6) / 8;
@Pc(821) int local821 = (LoginManager.centralZoneZ - 6) / 8;
chunkX = (LoginManager.centralZoneX - 6) / 8;
@ -463,16 +467,16 @@ public class ClientProt {
local30 = Static81.anInt2225 + Static40.aClass13_1.width - Static40.aClass13_14.width;
}
local41 -= Static40.anInt4035;
if (local41 < Static228.anInt5103) {
local41 = Static228.anInt5103;
if (local41 < InterfaceList.anInt5103) {
local41 = InterfaceList.anInt5103;
}
if (Static228.anInt5103 + Static40.aClass13_1.height < local41 - -Static40.aClass13_14.height) {
local41 = Static228.anInt5103 + Static40.aClass13_1.height - Static40.aClass13_14.height;
if (InterfaceList.anInt5103 + Static40.aClass13_1.height < local41 - -Static40.aClass13_14.height) {
local41 = InterfaceList.anInt5103 + Static40.aClass13_1.height - Static40.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 - Static228.anInt5103;
@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;
@ -491,17 +495,17 @@ public class ClientProt {
if (Static40.aClass13_14.onDragRelease != null) {
local176 = new HookRequest();
local176.mouseY = local130;
local176.target = Static56.aClass13_12;
local176.target = InterfaceList.aClass13_12;
local176.mouseX = local122;
local176.arguments = Static40.aClass13_14.onDragRelease;
local176.source = Static40.aClass13_14;
ScriptRunner.run(local176);
}
if (Static56.aClass13_12 != null && Static36.method938(Static40.aClass13_14) != null) {
if (InterfaceList.aClass13_12 != null && Static36.method938(Static40.aClass13_14) != null) {
Protocol.outboundBuffer.p1isaac(79);
Protocol.outboundBuffer.mp4(Static40.aClass13_14.id);
Protocol.outboundBuffer.ip2(Static56.aClass13_12.createdComponentId);
Protocol.outboundBuffer.p4(Static56.aClass13_12.id);
Protocol.outboundBuffer.ip2(InterfaceList.aClass13_12.createdComponentId);
Protocol.outboundBuffer.p4(InterfaceList.aClass13_12.id);
Protocol.outboundBuffer.ip2(Static40.aClass13_14.createdComponentId);
}
} else if ((VarpDomain.anInt2952 == 1 || MiniMenu.method4640(MiniMenu.size - 1)) && MiniMenu.size > 2) {
@ -522,4 +526,14 @@ public class ClientProt {
Protocol.outboundBuffer.imp4(arg1);
Protocol.outboundBuffer.ip2(arg0);
}
@OriginalMember(owner = "client!g", name = "b", descriptor = "(I)V")
public static void setDefaultChunksAtmosphere() {
@Pc(9) Environment local9 = new Environment();
for (@Pc(18) int local18 = 0; local18 < 13; local18++) {
for (@Pc(25) int local25 = 0; local25 < 13; local25++) {
Static103.aClass92ArrayArray1[local18][local25] = local9;
}
}
}
}

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

@ -5,6 +5,9 @@ import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc;
public class ColorUtils {
@OriginalMember(owner = "client!ug", name = "b", descriptor = "[F")
public static final float[] aFloatArray28 = new float[4];
@OriginalMember(owner = "client!ib", name = "a", descriptor = "(II)I")
public static int rgbToHsl(@OriginalArg(1) int arg0) {
@Pc(10) double local10 = (double) (arg0 >> 16 & 0xFF) / 256.0D;
@ -73,14 +76,14 @@ public class ColorUtils {
@Pc(7) float local7 = FogManager.method3068() + FogManager.method3059();
@Pc(9) int local9 = FogManager.method3064();
@Pc(11) float local11 = 0.58823526F;
Static251.aFloatArray28[3] = 1.0F;
aFloatArray28[3] = 1.0F;
@Pc(24) float local24 = (float) (local9 >> 16 & 0xFF) / 255.0F;
@Pc(33) float local33 = (float) (local9 >> 8 & 0xFF) / 255.0F;
Static251.aFloatArray28[1] = local7 * (float) (arg0 >> 8 & 0xFF) / 255.0F * local33 * local11;
Static251.aFloatArray28[0] = local7 * local11 * local24 * ((float) (arg0 >> 16 & 0xFF) / 255.0F);
aFloatArray28[1] = local7 * (float) (arg0 >> 8 & 0xFF) / 255.0F * local33 * local11;
aFloatArray28[0] = local7 * local11 * local24 * ((float) (arg0 >> 16 & 0xFF) / 255.0F);
@Pc(74) float local74 = (float) (local9 & 0xFF) / 255.0F;
Static251.aFloatArray28[2] = (float) (arg0 & 0xFF) / 255.0F * local74 * local11 * local7;
return Static251.aFloatArray28;
aFloatArray28[2] = (float) (arg0 & 0xFF) / 255.0F * local74 * local11 * local7;
return aFloatArray28;
}
@OriginalMember(owner = "client!gn", name = "a", descriptor = "(IZI)I")

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

@ -1135,7 +1135,7 @@ public final class Component {
this.dragRenderBehavior = buffer.g1() == 1;
local567 = -1;
this.targetVerb = buffer.gjstr();
if (Static199.method3594(local175) != 0) {
if (ServerActiveProperties.method3594(local175) != 0) {
local567 = buffer.g2();
this.anInt499 = buffer.g2();
if (local567 == 65535) {

93
client/src/main/java/rt4/DateUtil.java Normal file
View file

@ -0,0 +1,93 @@
package rt4;
import org.openrs2.deob.annotation.OriginalArg;
import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc;
import java.util.Calendar;
import java.util.Date;
import java.util.TimeZone;
public final class DateUtil {
@OriginalMember(owner = "client!cl", name = "K", descriptor = "Ljava/util/Calendar;")
public static final Calendar calendar = Calendar.getInstance(TimeZone.getTimeZone("GMT"));
@OriginalMember(owner = "client!fn", name = "Z", descriptor = "Lclient!na;")
public static final JagString aClass100_461 = JagString.parse(")1 ");
@OriginalMember(owner = "client!wb", name = "a", descriptor = "Lclient!na;")
public static final JagString aClass100_1089 = JagString.parse(")2");
@OriginalMember(owner = "client!dm", name = "j", descriptor = "Lclient!na;")
public static final JagString SPACE = JagString.parse(" ");
@OriginalMember(owner = "client!vh", name = "c", descriptor = "Lclient!na;")
public static final JagString COLON = JagString.parse(":");
@OriginalMember(owner = "client!ee", name = "a", descriptor = "Lclient!na;")
public static final JagString TIMEZONE = JagString.parse(" GMT");
@OriginalMember(owner = "client!km", name = "tc", descriptor = "Lclient!na;")
private static final JagString DEC = JagString.parse("Dec");
@OriginalMember(owner = "client!km", name = "vc", descriptor = "Lclient!na;")
private static final JagString JUL = JagString.parse("Jul");
@OriginalMember(owner = "client!km", name = "xc", descriptor = "Lclient!na;")
private static final JagString MAY = JagString.parse("May");
@OriginalMember(owner = "client!km", name = "yc", descriptor = "Lclient!na;")
private static final JagString NOV = JagString.parse("Nov");
@OriginalMember(owner = "client!km", name = "zc", descriptor = "Lclient!na;")
private static final JagString MAR = JagString.parse("Mar");
@OriginalMember(owner = "client!km", name = "Gc", descriptor = "Lclient!na;")
private static final JagString JAN = JagString.parse("Jan");
@OriginalMember(owner = "client!km", name = "Hc", descriptor = "Lclient!na;")
private static final JagString FEB = JagString.parse("Feb");
@OriginalMember(owner = "client!km", name = "Tc", descriptor = "Lclient!na;")
private static final JagString APR = JagString.parse("Apr");
@OriginalMember(owner = "client!km", name = "Wc", descriptor = "Lclient!na;")
private static final JagString JUN = JagString.parse("Jun");
@OriginalMember(owner = "client!km", name = "Qc", descriptor = "Lclient!na;")
private static final JagString AUG = JagString.parse("Aug");
@OriginalMember(owner = "client!km", name = "cd", descriptor = "Lclient!na;")
private static final JagString SEP = JagString.parse("Sep");
@OriginalMember(owner = "client!km", name = "dd", descriptor = "Lclient!na;")
private static final JagString OCT = JagString.parse("Oct");
@OriginalMember(owner = "client!km", name = "Ac", descriptor = "[Lclient!na;")
public static final JagString[] MONTHS = new JagString[] {JAN, FEB, MAR, APR, MAY, JUN, JUL, AUG, SEP, OCT, NOV, DEC};
@OriginalMember(owner = "client!rl", name = "T", descriptor = "Lclient!na;")
private static final JagString SAT = JagString.parse("Sat");
@OriginalMember(owner = "client!rl", name = "U", descriptor = "Lclient!na;")
private static final JagString MON = JagString.parse("Mon");
@OriginalMember(owner = "client!rl", name = "W", descriptor = "Lclient!na;")
private static final JagString FRI = JagString.parse("Fri");
@OriginalMember(owner = "client!rl", name = "db", descriptor = "Lclient!na;")
private static final JagString SUN = JagString.parse("Sun");
@OriginalMember(owner = "client!rl", name = "cb", descriptor = "Lclient!na;")
private static final JagString TUE = JagString.parse("Tue");
@OriginalMember(owner = "client!rl", name = "ab", descriptor = "Lclient!na;")
private static final JagString WED = JagString.parse("Wed");
@OriginalMember(owner = "client!rl", name = "bb", descriptor = "Lclient!na;")
private static final JagString THU = JagString.parse("Thu");
@OriginalMember(owner = "client!rl", name = "Y", descriptor = "[Lclient!na;")
public static final JagString[] DAYS = new JagString[] {SUN, MON, TUE, WED, THU, FRI, SAT};
@OriginalMember(owner = "client!cj", name = "a", descriptor = "(JB)Lclient!na;")
public static JagString getDateString(@OriginalArg(0) long date) {
calendar.setTime(new Date(date));
@Pc(13) int local13 = calendar.get(Calendar.DAY_OF_WEEK);
@Pc(17) int local17 = calendar.get(Calendar.DATE);
@Pc(21) int local21 = calendar.get(Calendar.MONTH);
@Pc(32) int local32 = calendar.get(Calendar.YEAR);
@Pc(36) int local36 = calendar.get(Calendar.HOUR_OF_DAY);
@Pc(40) int local40 = calendar.get(Calendar.MINUTE);
@Pc(44) int local44 = calendar.get(Calendar.SECOND);
return JagString.concatenate(new JagString[] { DAYS[local13 - 1], aClass100_461, JagString.parseInt(local17 / 10), JagString.parseInt(local17 % 10), aClass100_1089, MONTHS[local21], aClass100_1089, JagString.parseInt(local32), SPACE, JagString.parseInt(local36 / 10), JagString.parseInt(local36 % 10), COLON, JagString.parseInt(local40 / 10), JagString.parseInt(local40 % 10), COLON, JagString.parseInt(local44 / 10), JagString.parseInt(local44 % 10), TIMEZONE});
}
}

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

@ -8,4 +8,10 @@ public final class DeadClass {
@OriginalMember(owner = "client!ul", name = "I", descriptor = "Lclient!gn;")
public static final LruHashTable cache = new LruHashTable(4);
@OriginalMember(owner = "client!ck", name = "b", descriptor = "Lclient!na;")
private static final JagString aClass100_195 = JagString.parse("Discard");
@OriginalMember(owner = "client!rc", name = "R", descriptor = "Z")
private static boolean aBoolean74;
}

82
client/src/main/java/rt4/DisplayMode.java
View file

@ -16,8 +16,10 @@ public final class DisplayMode {
public static boolean aBoolean73 = false;
@OriginalMember(owner = "client!jk", name = "y", descriptor = "Z")
public static boolean aBoolean156 = false;
@OriginalMember(owner = "client!hi", name = "f", descriptor = "J")
public static long aLong89 = 0L;
@OriginalMember(owner = "client!od", name = "j", descriptor = "I")
@OriginalMember(owner = "client!od", name = "j", descriptor = "I")
public int width;
@OriginalMember(owner = "client!od", name = "k", descriptor = "I")
@ -47,7 +49,7 @@ public final class DisplayMode {
@OriginalMember(owner = "client!th", name = "a", descriptor = "(ZIIII)V")
public static void setWindowMode(@OriginalArg(0) boolean arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3) {
Static97.aLong89 = 0L;
aLong89 = 0L;
@Pc(4) int mode = getWindowMode();
if (arg1 == 3 || mode == 3) {
arg0 = true;
@ -85,7 +87,7 @@ public final class DisplayMode {
GameShell.fullScreenFrame = null;
}
if (arg1 == 3 && GameShell.fullScreenFrame == null) {
GameShell.fullScreenFrame = Static169.method3176(0, arg5, arg4, GameShell.signLink);
GameShell.fullScreenFrame = method3176(0, arg5, arg4, GameShell.signLink);
if (GameShell.fullScreenFrame != null) {
Preferences.fullScreenHeight = arg5;
Preferences.fullScreenWidth = arg4;
@ -202,7 +204,7 @@ public final class DisplayMode {
GameShell.thread.setPriority(1);
SoftwareRaster.frameBuffer = Static131.create(503, 765, GameShell.canvas);
SoftwareModel.method4583();
Static76.method1643();
ParticleSystem.quit();
((Js5GlTextureProvider) Rasteriser.textureProvider).method3248(20);
if (Preferences.highDetailLighting) {
if (Preferences.brightness == 1) {
@ -271,7 +273,7 @@ public final class DisplayMode {
@Pc(122) DisplayMode local122 = aClass114Array1[local114];
local112[local114] = local122.height * local122.width;
}
Static181.method3346(local112, aClass114Array1);
method3346(local112, aClass114Array1);
}
return aClass114Array1;
}
@ -300,4 +302,74 @@ public final class DisplayMode {
}
return local45;
}
@OriginalMember(owner = "client!nf", name = "a", descriptor = "(IIIIILsignlink!ll;)Ljava/awt/Frame;")
public static Frame method3176(@OriginalArg(2) int arg0, @OriginalArg(3) int arg1, @OriginalArg(4) int arg2, @OriginalArg(5) SignLink arg3) {
if (!arg3.isFullScreenSupported()) {
return null;
}
@Pc(20) DisplayMode[] local20 = method3558(arg3);
if (local20 == null) {
return null;
}
@Pc(27) boolean local27 = false;
for (@Pc(29) int local29 = 0; local29 < local20.length; local29++) {
if (arg2 == local20[local29].width && arg1 == local20[local29].height && (!local27 || local20[local29].bitDepth > arg0)) {
arg0 = local20[local29].bitDepth;
local27 = true;
}
}
if (!local27) {
return null;
}
@Pc(90) PrivilegedRequest local90 = arg3.enterFullScreen(arg0, arg1, arg2);
while (local90.status == 0) {
ThreadUtils.sleep(10L);
}
@Pc(103) Frame local103 = (Frame) local90.result;
if (local103 == null) {
return null;
} else if (local90.status == 2) {
exitFullScreen(local103, arg3);
return null;
} else {
return local103;
}
}
@OriginalMember(owner = "client!oi", name = "a", descriptor = "(I[I[Ljava/lang/Object;)V")
public static void method3346(@OriginalArg(1) int[] arg0, @OriginalArg(2) Object[] arg1) {
method1292(arg1, arg0.length - 1, arg0, 0);
}
@OriginalMember(owner = "client!ec", name = "a", descriptor = "([Ljava/lang/Object;I[III)V")
public static void method1292(@OriginalArg(0) Object[] arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int[] arg2, @OriginalArg(4) int arg3) {
if (arg3 >= arg1) {
return;
}
@Pc(11) int local11 = (arg3 + arg1) / 2;
@Pc(15) int local15 = arg2[local11];
@Pc(17) int local17 = arg3;
arg2[local11] = arg2[arg1];
arg2[arg1] = local15;
@Pc(31) Object local31 = arg0[local11];
arg0[local11] = arg0[arg1];
arg0[arg1] = local31;
for (@Pc(43) int local43 = arg3; local43 < arg1; local43++) {
if ((local43 & 0x1) + local15 > arg2[local43]) {
@Pc(67) int local67 = arg2[local43];
arg2[local43] = arg2[local17];
arg2[local17] = local67;
@Pc(81) Object local81 = arg0[local43];
arg0[local43] = arg0[local17];
arg0[local17++] = local81;
}
}
arg2[arg1] = arg2[local17];
arg2[local17] = local15;
arg0[arg1] = arg0[local17];
arg0[local17] = local31;
method1292(arg0, local17 - 1, arg2, arg3);
method1292(arg0, arg1, arg2, local17 + 1);
}
}

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

@ -21,7 +21,7 @@ public class EnumTypeList {
if (local10 != null) {
return local10;
}
@Pc(24) byte[] local24 = archive.fetchFile(Static97.method1959(arg0), Static103.method2236(arg0));
@Pc(24) byte[] local24 = archive.fetchFile(getGroupId(arg0), getFileId(arg0));
local10 = new EnumType();
if (local24 != null) {
local10.decode(new Buffer(local24));
@ -29,4 +29,14 @@ public class EnumTypeList {
types.put(local10, (long) arg0);
return local10;
}
@OriginalMember(owner = "client!i", name = "e", descriptor = "(BI)I")
public static int getFileId(@OriginalArg(1) int arg0) {
return arg0 & 0xFF;
}
@OriginalMember(owner = "client!hi", name = "a", descriptor = "(BI)I")
public static int getGroupId(@OriginalArg(1) int arg0) {
return arg0 >>> 8;
}
}

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

@ -44,7 +44,7 @@ public class Find {
for (@Pc(115) int local115 = 0; local115 < index; local115++) {
local113[local115] = QuickChatPhraseTypeList.get(local22[local115]).getText();
}
Static202.method3656(local113, results);
method3656(local113, results);
}
@OriginalMember(owner = "client!me", name = "a", descriptor = "(ZLclient!na;I)V")
@ -77,6 +77,42 @@ public class Find {
for (@Pc(119) int local119 = 0; local119 < index; local119++) {
local117[local119] = ObjTypeList.get(local8[local119]).name;
}
Static202.method3656(local117, results);
method3656(local117, results);
}
@OriginalMember(owner = "client!qg", name = "a", descriptor = "([Lclient!na;[SI)V")
public static void method3656(@OriginalArg(0) JagString[] arg0, @OriginalArg(1) short[] arg1) {
method1307(arg1, arg0.length - 1, arg0, 0);
}
@OriginalMember(owner = "client!ed", name = "a", descriptor = "([SI[Lclient!na;II)V")
public static void method1307(@OriginalArg(0) short[] arg0, @OriginalArg(1) int arg1, @OriginalArg(2) JagString[] arg2, @OriginalArg(4) int arg3) {
if (arg1 <= arg3) {
return;
}
@Pc(14) int local14 = arg3;
@Pc(21) int local21 = (arg3 + arg1) / 2;
@Pc(25) JagString local25 = arg2[local21];
arg2[local21] = arg2[arg1];
arg2[arg1] = local25;
@Pc(39) short local39 = arg0[local21];
arg0[local21] = arg0[arg1];
arg0[arg1] = local39;
for (@Pc(51) int local51 = arg3; local51 < arg1; local51++) {
if (local25 == null || arg2[local51] != null && arg2[local51].method3139(local25) < (local51 & 0x1)) {
@Pc(80) JagString local80 = arg2[local51];
arg2[local51] = arg2[local14];
arg2[local14] = local80;
@Pc(94) short local94 = arg0[local51];
arg0[local51] = arg0[local14];
arg0[local14++] = local94;
}
}
arg2[arg1] = arg2[local14];
arg2[local14] = local25;
arg0[arg1] = arg0[local14];
arg0[local14] = local39;
method1307(arg0, local14 - 1, arg2, arg3);
method1307(arg0, arg1, arg2, local14 + 1);
}
}

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

@ -54,8 +54,10 @@ public final class GlModel extends Model {
public static int anInt5300;
@OriginalMember(owner = "client!td", name = "zb", descriptor = "F")
public static float aFloat28;
@OriginalMember(owner = "client!lk", name = "V", descriptor = "I")
public static int anInt3582 = 0;
@OriginalMember(owner = "client!td", name = "t", descriptor = "[S")
@OriginalMember(owner = "client!td", name = "t", descriptor = "[S")
private short[] aShortArray75;
@OriginalMember(owner = "client!td", name = "v", descriptor = "[S")
@ -909,7 +911,18 @@ public final class GlModel extends Model {
aClass8_Sub1_Sub1_6 = new GlModel();
}
@OriginalMember(owner = "client!td", name = "a", descriptor = "(ZZZ)Lclient!ak;")
@OriginalMember(owner = "client!vg", name = "a", descriptor = "(I[S)[S")
public static short[] method4511(@OriginalArg(1) short[] arg0) {
if (arg0 == null) {
return null;
} else {
@Pc(19) short[] local19 = new short[arg0.length];
ArrayUtils.copy(arg0, 0, local19, 0, arg0.length);
return local19;
}
}
@OriginalMember(owner = "client!td", name = "a", descriptor = "(ZZZ)Lclient!ak;")
@Override
public final Model method4560(@OriginalArg(0) boolean arg0, @OriginalArg(1) boolean arg1, @OriginalArg(2) boolean arg2) {
return this.method4114(arg0, arg1, arg2, aClass8_Sub1_Sub1_4, aClass8_Sub1_Sub1_3);
@ -961,7 +974,7 @@ public final class GlModel extends Model {
local161 = MathUtils.sin[arg0];
local163 = MathUtils.cos[arg0];
}
if (arg8 > 0L && Static39.aBoolean77 && local70 > 0) {
if (arg8 > 0L && ScriptRunner.aBoolean77 && local70 > 0) {
@Pc(187) int local187;
@Pc(191) int local191;
if (local84 > 0) {
@ -980,7 +993,7 @@ public final class GlModel extends Model {
local206 = local153 / local70;
local210 = local132 / local53;
}
if (Static150.anInt3582 >= local187 && Static150.anInt3582 <= local191 && Static34.anInt1053 >= local206 && Static34.anInt1053 <= local210) {
if (anInt3582 >= local187 && anInt3582 <= local191 && Static34.anInt1053 >= local206 && Static34.anInt1053 <= local210) {
local187 = 999999;
local191 = -999999;
local206 = 999999;
@ -1033,9 +1046,9 @@ public final class GlModel extends Model {
}
}
}
if (Static150.anInt3582 >= local187 && Static150.anInt3582 <= local191 && Static34.anInt1053 >= local206 && Static34.anInt1053 <= local210) {
if (anInt3582 >= local187 && anInt3582 <= local191 && Static34.anInt1053 >= local206 && Static34.anInt1053 <= local210) {
if (this.aBoolean303) {
Model.aLongArray11[Static2.anInt7++] = arg8;
Model.aLongArray11[MiniMenu.anInt7++] = arg8;
} else {
if (anIntArray468.length < this.anInt5296) {
anIntArray468 = new int[this.anInt5296];
@ -1052,8 +1065,8 @@ public final class GlModel extends Model {
@Pc(698) short local698 = this.aShortArray77[local362];
@Pc(703) short local703 = this.aShortArray82[local362];
@Pc(708) short local708 = this.aShortArray83[local362];
if (this.method4118(Static150.anInt3582, Static34.anInt1053, anIntArray467[local698], anIntArray467[local703], anIntArray467[local708], anIntArray468[local698], anIntArray468[local703], anIntArray468[local708])) {
Model.aLongArray11[Static2.anInt7++] = arg8;
if (this.method4118(anInt3582, Static34.anInt1053, anIntArray467[local698], anIntArray467[local703], anIntArray467[local708], anIntArray468[local698], anIntArray468[local703], anIntArray468[local708])) {
Model.aLongArray11[MiniMenu.anInt7++] = arg8;
break label118;
}
local362++;
@ -1288,17 +1301,17 @@ public final class GlModel extends Model {
if (local237 != -1) {
if (local40 == null) {
this.aClass23_1 = new GlModel_Class23();
local40 = this.aClass23_1.aShortArray8 = Static263.method4511(this.aShortArray76);
local44 = this.aClass23_1.aShortArray10 = Static263.method4511(this.aShortArray79);
local48 = this.aClass23_1.aShortArray9 = Static263.method4511(this.aShortArray85);
local52 = this.aClass23_1.aShortArray7 = Static263.method4511(this.aShortArray86);
local40 = this.aClass23_1.aShortArray8 = method4511(this.aShortArray76);
local44 = this.aClass23_1.aShortArray10 = method4511(this.aShortArray79);
local48 = this.aClass23_1.aShortArray9 = method4511(this.aShortArray85);
local52 = this.aClass23_1.aShortArray7 = method4511(this.aShortArray86);
}
if (local68 == null) {
@Pc(325) GlModel_Class23 local325 = local2.aClass23_1 = new GlModel_Class23();
local68 = local325.aShortArray8 = Static263.method4511(local24);
local72 = local325.aShortArray10 = Static263.method4511(local27);
local76 = local325.aShortArray9 = Static263.method4511(local30);
local80 = local325.aShortArray7 = Static263.method4511(local33);
local68 = local325.aShortArray8 = method4511(local24);
local72 = local325.aShortArray10 = method4511(local27);
local76 = local325.aShortArray9 = method4511(local30);
local80 = local325.aShortArray7 = method4511(local33);
}
@Pc(358) short local358 = this.aShortArray76[local175];
@Pc(363) short local363 = this.aShortArray79[local175];
@ -2819,7 +2832,7 @@ public final class GlModel extends Model {
if (arg2) {
local3.aShortArray75 = this.aShortArray75;
} else {
local3.aShortArray75 = Static263.method4511(this.aShortArray75);
local3.aShortArray75 = method4511(this.aShortArray75);
}
local3.aByteArray71 = this.aByteArray71;
if (arg2 && arg3 && (arg6 && arg4 || Preferences.highDetailLighting)) {
@ -2833,10 +2846,10 @@ public final class GlModel extends Model {
local3.aShortArray85 = this.aShortArray85;
local3.aShortArray86 = this.aShortArray86;
} else {
local3.aShortArray76 = Static263.method4511(this.aShortArray76);
local3.aShortArray79 = Static263.method4511(this.aShortArray79);
local3.aShortArray85 = Static263.method4511(this.aShortArray85);
local3.aShortArray86 = Static263.method4511(this.aShortArray86);
local3.aShortArray76 = method4511(this.aShortArray76);
local3.aShortArray79 = method4511(this.aShortArray79);
local3.aShortArray85 = method4511(this.aShortArray85);
local3.aShortArray86 = method4511(this.aShortArray86);
}
if (!Preferences.highDetailLighting) {
local3.aClass127_2 = null;
@ -2854,15 +2867,15 @@ public final class GlModel extends Model {
local3.aShortArray83 = this.aShortArray83;
local3.aClass127_5 = this.aClass127_5;
} else {
local3.aShortArray77 = Static263.method4511(this.aShortArray77);
local3.aShortArray82 = Static263.method4511(this.aShortArray82);
local3.aShortArray83 = Static263.method4511(this.aShortArray83);
local3.aShortArray77 = method4511(this.aShortArray77);
local3.aShortArray82 = method4511(this.aShortArray82);
local3.aShortArray83 = method4511(this.aShortArray83);
local3.aClass127_5 = new GlBuffer();
}
if (arg8) {
local3.aShortArray80 = this.aShortArray80;
} else {
local3.aShortArray80 = Static263.method4511(this.aShortArray80);
local3.aShortArray80 = method4511(this.aShortArray80);
}
local3.anIntArray464 = this.anIntArray464;
local3.anIntArrayArray36 = this.anIntArrayArray36;

718
client/src/main/java/rt4/InterfaceList.java
View file

@ -25,6 +25,10 @@ public class InterfaceList {
public static final int[] rectangleHeight = new int[100];
@OriginalMember(owner = "client!pa", name = "R", descriptor = "[Z")
public static final boolean[] aBooleanArray100 = new boolean[100];
@OriginalMember(owner = "client!ql", name = "h", descriptor = "Lclient!na;")
public static final JagString aClass100_903 = JagString.parse("Hidden)2");
@OriginalMember(owner = "client!ja", name = "f", descriptor = "Lclient!ih;")
public static final LinkedList mediumPriorityRequests = new LinkedList();
@OriginalMember(owner = "client!bn", name = "V", descriptor = "I")
public static int rectangles = 0;
@OriginalMember(owner = "client!md", name = "W", descriptor = "I")
@ -49,6 +53,32 @@ public class InterfaceList {
public static int miscTransmitAt = 0;
@OriginalMember(owner = "client!je", name = "T", descriptor = "Lclient!sc;")
public static HashTable openInterfaces = new HashTable(8);
@OriginalMember(owner = "client!wl", name = "h", descriptor = "Lclient!be;")
public static Component aClass13_26 = null;
@OriginalMember(owner = "client!jd", name = "i", descriptor = "Lclient!be;")
public static Component clickedInventoryComponent;
@OriginalMember(owner = "client!nf", name = "h", descriptor = "Lclient!be;")
public static Component mouseOverInventoryInterface;
@OriginalMember(owner = "client!qk", name = "f", descriptor = "I")
public static int clickedInventoryComponentY = 0;
@OriginalMember(owner = "client!ef", name = "r", descriptor = "Lclient!be;")
public static Component aClass13_12 = null;
@OriginalMember(owner = "client!bn", name = "O", descriptor = "I")
public static int anInt761;
@OriginalMember(owner = "client!bc", name = "X", descriptor = "I")
public static int anInt436;
@OriginalMember(owner = "client!si", name = "ab", descriptor = "I")
public static int anInt5138;
@OriginalMember(owner = "client!sh", name = "f", descriptor = "I")
public static int anInt5103 = -1;
@OriginalMember(owner = "client!gd", name = "j", descriptor = "I")
public static int clickedInventoryComponentCycle = 0;
@OriginalMember(owner = "client!lj", name = "w", descriptor = "I")
public static int clickedInventoryComponentX = 0;
@OriginalMember(owner = "client!og", name = "e", descriptor = "Lclient!be;")
public static Component aClass13_22;
@OriginalMember(owner = "client!ok", name = "b", descriptor = "I")
public static int anInt4271;
@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) {
@ -194,7 +224,7 @@ public class InterfaceList {
if (!getServerActiveProperties(arg0).method503(arg1) && arg0.onOptionClick == null) {
return null;
} else if (arg0.ops == null || arg0.ops.length <= arg1 || arg0.ops[arg1] == null || arg0.ops[arg1].trim().length() == 0) {
return Static121.qaOpTest ? JagString.concatenate(new JagString[] { Static207.aClass100_903, JagString.parseInt(arg1) }) : null;
return Static121.qaOpTest ? JagString.concatenate(new JagString[] { aClass100_903, JagString.parseInt(arg1) }) : null;
} else {
return arg0.ops[arg1];
}
@ -259,8 +289,8 @@ public class InterfaceList {
for (@Pc(3) int local3 = 0; local3 < arg4.length; local3++) {
@Pc(19) Component local19 = arg4[local3];
if (local19 != null && local19.layer == arg0) {
Static150.method2801(arg3, arg2, local19, arg1);
Static111.method2291(local19, arg3, arg2);
method2801(arg3, arg2, local19, arg1);
method2291(local19, arg3, arg2);
if (local19.scrollMaxH - local19.width < local19.scrollX) {
local19.scrollX = local19.scrollMaxH - local19.width;
}
@ -305,7 +335,7 @@ public class InterfaceList {
if (arg0) {
method2275(local16);
}
Static132.method3214(local16);
method3214(local16);
@Pc(32) Component local32 = getComponent(local9);
if (local32 != null) {
redraw(local32);
@ -313,15 +343,15 @@ public class InterfaceList {
@Pc(41) int local41 = MiniMenu.size;
@Pc(43) int local43;
for (local43 = 0; local43 < local41; local43++) {
if (Static2.method5(MiniMenu.actions[local43])) {
if (method5(MiniMenu.actions[local43])) {
MiniMenu.remove(local43);
}
}
if (MiniMenu.size == 1) {
Static40.aBoolean108 = false;
Static133.method4012(Static183.anInt4271, Static24.anInt761, Static229.anInt5138, Static13.anInt436);
method4012(anInt4271, anInt761, anInt5138, anInt436);
} else {
Static133.method4012(Static183.anInt4271, Static24.anInt761, Static229.anInt5138, Static13.anInt436);
method4012(anInt4271, anInt761, anInt5138, anInt436);
local43 = Fonts.b12Full.getStringWidth(LocalizedText.CHOOSE_OPTION);
for (@Pc(75) int local75 = 0; local75 < MiniMenu.size; local75++) {
@Pc(88) int local88 = Fonts.b12Full.getStringWidth(MiniMenu.getOp(local75));
@ -329,11 +359,679 @@ public class InterfaceList {
local43 = local88;
}
}
Static13.anInt436 = MiniMenu.size * 15 + (Static40.aBoolean298 ? 26 : 22);
Static24.anInt761 = local43 + 8;
anInt436 = MiniMenu.size * 15 + (Static40.aBoolean298 ? 26 : 22);
anInt761 = local43 + 8;
}
if (topLevelInterface != -1) {
Static54.runScripts(1, topLevelInterface);
runScripts(1, topLevelInterface);
}
}
@OriginalMember(owner = "client!ii", name = "a", descriptor = "(Lclient!be;III)V")
public static void method2291(@OriginalArg(0) Component arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2) {
if (arg0.xMode == 0) {
arg0.y = arg0.baseY;
} else if (arg0.xMode == 1) {
arg0.y = (arg1 - arg0.height) / 2 + arg0.baseY;
} else if (arg0.xMode == 2) {
arg0.y = arg1 - arg0.height - arg0.baseY;
} else if (arg0.xMode == 3) {
arg0.y = arg0.baseY * arg1 >> 14;
} else if (arg0.xMode == 4) {
arg0.y = (arg1 * arg0.baseY >> 14) + (arg1 - arg0.height) / 2;
} else {
arg0.y = arg1 - (arg1 * arg0.baseY >> 14) - arg0.height;
}
if (arg0.yMode == 0) {
arg0.x = arg0.baseX;
} else if (arg0.yMode == 1) {
arg0.x = arg0.baseX + (arg2 - arg0.width) / 2;
} else if (arg0.yMode == 2) {
arg0.x = arg2 - arg0.baseX - arg0.width;
} else if (arg0.yMode == 3) {
arg0.x = arg0.baseX * arg2 >> 14;
} else if (arg0.yMode == 4) {
arg0.x = (arg0.baseX * arg2 >> 14) + (arg2 - arg0.width) / 2;
} else {
arg0.x = arg2 - (arg2 * arg0.baseX >> 14) - arg0.width;
}
if (!Static121.qaOpTest || getServerActiveProperties(arg0).events == 0 && arg0.type != 0) {
return;
}
if (arg0.y < 0) {
arg0.y = 0;
} else if (arg0.height + arg0.y > arg1) {
arg0.y = arg1 - arg0.height;
}
if (arg0.x < 0) {
arg0.x = 0;
} else if (arg2 < arg0.x + arg0.width) {
arg0.x = arg2 - arg0.width;
}
}
@OriginalMember(owner = "client!fn", name = "a", descriptor = "(ILclient!be;)V")
public static void update(@OriginalArg(1) Component arg0) {
@Pc(7) Component local7 = method4668(arg0);
@Pc(19) int local19;
@Pc(17) int local17;
if (local7 == null) {
local17 = GameShell.canvasHeight;
local19 = GameShell.canvasWidth;
} else {
local17 = local7.height;
local19 = local7.width;
}
method2801(local17, local19, arg0, false);
method2291(arg0, local17, local19);
}
@OriginalMember(owner = "client!lk", name = "a", descriptor = "(IIILclient!be;Z)V")
public static void method2801(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) Component arg2, @OriginalArg(4) boolean arg3) {
@Pc(4) int local4 = arg2.width;
@Pc(7) int local7 = arg2.height;
if (arg2.dynamicWidthValue == 0) {
arg2.width = arg2.baseWidth;
} else if (arg2.dynamicWidthValue == 1) {
arg2.width = arg1 - arg2.baseWidth;
} else if (arg2.dynamicWidthValue == 2) {
arg2.width = arg2.baseWidth * arg1 >> 14;
} else if (arg2.dynamicWidthValue == 3) {
if (arg2.type == 2) {
arg2.width = arg2.baseWidth * 32 + (arg2.baseWidth - 1) * arg2.anInt512;
} else if (arg2.type == 7) {
arg2.width = arg2.baseWidth * 115 + arg2.anInt512 * (arg2.baseWidth - 1);
}
}
if (arg2.dynamicHeightValue == 0) {
arg2.height = arg2.baseHeight;
} else if (arg2.dynamicHeightValue == 1) {
arg2.height = arg0 - arg2.baseHeight;
} else if (arg2.dynamicHeightValue == 2) {
arg2.height = arg0 * arg2.baseHeight >> 14;
} else if (arg2.dynamicHeightValue == 3) {
if (arg2.type == 2) {
arg2.height = (arg2.baseHeight - 1) * arg2.anInt516 + arg2.baseHeight * 32;
} else if (arg2.type == 7) {
arg2.height = arg2.baseHeight * 12 + (arg2.baseHeight - 1) * arg2.anInt516;
}
}
if (arg2.dynamicWidthValue == 4) {
arg2.width = arg2.aspectWidth * arg2.height / arg2.aspectHeight;
}
if (arg2.dynamicHeightValue == 4) {
arg2.height = arg2.aspectHeight * arg2.width / arg2.aspectWidth;
}
if (Static121.qaOpTest && (getServerActiveProperties(arg2).events != 0 || arg2.type == 0)) {
if (arg2.height < 5 && arg2.width < 5) {
arg2.height = 5;
arg2.width = 5;
} else {
if (arg2.width <= 0) {
arg2.width = 5;
}
if (arg2.height <= 0) {
arg2.height = 5;
}
}
}
if (arg2.clientCode == 1337) {
aClass13_26 = arg2;
}
if (arg3 && arg2.onResize != null && (local4 != arg2.width || arg2.height != local7)) {
@Pc(305) HookRequest local305 = new HookRequest();
local305.arguments = arg2.onResize;
local305.source = arg2;
lowPriorityRequests.addTail(local305);
}
}
@OriginalMember(owner = "client!wl", name = "a", descriptor = "(Lclient!be;I)Lclient!be;")
public static Component method4668(@OriginalArg(0) Component arg0) {
if (arg0.layer != -1) {
return getComponent(arg0.layer);
}
@Pc(28) int local28 = arg0.id >>> 16;
@Pc(33) HashTableIterator local33 = new HashTableIterator(openInterfaces);
for (@Pc(38) ComponentPointer local38 = (ComponentPointer) local33.method2701(); local38 != null; local38 = (ComponentPointer) local33.method2700()) {
if (local28 == local38.anInt5878) {
return getComponent((int) local38.key);
}
}
return null;
}
@OriginalMember(owner = "client!kf", name = "a", descriptor = "(IIBII)V")
public static void method4012(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3) {
for (@Pc(12) int local12 = 0; local12 < rectangles; local12++) {
if (rectangleWidth[local12] + rectangleX[local12] > arg0 && arg1 + arg0 > rectangleX[local12] && arg2 < rectangleHeight[local12] + rectangleY[local12] && rectangleY[local12] < arg2 + arg3) {
aBooleanArray100[local12] = true;
}
}
}
@OriginalMember(owner = "client!we", name = "b", descriptor = "(BI)V")
public static void method3214(@OriginalArg(1) int arg0) {
for (@Pc(11) Node local11 = properties.head(); local11 != null; local11 = properties.next()) {
if ((local11.key >> 48 & 0xFFFFL) == (long) arg0) {
local11.unlink();
}
}
}
@OriginalMember(owner = "client!ed", name = "a", descriptor = "(III)V")
public static void runScripts(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) {
if (load(arg1)) {
method7(components[arg1], arg0);
}
}
@OriginalMember(owner = "client!aa", name = "a", descriptor = "([Lclient!be;ZI)V")
public static void method7(@OriginalArg(0) Component[] arg0, @OriginalArg(2) int arg1) {
for (@Pc(11) int local11 = 0; local11 < arg0.length; local11++) {
@Pc(23) Component local23 = arg0[local11];
if (local23 != null) {
if (local23.type == 0) {
if (local23.createdComponents != null) {
method7(local23.createdComponents, arg1);
}
@Pc(49) ComponentPointer local49 = (ComponentPointer) openInterfaces.get((long) local23.id);
if (local49 != null) {
runScripts(arg1, local49.anInt5878);
}
}
@Pc(72) HookRequest local72;
if (arg1 == 0 && local23.onDialogAbort != null) {
local72 = new HookRequest();
local72.arguments = local23.onDialogAbort;
local72.source = local23;
ScriptRunner.run(local72);
}
if (arg1 == 1 && local23.onWidgetsOpenClose != null) {
if (local23.createdComponentId >= 0) {
@Pc(103) Component local103 = getComponent(local23.id);
if (local103 == null || local103.createdComponents == null || local23.createdComponentId >= local103.createdComponents.length || local103.createdComponents[local23.createdComponentId] != local23) {
continue;
}
}
local72 = new HookRequest();
local72.arguments = local23.onWidgetsOpenClose;
local72.source = local23;
ScriptRunner.run(local72);
}
}
}
}
@OriginalMember(owner = "client!eg", name = "a", descriptor = "(IIIIIIII)V")
public static void method1320(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5, @OriginalArg(7) int arg6) {
if (load(arg4)) {
method946(components[arg4], -1, arg5, arg1, arg3, arg6, arg0, arg2);
}
}
@OriginalMember(owner = "client!client", name = "a", descriptor = "([Lclient!be;IIIIIII)V")
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))) {
@Pc(50) int local50 = component.x + arg6;
@Pc(55) int local55 = component.y + arg7;
@Pc(61) int local61;
@Pc(63) int local63;
@Pc(65) int local65;
@Pc(67) int local67;
if (component.type == 2) {
local61 = arg2;
local63 = arg3;
local65 = arg4;
local67 = arg5;
} else {
@Pc(73) int local73 = local50 + component.width;
@Pc(78) int local78 = local55 + component.height;
if (component.type == 9) {
local73++;
local78++;
}
local61 = local50 > arg2 ? local50 : arg2;
local63 = local55 > arg3 ? local55 : arg3;
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.if3 || local61 < local65 && local63 < local67) {
if (component.type == 0) {
if (!component.if3 && Static36.method947(component) && aClass13_22 != component) {
continue;
}
if (component.noClickThrough && Mouse.lastMouseX >= local61 && Mouse.lastMouseY >= local63 && Mouse.lastMouseX < local65 && Mouse.lastMouseY < local67) {
for (@Pc(164) HookRequest local164 = (HookRequest) lowPriorityRequests.head(); local164 != null; local164 = (HookRequest) lowPriorityRequests.next()) {
if (local164.aBoolean158) {
local164.unlink();
local164.source.aBoolean19 = false;
}
}
if (Static40.anInt4851 == 0) {
Static40.aClass13_14 = null;
Static40.aClass13_1 = null;
}
Static36.anInt3337 = 0;
}
}
if (component.if3) {
@Pc(207) boolean local207;
if (Mouse.lastMouseX >= local61 && Mouse.lastMouseY >= local63 && Mouse.lastMouseX < local65 && Mouse.lastMouseY < local67) {
local207 = true;
} else {
local207 = false;
}
@Pc(212) boolean local212 = false;
if (Mouse.pressedButton == 1 && local207) {
local212 = true;
}
@Pc(221) boolean local221 = false;
if (Mouse.clickButton == 1 && Mouse.clickX >= local61 && Mouse.clickY >= local63 && Mouse.clickX < local65 && Mouse.clickY < local67) {
local221 = true;
}
@Pc(243) int i;
@Pc(322) int k;
if (component.aByteArray8 != null) {
for (i = 0; i < component.aByteArray8.length; i++) {
if (Keyboard.pressedKeys[component.aByteArray8[i]]) {
if (component.anIntArray49 == null || client.loop >= component.anIntArray49[i]) {
@Pc(279) byte local279 = component.aByteArray7[i];
if (local279 == 0 || ((local279 & 0x2) == 0 || Keyboard.pressedKeys[Keyboard.KEY_ALT]) && ((local279 & 0x1) == 0 || Keyboard.pressedKeys[Keyboard.KEY_CTRL]) && ((local279 & 0x4) == 0 || Keyboard.pressedKeys[Keyboard.KEY_SHIFT])) {
ClientProt.method4512(JagString.EMPTY, -1, i + 1, component.id);
k = component.anIntArray46[i];
if (component.anIntArray49 == null) {
component.anIntArray49 = new int[component.aByteArray8.length];
}
if (k == 0) {
component.anIntArray49[i] = Integer.MAX_VALUE;
} else {
component.anIntArray49[i] = client.loop + k;
}
}
}
} else if (component.anIntArray49 != null) {
component.anIntArray49[i] = 0;
}
}
}
if (local221) {
Static40.method1015(Mouse.clickY - local55, Mouse.clickX - local50, component);
}
if (Static40.aClass13_14 != null && Static40.aClass13_14 != component && local207 && getServerActiveProperties(component).method509()) {
aClass13_12 = component;
}
if (component == Static40.aClass13_1) {
Static146.aBoolean174 = true;
Static81.anInt2225 = local50;
anInt5103 = local55;
}
if (component.aBoolean25 || component.clientCode != 0) {
@Pc(399) HookRequest request;
if (local207 && MouseWheel.wheelRotation != 0 && component.onScroll != null) {
request = new HookRequest();
request.aBoolean158 = true;
request.source = component;
request.mouseY = MouseWheel.wheelRotation;
request.arguments = component.onScroll;
lowPriorityRequests.addTail(request);
}
if (Static40.aClass13_14 != null || clickedInventoryComponent != null || Static40.aBoolean108 || component.clientCode != 1400 && Static36.anInt3337 > 0) {
local221 = false;
local212 = false;
local207 = false;
}
@Pc(508) int skill;
if (component.clientCode != 0) {
if (component.clientCode == 1337) {
aClass13_26 = component;
redraw(component);
continue;
}
if (component.clientCode == 1338) {
if (local221) {
Static1.anInt5 = Mouse.clickX - local50;
MiniMenu.anInt2878 = Mouse.clickY - local55;
}
continue;
}
if (component.clientCode == 1400) {
WorldMap.component = component;
if (local221) {
if (Keyboard.pressedKeys[Keyboard.KEY_CTRL] && LoginManager.staffModLevel > 0) {
i = (int) ((double) (Mouse.clickX - local50 - component.width / 2) * 2.0D / (double) WorldMap.zoom);
skill = (int) ((double) (Mouse.clickY - local55 - component.height / 2) * 2.0D / (double) WorldMap.zoom);
k = WorldMap.anInt435 + i;
@Pc(516) int local516 = WorldMap.anInt919 + skill;
@Pc(520) int local520 = k + WorldMap.originX;
@Pc(528) int local528 = WorldMap.length + WorldMap.originZ - local516 - 1;
Cheat.teleport(local520, local528, 0);
ClientProt.closeWidget();
continue;
}
Static36.anInt3337 = 1;
Static40.anInt5388 = Mouse.lastMouseX;
Static40.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 (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));
}
continue;
}
Static36.anInt3337 = 0;
continue;
}
if (component.clientCode == 1401) {
if (local212) {
WorldMap.method2387(component.width, Mouse.lastMouseY - local55, Mouse.lastMouseX - local50, component.height);
}
continue;
}
if (component.clientCode == 1402) {
if (!GlRenderer.enabled) {
redraw(component);
}
continue;
}
}
if (!component.aBoolean24 && local221) {
component.aBoolean24 = true;
if (component.onClickRepeat != null) {
request = new HookRequest();
request.aBoolean158 = true;
request.source = component;
request.mouseX = Mouse.clickX - local50;
request.mouseY = Mouse.clickY - local55;
request.arguments = component.onClickRepeat;
lowPriorityRequests.addTail(request);
}
}
if (component.aBoolean24 && local212 && component.onDrag != null) {
request = new HookRequest();
request.aBoolean158 = true;
request.source = component;
request.mouseX = Mouse.lastMouseX - local50;
request.mouseY = Mouse.lastMouseY - local55;
request.arguments = component.onDrag;
lowPriorityRequests.addTail(request);
}
if (component.aBoolean24 && !local212) {
component.aBoolean24 = false;
if (component.onRelease != null) {
request = new HookRequest();
request.aBoolean158 = true;
request.source = component;
request.mouseX = Mouse.lastMouseX - local50;
request.mouseY = Mouse.lastMouseY - local55;
request.arguments = component.onRelease;
mediumPriorityRequests.addTail(request);
}
}
if (local212 && component.onHold != null) {
request = new HookRequest();
request.aBoolean158 = true;
request.source = component;
request.mouseX = Mouse.lastMouseX - local50;
request.mouseY = Mouse.lastMouseY - local55;
request.arguments = component.onHold;
lowPriorityRequests.addTail(request);
}
if (!component.aBoolean19 && local207) {
component.aBoolean19 = true;
if (component.onMouseOver != null) {
request = new HookRequest();
request.aBoolean158 = true;
request.source = component;
request.mouseX = Mouse.lastMouseX - local50;
request.mouseY = Mouse.lastMouseY - local55;
request.arguments = component.onMouseOver;
lowPriorityRequests.addTail(request);
}
}
if (component.aBoolean19 && local207 && component.onMouseRepeat != null) {
request = new HookRequest();
request.aBoolean158 = true;
request.source = component;
request.mouseX = Mouse.lastMouseX - local50;
request.mouseY = Mouse.lastMouseY - local55;
request.arguments = component.onMouseRepeat;
lowPriorityRequests.addTail(request);
}
if (component.aBoolean19 && !local207) {
component.aBoolean19 = false;
if (component.onMouseLeave != null) {
request = new HookRequest();
request.aBoolean158 = true;
request.source = component;
request.mouseX = Mouse.lastMouseX - local50;
request.mouseY = Mouse.lastMouseY - local55;
request.arguments = component.onMouseLeave;
mediumPriorityRequests.addTail(request);
}
}
if (component.onTimer != null) {
request = new HookRequest();
request.source = component;
request.arguments = component.onTimer;
Static4.highPriorityRequests.addTail(request);
}
@Pc(966) HookRequest request2;
if (component.onVarcTransmit != null && VarcDomain.updatedVarcsWriterIndex > component.updatedVarcsReaderIndex) {
if (component.varcTriggers == null || VarcDomain.updatedVarcsWriterIndex - component.updatedVarcsReaderIndex > 32) {
request = new HookRequest();
request.source = component;
request.arguments = component.onVarcTransmit;
lowPriorityRequests.addTail(request);
} else {
label563: for (i = component.updatedVarcsReaderIndex; i < VarcDomain.updatedVarcsWriterIndex; i++) {
skill = VarcDomain.updatedVarcs[i & 0x1F];
for (k = 0; k < component.varcTriggers.length; k++) {
if (component.varcTriggers[k] == skill) {
request2 = new HookRequest();
request2.source = component;
request2.arguments = component.onVarcTransmit;
lowPriorityRequests.addTail(request2);
break label563;
}
}
}
}
component.updatedVarcsReaderIndex = VarcDomain.updatedVarcsWriterIndex;
}
if (component.onVarcstrTransmit != null && VarcDomain.updatedVarcstrsWriterIndex > component.updatedVarcstrsReaderIndex) {
if (component.varcstrTriggers == null || VarcDomain.updatedVarcstrsWriterIndex - component.updatedVarcstrsReaderIndex > 32) {
request = new HookRequest();
request.source = component;
request.arguments = component.onVarcstrTransmit;
lowPriorityRequests.addTail(request);
} else {
label539: for (i = component.updatedVarcstrsReaderIndex; i < VarcDomain.updatedVarcstrsWriterIndex; i++) {
skill = VarcDomain.updatedVarcstrs[i & 0x1F];
for (k = 0; k < component.varcstrTriggers.length; k++) {
if (component.varcstrTriggers[k] == skill) {
request2 = new HookRequest();
request2.source = component;
request2.arguments = component.onVarcstrTransmit;
lowPriorityRequests.addTail(request2);
break label539;
}
}
}
}
component.updatedVarcstrsReaderIndex = VarcDomain.updatedVarcstrsWriterIndex;
}
if (component.onVarpTransmit != null && VarpDomain.updatedVarpsWriterIndex > component.updatedVarpsReaderIndex) {
if (component.varpTriggers == null || VarpDomain.updatedVarpsWriterIndex - component.updatedVarpsReaderIndex > 32) {
request = new HookRequest();
request.source = component;
request.arguments = component.onVarpTransmit;
lowPriorityRequests.addTail(request);
} else {
label515: for (i = component.updatedVarpsReaderIndex; i < VarpDomain.updatedVarpsWriterIndex; i++) {
skill = VarpDomain.updatedVarps[i & 0x1F];
for (k = 0; k < component.varpTriggers.length; k++) {
if (component.varpTriggers[k] == skill) {
request2 = new HookRequest();
request2.source = component;
request2.arguments = component.onVarpTransmit;
lowPriorityRequests.addTail(request2);
break label515;
}
}
}
}
component.updatedVarpsReaderIndex = VarpDomain.updatedVarpsWriterIndex;
}
if (component.onInvTransmit != null && Inv.updatedInventoriesWriterIndex > component.updatedInventoriesReaderIndex) {
if (component.inventoryTriggers == null || Inv.updatedInventoriesWriterIndex - component.updatedInventoriesReaderIndex > 32) {
request = new HookRequest();
request.source = component;
request.arguments = component.onInvTransmit;
lowPriorityRequests.addTail(request);
} else {
outer:
for (i = component.updatedInventoriesReaderIndex; i < Inv.updatedInventoriesWriterIndex; i++) {
skill = Inv.updatedInventories[i & 0x1F];
for (k = 0; k < component.inventoryTriggers.length; k++) {
if (component.inventoryTriggers[k] == skill) {
request2 = new HookRequest();
request2.source = component;
request2.arguments = component.onInvTransmit;
lowPriorityRequests.addTail(request2);
break outer;
}
}
}
}
component.updatedInventoriesReaderIndex = Inv.updatedInventoriesWriterIndex;
}
if (component.onStatTransmit != null && PlayerSkillXpTable.updatedStatsWriterIndex > component.updatedStatsReaderIndex) {
if (component.statTriggers == null || PlayerSkillXpTable.updatedStatsWriterIndex - component.updatedStatsReaderIndex > 32) {
request = new HookRequest();
request.source = component;
request.arguments = component.onStatTransmit;
lowPriorityRequests.addTail(request);
} else {
outer:
for (i = component.updatedStatsReaderIndex; i < PlayerSkillXpTable.updatedStatsWriterIndex; i++) {
skill = PlayerSkillXpTable.updatedStats[i & 0x1F];
for (k = 0; k < component.statTriggers.length; k++) {
if (component.statTriggers[k] == skill) {
request2 = new HookRequest();
request2.source = component;
request2.arguments = component.onStatTransmit;
lowPriorityRequests.addTail(request2);
break outer;
}
}
}
}
component.updatedStatsReaderIndex = PlayerSkillXpTable.updatedStatsWriterIndex;
}
if (Chat.transmitAt > component.lastTransmitTimer && component.onMsg != null) {
request = new HookRequest();
request.source = component;
request.arguments = component.onMsg;
lowPriorityRequests.addTail(request);
}
if (FriendsList.transmitAt > component.lastTransmitTimer && component.onFriendTransmit != null) {
request = new HookRequest();
request.source = component;
request.arguments = component.onFriendTransmit;
lowPriorityRequests.addTail(request);
}
if (ClanChat.transmitAt > component.lastTransmitTimer && component.onClanTransmit != null) {
request = new HookRequest();
request.source = component;
request.arguments = component.onClanTransmit;
lowPriorityRequests.addTail(request);
}
if (StockMarketManager.transmitAt > component.lastTransmitTimer && component.onStockTransmit != null) {
request = new HookRequest();
request.source = component;
request.arguments = component.onStockTransmit;
lowPriorityRequests.addTail(request);
}
if (miscTransmitAt > component.lastTransmitTimer && component.onMiscTransmit != null) {
request = new HookRequest();
request.source = component;
request.arguments = component.onMiscTransmit;
lowPriorityRequests.addTail(request);
}
component.lastTransmitTimer = transmitTimer;
if (component.onKey != null) {
for (i = 0; i < keyQueueSize; i++) {
@Pc(1430) HookRequest local1430 = new HookRequest();
local1430.source = component;
local1430.keyCode = keyCodes[i];
local1430.keyChar = keyChars[i];
local1430.arguments = component.onKey;
lowPriorityRequests.addTail(local1430);
}
}
if (Camera.aBoolean16 && component.onMinimapUnlock != null) {
request = new HookRequest();
request.source = component;
request.arguments = component.onMinimapUnlock;
lowPriorityRequests.addTail(request);
}
}
}
if (!component.if3 && Static40.aClass13_14 == null && clickedInventoryComponent == null && !Static40.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];
} else {
aClass13_22 = component;
}
}
if (component.type == 8 && Mouse.lastMouseX >= local61 && Mouse.lastMouseY >= local63 && Mouse.lastMouseX < local65 && Mouse.lastMouseY < local67) {
Protocol.aClass13_11 = component;
}
if (component.scrollMaxV > component.height) {
Static36.method4049(Mouse.lastMouseY, component.height, component, Mouse.lastMouseX, local50 + component.width, local55, component.scrollMaxV);
}
}
if (component.type == 0) {
method946(arg0, component.id, local61, local63, local65, local67, local50 - component.scrollX, local55 - component.scrollY);
if (component.createdComponents != null) {
method946(component.createdComponents, component.id, local61, local63, local65, local67, local50 - component.scrollX, local55 - component.scrollY);
}
@Pc(1595) ComponentPointer local1595 = (ComponentPointer) openInterfaces.get((long) component.id);
if (local1595 != null) {
method1320(local50, local63, local55, local65, local1595.anInt5878, local61, local67);
}
}
}
}
}
}
@OriginalMember(owner = "client!aa", name = "a", descriptor = "(SI)Z")
public static boolean method5(@OriginalArg(0) short arg0) {
if (arg0 == 47 || arg0 == 5 || arg0 == 43 || arg0 == 35 || arg0 == 58 || arg0 == 22 || arg0 == 40 || arg0 == 3) {
return true;
} else if (arg0 == 9 || arg0 == 12 || arg0 == 1006 || arg0 == 1003) {
return true;
} else if (arg0 == 25 || arg0 == 23 || arg0 == 48 || arg0 == 7 || arg0 == 13) {
return true;
} else {
return arg0 == 8 || arg0 == 32 || arg0 == 28 || arg0 == 59 || arg0 == 51 || arg0 == 41;
}
}
}

25
client/src/main/java/rt4/Inv.java
View file

@ -10,6 +10,14 @@ public final class Inv extends Node {
@OriginalMember(owner = "client!cb", name = "I", descriptor = "[I")
public static final int[] updatedInventories = new int[32];
@OriginalMember(owner = "client!kl", name = "u", descriptor = "Lclient!na;")
public static final JagString aClass100_637 = JagString.parse("<col=ffffff>");
@OriginalMember(owner = "client!ol", name = "Y", descriptor = "Lclient!na;")
public static final JagString aClass100_819 = JagString.parse("<col=00ff80>");
@OriginalMember(owner = "client!ib", name = "g", descriptor = "Lclient!na;")
public static final JagString aClass100_559 = JagString.parse("<col=ffff00>");
@OriginalMember(owner = "client!jj", name = "m", descriptor = "Lclient!na;")
public static final JagString aClass100_594 = JagString.parse("<)4col>");
@OriginalMember(owner = "client!ii", name = "c", descriptor = "I")
public static int updatedInventoriesWriterIndex = 0;
@OriginalMember(owner = "client!bj", name = "v", descriptor = "Lclient!sc;")
@ -255,11 +263,22 @@ public final class Inv extends Node {
@OriginalMember(owner = "client!eb", name = "b", descriptor = "(II)Lclient!na;")
public static JagString formatObjAmount(@OriginalArg(1) int arg0) {
if (arg0 < 100000) {
return JagString.concatenate(new JagString[] { Static52.aClass100_559, JagString.parseInt(arg0), Static52.aClass100_594 });
return JagString.concatenate(new JagString[] { aClass100_559, JagString.parseInt(arg0), aClass100_594 });
} else if (arg0 >= 10000000) {
return JagString.concatenate(new JagString[] { Static52.aClass100_819, JagString.parseInt(arg0 / 1000000), LocalizedText.MILLION, Static52.aClass100_594 });
return JagString.concatenate(new JagString[] { aClass100_819, JagString.parseInt(arg0 / 1000000), LocalizedText.MILLION, aClass100_594 });
} else {
return JagString.concatenate(new JagString[] { Static52.aClass100_637, JagString.parseInt(arg0 / 1000), LocalizedText.THOUSAND, Static52.aClass100_594 });
return JagString.concatenate(new JagString[] { aClass100_637, JagString.parseInt(arg0 / 1000), LocalizedText.THOUSAND, aClass100_594 });
}
}
@OriginalMember(owner = "client!bd", name = "a", descriptor = "(BI)V")
public static void method475(@OriginalArg(1) int arg0) {
@Pc(8) Inv local8 = (Inv) objectContainerCache.get((long) arg0);
if (local8 != null) {
for (@Pc(24) int local24 = 0; local24 < local8.objectIds.length; local24++) {
local8.objectIds[local24] = -1;
local8.anIntArray422[local24] = 0;
}
}
}
}

217
client/src/main/java/rt4/JagString.java
View file

@ -21,7 +21,27 @@ 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!na", name = "T", descriptor = "[B")
@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!li", name = "w", descriptor = "Lclient!sc;")
public static HashTable aClass133_13;
@OriginalMember(owner = "client!na", name = "T", descriptor = "[B")
public byte[] chars;
@OriginalMember(owner = "client!na", name = "lb", descriptor = "I")
@ -201,26 +221,26 @@ public final class JagString implements StringInterface {
@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(Static127.PERCENT_SIGN) == -1) {
if (arg1.indexOf(PERCENT_SIGN) == -1) {
return arg1;
}
while (true) {
@Pc(14) int local14 = arg1.indexOf(Static127.aClass100_133);
@Pc(14) int local14 = arg1.indexOf(aClass100_133);
if (local14 == -1) {
while (true) {
local14 = arg1.indexOf(Static127.aClass100_1097);
local14 = arg1.indexOf(aClass100_1097);
if (local14 == -1) {
while (true) {
local14 = arg1.indexOf(Static127.aClass100_761);
local14 = arg1.indexOf(aClass100_761);
if (local14 == -1) {
while (true) {
local14 = arg1.indexOf(Static127.aClass100_520);
local14 = arg1.indexOf(aClass100_520);
if (local14 == -1) {
while (true) {
local14 = arg1.indexOf(Static127.aClass100_1002);
local14 = arg1.indexOf(aClass100_1002);
if (local14 == -1) {
while (true) {
local14 = arg1.indexOf(Static127.aClass100_591);
local14 = arg1.indexOf(aClass100_591);
if (local14 == -1) {
return arg1;
}
@ -235,22 +255,177 @@ public final class JagString implements StringInterface {
arg1 = concatenate(new JagString[] { arg1.substring(local14, 0), local246, arg1.substring(local14 + 4) });
}
}
arg1 = concatenate(new JagString[] { arg1.substring(local14, 0), StringUtils.method4510(Static127.method3212(4, arg0)), arg1.substring(local14 + 2) });
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(Static127.method3212(3, 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(Static127.method3212(2, 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(Static127.method3212(1, 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(Static127.method3212(0, 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 (Static182.aBooleanArray97[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();
str.length = 1;
str.chars = new byte[1];
str.chars[0] = -96; // 0xA0 - NBSP
return str;
}
@OriginalMember(owner = "client!sj", name = "a", descriptor = "(Ljava/lang/String;I)Lclient!na;")
public static JagString method3952(@OriginalArg(0) String arg0) {
@Pc(14) byte[] local14 = arg0.getBytes(StandardCharsets.ISO_8859_1);
@Pc(23) JagString local23 = new JagString();
local23.chars = local14;
local23.length = 0;
for (@Pc(31) int local31 = 0; local31 < local14.length; local31++) {
if (local14[local31] != 0) {
local14[local23.length++] = local14[local31];
}
}
return local23;
}
@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));
@ -527,10 +702,10 @@ public final class JagString implements StringInterface {
} else {
local17--;
}
if (Static266.anIntArray471[local12] < Static266.anIntArray471[local14]) {
if (anIntArray471[local12] < anIntArray471[local14]) {
return -1;
}
if (Static266.anIntArray471[local14] < Static266.anIntArray471[local12]) {
if (anIntArray471[local14] < anIntArray471[local12]) {
return 1;
}
}
@ -918,10 +1093,10 @@ public final class JagString implements StringInterface {
@Pc(19) Class local19 = JagString.class;
synchronized (local19) {
@Pc(30) StringNode local30;
if (Static148.aClass133_13 == null) {
Static148.aClass133_13 = new HashTable(4096);
if (aClass133_13 == null) {
aClass133_13 = new HashTable(4096);
} else {
for (local30 = (StringNode) Static148.aClass133_13.get(local9); local30 != null; local30 = (StringNode) Static148.aClass133_13.nextWithKey()) {
for (local30 = (StringNode) aClass133_13.get(local9); local30 != null; local30 = (StringNode) aClass133_13.nextWithKey()) {
if (this.strEquals(local30.value)) {
return local30.value;
}
@ -930,7 +1105,7 @@ public final class JagString implements StringInterface {
local30 = new StringNode();
local30.value = this;
this.aBoolean193 = false;
Static148.aClass133_13.put(local30, local9);
aClass133_13.put(local30, local9);
return this;
}
}
@ -959,7 +1134,7 @@ public final class JagString implements StringInterface {
public final JagString fromParameters(@OriginalArg(1) Applet arg0) {
@Pc(19) String local19 = new String(this.chars, 0, this.length);
@Pc(23) String local23 = arg0.getParameter(local19);
return local23 == null ? null : Static230.method3952(local23);
return local23 == null ? null : method3952(local23);
}
@OriginalMember(owner = "client!na", name = "d", descriptor = "(Z)I")
@ -1024,7 +1199,7 @@ public final class JagString implements StringInterface {
@OriginalMember(owner = "client!na", name = "k", descriptor = "(I)Lclient!na;")
public final JagString method3159() {
@Pc(9) JagString local9 = Base37.decode37(this.encode37());
return local9 == null ? Static228.aClass100_967 : local9;
return local9 == null ? aClass100_967 : local9;
}
@OriginalMember(owner = "client!na", name = "a", descriptor = "(Z[BIII)I")

22
client/src/main/java/rt4/Static101.java → client/src/main/java/rt4/LangUtils.java
View file

@ -4,10 +4,8 @@ import org.openrs2.deob.annotation.OriginalArg;
import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc;
public final class Static101 {
public final class LangUtils {
@OriginalMember(owner = "client!hm", name = "T", descriptor = "Lclient!na;")
public static final JagString aClass100_538 = JagString.parse(" ");
@OriginalMember(owner = "client!mc", name = "fb", descriptor = "Lclient!na;")
private static final JagString LANG_PT = JagString.parse("pt");
@OriginalMember(owner = "client!mc", name = "mb", descriptor = "Lclient!na;")
@ -19,10 +17,7 @@ public final class Static101 {
@OriginalMember(owner = "client!mc", name = "ob", descriptor = "[Lclient!na;")
public static final JagString[] LANGUAGES = new JagString[] {LANG_EN, LANG_DE, LANG_FR, LANG_PT};
@OriginalMember(owner = "client!hm", name = "ab", descriptor = "I")
public static int anInt2640 = 0;
@OriginalMember(owner = "client!hm", name = "a", descriptor = "(Lclient!na;B)I")
@OriginalMember(owner = "client!hm", name = "a", descriptor = "(Lclient!na;B)I")
public static int method2053(@OriginalArg(0) JagString arg0) {
for (@Pc(12) int local12 = 0; local12 < LANGUAGES.length; local12++) {
if (LANGUAGES[local12].equalsIgnoreCase(arg0)) {
@ -32,17 +27,4 @@ public final class Static101 {
return -1;
}
@OriginalMember(owner = "client!hm", name = "a", descriptor = "(IIIII)V")
public static void method2054(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3) {
@Pc(8) int local8;
if (arg0 <= arg2) {
for (local8 = arg0; local8 < arg2; local8++) {
Static71.anIntArrayArray10[local8][arg1] = arg3;
}
} else {
for (local8 = arg2; local8 < arg0; local8++) {
Static71.anIntArrayArray10[local8][arg1] = arg3;
}
}
}
}

18
client/src/main/java/rt4/Light.java
View file

@ -100,7 +100,23 @@ public final class Light {
@OriginalMember(owner = "client!gk", name = "b", descriptor = "(B)V")
public static void method1771() {
anIntArray150 = Static206.method3679(0.4F);
anIntArray150 = method3679(0.4F);
}
@OriginalMember(owner = "client!qk", name = "a", descriptor = "(ZIIIIFII)[I")
public static int[] method3679(@OriginalArg(5) float arg0) {
@Pc(11) int[] local11 = new int[2048];
@Pc(15) TextureOp4 local15 = new TextureOp4();
local15.anInt646 = 8;
local15.anInt642 = 4;
local15.anInt650 = 35;
local15.anInt641 = 8;
local15.anInt648 = (int) (arg0 * 4096.0F);
local15.aBoolean44 = true;
local15.method4630();
Static10.method348(1, 2048);
local15.method584(0, local11);
return local11;
}
@OriginalMember(owner = "client!gi", name = "a", descriptor = "(BIIII)V")

38
client/src/main/java/rt4/LightingManager.java
View file

@ -12,6 +12,16 @@ public class LightingManager {
public static int lightCount = 0;
@OriginalMember(owner = "client!jf", name = "a", descriptor = "[Lclient!gi;")
public static Light[] lights;
@OriginalMember(owner = "client!rh", name = "d", descriptor = "I")
public static int anInt4866;
@OriginalMember(owner = "client!aa", name = "m", descriptor = "I")
public static int anInt15;
@OriginalMember(owner = "client!gf", name = "M", descriptor = "I")
public static int anInt4698;
@OriginalMember(owner = "client!ch", name = "w", descriptor = "I")
public static int anInt987;
@OriginalMember(owner = "client!id", name = "b", descriptor = "I")
public static int anInt2875 = -1;
@OriginalMember(owner = "client!jf", name = "c", descriptor = "[I")
private static int[] anIntArray283;
@OriginalMember(owner = "client!jf", name = "d", descriptor = "I")
@ -377,22 +387,22 @@ public class LightingManager {
@Pc(76) int local76 = 0;
@Pc(84) int local84 = (local63.anInt2245 >> 7) - local63.anInt2236;
@Pc(92) int local92 = (local63.anInt2245 >> 7) + local63.anInt2236;
if (local92 >= Static215.anInt4866) {
local92 = Static215.anInt4866 - 1;
if (local92 >= anInt4866) {
local92 = anInt4866 - 1;
}
if (local84 < Static80.anInt4698) {
local76 = Static80.anInt4698 - local84;
local84 = Static80.anInt4698;
if (local84 < anInt4698) {
local76 = anInt4698 - local84;
local84 = anInt4698;
}
for (@Pc(112) int local112 = local84; local112 <= local92; local112++) {
@Pc(121) short local121 = local63.aShortArray30[local76++];
@Pc(133) int local133 = (local63.anInt2240 >> 7) + (local121 >> 8) - local63.anInt2236;
@Pc(141) int local141 = local133 + (local121 & 0xFF) - 1;
if (local133 < Static31.anInt987) {
local133 = Static31.anInt987;
if (local133 < anInt987) {
local133 = anInt987;
}
if (local141 >= Static2.anInt15) {
local141 = Static2.anInt15 - 1;
if (local141 >= anInt15) {
local141 = anInt15 - 1;
}
for (@Pc(155) int local155 = local133; local155 <= local141; local155++) {
@Pc(160) Tile local160 = null;
@ -445,4 +455,14 @@ public class LightingManager {
}
}
}
@OriginalMember(owner = "client!ch", name = "c", descriptor = "(I)V")
public static void method846() {
if (!SceneGraph.allLevelsAreVisible() && LoginManager.centralPlane != Player.level) {
LoginManager.method2463(Player.level, LoginManager.centralZoneZ, LoginManager.centralZoneX, PlayerList.self.movementQueueZ[0], false, PlayerList.self.movementQueueX[0]);
} else if (Player.level != anInt2875 && MiniMap.renderMap(Player.level)) {
anInt2875 = Player.level;
ScriptRunner.method2218();
}
}
}

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

@ -87,9 +87,9 @@ public final class LiquidMaterialRenderer implements MaterialRenderer {
local5.glCallList(this.anInt4831);
local5.glActiveTexture(GL2.GL_TEXTURE1);
local5.glMatrixMode(GL2.GL_TEXTURE);
local5.glTranslatef((float) Static253.anInt406, (float) Static253.anInt4675, (float) Static253.anInt5158);
local5.glRotatef(-((float) Static253.anInt1815 * 360.0F) / 2048.0F, 0.0F, 1.0F, 0.0F);
local5.glRotatef(-((float) Static253.anInt5559 * 360.0F) / 2048.0F, 1.0F, 0.0F, 0.0F);
local5.glTranslatef((float) MaterialManager.anInt406, (float) MaterialManager.anInt4675, (float) MaterialManager.anInt5158);
local5.glRotatef(-((float) MaterialManager.anInt1815 * 360.0F) / 2048.0F, 0.0F, 1.0F, 0.0F);
local5.glRotatef(-((float) MaterialManager.anInt5559 * 360.0F) / 2048.0F, 1.0F, 0.0F, 0.0F);
local5.glRotatef(-180.0F, 1.0F, 0.0F, 0.0F);
local5.glMatrixMode(GL2.GL_MODELVIEW);
if (!Static151.allows3DTextureMapping) {

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

@ -186,7 +186,7 @@ public final class Loc extends Entity {
local158 = SceneGraph.tileHeights[arg7 + 1];
}
@Pc(215) Loc_Class139 local215 = arg0.method3428(arg2, local80, local120, arg4, local148, local158, false, null, true, local88);
Static242.method4207(local215.aClass36_Sub1_3, local80 - arg3, local122, local88 - arg1);
ShadowManager.method4207(local215.aClass36_Sub1_3, local80 - arg3, local122, local88 - arg1);
}
@OriginalMember(owner = "client!dc", name = "a", descriptor = "(IIIII)V")
@ -211,7 +211,7 @@ public final class Loc extends Entity {
@OriginalMember(owner = "client!dc", name = "c", descriptor = "(I)V")
public final void method1046() {
if (this.aClass36_Sub1_2 != null) {
Static242.method4207(this.aClass36_Sub1_2, this.anInt1296, this.anInt1294, this.anInt1319);
ShadowManager.method4207(this.aClass36_Sub1_2, this.anInt1296, this.anInt1294, this.anInt1319);
}
this.anInt1321 = -1;
this.anInt1322 = -1;
@ -338,7 +338,7 @@ public final class Loc extends Entity {
local314 = SceneGraph.tileHeights[this.anInt1303 + 1];
}
if (GlRenderer.enabled && local256) {
Static242.method4207(this.aClass36_Sub1_2, this.anInt1296, this.anInt1294, this.anInt1319);
ShadowManager.method4207(this.aClass36_Sub1_2, this.anInt1296, this.anInt1294, this.anInt1319);
}
@Pc(356) boolean local356 = this.aClass36_Sub1_2 == null;
@Pc(389) Loc_Class139 local389;
@ -360,11 +360,11 @@ public final class Loc extends Entity {
local429 = local293 - (local439[local178][local192] + local439[local185][local192] + local439[local185][local201] + local439[local178][local201] >> 2);
}
@Pc(471) SoftwareIndexedSprite local471 = local389.aClass36_Sub1_3;
if (this.aBoolean81 && Static242.method4209(local471, local302, local429, local311)) {
if (this.aBoolean81 && ShadowManager.method4209(local471, local302, local429, local311)) {
this.aBoolean81 = false;
}
if (!this.aBoolean81) {
Static242.method4211(local471, local302, local429, local311);
ShadowManager.method4211(local471, local302, local429, local311);
this.aClass36_Sub1_2 = local471;
this.anInt1319 = local311;
if (local356) {

476
client/src/main/java/rt4/LoginManager.java
View file

@ -26,6 +26,10 @@ public class LoginManager {
public static final JagString aClass100_772 = JagString.parse("um");
@OriginalMember(owner = "client!gm", name = "W", descriptor = "Lclient!na;")
public static final JagString UNDERSCORE = JagString.parse("_");
@OriginalMember(owner = "client!hk", name = "W", descriptor = "Lclient!ih;")
public static final LinkedList aClass69_64 = new LinkedList();
@OriginalMember(owner = "client!gd", name = "h", descriptor = "[I")
public static final int[] anIntArray204 = new int[] { 16, 32, 64, 128 };
@OriginalMember(owner = "client!rl", name = "X", descriptor = "I")
public static int anInt4937 = 0;
@OriginalMember(owner = "client!sd", name = "X", descriptor = "Z")
@ -104,6 +108,10 @@ public class LoginManager {
public static int mapFlagX = 0;
@OriginalMember(owner = "client!gk", name = "h", descriptor = "I")
public static int mapFlagZ = 0;
@OriginalMember(owner = "client!qf", name = "M", descriptor = "I")
public static int anInt1862 = 0;
@OriginalMember(owner = "client!sj", name = "u", descriptor = "Z")
public static boolean dynamicMapRegion = false;
@OriginalMember(owner = "client!dm", name = "d", descriptor = "(I)V")
public static void clear() {
@ -613,13 +621,13 @@ public class LoginManager {
MidiPlayer.jingle = false;
MusicPlayer.groupId = -1;
AreaSoundManager.clear(true);
Static230.dynamicMapRegion = false;
dynamicMapRegion = false;
Camera.originZ = 0;
centralZoneX = 0;
centralZoneZ = 0;
Camera.originX = 0;
for (local19 = 0; local19 < Static143.hintMapMarkers.length; local19++) {
Static143.hintMapMarkers[local19] = null;
for (local19 = 0; local19 < MiniMap.hintMapMarkers.length; local19++) {
MiniMap.hintMapMarkers[local19] = null;
}
PlayerList.size = 0;
NpcList.size = 0;
@ -770,8 +778,8 @@ public class LoginManager {
if (GlRenderer.enabled && arg4 && (Math.abs(local86) > 104 || Math.abs(local81) > 104)) {
Static103.setInstantFade();
}
Static107.anInt2875 = -1;
Static99.aClass69_64.clear();
LightingManager.anInt2875 = -1;
aClass69_64.clear();
Static217.aClass69_116.clear();
}
@ -788,7 +796,7 @@ public class LoginManager {
Player.rebootTimer = 0;
Protocol.opcode4 = -1;
Protocol.inboundBuffer.offset = 0;
Static201.anInt1862 = 0;
anInt1862 = 0;
Protocol.opcode = -1;
@Pc(35) int local35;
for (local35 = 0; local35 < PlayerList.players.length; local35++) {
@ -809,4 +817,460 @@ public class LoginManager {
}
ClientProt.method1373();
}
@OriginalMember(owner = "client!ca", name = "a", descriptor = "(ZI)V")
public static void method743(@OriginalArg(0) boolean arg0) {
@Pc(13) int local13 = mapFilesBuffer.length;
@Pc(19) byte[][] local19;
if (GlRenderer.enabled && arg0) {
local19 = underWaterLocationsMapFilesBuffer;
} else {
local19 = locationMapFilesBuffer;
}
for (@Pc(25) int local25 = 0; local25 < local13; local25++) {
@Pc(32) byte[] local32 = local19[local25];
if (local32 != null) {
@Pc(45) int local45 = (regionBitPacked[local25] >> 8) * 64 - Camera.originX;
@Pc(56) int local56 = (regionBitPacked[local25] & 0xFF) * 64 - Camera.originZ;
client.audioLoop();
method2437(local45, arg0, local32, local56, PathFinder.collisionMaps);
}
}
}
@OriginalMember(owner = "client!jk", name = "a", descriptor = "(IZ[BII[Lclient!mj;)V")
public static void method2437(@OriginalArg(0) int arg0, @OriginalArg(1) boolean arg1, @OriginalArg(2) byte[] arg2, @OriginalArg(3) int arg3, @OriginalArg(5) CollisionMap[] arg4) {
@Pc(10) Buffer local10 = new Buffer(arg2);
@Pc(12) int local12 = -1;
while (true) {
@Pc(16) int local16 = local10.gVarSmart();
if (local16 == 0) {
return;
}
local12 += local16;
@Pc(27) int local27 = 0;
while (true) {
@Pc(31) int local31 = local10.gsmarts();
if (local31 == 0) {
break;
}
local27 += local31 - 1;
@Pc(46) int local46 = local27 & 0x3F;
@Pc(50) int local50 = local27 >> 12;
@Pc(56) int local56 = local27 >> 6 & 0x3F;
@Pc(60) int local60 = local10.g1();
@Pc(64) int local64 = local60 >> 2;
@Pc(68) int local68 = local60 & 0x3;
@Pc(72) int local72 = arg0 + local56;
@Pc(76) int local76 = local46 + arg3;
if (local72 > 0 && local76 > 0 && local72 < 103 && local76 < 103) {
@Pc(90) CollisionMap local90 = null;
if (!arg1) {
@Pc(95) int local95 = local50;
if ((SceneGraph.tileFlags[1][local72][local76] & 0x2) == 2) {
local95 = local50 - 1;
}
if (local95 >= 0) {
local90 = arg4[local95];
}
}
method3397(local50, !arg1, local50, arg1, local90, local12, local64, local72, local76, local68);
}
}
}
}
@OriginalMember(owner = "client!p", name = "a", descriptor = "(IZIZLclient!mj;IIIBII)V")
public static void method3397(@OriginalArg(0) int arg0, @OriginalArg(1) boolean arg1, @OriginalArg(2) int arg2, @OriginalArg(3) boolean arg3, @OriginalArg(4) CollisionMap arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7, @OriginalArg(9) int arg8, @OriginalArg(10) int arg9) {
if (arg1 && !SceneGraph.allLevelsAreVisible() && (SceneGraph.tileFlags[0][arg7][arg8] & 0x2) == 0) {
if ((SceneGraph.tileFlags[arg2][arg7][arg8] & 0x10) != 0) {
return;
}
if (Static4.method22(arg8, arg7, arg2) != centralPlane) {
return;
}
}
if (arg2 < SceneGraph.firstVisibleLevel) {
SceneGraph.firstVisibleLevel = arg2;
}
@Pc(62) LocType local62 = LocTypeList.get(arg5);
if (GlRenderer.enabled && local62.aBoolean216) {
return;
}
@Pc(84) int local84;
@Pc(81) int local81;
if (arg9 == 1 || arg9 == 3) {
local81 = local62.width;
local84 = local62.length;
} else {
local84 = local62.width;
local81 = local62.length;
}
@Pc(103) int local103;
@Pc(112) int local112;
if (arg7 + local84 <= 104) {
local103 = arg7 + (local84 >> 1);
local112 = arg7 + (local84 + 1 >> 1);
} else {
local112 = arg7 + 1;
local103 = arg7;
}
@Pc(129) int local129;
@Pc(133) int local133;
if (local81 + arg8 > 104) {
local129 = arg8;
local133 = arg8 + 1;
} else {
local129 = (local81 >> 1) + arg8;
local133 = arg8 + (local81 + 1 >> 1);
}
@Pc(153) int[][] local153 = SceneGraph.tileHeights[arg0];
@Pc(165) int local165 = (local84 << 6) + (arg7 << 7);
@Pc(173) int local173 = (local81 << 6) + (arg8 << 7);
@Pc(199) int local199 = local153[local103][local133] + local153[local112][local129] + local153[local103][local129] + local153[local112][local133] >> 2;
@Pc(201) int local201 = 0;
@Pc(213) int[][] local213;
if (GlRenderer.enabled && arg0 != 0) {
local213 = SceneGraph.tileHeights[0];
local201 = local199 - (local213[local112][local133] + local213[local112][local129] + local213[local103][local129] + local213[local103][local133] >> 2);
}
local213 = null;
@Pc(261) long local261 = (long) (arg7 | 0x40000000 | arg8 << 7 | arg6 << 14 | arg9 << 20);
if (arg3) {
local213 = SceneGraph.surfaceTileHeights[0];
} else if (arg0 < 3) {
local213 = SceneGraph.tileHeights[arg0 + 1];
}
if (local62.anInt4429 == 0 || arg3) {
local261 |= Long.MIN_VALUE;
}
if (local62.anInt4438 == 1) {
local261 |= 0x400000L;
}
if (local62.aBoolean213) {
local261 |= 0x80000000L;
}
if (local62.hasAreaSound()) {
AreaSoundManager.add(arg8, local62, arg9, null, arg7, arg2, null);
}
@Pc(330) boolean local330 = local62.aBoolean212 & !arg3;
local261 |= (long) arg5 << 32;
@Pc(387) Entity local387;
@Pc(403) Loc_Class139 local403;
if (arg6 == 22) {
if (Preferences.showGroundDecorations || local62.anInt4429 != 0 || local62.anInt4435 == 1 || local62.aBoolean206) {
if (local62.anInt4430 == -1 && local62.multiLocs == null && !local62.aBoolean214) {
local403 = local62.method3428(arg9, local165, local153, 22, local199, local213, arg1, null, local330, local173);
if (GlRenderer.enabled && local330) {
ShadowManager.method4211(local403.aClass36_Sub1_3, local165, local201, local173);
}
local387 = local403.aClass8_10;
} else {
local387 = new Loc(arg5, 22, arg9, arg0, arg7, arg8, local62.anInt4430, local62.aBoolean209, null);
}
SceneGraph.setGroundDecor(arg2, arg7, arg8, local199, local387, local261, local62.aBoolean211);
if (local62.anInt4435 == 1 && arg4 != null) {
arg4.flagGroundDecor(arg7, arg8);
}
}
} else if (arg6 == 10 || arg6 == 11) {
if (local62.anInt4430 == -1 && local62.multiLocs == null && !local62.aBoolean214) {
local403 = local62.method3428(arg6 == 11 ? arg9 + 4 : arg9, local165, local153, 10, local199, local213, arg1, null, local330, local173);
if (GlRenderer.enabled && local330) {
ShadowManager.method4211(local403.aClass36_Sub1_3, local165, local201, local173);
}
local387 = local403.aClass8_10;
} else {
local387 = new Loc(arg5, 10, arg6 == 11 ? arg9 + 4 : arg9, arg0, arg7, arg8, local62.anInt4430, local62.aBoolean209, null);
}
if (local387 != null) {
@Pc(531) boolean local531 = Static5.method35(arg2, arg7, arg8, local199, local84, local81, local387, local261);
if (local62.aBoolean215 && local531 && arg1) {
@Pc(541) int local541 = 15;
if (local387 instanceof Model) {
local541 = ((Model) local387).method4566() / 4;
if (local541 > 30) {
local541 = 30;
}
}
for (@Pc(560) int local560 = 0; local560 <= local84; local560++) {
for (@Pc(565) int local565 = 0; local565 <= local81; local565++) {
if (SceneGraph.aByteArrayArrayArray9[arg2][arg7 + local560][local565 + arg8] < local541) {
SceneGraph.aByteArrayArrayArray9[arg2][arg7 + local560][arg8 + local565] = (byte) local541;
}
}
}
}
}
if (local62.anInt4435 != 0 && arg4 != null) {
arg4.flagScenery(arg7, local62.aBoolean207, arg8, local84, local81);
}
} else if (arg6 >= 12) {
if (local62.anInt4430 == -1 && local62.multiLocs == null && !local62.aBoolean214) {
local403 = local62.method3428(arg9, local165, local153, arg6, local199, local213, arg1, null, local330, local173);
if (GlRenderer.enabled && local330) {
ShadowManager.method4211(local403.aClass36_Sub1_3, local165, local201, local173);
}
local387 = local403.aClass8_10;
} else {
local387 = new Loc(arg5, arg6, arg9, arg0, arg7, arg8, local62.anInt4430, local62.aBoolean209, null);
}
Static5.method35(arg2, arg7, arg8, local199, 1, 1, local387, local261);
if (arg1 && arg6 >= 12 && arg6 <= 17 && arg6 != 13 && arg2 > 0) {
SceneGraph.anIntArrayArrayArray6[arg2][arg7][arg8] |= 0x4;
}
if (local62.anInt4435 != 0 && arg4 != null) {
arg4.flagScenery(arg7, local62.aBoolean207, arg8, local84, local81);
}
} else if (arg6 == 0) {
if (local62.anInt4430 == -1 && local62.multiLocs == null && !local62.aBoolean214) {
local403 = local62.method3428(arg9, local165, local153, 0, local199, local213, arg1, null, local330, local173);
if (GlRenderer.enabled && local330) {
ShadowManager.method4211(local403.aClass36_Sub1_3, local165, local201, local173);
}
local387 = local403.aClass8_10;
} else {
local387 = new Loc(arg5, 0, arg9, arg0, arg7, arg8, local62.anInt4430, local62.aBoolean209, null);
}
SceneGraph.setWall(arg2, arg7, arg8, local199, local387, null, Static267.anIntArray517[arg9], 0, local261);
if (arg1) {
if (arg9 == 0) {
if (local62.aBoolean215) {
SceneGraph.aByteArrayArrayArray9[arg2][arg7][arg8] = 50;
SceneGraph.aByteArrayArrayArray9[arg2][arg7][arg8 + 1] = 50;
}
if (local62.aBoolean220) {
SceneGraph.anIntArrayArrayArray6[arg2][arg7][arg8] |= 0x1;
}
} else if (arg9 == 1) {
if (local62.aBoolean215) {
SceneGraph.aByteArrayArrayArray9[arg2][arg7][arg8 + 1] = 50;
SceneGraph.aByteArrayArrayArray9[arg2][arg7 + 1][arg8 + 1] = 50;
}
if (local62.aBoolean220) {
SceneGraph.anIntArrayArrayArray6[arg2][arg7][arg8 + 1] |= 0x2;
}
} else if (arg9 == 2) {
if (local62.aBoolean215) {
SceneGraph.aByteArrayArrayArray9[arg2][arg7 + 1][arg8] = 50;
SceneGraph.aByteArrayArrayArray9[arg2][arg7 + 1][arg8 + 1] = 50;
}
if (local62.aBoolean220) {
SceneGraph.anIntArrayArrayArray6[arg2][arg7 + 1][arg8] |= 0x1;
}
} else if (arg9 == 3) {
if (local62.aBoolean215) {
SceneGraph.aByteArrayArrayArray9[arg2][arg7][arg8] = 50;
SceneGraph.aByteArrayArrayArray9[arg2][arg7 + 1][arg8] = 50;
}
if (local62.aBoolean220) {
SceneGraph.anIntArrayArrayArray6[arg2][arg7][arg8] |= 0x2;
}
}
}
if (local62.anInt4435 != 0 && arg4 != null) {
arg4.flagWall(arg9, arg6, local62.aBoolean207, arg8, arg7);
}
if (local62.wallDecorOffsetScale != 16) {
Static18.method559(arg2, arg7, arg8, local62.wallDecorOffsetScale);
}
} else if (arg6 == 1) {
if (local62.anInt4430 == -1 && local62.multiLocs == null && !local62.aBoolean214) {
local403 = local62.method3428(arg9, local165, local153, 1, local199, local213, arg1, null, local330, local173);
if (GlRenderer.enabled && local330) {
ShadowManager.method4211(local403.aClass36_Sub1_3, local165, local201, local173);
}
local387 = local403.aClass8_10;
} else {
local387 = new Loc(arg5, 1, arg9, arg0, arg7, arg8, local62.anInt4430, local62.aBoolean209, null);
}
SceneGraph.setWall(arg2, arg7, arg8, local199, local387, null, anIntArray204[arg9], 0, local261);
if (local62.aBoolean215 && arg1) {
if (arg9 == 0) {
SceneGraph.aByteArrayArrayArray9[arg2][arg7][arg8 + 1] = 50;
} else if (arg9 == 1) {
SceneGraph.aByteArrayArrayArray9[arg2][arg7 + 1][arg8 + 1] = 50;
} else if (arg9 == 2) {
SceneGraph.aByteArrayArrayArray9[arg2][arg7 + 1][arg8] = 50;
} else if (arg9 == 3) {
SceneGraph.aByteArrayArrayArray9[arg2][arg7][arg8] = 50;
}
}
if (local62.anInt4435 != 0 && arg4 != null) {
arg4.flagWall(arg9, arg6, local62.aBoolean207, arg8, arg7);
}
} else {
@Pc(1226) int local1226;
if (arg6 == 2) {
local1226 = arg9 + 1 & 0x3;
@Pc(1269) Entity local1269;
@Pc(1254) Entity local1254;
if (local62.anInt4430 == -1 && local62.multiLocs == null && !local62.aBoolean214) {
@Pc(1287) Loc_Class139 local1287 = local62.method3428(arg9 + 4, local165, local153, 2, local199, local213, arg1, null, local330, local173);
if (GlRenderer.enabled && local330) {
ShadowManager.method4211(local1287.aClass36_Sub1_3, local165, local201, local173);
}
local1254 = local1287.aClass8_10;
local1287 = local62.method3428(local1226, local165, local153, 2, local199, local213, arg1, null, local330, local173);
if (GlRenderer.enabled && local330) {
ShadowManager.method4211(local1287.aClass36_Sub1_3, local165, local201, local173);
}
local1269 = local1287.aClass8_10;
} else {
local1254 = new Loc(arg5, 2, arg9 + 4, arg0, arg7, arg8, local62.anInt4430, local62.aBoolean209, null);
local1269 = new Loc(arg5, 2, local1226, arg0, arg7, arg8, local62.anInt4430, local62.aBoolean209, null);
}
SceneGraph.setWall(arg2, arg7, arg8, local199, local1254, local1269, Static267.anIntArray517[arg9], Static267.anIntArray517[local1226], local261);
if (local62.aBoolean220 && arg1) {
if (arg9 == 0) {
SceneGraph.anIntArrayArrayArray6[arg2][arg7][arg8] |= 0x1;
SceneGraph.anIntArrayArrayArray6[arg2][arg7][arg8 + 1] |= 0x2;
} else if (arg9 == 1) {
SceneGraph.anIntArrayArrayArray6[arg2][arg7][arg8 + 1] |= 0x2;
SceneGraph.anIntArrayArrayArray6[arg2][arg7 + 1][arg8] |= 0x1;
} else if (arg9 == 2) {
SceneGraph.anIntArrayArrayArray6[arg2][arg7 + 1][arg8] |= 0x1;
SceneGraph.anIntArrayArrayArray6[arg2][arg7][arg8] |= 0x2;
} else if (arg9 == 3) {
SceneGraph.anIntArrayArrayArray6[arg2][arg7][arg8] |= 0x2;
SceneGraph.anIntArrayArrayArray6[arg2][arg7][arg8] |= 0x1;
}
}
if (local62.anInt4435 != 0 && arg4 != null) {
arg4.flagWall(arg9, arg6, local62.aBoolean207, arg8, arg7);
}
if (local62.wallDecorOffsetScale != 16) {
Static18.method559(arg2, arg7, arg8, local62.wallDecorOffsetScale);
}
} else if (arg6 == 3) {
if (local62.anInt4430 == -1 && local62.multiLocs == null && !local62.aBoolean214) {
local403 = local62.method3428(arg9, local165, local153, 3, local199, local213, arg1, null, local330, local173);
if (GlRenderer.enabled && local330) {
ShadowManager.method4211(local403.aClass36_Sub1_3, local165, local201, local173);
}
local387 = local403.aClass8_10;
} else {
local387 = new Loc(arg5, 3, arg9, arg0, arg7, arg8, local62.anInt4430, local62.aBoolean209, null);
}
SceneGraph.setWall(arg2, arg7, arg8, local199, local387, null, anIntArray204[arg9], 0, local261);
if (local62.aBoolean215 && arg1) {
if (arg9 == 0) {
SceneGraph.aByteArrayArrayArray9[arg2][arg7][arg8 + 1] = 50;
} else if (arg9 == 1) {
SceneGraph.aByteArrayArrayArray9[arg2][arg7 + 1][arg8 + 1] = 50;
} else if (arg9 == 2) {
SceneGraph.aByteArrayArrayArray9[arg2][arg7 + 1][arg8] = 50;
} else if (arg9 == 3) {
SceneGraph.aByteArrayArrayArray9[arg2][arg7][arg8] = 50;
}
}
if (local62.anInt4435 != 0 && arg4 != null) {
arg4.flagWall(arg9, arg6, local62.aBoolean207, arg8, arg7);
}
} else if (arg6 == 9) {
if (local62.anInt4430 == -1 && local62.multiLocs == null && !local62.aBoolean214) {
local403 = local62.method3428(arg9, local165, local153, arg6, local199, local213, arg1, null, local330, local173);
if (GlRenderer.enabled && local330) {
ShadowManager.method4211(local403.aClass36_Sub1_3, local165, local201, local173);
}
local387 = local403.aClass8_10;
} else {
local387 = new Loc(arg5, arg6, arg9, arg0, arg7, arg8, local62.anInt4430, local62.aBoolean209, null);
}
Static5.method35(arg2, arg7, arg8, local199, 1, 1, local387, local261);
if (local62.anInt4435 != 0 && arg4 != null) {
arg4.flagScenery(arg7, local62.aBoolean207, arg8, local84, local81);
}
if (local62.wallDecorOffsetScale != 16) {
Static18.method559(arg2, arg7, arg8, local62.wallDecorOffsetScale);
}
} else if (arg6 == 4) {
if (local62.anInt4430 == -1 && local62.multiLocs == null && !local62.aBoolean214) {
local403 = local62.method3428(arg9, local165, local153, 4, local199, local213, arg1, null, local330, local173);
if (GlRenderer.enabled && local330) {
ShadowManager.method4211(local403.aClass36_Sub1_3, local165, local201, local173);
}
local387 = local403.aClass8_10;
} else {
local387 = new Loc(arg5, 4, arg9, arg0, arg7, arg8, local62.anInt4430, local62.aBoolean209, null);
}
Static185.method1880(arg2, arg7, arg8, local199, local387, null, Static267.anIntArray517[arg9], 0, 0, 0, local261);
} else {
@Pc(1889) long local1889;
@Pc(1934) Entity local1934;
@Pc(1950) Loc_Class139 local1950;
if (arg6 == 5) {
local1226 = 16;
local1889 = SceneGraph.getWallKey(arg2, arg7, arg8);
if (local1889 != 0L) {
local1226 = LocTypeList.get(Integer.MAX_VALUE & (int) (local1889 >>> 32)).wallDecorOffsetScale;
}
if (local62.anInt4430 == -1 && local62.multiLocs == null && !local62.aBoolean214) {
local1950 = local62.method3428(arg9, local165, local153, 4, local199, local213, arg1, null, local330, local173);
if (GlRenderer.enabled && local330) {
ShadowManager.method4211(local1950.aClass36_Sub1_3, local165 - Static34.anIntArray80[arg9] * 8, local201, local173 - SceneGraph.anIntArray469[arg9] * 8);
}
local1934 = local1950.aClass8_10;
} else {
local1934 = new Loc(arg5, 4, arg9, arg0, arg7, arg8, local62.anInt4430, local62.aBoolean209, null);
}
Static185.method1880(arg2, arg7, arg8, local199, local1934, null, Static267.anIntArray517[arg9], 0, local1226 * Static34.anIntArray80[arg9], SceneGraph.anIntArray469[arg9] * local1226, local261);
} else if (arg6 == 6) {
local1226 = 8;
local1889 = SceneGraph.getWallKey(arg2, arg7, arg8);
if (local1889 != 0L) {
local1226 = LocTypeList.get(Integer.MAX_VALUE & (int) (local1889 >>> 32)).wallDecorOffsetScale / 2;
}
if (local62.anInt4430 == -1 && local62.multiLocs == null && !local62.aBoolean214) {
local1950 = local62.method3428(arg9 + 4, local165, local153, 4, local199, local213, arg1, null, local330, local173);
if (GlRenderer.enabled && local330) {
ShadowManager.method4211(local1950.aClass36_Sub1_3, local165 - Static114.anIntArray565[arg9] * 8, local201, local173 - SceneGraph.anIntArray154[arg9] * 8);
}
local1934 = local1950.aClass8_10;
} else {
local1934 = new Loc(arg5, 4, arg9 + 4, arg0, arg7, arg8, local62.anInt4430, local62.aBoolean209, null);
}
Static185.method1880(arg2, arg7, arg8, local199, local1934, null, 256, arg9, local1226 * Static114.anIntArray565[arg9], local1226 * SceneGraph.anIntArray154[arg9], local261);
} else if (arg6 == 7) {
@Pc(2137) int local2137 = arg9 + 2 & 0x3;
if (local62.anInt4430 == -1 && local62.multiLocs == null && !local62.aBoolean214) {
@Pc(2183) Loc_Class139 local2183 = local62.method3428(local2137 + 4, local165, local153, 4, local199, local213, arg1, null, local330, local173);
if (GlRenderer.enabled && local330) {
ShadowManager.method4211(local2183.aClass36_Sub1_3, local165, local201, local173);
}
local387 = local2183.aClass8_10;
} else {
local387 = new Loc(arg5, 4, local2137 + 4, arg0, arg7, arg8, local62.anInt4430, local62.aBoolean209, null);
}
Static185.method1880(arg2, arg7, arg8, local199, local387, null, 256, local2137, 0, 0, local261);
} else if (arg6 == 8) {
local1226 = 8;
local1889 = SceneGraph.getWallKey(arg2, arg7, arg8);
if (local1889 != 0L) {
local1226 = LocTypeList.get(Integer.MAX_VALUE & (int) (local1889 >>> 32)).wallDecorOffsetScale / 2;
}
@Pc(2244) int local2244 = arg9 + 2 & 0x3;
@Pc(2289) Entity local2289;
if (local62.anInt4430 == -1 && local62.multiLocs == null && !local62.aBoolean214) {
@Pc(2297) int local2297 = SceneGraph.anIntArray154[arg9] * 8;
@Pc(2303) int local2303 = Static114.anIntArray565[arg9] * 8;
@Pc(2319) Loc_Class139 local2319 = local62.method3428(arg9 + 4, local165, local153, 4, local199, local213, arg1, null, local330, local173);
if (GlRenderer.enabled && local330) {
ShadowManager.method4211(local2319.aClass36_Sub1_3, local165 - local2303, local201, local173 - local2297);
}
local1934 = local2319.aClass8_10;
local2319 = local62.method3428(local2244 + 4, local165, local153, 4, local199, local213, arg1, null, local330, local173);
if (GlRenderer.enabled && local330) {
ShadowManager.method4211(local2319.aClass36_Sub1_3, local165 - local2303, local201, local173 - local2297);
}
local2289 = local2319.aClass8_10;
} else {
local1934 = new Loc(arg5, 4, arg9 + 4, arg0, arg7, arg8, local62.anInt4430, local62.aBoolean209, null);
local2289 = new Loc(arg5, 4, local2244 + 4, arg0, arg7, arg8, local62.anInt4430, local62.aBoolean209, null);
}
Static185.method1880(arg2, arg7, arg8, local199, local1934, local2289, 256, arg9, local1226 * Static114.anIntArray565[arg9], SceneGraph.anIntArray154[arg9] * local1226, local261);
}
}
}
}
}

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

@ -7,6 +7,8 @@ import org.openrs2.deob.annotation.Pc;
public class MapList {
@OriginalMember(owner = "client!sh", name = "a", descriptor = "Lclient!ih;")
public static final LinkedList aClass69_120 = new LinkedList();
@OriginalMember(owner = "client!ed", name = "D", descriptor = "Lclient!na;")
public static final JagString aClass100_374 = JagString.parse("details");
@OriginalMember(owner = "client!je", name = "W", descriptor = "Lclient!ve;")
public static Js5 archive;
@OriginalMember(owner = "client!th", name = "p", descriptor = "[Lclient!mm;")
@ -20,7 +22,7 @@ public class MapList {
sprites = arg0;
aBooleanArray130 = new boolean[sprites.length];
aClass69_120.clear();
@Pc(25) int local25 = archive.getGroupId(Static54.aClass100_374);
@Pc(25) int local25 = archive.getGroupId(aClass100_374);
@Pc(30) int[] local30 = archive.getFileIds(local25);
for (@Pc(32) int local32 = 0; local32 < local30.length; local32++) {
aClass69_120.addTail(Map.create(new Buffer(archive.fetchFile(local25, local30[local32]))));

19
client/src/main/java/rt4/MaterialManager.java
View file

@ -15,6 +15,16 @@ public class MaterialManager {
public static MaterialRenderer[] renderers;
@OriginalMember(owner = "client!mh", name = "eb", descriptor = "I")
public static int currentArg = 0;
@OriginalMember(owner = "client!sj", name = "D", descriptor = "I")
public static int anInt5158;
@OriginalMember(owner = "client!ej", name = "X", descriptor = "I")
public static int anInt1815;
@OriginalMember(owner = "client!uj", name = "H", descriptor = "I")
public static int anInt5559;
@OriginalMember(owner = "client!bb", name = "M", descriptor = "I")
public static int anInt406;
@OriginalMember(owner = "client!qc", name = "cb", descriptor = "I")
public static int anInt4675;
@OriginalMember(owner = "client!cb", name = "b", descriptor = "(III)V")
public static void setMaterial(@OriginalArg(1) int arg, @OriginalArg(2) int type) {
@ -72,4 +82,13 @@ public class MaterialManager {
renderers[5] = new WaterfallMaterialRenderer();
renderers[6] = new UnlitMaterialRenderer();
}
@OriginalMember(owner = "client!ld", name = "a", descriptor = "(IIIIZI)V")
public static void method2731(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(5) int arg4) {
anInt5158 = arg1;
anInt1815 = arg4;
anInt5559 = arg0;
anInt406 = arg3;
anInt4675 = arg2;
}
}

9
client/src/main/java/rt4/MidiPlayer.java
View file

@ -155,4 +155,13 @@ public class MidiPlayer {
state = 1;
songArchive = null;
}
@OriginalMember(owner = "client!sj", name = "c", descriptor = "(II)V")
public static void method3956(@OriginalArg(0) int arg0) {
if (state == 0) {
stream.setVolume(arg0);
} else {
volume = arg0;
}
}
}

58
client/src/main/java/rt4/MiniMap.java
View file

@ -15,6 +15,10 @@ public class MiniMap {
public static final int[] locX = new int[1000];
@OriginalMember(owner = "client!he", name = "eb", descriptor = "[I")
public static final int[] locZ = new int[1000];
@OriginalMember(owner = "client!ld", name = "b", descriptor = "[Lclient!nc;")
public static final MapMarker[] hintMapMarkers = new MapMarker[4];
@OriginalMember(owner = "client!ld", name = "d", descriptor = "Lclient!na;")
public static final JagString aClass100_668 = JagString.parse("Hidden)2use");
@OriginalMember(owner = "client!ef", name = "j", descriptor = "Lclient!mm;")
public static SoftwareSprite softwareSprite;
@OriginalMember(owner = "client!ha", name = "i", descriptor = "Lclient!qf;")
@ -33,6 +37,12 @@ public class MiniMap {
public static int anInt4262 = 1;
@OriginalMember(owner = "client!gi", name = "H", descriptor = "I")
public static int anInt2252 = 0;
@OriginalMember(owner = "client!nf", name = "i", descriptor = "I")
public static int anInt4075 = -1;
@OriginalMember(owner = "client!se", name = "h", descriptor = "I")
public static int anInt5073 = -1;
@OriginalMember(owner = "client!sd", name = "R", descriptor = "I")
public static int anInt5062;
@OriginalMember(owner = "client!ma", name = "a", descriptor = "([IIIIII)V")
public static void renderTile(@OriginalArg(0) int[] pixels, @OriginalArg(1) int index, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4) {
@ -356,7 +366,7 @@ public class MiniMap {
}
}
}
@Pc(756) MapMarker[] local756 = Static143.hintMapMarkers;
@Pc(756) MapMarker[] local756 = hintMapMarkers;
for (local181 = 0; local181 < local756.length; local181++) {
@Pc(770) MapMarker local770 = local756[local181];
if (local770 != null && local770.type != 0 && client.loop % 20 < 10) {
@ -365,20 +375,20 @@ public class MiniMap {
if (local804 != null) {
local231 = local804.xFine / 32 - PlayerList.self.xFine / 32;
local200 = local804.zFine / 32 - PlayerList.self.zFine / 32;
Static97.method1960(local770.anInt4048, arg1, arg2, local231, local200, arg3);
method1960(local770.anInt4048, arg1, arg2, local231, local200, arg3);
}
}
if (local770.type == 2) {
local154 = (local770.targetX - Camera.originX) * 4 + 2 - PlayerList.self.xFine / 32;
local231 = (-Camera.originZ + local770.anInt4046) * 4 + 2 - PlayerList.self.zFine / 32;
Static97.method1960(local770.anInt4048, arg1, arg2, local154, local231, arg3);
method1960(local770.anInt4048, arg1, arg2, local154, local231, arg3);
}
if (local770.type == 10 && local770.actorTargetId >= 0 && PlayerList.players.length > local770.actorTargetId) {
@Pc(905) Player local905 = PlayerList.players[local770.actorTargetId];
if (local905 != null) {
local200 = local905.zFine / 32 - PlayerList.self.zFine / 32;
local231 = local905.xFine / 32 - PlayerList.self.xFine / 32;
Static97.method1960(local770.anInt4048, arg1, arg2, local231, local200, arg3);
method1960(local770.anInt4048, arg1, arg2, local231, local200, arg3);
}
}
}
@ -427,4 +437,44 @@ public class MiniMap {
((SoftwareSprite) arg1).method312(arg0.width / 2 + arg5 + local81 - arg1.anInt1860 / 2, -(arg1.anInt1866 / 2) + arg0.height / 2 + arg4 + -local92, arg0.anIntArray37, arg0.anIntArray45);
}
}
@OriginalMember(owner = "client!hi", name = "a", descriptor = "(IIIIILclient!be;Z)V")
public static void method1960(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) Component arg5) {
@Pc(13) int local13 = arg3 * arg3 + arg4 * arg4;
if (local13 > 360000) {
return;
}
@Pc(30) int local30 = Math.min(arg5.width / 2, arg5.height / 2);
if (local30 * local30 >= local13) {
method1446(arg5, Sprites.mapmarkhints[arg0], arg4, arg3, arg1, arg2);
return;
}
local30 -= 10;
@Pc(58) int local58 = anInt1814 + (int)Camera.yawTarget & 0x7FF;
@Pc(62) int local62 = MathUtils.cos[local58];
@Pc(66) int local66 = MathUtils.sin[local58];
@Pc(74) int local74 = local66 * 256 / (anInt4130 + 256);
@Pc(82) int local82 = local62 * 256 / (anInt4130 + 256);
@Pc(93) int local93 = arg4 * local74 + local82 * arg3 >> 16;
@Pc(104) int local104 = arg4 * local82 - local74 * arg3 >> 16;
@Pc(110) double local110 = Math.atan2((double) local93, (double) local104);
@Pc(117) int local117 = (int) (Math.sin(local110) * (double) local30);
@Pc(124) int local124 = (int) (Math.cos(local110) * (double) local30);
if (GlRenderer.enabled) {
((GlSprite) Sprites.hintMapEdge[arg0]).method1428((arg5.width / 2 + arg2 + local117) * 16, (arg5.height / 2 + arg1 - local124) * 16, (int) (local110 * 10430.378D));
} else {
((SoftwareSprite) Sprites.hintMapEdge[arg0]).method306(local117 + arg5.width / 2 + arg2 - 10, arg5.height / 2 + -10 + arg1 + -local124, local110);
}
}
@OriginalMember(owner = "client!hi", name = "a", descriptor = "(Lclient!be;B)Lclient!na;")
public static JagString getTargetVerb(@OriginalArg(0) Component arg0) {
if (InterfaceList.getServerActiveProperties(arg0).getTargetMask() == 0) {
return null;
} else if (arg0.targetVerb == null || arg0.targetVerb.trim().length() == 0) {
return Static121.qaOpTest ? aClass100_668 : null;
} else {
return arg0.targetVerb;
}
}
}

87
client/src/main/java/rt4/MiniMenu.java
View file

@ -117,6 +117,10 @@ public class MiniMenu {
public static JagString walkText;
@OriginalMember(owner = "client!jl", name = "v", descriptor = "I")
public static int anInt3096 = 0;
@OriginalMember(owner = "client!aa", name = "a", descriptor = "I")
public static int anInt7 = 0;
@OriginalMember(owner = "client!cl", name = "Y", descriptor = "I")
public static int anInt1092 = -1;
@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) {
@ -125,7 +129,7 @@ public class MiniMenu {
}
@Pc(47) JagString local47;
if (component.anInt530 == 2 && !Static241.aBoolean302) {
local47 = Static97.getTargetVerb(component);
local47 = MiniMap.getTargetVerb(component);
if (local47 != null) {
add(-1, 0L, JagString.concatenate(new JagString[] {COLOR_GREEN, component.aClass100_85 }), -1, (short) 32, local47, component.id);
}
@ -139,7 +143,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 && Static39.aClass13_10 == null) {
if (component.anInt530 == 6 && Static44.aClass13_10 == null) {
add(-1, 0L, JagString.EMPTY, -1, (short) 41, component.aClass100_89, component.id);
}
@Pc(173) int local173;
@ -155,13 +159,13 @@ public class MiniMenu {
local195 += component.anIntArray41[local171];
}
if (arg1 >= local195 && local202 <= arg0 && local195 + 32 > arg1 && local202 + 32 > arg0) {
Static169.mouseOverInventoryInterface = component;
InterfaceList.mouseOverInventoryInterface = component;
Static18.clickedInventoryIndex = local171;
if (component.objTypes[local171] > 0) {
@Pc(267) ServerActiveProperties local267 = InterfaceList.getServerActiveProperties(component);
@Pc(276) ObjType local276 = ObjTypeList.get(component.objTypes[local171] - 1);
if (anInt5014 == 1 && local267.isObjOpsEnabled()) {
if (Static224.anInt5062 != component.id || Static185.anInt4370 != local171) {
if (MiniMap.anInt5062 != component.id || Static185.anInt4370 != local171) {
add(-1, (long) local276.id, JagString.concatenate(new JagString[] { aClass100_203, aClass100_947, local276.name}), local171, (short) 40, LocalizedText.USE, component.id);
}
} else if (Static241.aBoolean302 && local267.isObjOpsEnabled()) {
@ -189,7 +193,7 @@ public class MiniMenu {
}
}
if (local267.method507()) {
add(Static169.anInt4075, (long) local276.id, JagString.concatenate(new JagString[] { aClass100_32, local276.name}), local171, (short) 22, LocalizedText.USE, component.id);
add(MiniMap.anInt4075, (long) local276.id, JagString.concatenate(new JagString[] { aClass100_32, local276.name}), local171, (short) 22, LocalizedText.USE, component.id);
}
if (local267.isObjOpsEnabled() && local296 != null) {
for (local309 = 2; local309 >= 0; local309--) {
@ -235,7 +239,7 @@ public class MiniMenu {
}
}
}
add(Static225.anInt5073, (long) local276.id, JagString.concatenate(new JagString[] { aClass100_32, local276.name}), local171, (short) 1006, LocalizedText.EXAMINE, component.id);
add(MiniMap.anInt5073, (long) local276.id, JagString.concatenate(new JagString[] { aClass100_32, local276.name}), local171, (short) 1006, LocalizedText.EXAMINE, component.id);
}
}
}
@ -253,7 +257,7 @@ public class MiniMenu {
add(getOpCursor(local171, component), (long) (local171 + 1), component.optionBase, component.createdComponentId, (short) 1003, local765, component.id);
}
}
local47 = Static97.getTargetVerb(component);
local47 = MiniMap.getTargetVerb(component);
if (local47 != null) {
add(-1, 0L, component.optionBase, component.createdComponentId, (short) 32, local47, component.id);
}
@ -278,7 +282,7 @@ public class MiniMenu {
}
ops[size] = arg5;
opBases[size] = arg2;
cursors[size] = cursor == -1 ? Static35.anInt1092 : cursor;
cursors[size] = cursor == -1 ? anInt1092 : cursor;
actions[size] = arg4;
keys[size] = arg1;
intArgs1[size] = arg3;
@ -378,7 +382,7 @@ public class MiniMenu {
Protocol.outboundBuffer.p2(Static185.anInt4370);
Protocol.outboundBuffer.ip4(local19);
Protocol.outboundBuffer.ip2(local15);
Protocol.outboundBuffer.ip4(Static224.anInt5062);
Protocol.outboundBuffer.ip4(MiniMap.anInt5062);
Protocol.outboundBuffer.ip2add(anInt4997);
Protocol.outboundBuffer.ip2add(local36);
anInt2043 = 0;
@ -572,10 +576,10 @@ public class MiniMenu {
Protocol.outboundBuffer.ip2(local36);
}
}
if (local23 == 41 && Static39.aClass13_10 == null) {
if (local23 == 41 && Static44.aClass13_10 == null) {
ClientProt.method10(local15, local19);
Static39.aClass13_10 = InterfaceList.method1418(local19, local15);
InterfaceList.redraw(Static39.aClass13_10);
Static44.aClass13_10 = InterfaceList.method1418(local19, local15);
InterfaceList.redraw(Static44.aClass13_10);
}
if (local23 == 49) {
PathFinder.findPathToLoc(local31, local19, local15);
@ -599,7 +603,7 @@ public class MiniMenu {
Protocol.outboundBuffer.p2(anInt4997);
Protocol.outboundBuffer.ip2(local19 + Camera.originZ);
Protocol.outboundBuffer.p2(Static185.anInt4370);
Protocol.outboundBuffer.mp4(Static224.anInt5062);
Protocol.outboundBuffer.mp4(MiniMap.anInt5062);
Protocol.outboundBuffer.p2add((int) (local31 >>> 32) & Integer.MAX_VALUE);
}
if (local23 == 37) {
@ -659,11 +663,11 @@ public class MiniMenu {
if (local23 == 32) {
local693 = InterfaceList.method1418(local19, local15);
if (local693 != null) {
Static53.method1294();
method1294();
@Pc(1493) ServerActiveProperties local1493 = InterfaceList.getServerActiveProperties(local693);
Static247.method4246(local19, local15, local1493.getTargetMask(), local1493.anInt540, local693.anInt499, local693.anInt484);
anInt5014 = 0;
aClass100_545 = Static97.getTargetVerb(local693);
aClass100_545 = MiniMap.getTargetVerb(local693);
if (aClass100_545 == null) {
aClass100_545 = aClass100_1042;
}
@ -771,7 +775,7 @@ public class MiniMenu {
Cross.y = Mouse.clickY;
Cross.x = Mouse.clickX;
Protocol.outboundBuffer.p1isaac(115);
Protocol.outboundBuffer.mp4(Static224.anInt5062);
Protocol.outboundBuffer.mp4(MiniMap.anInt5062);
Protocol.outboundBuffer.ip2(Static185.anInt4370);
Protocol.outboundBuffer.ip2(local36);
Protocol.outboundBuffer.ip2add(anInt4997);
@ -802,7 +806,7 @@ public class MiniMenu {
Protocol.outboundBuffer.ip2(anInt4997);
Protocol.outboundBuffer.ip2(local36);
Protocol.outboundBuffer.ip2add(Camera.originZ + local19);
Protocol.outboundBuffer.mp4(Static224.anInt5062);
Protocol.outboundBuffer.mp4(MiniMap.anInt5062);
}
if (local23 == 1004) {
Cross.milliseconds = 0;
@ -847,7 +851,7 @@ public class MiniMenu {
Protocol.outboundBuffer.ip2add(local36);
Protocol.outboundBuffer.p2(anInt4997);
Protocol.outboundBuffer.p2(Static185.anInt4370);
Protocol.outboundBuffer.mp4(Static224.anInt5062);
Protocol.outboundBuffer.mp4(MiniMap.anInt5062);
}
}
if (local23 == 7) {
@ -907,9 +911,9 @@ public class MiniMenu {
}
}
if (local23 == 22) {
Static53.method1294();
method1294();
local693 = InterfaceList.getComponent(local19);
Static224.anInt5062 = local19;
MiniMap.anInt5062 = local19;
Static185.anInt4370 = local15;
anInt5014 = 1;
anInt4997 = local36;
@ -982,7 +986,7 @@ public class MiniMenu {
}
if (local23 == 36) {
if (local36 == 0) {
Static187.anInt4422 = 1;
Protocol.anInt4422 = 1;
method3556(Player.level, local15, local19);
} else if (LoginManager.staffModLevel > 0 && Keyboard.pressedKeys[Keyboard.KEY_CTRL] && Keyboard.pressedKeys[Keyboard.KEY_SHIFT]) {
Cheat.teleport(local15 + Camera.originX, Camera.originZ - -local19, Player.level);
@ -1036,10 +1040,10 @@ public class MiniMenu {
}
if (anInt5014 != 0) {
anInt5014 = 0;
InterfaceList.redraw(InterfaceList.getComponent(Static224.anInt5062));
InterfaceList.redraw(InterfaceList.getComponent(MiniMap.anInt5062));
}
if (Static241.aBoolean302) {
Static53.method1294();
method1294();
}
if (pressedInventoryComponent != null && anInt2043 == 0) {
InterfaceList.redraw(pressedInventoryComponent);
@ -1082,7 +1086,7 @@ public class MiniMenu {
if (Static241.aBoolean302 && (anInt4999 & 0x40) != 0) {
@Pc(61) Component local61 = InterfaceList.method1418(anInt2512, anInt506);
if (local61 == null) {
Static53.method1294();
method1294();
} else {
add(anInt5393, 0L, aClass100_961, local33, (short) 11, aClass100_545, x);
}
@ -1094,7 +1098,7 @@ public class MiniMenu {
}
}
@Pc(112) long local112 = -1L;
for (local15 = 0; local15 < Static2.anInt7; local15++) {
for (local15 = 0; local15 < anInt7; local15++) {
@Pc(121) long local121 = Model.aLongArray11[local15];
x = (int) local121 & 0x7F;
@Pc(133) int local133 = (int) local121 >> 29 & 0x3;
@ -1112,7 +1116,7 @@ public class MiniMenu {
continue;
}
if (anInt5014 == 1) {
add(Static169.anInt4075, local121, JagString.concatenate(new JagString[] {aClass100_203, aClass100_164, local172.name}), x, (short) 14, LocalizedText.USE, z);
add(MiniMap.anInt4075, local121, JagString.concatenate(new JagString[] {aClass100_203, aClass100_164, local172.name}), x, (short) 14, LocalizedText.USE, z);
} else if (Static241.aBoolean302) {
@Pc(363) ParamType local363 = Static121.anInt3039 == -1 ? null : ParamTypeList.get(Static121.anInt3039);
if ((anInt4999 & 0x4) != 0 && (local363 == null || local172.getParam(local363.defaultInt, Static121.anInt3039) != local363.defaultInt)) {
@ -1153,7 +1157,7 @@ public class MiniMenu {
}
}
}
add(Static225.anInt5073, (long) local172.id, JagString.concatenate(new JagString[] { aClass100_1008, local172.name}), x, (short) 1004, LocalizedText.EXAMINE, z);
add(MiniMap.anInt5073, (long) local172.id, JagString.concatenate(new JagString[] { aClass100_1008, local172.name}), x, (short) 1004, LocalizedText.EXAMINE, z);
}
}
@Pc(514) int local514;
@ -1217,7 +1221,7 @@ public class MiniMenu {
local240 = node.value.type;
@Pc(951) ObjType local951 = ObjTypeList.get(local240);
if (anInt5014 == 1) {
add(Static169.anInt4075, (long) local240, JagString.concatenate(new JagString[] { aClass100_203, aClass100_947, local951.name }), x, (short) 33, LocalizedText.USE, z);
add(MiniMap.anInt4075, (long) local240, JagString.concatenate(new JagString[] { aClass100_203, aClass100_947, local951.name }), x, (short) 33, LocalizedText.USE, z);
} else if (Static241.aBoolean302) {
@Pc(1142) ParamType local1142 = Static121.anInt3039 == -1 ? null : ParamTypeList.get(Static121.anInt3039);
if ((anInt4999 & 0x1) != 0 && (local1142 == null || local951.getParam(local1142.defaultInt, Static121.anInt3039) != local1142.defaultInt)) {
@ -1256,7 +1260,7 @@ public class MiniMenu {
add(local1041, (long) local240, JagString.concatenate(new JagString[] { aClass100_32, local951.name}), x, local1025, local997[local514], z);
}
}
add(Static225.anInt5073, (long) local240, JagString.concatenate(new JagString[] { aClass100_32, local951.name}), x, (short) 1002, LocalizedText.EXAMINE, z);
add(MiniMap.anInt5073, (long) local240, JagString.concatenate(new JagString[] { aClass100_32, local951.name}), x, (short) 1002, LocalizedText.EXAMINE, z);
}
}
}
@ -1312,7 +1316,7 @@ public class MiniMenu {
local35 = JagString.concatenate(new JagString[] { local35, getCombatLevelColor(arg0.combatLevel, PlayerList.self.combatLevel), OPEN_PARENTHESIS, local47, JagString.parseInt(arg0.combatLevel), CLOSE_PARENTHESIS});
}
if (anInt5014 == 1) {
add(Static169.anInt4075, (long) arg2, JagString.concatenate(new JagString[] {aClass100_203, aClass100_407, local35 }), arg1, (short) 26, LocalizedText.USE, arg3);
add(MiniMap.anInt4075, (long) arg2, JagString.concatenate(new JagString[] {aClass100_203, aClass100_407, local35 }), arg1, (short) 26, LocalizedText.USE, arg3);
} else if (Static241.aBoolean302) {
@Pc(378) ParamType local378 = Static121.anInt3039 == -1 ? null : ParamTypeList.get(Static121.anInt3039);
if ((anInt4999 & 0x2) != 0 && (local378 == null || arg0.getParam(Static121.anInt3039, local378.defaultInt) != local378.defaultInt)) {
@ -1384,7 +1388,7 @@ public class MiniMenu {
}
}
}
add(Static225.anInt5073, (long) arg2, JagString.concatenate(new JagString[] {aClass100_965, local35 }), arg1, (short) 1007, LocalizedText.EXAMINE, arg3);
add(MiniMap.anInt5073, (long) arg2, JagString.concatenate(new JagString[] {aClass100_965, local35 }), arg1, (short) 1007, LocalizedText.EXAMINE, arg3);
}
}
@ -1419,7 +1423,7 @@ public class MiniMenu {
}
@Pc(275) int local275;
if (anInt5014 == 1) {
add(Static169.anInt4075, (long) arg0, JagString.concatenate(new JagString[] {aClass100_203, aClass100_561, string }), arg3, (short) 1, LocalizedText.USE, arg1);
add(MiniMap.anInt4075, (long) arg0, JagString.concatenate(new JagString[] {aClass100_203, aClass100_561, string }), arg3, (short) 1, LocalizedText.USE, arg1);
} else if (!Static241.aBoolean302) {
for (local275 = 7; local275 >= 0; local275--) {
if (Player.options[local275] != null) {
@ -1490,10 +1494,27 @@ public class MiniMenu {
@OriginalMember(owner = "client!ud", name = "a", descriptor = "(ILclient!be;)Z")
public static boolean method4265(@OriginalArg(1) Component arg0) {
if (arg0.clientCode == 205) {
Static267.anInt5775 = 250;
Protocol.anInt5775 = 250;
return true;
} else {
return false;
}
}
@OriginalMember(owner = "client!ec", name = "a", descriptor = "(B)V")
public static void method1294() {
if (!Static241.aBoolean302) {
return;
}
@Pc(19) Component local19 = InterfaceList.method1418(anInt2512, anInt506);
if (local19 != null && local19.onUseWith != null) {
@Pc(29) HookRequest local29 = new HookRequest();
local29.arguments = local19.onUseWith;
local29.source = local19;
ScriptRunner.run(local29);
}
Static241.aBoolean302 = false;
anInt1092 = -1;
InterfaceList.redraw(local19);
}
}

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

@ -50,6 +50,8 @@ public final class Mouse implements MouseListener, MouseMotionListener, FocusLis
public static volatile int anInt4973 = 0;
@OriginalMember(owner = "client!wi", name = "W", descriptor = "I")
public static int anInt5850 = 0;
@OriginalMember(owner = "client!ok", name = "f", descriptor = "J")
public static long prevClickTime = 0L;
public int mouseWheelX;
public int mouseWheelY;

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

@ -90,14 +90,14 @@ public final class Npc extends PathingEntity {
model.translate(0, -this.spotAnimY, 0);
if (spotAnimType.aBoolean100) {
if (Static101.anInt2640 != 0) {
model.rotateX(Static101.anInt2640);
if (PathingEntity.anInt2640 != 0) {
model.rotateX(PathingEntity.anInt2640);
}
if (PathingEntity.anInt2680 != 0) {
model.rotateZ(PathingEntity.anInt2680);
}
if (Static62.anInt1938 != 0) {
model.translate(0, Static62.anInt1938, 0);
if (PathingEntity.anInt1938 != 0) {
model.translate(0, PathingEntity.anInt1938, 0);
}
}
}

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

@ -76,8 +76,10 @@ public final class NpcType {
@OriginalMember(owner = "client!me", name = "r", descriptor = "S")
public short aShort23 = 0;
@OriginalMember(owner = "client!vk", name = "d", descriptor = "Lclient!na;")
public static final JagString aClass100_1010 = JagString.parse("null");
@OriginalMember(owner = "client!me", name = "L", descriptor = "Lclient!na;")
public JagString name = Static266.aClass100_1010;
public JagString name = aClass100_1010;
@OriginalMember(owner = "client!me", name = "x", descriptor = "I")
public int combatLevel = -1;

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

@ -59,8 +59,10 @@ public final class ObjType {
@OriginalMember(owner = "client!h", name = "T", descriptor = "I")
public int team = 0;
@OriginalMember(owner = "client!gd", name = "b", descriptor = "Lclient!na;")
public static final JagString aClass100_464 = JagString.parse("null");
@OriginalMember(owner = "client!h", name = "E", descriptor = "Lclient!na;")
public JagString name = Static78.aClass100_464;
public JagString name = aClass100_464;
@OriginalMember(owner = "client!h", name = "J", descriptor = "I")
private int manWearZOff = 0;

29
client/src/main/java/rt4/ParticleSystem.java
View file

@ -1,7 +1,11 @@
package rt4;
import com.jogamp.opengl.GL2;
import org.openrs2.deob.annotation.OriginalClass;
import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc;
import java.nio.FloatBuffer;
@OriginalClass("client!ga")
public final class ParticleSystem extends ParticleNode {
@ -11,7 +15,30 @@ public final class ParticleSystem extends ParticleNode {
new Buffer(131056);
}
@OriginalMember(owner = "client!ga", name = "d", descriptor = "()V")
@OriginalMember(owner = "client!ga", name = "a", descriptor = "()V")
public static void load() {
@Pc(1) GL2 gl = GlRenderer.gl;
if (gl.isExtensionAvailable("GL_ARB_point_parameters")) {
@Pc(20) float[] coefficients = new float[] { 1.0F, 0.0F, 5.0E-4F };
gl.glPointParameterfv(GL2.GL_POINT_DISTANCE_ATTENUATION, coefficients, 0);
@Pc(28) FloatBuffer buffer = FloatBuffer.allocate(1);
gl.glGetFloatv(GL2.GL_POINT_SIZE_MAX, buffer);
@Pc(36) float pointSizeMax = buffer.get(0);
if (pointSizeMax > 1024.0F) {
pointSizeMax = 1024.0F;
}
gl.glPointParameterf(GL2.GL_POINT_SIZE_MIN, 1.0F);
gl.glPointParameterf(GL2.GL_POINT_SIZE_MAX, pointSizeMax);
}
if (gl.isExtensionAvailable("GL_ARB_point_sprite")) {
}
}
@OriginalMember(owner = "client!ga", name = "b", descriptor = "()V")
public static void quit() {
}
@OriginalMember(owner = "client!ga", name = "d", descriptor = "()V")
public final void method1646() {
}
}

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

@ -14,6 +14,10 @@ public abstract class PathingEntity extends Entity {
public static final BasType aClass20_1 = new BasType();
@OriginalMember(owner = "client!hn", name = "Y", descriptor = "I")
public static int anInt2680 = 0;
@OriginalMember(owner = "client!hm", name = "ab", descriptor = "I")
public static int anInt2640 = 0;
@OriginalMember(owner = "client!f", name = "V", descriptor = "I")
public static int anInt1938 = 0;
@OriginalMember(owner = "client!fe", name = "A", descriptor = "I")
public int spotAnimStart;
@ -357,8 +361,8 @@ public abstract class PathingEntity extends Entity {
@OriginalMember(owner = "client!fe", name = "a", descriptor = "(BLclient!ak;I)V")
protected final void method2685(@OriginalArg(1) Model arg0, @OriginalArg(2) int arg1) {
anInt2680 = 0;
Static101.anInt2640 = 0;
Static62.anInt1938 = 0;
anInt2640 = 0;
anInt1938 = 0;
@Pc(21) BasType local21 = this.getBasType();
@Pc(24) int local24 = local21.anInt1059;
@Pc(27) int local27 = local21.anInt1050;
@ -391,21 +395,21 @@ public abstract class PathingEntity extends Entity {
@Pc(231) int local231 = local224 > local201 ? local201 : local224;
@Pc(238) int local238 = local224 > local134 ? local134 : local224;
@Pc(245) int local245 = local201 <= local87 ? local201 : local87;
Static101.anInt2640 = (int) (Math.atan2((double) (local212 - local231), (double) local27) * 325.95D) & 0x7FF;
if (Static101.anInt2640 != 0) {
arg0.rotateX(Static101.anInt2640);
anInt2640 = (int) (Math.atan2((double) (local212 - local231), (double) local27) * 325.95D) & 0x7FF;
if (anInt2640 != 0) {
arg0.rotateX(anInt2640);
}
anInt2680 = (int) (Math.atan2((double) (local245 - local238), (double) local24) * 325.95D) & 0x7FF;
if (anInt2680 != 0) {
arg0.rotateZ(anInt2680);
}
Static62.anInt1938 = local224 + local87;
if (local201 + local134 < Static62.anInt1938) {
Static62.anInt1938 = local201 + local134;
anInt1938 = local224 + local87;
if (local201 + local134 < anInt1938) {
anInt1938 = local201 + local134;
}
Static62.anInt1938 = (Static62.anInt1938 >> 1) - this.anInt3424;
if (Static62.anInt1938 != 0) {
arg0.translate(0, Static62.anInt1938, 0);
anInt1938 = (anInt1938 >> 1) - this.anInt3424;
if (anInt1938 != 0) {
arg0.translate(0, anInt1938, 0);
}
}

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

@ -36,6 +36,8 @@ public final class Player extends PathingEntity {
public static PrivilegedRequest lastLogAddress;
@OriginalMember(owner = "client!ib", name = "l", descriptor = "I")
public static int anInt2863 = 0;
@OriginalMember(owner = "client!ea", name = "r", descriptor = "[[B")
public static byte[][] aByteArrayArray8;
@OriginalMember(owner = "client!e", name = "Bc", descriptor = "Lclient!hh;")
public PlayerAppearance appearance;
@ -195,6 +197,101 @@ public final class Player extends PathingEntity {
}
}
@OriginalMember(owner = "client!rg", name = "a", descriptor = "(Lclient!e;I)V")
public static void method4359(@OriginalArg(0) Player arg0) {
@Pc(12) AreaSound local12 = (AreaSound) AreaSoundManager.playerSounds.get(arg0.username.encode37());
if (local12 == null) {
AreaSoundManager.add(arg0.movementQueueZ[0], null, 0, null, arg0.movementQueueX[0], level, arg0);
} else {
local12.update();
}
}
@OriginalMember(owner = "client!bf", name = "c", descriptor = "(I)V")
public static void method501() {
if (!GlRenderer.enabled || Static231.aBoolean252) {
return;
}
@Pc(14) Tile[][][] local14 = SceneGraph.tiles;
for (@Pc(22) int local22 = 0; local22 < local14.length; local22++) {
@Pc(30) Tile[][] local30 = local14[local22];
for (@Pc(32) int local32 = 0; local32 < local30.length; local32++) {
for (@Pc(42) int local42 = 0; local42 < local30[local32].length; local42++) {
@Pc(54) Tile local54 = local30[local32][local42];
if (local54 != null) {
@Pc(71) GlModel local71;
if (local54.groundDecor != null && local54.groundDecor.entity instanceof GlModel) {
local71 = (GlModel) local54.groundDecor.entity;
if ((local54.groundDecor.key & Long.MIN_VALUE) == 0L) {
local71.method4111(false, true, true, false, true, true);
} else {
local71.method4111(true, true, true, true, true, true);
}
}
if (local54.wallDecor != null) {
if (local54.wallDecor.primary instanceof GlModel) {
local71 = (GlModel) local54.wallDecor.primary;
if ((local54.wallDecor.key & Long.MIN_VALUE) == 0L) {
local71.method4111(false, true, true, false, true, true);
} else {
local71.method4111(true, true, true, true, true, true);
}
}
if (local54.wallDecor.secondary instanceof GlModel) {
local71 = (GlModel) local54.wallDecor.secondary;
if ((Long.MIN_VALUE & local54.wallDecor.key) == 0L) {
local71.method4111(false, true, true, false, true, true);
} else {
local71.method4111(true, true, true, true, true, true);
}
}
}
if (local54.wall != null) {
if (local54.wall.primary instanceof GlModel) {
local71 = (GlModel) local54.wall.primary;
if ((local54.wall.key & Long.MIN_VALUE) == 0L) {
local71.method4111(false, true, true, false, true, true);
} else {
local71.method4111(true, true, true, true, true, true);
}
}
if (local54.wall.secondary instanceof GlModel) {
local71 = (GlModel) local54.wall.secondary;
if ((Long.MIN_VALUE & local54.wall.key) == 0L) {
local71.method4111(false, true, true, false, true, true);
} else {
local71.method4111(true, true, true, true, true, true);
}
}
}
for (@Pc(270) int local270 = 0; local270 < local54.sceneryLen; local270++) {
if (local54.scenery[local270].entity instanceof GlModel) {
@Pc(293) GlModel local293 = (GlModel) local54.scenery[local270].entity;
if ((Long.MIN_VALUE & local54.scenery[local270].key) == 0L) {
local293.method4111(false, true, true, false, true, true);
} else {
local293.method4111(true, true, true, true, true, true);
}
}
}
}
}
}
}
Static231.aBoolean252 = true;
}
@OriginalMember(owner = "client!ja", name = "a", descriptor = "(IIIIB)V")
public static void method2310(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) {
if (Cross.type == 1) {
Sprites.crosses[Cross.milliseconds / 100].render(Cross.x - 8, Cross.y + -8);
}
if (Cross.type == 2) {
Sprites.crosses[Cross.milliseconds / 100 + 4].render(Cross.x - 8, Cross.y + -8);
}
setTutorialIsland();
}
@OriginalMember(owner = "client!e", name = "c", descriptor = "(B)I")
@Override
public final int getSize() {
@ -289,7 +386,7 @@ public final class Player extends PathingEntity {
this.anInt1654 = arg0.g2();
this.anInt1670 = arg0.g2();
if (this.soundRadius != local134 || this.anInt1648 != local175 || this.anInt1658 != local309 || local312 != this.anInt1654 || this.anInt1670 != local315) {
Static214.method4359(this);
method4359(this);
}
}
if (this.appearance == null) {
@ -315,20 +412,20 @@ public final class Player extends PathingEntity {
@Pc(25) SeqType local25 = this.seqId != -1 && this.anInt3420 == 0 ? SeqTypeList.get(this.seqId) : null;
@Pc(54) SeqType local54 = this.movementSeqId == -1 || this.aBoolean98 || this.movementSeqId == this.getBasType().idleAnimationId && local25 != null ? null : SeqTypeList.get(this.movementSeqId);
@Pc(76) Model local76 = this.appearance.method1954(this.aClass147Array3, this.anInt3373, local54, local25, this.anInt3396, this.anInt3388, this.anInt3360, this.anInt3425, this.anInt3407);
@Pc(79) int local79 = Static198.method1029();
@Pc(79) int local79 = PlayerAppearance.method1029();
if (GlRenderer.enabled && GameShell.maxMemory < 96 && local79 > 50) {
Static16.method501();
method501();
}
@Pc(102) int local102;
if (client.modeWhat != 0 && local79 < 50) {
local102 = 50 - local79;
while (anInt2863 < local102) {
Static51.aByteArrayArray8[anInt2863] = new byte[102400];
aByteArrayArray8[anInt2863] = new byte[102400];
anInt2863++;
}
while (anInt2863 > local102) {
anInt2863--;
Static51.aByteArrayArray8[anInt2863] = null;
aByteArrayArray8[anInt2863] = null;
}
}
if (local76 == null) {
@ -351,8 +448,8 @@ public final class Player extends PathingEntity {
}
}
if (PlayerList.self == this) {
for (local102 = Static143.hintMapMarkers.length - 1; local102 >= 0; local102--) {
@Pc(245) MapMarker local245 = Static143.hintMapMarkers[local102];
for (local102 = MiniMap.hintMapMarkers.length - 1; local102 >= 0; local102--) {
@Pc(245) MapMarker local245 = MiniMap.hintMapMarkers[local102];
if (local245 != null && local245.playerModelId != -1) {
@Pc(291) int local291;
@Pc(302) int local302;
@ -389,14 +486,14 @@ public final class Player extends PathingEntity {
if (local184 != null) {
local184.translate(0, -this.spotAnimY, 0);
if (local471.aBoolean100) {
if (Static101.anInt2640 != 0) {
local184.rotateX(Static101.anInt2640);
if (PathingEntity.anInt2640 != 0) {
local184.rotateX(PathingEntity.anInt2640);
}
if (PathingEntity.anInt2680 != 0) {
local184.rotateZ(PathingEntity.anInt2680);
}
if (Static62.anInt1938 != 0) {
local184.translate(0, Static62.anInt1938, 0);
if (PathingEntity.anInt1938 != 0) {
local184.translate(0, PathingEntity.anInt1938, 0);
}
}
}

27
client/src/main/java/rt4/PlayerAppearance.java
View file

@ -44,6 +44,8 @@ public final class PlayerAppearance {
public static final AnimFrameset[] aClass3_Sub2_Sub7Array8 = new AnimFrameset[14];
@OriginalMember(owner = "client!vf", name = "g", descriptor = "[I")
public static final int[] anIntArray515 = new int[14];
@OriginalMember(owner = "client!kf", name = "d", descriptor = "[Lclient!cl;")
public static final AnimFrameset[] aClass3_Sub2_Sub7Array7 = new AnimFrameset[14];
@OriginalMember(owner = "client!cj", name = "e", descriptor = "[[S")
public static short[][] aShortArrayArray2;
@OriginalMember(owner = "client!nj", name = "m", descriptor = "[[S")
@ -88,6 +90,17 @@ public final class PlayerAppearance {
aClass99_21.method3103();
}
@OriginalMember(owner = "client!sj", name = "c", descriptor = "(I)V")
public static void method3947() {
aClass99_33.clear();
aClass99_21.clear();
}
@OriginalMember(owner = "client!q", name = "a", descriptor = "(B)I")
public static int method1029() {
return aClass99_33.method3100();
}
@OriginalMember(owner = "client!hh", name = "a", descriptor = "(IIIILclient!tk;III)Lclient!ak;")
public final Model method1946(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) SeqType arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6) {
@Pc(24) long local24 = (long) arg2 | (long) (arg6 << 16) | (long) arg1 << 32;
@ -388,17 +401,17 @@ public final class PlayerAppearance {
anIntArray515[local353] = local858.anIntArray474[local374];
Static73.anIntArray183[local353] = arg0[local353].anInt5404;
local979 = local858.frames[local367];
Static133.aClass3_Sub2_Sub7Array7[local353] = SeqTypeList.getAnimFrameset(local979 >>> 16);
aClass3_Sub2_Sub7Array7[local353] = SeqTypeList.getAnimFrameset(local979 >>> 16);
@Pc(991) int local991 = local979 & 0xFFFF;
anIntArray187[local353] = local991;
if (Static133.aClass3_Sub2_Sub7Array7[local353] != null) {
local836 |= Static133.aClass3_Sub2_Sub7Array7[local353].isColorTransformed(local991);
local827 |= Static133.aClass3_Sub2_Sub7Array7[local353].isAlphaTransformed(local991);
if (aClass3_Sub2_Sub7Array7[local353] != null) {
local836 |= aClass3_Sub2_Sub7Array7[local353].isColorTransformed(local991);
local827 |= aClass3_Sub2_Sub7Array7[local353].isAlphaTransformed(local991);
}
} else {
anIntArray515[local353] = 0;
Static73.anIntArray183[local353] = 0;
Static133.aClass3_Sub2_Sub7Array7[local353] = null;
aClass3_Sub2_Sub7Array7[local353] = null;
anIntArray187[local353] = -1;
}
}
@ -474,7 +487,7 @@ public final class PlayerAppearance {
local598 = 1;
while (local481 < local346) {
if (aClass3_Sub2_Sub7Array8[local481] != null) {
local1284.method4565(aClass3_Sub2_Sub7Array8[local481], Static241.anIntArray520[local481], Static133.aClass3_Sub2_Sub7Array7[local481], anIntArray187[local481], Static73.anIntArray183[local481] - 1, anIntArray515[local481], local598, aClass144Array2[local481].aBoolean278, this.anIntArrayArray19[local481]);
local1284.method4565(aClass3_Sub2_Sub7Array8[local481], Static241.anIntArray520[local481], aClass3_Sub2_Sub7Array7[local481], anIntArray187[local481], Static73.anIntArray183[local481] - 1, anIntArray515[local481], local598, aClass144Array2[local481].aBoolean278, this.anIntArrayArray19[local481]);
}
local481++;
local598 <<= 0x1;
@ -488,7 +501,7 @@ public final class PlayerAppearance {
}
for (local481 = 0; local481 < local346; local481++) {
aClass3_Sub2_Sub7Array8[local481] = null;
Static133.aClass3_Sub2_Sub7Array7[local481] = null;
aClass3_Sub2_Sub7Array7[local481] = null;
aClass144Array2[local481] = null;
}
return local1284;

17
client/src/main/java/rt4/PlayerList.java
View file

@ -1,6 +1,7 @@
package rt4;
import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc;
public class PlayerList {
@OriginalMember(owner = "client!ja", name = "l", descriptor = "[Lclient!wa;")
@ -21,4 +22,20 @@ public class PlayerList {
public static JagString[] playerNames;
@OriginalMember(owner = "client!vg", name = "a", descriptor = "[Lclient!na;")
public static JagString[] playerNames2;
@OriginalMember(owner = "client!fk", name = "b", descriptor = "(I)V")
public static void method1444() {
for (@Pc(7) int local7 = -1; local7 < size; local7++) {
@Pc(21) int local21;
if (local7 == -1) {
local21 = 2047;
} else {
local21 = ids[local7];
}
@Pc(31) Player local31 = players[local21];
if (local31 != null) {
NpcList.method4514(local31.getSize(), local31);
}
}
}
}

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

@ -28,6 +28,36 @@ public class Protocol {
public static final JagString CLAN = JagString.parse(":clan:");
@OriginalMember(owner = "client!ij", name = "a", descriptor = "Lclient!na;")
public static final JagString DUELFRIEND = JagString.parse(":duelfriend:");
@OriginalMember(owner = "client!km", name = "Sc", descriptor = "Lclient!na;")
public static final JagString TRADE = JagString.parse(":trade:");
@OriginalMember(owner = "client!pb", name = "x", descriptor = "[[[I")
public static final int[][][] anIntArrayArrayArray18 = new int[4][13][13];
@OriginalMember(owner = "client!fc", name = "f", descriptor = "Lclient!na;")
public static final JagString IMG0 = JagString.parse("<img=0>");
@OriginalMember(owner = "client!en", name = "h", descriptor = "Lclient!na;")
public static final JagString CHALREQ = JagString.parse(":chalreq:");
@OriginalMember(owner = "client!ef", name = "f", descriptor = "Lclient!na;")
public static final JagString DUELSTAKE = JagString.parse(":duelstake:");
@OriginalMember(owner = "client!wd", name = "e", descriptor = "Lclient!na;")
public static final JagString aClass100_989 = JagString.parse("cookieprefix");
@OriginalMember(owner = "client!u", name = "g", descriptor = "Lclient!na;")
public static final JagString aClass100_1029 = JagString.parse("cookiehost");
@OriginalMember(owner = "client!lc", name = "m", descriptor = "Lclient!na;")
public static final JagString aClass100_667 = JagString.parse("settings=");
@OriginalMember(owner = "client!wh", name = "n", descriptor = "Lclient!na;")
public static final JagString aClass100_1095 = JagString.parse("; version=1; path=)4; domain=");
@OriginalMember(owner = "client!tm", name = "d", descriptor = "Lclient!na;")
public static final JagString aClass100_1018 = JagString.parse("; Expires=Thu)1 01)2Jan)21970 00:00:00 GMT; Max)2Age=0");
@OriginalMember(owner = "client!vg", name = "h", descriptor = "Lclient!na;")
public static final JagString aClass100_1082 = JagString.parse("; Expires=");
@OriginalMember(owner = "client!s", name = "g", descriptor = "Lclient!na;")
public static final JagString aClass100_821 = JagString.parse("document)3cookie=(R");
@OriginalMember(owner = "client!sc", name = "f", descriptor = "Lclient!na;")
public static final JagString aClass100_946 = JagString.parse("(R");
@OriginalMember(owner = "client!fb", name = "i", descriptor = "Lclient!na;")
public static final JagString aClass100_431 = JagString.parse("; Max)2Age=");
@OriginalMember(owner = "client!ch", name = "z", descriptor = "[I")
public static final int[] anIntArray76 = new int[5];
@OriginalMember(owner = "client!jk", name = "B", descriptor = "Lclient!ma;")
public static BufferedSocket socket;
@OriginalMember(owner = "client!fl", name = "C", descriptor = "Lsignlink!im;")
@ -54,6 +84,26 @@ public class Protocol {
public static int opcode2 = 0;
@OriginalMember(owner = "client!bj", name = "r", descriptor = "I")
public static int anInt659 = 2;
@OriginalMember(owner = "client!dg", name = "h", descriptor = "Lclient!be;")
public static Component aClass13_11;
@OriginalMember(owner = "client!ld", name = "i", descriptor = "I")
public static int anInt3486 = 0;
@OriginalMember(owner = "client!kf", name = "l", descriptor = "I")
public static int anInt5235 = 0;
@OriginalMember(owner = "client!pm", name = "ab", descriptor = "Z")
public static boolean aBoolean228 = true;
@OriginalMember(owner = "client!vl", name = "k", descriptor = "I")
public static int anInt5775 = 0;
@OriginalMember(owner = "client!t", name = "l", descriptor = "Lclient!ma;")
public static BufferedSocket aClass95_4;
@OriginalMember(owner = "client!od", name = "i", descriptor = "I")
public static int anInt4247 = 0;
@OriginalMember(owner = "client!bf", name = "G", descriptor = "I")
public static int anInt551 = 0;
@OriginalMember(owner = "client!pb", name = "ab", descriptor = "I")
public static int anInt4422 = 0;
@OriginalMember(owner = "client!fe", name = "R", descriptor = "Z")
public static boolean prevFocus = true;
@OriginalMember(owner = "client!g", name = "b", descriptor = "(B)V")
public static void readLocationPacket() {
@ -121,7 +171,7 @@ public class Protocol {
local23 = local23 * 128 + 64;
local19 = local19 * 128 + 64;
@Pc(427) SpotAnim local427 = new SpotAnim(local27, Player.level, local23, local19, SceneGraph.getTileHeight(Player.level, local23, local19) - local31, local39, client.loop);
Static99.aClass69_64.addTail(new SpotAnimNode(local427));
LoginManager.aClass69_64.addTail(new SpotAnimNode(local427));
}
} else if (opcode == ServerProt.LOCATION_PACKET_179) {
int local15 = inboundBuffer.g1add();
@ -339,7 +389,7 @@ public class Protocol {
@OriginalMember(owner = "client!g", name = "a", descriptor = "(IZ)V")
public static void readRebuildPacket(@OriginalArg(1) boolean arg0) {
Static230.dynamicMapRegion = arg0;
LoginManager.dynamicMapRegion = arg0;
@Pc(13) int local13;
@Pc(20) int local20;
@Pc(26) int local26;
@ -349,7 +399,7 @@ public class Protocol {
@Pc(138) int local138;
@Pc(151) int local151;
@Pc(169) int local169;
if (!Static230.dynamicMapRegion) {
if (!LoginManager.dynamicMapRegion) {
local13 = inboundBuffer.g2add();
local20 = (length - inboundBuffer.offset) / 16;
LoginManager.regionsXteaKeys = new int[local20][4];
@ -411,9 +461,9 @@ public class Protocol {
for (local391 = 0; local391 < 13; local391++) {
local138 = inboundBuffer.gBits(1);
if (local138 == 1) {
Static187.anIntArrayArrayArray18[local60][local64][local391] = inboundBuffer.gBits(26);
anIntArrayArrayArray18[local60][local64][local391] = inboundBuffer.gBits(26);
} else {
Static187.anIntArrayArrayArray18[local60][local64][local391] = -1;
anIntArrayArrayArray18[local60][local64][local391] = -1;
}
}
}
@ -442,7 +492,7 @@ public class Protocol {
for (local391 = 0; local391 < 4; local391++) {
for (local138 = 0; local138 < 13; local138++) {
for (local151 = 0; local151 < 13; local151++) {
local169 = Static187.anIntArrayArrayArray18[local391][local138][local151];
local169 = anIntArrayArrayArray18[local391][local138][local151];
if (local169 != -1) {
@Pc(555) int local555 = local169 >> 14 & 0x3FF;
@Pc(561) int local561 = local169 >> 3 & 0x7FF;
@ -509,7 +559,7 @@ public class Protocol {
local106 = phrase.id;
message = phrase.type.decodeMessage(chatBuffer);
} else {
message = Font.escape(Static65.formatChatMessage(chatBuffer).encodeMessage());
message = Font.escape(formatChatMessage(chatBuffer).encodeMessage());
}
player.chatMessage = message.trim();
player.chatEffect = int1 & 0xFF;
@ -518,7 +568,7 @@ public class Protocol {
if (int2 == 2) {
Chat.add(local106, local35 ? 17 : 1, message, null, JagString.concatenate(new JagString[] { Static44.IMG1, player.getName() }));
} else if (int2 == 1) {
Chat.add(local106, local35 ? 17 : 1, message, null, JagString.concatenate(new JagString[] { Static65.IMG0, player.getName() }));
Chat.add(local106, local35 ? 17 : 1, message, null, JagString.concatenate(new JagString[] { IMG0, player.getName() }));
} else {
Chat.add(local106, local35 ? 17 : 2, message, null, player.getName());
}
@ -872,7 +922,7 @@ public class Protocol {
opcode4 = opcode3;
opcode3 = opcode2;
opcode2 = opcode;
Static201.anInt1862 = 0;
LoginManager.anInt1862 = 0;
if (opcode == ServerProt.VARP_SMALL) {
int id = inboundBuffer.g2add();
@ -901,7 +951,7 @@ public class Protocol {
} else if (opcode == ServerProt.MESSAGE_GAME) {
@Pc(245) JagString message = inboundBuffer.gjstr();
if (message.endsWith(TRADEREQ)) {
JagString name = message.substring(message.indexOf(Static264.COLON), 0);
JagString name = message.substring(message.indexOf(DateUtil.COLON), 0);
long name37 = name.encode37();
boolean ignored = false;
for (int i = 0; i < IgnoreList.size; i++) {
@ -913,8 +963,8 @@ public class Protocol {
if (!ignored && Player.inTutorialIsland == 0) {
Chat.add(name, 4, LocalizedText.TRADEREQ);
}
} else if (message.endsWith(Static61.CHALREQ)) {
JagString name = message.substring(message.indexOf(Static264.COLON), 0);
} else if (message.endsWith(CHALREQ)) {
JagString name = message.substring(message.indexOf(DateUtil.COLON), 0);
long name37 = name.encode37();
boolean ignored = false;
for (int i = 0; i < IgnoreList.size; i++) {
@ -924,11 +974,11 @@ public class Protocol {
}
}
if (!ignored && Player.inTutorialIsland == 0) {
JagString local506 = message.substring(message.length() - 9, message.indexOf(Static264.COLON) + 1);
JagString local506 = message.substring(message.length() - 9, message.indexOf(DateUtil.COLON) + 1);
Chat.add(name, 8, local506);
}
} else if (message.endsWith(Static191.ASSISTREQ)) {
JagString name = message.substring(message.indexOf(Static264.COLON), 0);
JagString name = message.substring(message.indexOf(DateUtil.COLON), 0);
long name37 = name.encode37();
boolean ignored = false;
for (int i = 0; i < IgnoreList.size; i++) {
@ -943,8 +993,8 @@ public class Protocol {
} else if (message.endsWith(CLAN)) {
JagString name = message.substring(message.indexOf(CLAN), 0);
Chat.add(JagString.EMPTY, 11, name);
} else if (message.endsWith(Static138.TRADE)) {
JagString name = message.substring(message.indexOf(Static138.TRADE), 0);
} else if (message.endsWith(TRADE)) {
JagString name = message.substring(message.indexOf(TRADE), 0);
if (Player.inTutorialIsland == 0) {
Chat.add(JagString.EMPTY, 12, name);
}
@ -953,8 +1003,8 @@ public class Protocol {
if (Player.inTutorialIsland == 0) {
Chat.add(JagString.EMPTY, 13, name);
}
} else if (message.endsWith(Static56.DUELSTAKE)) {
JagString name = message.substring(message.indexOf(Static264.COLON), 0);
} else if (message.endsWith(DUELSTAKE)) {
JagString name = message.substring(message.indexOf(DateUtil.COLON), 0);
long name37 = name.encode37();
boolean ignored = false;
for (int i = 0; i < IgnoreList.size; i++) {
@ -967,7 +1017,7 @@ public class Protocol {
Chat.add(name, 14, JagString.EMPTY);
}
} else if (message.endsWith(DUELFRIEND)) {
JagString name = message.substring(message.indexOf(Static264.COLON), 0);
JagString name = message.substring(message.indexOf(DateUtil.COLON), 0);
long name37 = name.encode37();
boolean ignored = false;
for (int local277 = 0; local277 < IgnoreList.size; local277++) {
@ -980,7 +1030,7 @@ public class Protocol {
Chat.add(name, 15, JagString.EMPTY);
}
} else if (message.endsWith(Static217.aClass100_916)) {
JagString name = message.substring(message.indexOf(Static264.COLON), 0);
JagString name = message.substring(message.indexOf(DateUtil.COLON), 0);
long name37 = name.encode37();
boolean ignored = false;
for (int i = 0; i < IgnoreList.size; i++) {
@ -993,7 +1043,7 @@ public class Protocol {
Chat.add(name, 16, JagString.EMPTY);
}
} else if (message.endsWith(Static164.aClass100_770)) {
JagString name = message.substring(message.indexOf(Static264.COLON), 0);
JagString name = message.substring(message.indexOf(DateUtil.COLON), 0);
long name37 = name.encode37();
boolean ignored = false;
for (int i = 0; i < IgnoreList.size; i++) {
@ -1003,7 +1053,7 @@ public class Protocol {
}
}
if (!ignored && Player.inTutorialIsland == 0) {
JagString local506 = message.substring(message.length() - 9, message.indexOf(Static264.COLON) + 1);
JagString local506 = message.substring(message.length() - 9, message.indexOf(DateUtil.COLON) + 1);
Chat.add(name, 21, local506);
}
} else {
@ -1080,7 +1130,7 @@ public class Protocol {
if (rights == 2 || rights == 3) {
Chat.add(quickchatId, 20, message, Base37.decode37(clan37).toTitleCase(), JagString.concatenate(new JagString[] { Static44.IMG1, Base37.decode37(name37).toTitleCase() }));
} else if (rights == 1) {
Chat.add(quickchatId, 20, message, Base37.decode37(clan37).toTitleCase(), JagString.concatenate(new JagString[] { Static65.IMG0, Base37.decode37(name37).toTitleCase() }));
Chat.add(quickchatId, 20, message, Base37.decode37(clan37).toTitleCase(), JagString.concatenate(new JagString[] { IMG0, Base37.decode37(name37).toTitleCase() }));
} else {
Chat.add(quickchatId, 20, message, Base37.decode37(clan37).toTitleCase(), Base37.decode37(name37).toTitleCase());
}
@ -1366,7 +1416,7 @@ public class Protocol {
posZ = posZ * 128 + 64;
posX = posX * 128 + 64;
@Pc(2241) SpotAnim spotAnim = new SpotAnim(gfxId, plane, posX, posZ, SceneGraph.getTileHeight(plane, posX, posZ) - height, delay, client.loop);
Static99.aClass69_64.addTail(new SpotAnimNode(spotAnim));
LoginManager.aClass69_64.addTail(new SpotAnimNode(spotAnim));
}
}
opcode = -1;
@ -1408,9 +1458,9 @@ public class Protocol {
if (pointer != null) {
InterfaceList.closeInterface(true, pointer);
}
if (Static39.aClass13_10 != null) {
InterfaceList.redraw(Static39.aClass13_10);
Static39.aClass13_10 = null;
if (Static44.aClass13_10 != null) {
InterfaceList.redraw(Static44.aClass13_10);
Static44.aClass13_10 = null;
}
opcode = -1;
return true;
@ -1631,7 +1681,7 @@ public class Protocol {
if (rights == 2) {
Chat.add(chatId, 18, message, null, JagString.concatenate(new JagString[] { Static44.IMG1, Base37.decode37(name).toTitleCase() }));
} else if (rights == 1) {
Chat.add(chatId, 18, message, null, JagString.concatenate(new JagString[] { Static65.IMG0, Base37.decode37(name).toTitleCase() }));
Chat.add(chatId, 18, message, null, JagString.concatenate(new JagString[] { IMG0, Base37.decode37(name).toTitleCase() }));
} else {
Chat.add(chatId, 18, message, null, Base37.decode37(name).toTitleCase());
}
@ -1662,7 +1712,7 @@ public class Protocol {
InterfaceList.method531(component, true);
}
if (InterfaceList.topLevelInterface != -1) {
Static54.runScripts(1, InterfaceList.topLevelInterface);
InterfaceList.runScripts(1, InterfaceList.topLevelInterface);
}
opcode = -1;
return true;
@ -1678,7 +1728,7 @@ public class Protocol {
Camera.cameraJitter[cameraId] = jitter;
Camera.cameraAmplitude[cameraId] = amplitude;
Camera.cameraFrequency[cameraId] = frequency;
Static31.anIntArray76[cameraId] = shake4;
anIntArray76[cameraId] = shake4;
opcode = -1;
return true;
} else if (opcode == ServerProt.IF_SETCOLOUR) {
@ -1714,7 +1764,7 @@ public class Protocol {
return true;
} else if (opcode == ServerProt.GAME_FRAME_UNK) {
if (InterfaceList.topLevelInterface != -1) {
Static54.runScripts(0, InterfaceList.topLevelInterface);
InterfaceList.runScripts(0, InterfaceList.topLevelInterface);
}
opcode = -1;
return true;
@ -1730,7 +1780,7 @@ public class Protocol {
int seqId = inboundBuffer.g2();
@Pc(3766) Npc npc = NpcList.npcs[npcId];
if (npc != null) {
Static223.animateNpc(value, seqId, npc);
animateNpc(value, seqId, npc);
}
opcode = -1;
return true;
@ -1742,7 +1792,7 @@ public class Protocol {
return true;
} else if (opcode == ServerProt.MESSAGE_PRIVATE_ECHO) {
long name37 = inboundBuffer.g8();
JagString message = Font.escape(Static65.formatChatMessage(inboundBuffer).encodeMessage());
JagString message = Font.escape(formatChatMessage(inboundBuffer).encodeMessage());
Chat.add(Base37.decode37(name37).toTitleCase(), 6, message);
opcode = -1;
return true;
@ -1754,9 +1804,9 @@ public class Protocol {
inboundBuffer.gBytesIsaac(data, length);
JagString url = JagString.decodeString(data, length, 0);
if (GameShell.frame == null && (SignLink.anInt5928 == 3 || !SignLink.osName.startsWith("win") || client.haveIe6)) {
Static169.openUrl(url, true);
ScriptRunner.openUrl(url, true);
} else {
Static175.url = url;
ScriptRunner.url = url;
Static164.newTab = true;
Static33.openUrlRequest = GameShell.signLink.openUrl(new String(url.method3148(), StandardCharsets.ISO_8859_1));
}
@ -1844,7 +1894,7 @@ public class Protocol {
if (mapMarker.playerModelId == 65535) {
mapMarker.playerModelId = -1;
}
Static143.hintMapMarkers[slot] = mapMarker;
MiniMap.hintMapMarkers[slot] = mapMarker;
}
opcode = -1;
return true;
@ -1921,11 +1971,11 @@ public class Protocol {
if (!ignored && Player.inTutorialIsland == 0) {
Chat.recentMessages[Chat.messageCounter] = messageId;
Chat.messageCounter = (Chat.messageCounter + 1) % 100;
@Pc(4518) JagString message = Font.escape(Static65.formatChatMessage(inboundBuffer).encodeMessage());
@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);
} else if (rights == 1) {
Chat.add(JagString.concatenate(new JagString[] { Static65.IMG0, Base37.decode37(name37).toTitleCase() }), 7, message);
Chat.add(JagString.concatenate(new JagString[] { IMG0, Base37.decode37(name37).toTitleCase() }), 7, message);
} else {
Chat.add(Base37.decode37(name37).toTitleCase(), 3, message);
}
@ -1967,11 +2017,11 @@ public class Protocol {
if (!ignored && Player.inTutorialIsland == 0) {
Chat.recentMessages[Chat.messageCounter] = local4626;
Chat.messageCounter = (Chat.messageCounter + 1) % 100;
JagString message = Font.escape(Static65.formatChatMessage(inboundBuffer).encodeMessage());
JagString message = Font.escape(formatChatMessage(inboundBuffer).encodeMessage());
if (rights == 2 || rights == 3) {
Static73.method1598(message, JagString.concatenate(new JagString[] { Static44.IMG1, Base37.decode37(name37).toTitleCase() }), Base37.decode37(chat37).toTitleCase());
} else if (rights == 1) {
Static73.method1598(message, JagString.concatenate(new JagString[] { Static65.IMG0, Base37.decode37(name37).toTitleCase() }), Base37.decode37(chat37).toTitleCase());
Static73.method1598(message, JagString.concatenate(new JagString[] { IMG0, Base37.decode37(name37).toTitleCase() }), Base37.decode37(chat37).toTitleCase());
} else {
Static73.method1598(message, Base37.decode37(name37).toTitleCase(), Base37.decode37(chat37).toTitleCase());
}
@ -2238,7 +2288,7 @@ public class Protocol {
component.objCounts[i] = 0;
}
}
Static14.method475(containerId);
Inv.method475(containerId);
int total = inboundBuffer.g2();
for (int slot = 0; slot < total; slot++) {
int amount = inboundBuffer.g1sub();
@ -2260,7 +2310,7 @@ public class Protocol {
opcode = -1;
return true;
} else if (opcode == ServerProt.SET_SETTINGS_STRING) {
Static230.method3954(inboundBuffer.gjstr());
method3954(inboundBuffer.gjstr());
opcode = -1;
return true;
} else if (opcode == ServerProt.UPDATE_CURRENT_LOCATION) {
@ -2298,7 +2348,7 @@ public class Protocol {
return readPacketInternal();
} catch (@Pc(14) IOException ex) {
ex.printStackTrace();
Static175.method3279();
method3279();
return true;
} catch (@Pc(19) Exception ex) {
ex.printStackTrace();
@ -2315,8 +2365,8 @@ public class Protocol {
@OriginalMember(owner = "client!gg", name = "a", descriptor = "(Z)V")
public static void method1756() {
// todo: consolidate/rename static classes
if (Static267.anInt5775 > 0) {
Static267.anInt5775--;
if (anInt5775 > 0) {
anInt5775--;
}
if (Player.rebootTimer > 1) {
Player.rebootTimer--;
@ -2324,7 +2374,7 @@ public class Protocol {
}
if (LoginManager.aBoolean247) {
LoginManager.aBoolean247 = false;
Static175.method3279();
method3279();
return;
}
for (@Pc(34) int i = 0; i < 100 && readPacket(); i++) {
@ -2419,7 +2469,7 @@ public class Protocol {
}
}
if (Mouse.clickButton != 0) {
@Pc(411) long loops = (Mouse.clickTime - Static183.prevClickTime) / 50L;
@Pc(411) long loops = (Mouse.clickTime - Mouse.prevClickTime) / 50L;
type = Mouse.clickY;
if (type < 0) {
type = 0;
@ -2430,7 +2480,7 @@ public class Protocol {
loops = 32767L;
}
i = Mouse.clickX;
Static183.prevClickTime = Mouse.clickTime;
Mouse.prevClickTime = Mouse.clickTime;
@Pc(437) byte button = 0;
if (i < 0) {
i = 0;
@ -2445,34 +2495,34 @@ public class Protocol {
outboundBuffer.ip2add(button << 15 | x);
outboundBuffer.mp4(i | type << 16);
}
if (Static16.anInt551 > 0) {
Static16.anInt551--;
if (anInt551 > 0) {
anInt551--;
}
if (Preferences.aBoolean63) {
for (i = 0; i < InterfaceList.keyQueueSize; i++) {
offset = InterfaceList.keyCodes[i];
if (offset == 98 || offset == 99 || offset == 96 || offset == 97) {
Static197.aBoolean228 = true;
aBoolean228 = true;
break;
}
}
} else if (Keyboard.pressedKeys[Keyboard.KEY_LEFT] || Keyboard.pressedKeys[Keyboard.KEY_RIGHT] || Keyboard.pressedKeys[Keyboard.KEY_UP] || Keyboard.pressedKeys[Keyboard.KEY_DOWN]) {
Static197.aBoolean228 = true;
aBoolean228 = true;
}
if (Static197.aBoolean228 && Static16.anInt551 <= 0) {
Static16.anInt551 = 20;
Static197.aBoolean228 = false;
if (aBoolean228 && anInt551 <= 0) {
anInt551 = 20;
aBoolean228 = false;
outboundBuffer.p1isaac(21);
outboundBuffer.p2add((int)Camera.pitchTarget);
outboundBuffer.ip2((int)Camera.yawTarget);
}
if (GameShell.focus && !Static67.prevFocus) {
Static67.prevFocus = true;
if (GameShell.focus && !prevFocus) {
prevFocus = true;
outboundBuffer.p1isaac(22);
outboundBuffer.p1(1);
}
if (!GameShell.focus && Static67.prevFocus) {
Static67.prevFocus = false;
if (!GameShell.focus && prevFocus) {
prevFocus = false;
outboundBuffer.p1isaac(22);
outboundBuffer.p1(0);
}
@ -2481,19 +2531,19 @@ public class Protocol {
outboundBuffer.p4(Preferences.toInt());
Preferences.sentToServer = true;
}
Static31.method846();
LightingManager.method846();
if (client.gameState != 30) {
return;
}
ChangeLocRequest.loop();
AttachLocRequest.loop();
SoundPlayer.loop();
Static201.anInt1862++;
if (Static201.anInt1862 > 750) {
Static175.method3279();
LoginManager.anInt1862++;
if (LoginManager.anInt1862 > 750) {
method3279();
return;
}
Static71.method1444();
PlayerList.method1444();
NpcList.method2274();
OverheadChat.loop();
if (WorldMap.component != null) {
@ -2625,7 +2675,7 @@ public class Protocol {
Cross.type = 0;
}
}
Static178.anInt4247++;
anInt4247++;
if (MiniMenu.pressedInventoryComponent != null) {
MiniMenu.anInt2043++;
if (MiniMenu.anInt2043 >= 15) {
@ -2635,17 +2685,17 @@ public class Protocol {
}
@Pc(1361) Component component;
if (Static118.clickedInventoryComponent != null) {
InterfaceList.redraw(Static118.clickedInventoryComponent);
if (Static149.clickedInventoryComponentX + 5 < Mouse.lastMouseX || Mouse.lastMouseX < Static149.clickedInventoryComponentX - 5 || Static206.clickedInventoryComponentY + 5 < Mouse.lastMouseY || Static206.clickedInventoryComponentY - 5 > Mouse.lastMouseY) {
if (InterfaceList.clickedInventoryComponent != null) {
InterfaceList.redraw(InterfaceList.clickedInventoryComponent);
if (InterfaceList.clickedInventoryComponentX + 5 < Mouse.lastMouseX || Mouse.lastMouseX < InterfaceList.clickedInventoryComponentX - 5 || InterfaceList.clickedInventoryComponentY + 5 < Mouse.lastMouseY || InterfaceList.clickedInventoryComponentY - 5 > Mouse.lastMouseY) {
Static123.draggingClickedInventoryObject = true;
}
Static78.clickedInventoryComponentCycle++;
InterfaceList.clickedInventoryComponentCycle++;
if (Mouse.pressedButton == 0) {
if (Static123.draggingClickedInventoryObject && Static78.clickedInventoryComponentCycle >= 5) {
if (Static118.clickedInventoryComponent == Static169.mouseOverInventoryInterface && Static4.mouseOverInventoryObjectIndex != Static18.clickedInventoryIndex) {
component = Static118.clickedInventoryComponent;
if (Static123.draggingClickedInventoryObject && InterfaceList.clickedInventoryComponentCycle >= 5) {
if (InterfaceList.clickedInventoryComponent == InterfaceList.mouseOverInventoryInterface && Static4.mouseOverInventoryObjectIndex != Static18.clickedInventoryIndex) {
component = InterfaceList.clickedInventoryComponent;
@Pc(1363) byte inserting = 0;
if (VarpDomain.inserting == 1 && component.clientCode == 206) {
@ -2680,7 +2730,7 @@ public class Protocol {
}
outboundBuffer.p1isaac(231);
outboundBuffer.p2(Static4.mouseOverInventoryObjectIndex);
outboundBuffer.ip4(Static118.clickedInventoryComponent.id);
outboundBuffer.ip4(InterfaceList.clickedInventoryComponent.id);
outboundBuffer.p2add(Static18.clickedInventoryIndex);
outboundBuffer.p1sub(inserting);
}
@ -2691,17 +2741,17 @@ public class Protocol {
}
Mouse.clickButton = 0;
MiniMenu.anInt2043 = 10;
Static118.clickedInventoryComponent = null;
InterfaceList.clickedInventoryComponent = null;
}
}
Static146.aBoolean174 = false;
Static56.aClass13_12 = null;
InterfaceList.aClass13_12 = null;
Static44.aBoolean83 = false;
InterfaceList.keyQueueSize = 0;
component = Static180.aClass13_22;
Static180.aClass13_22 = null;
@Pc(1508) Component local1508 = Static43.aClass13_11;
Static43.aClass13_11 = null;
component = InterfaceList.aClass13_22;
InterfaceList.aClass13_22 = null;
@Pc(1508) Component local1508 = aClass13_11;
aClass13_11 = null;
while (Keyboard.nextKey() && InterfaceList.keyQueueSize < 128) {
InterfaceList.keyCodes[InterfaceList.keyQueueSize] = Keyboard.keyCode;
InterfaceList.keyChars[InterfaceList.keyQueueSize] = Keyboard.keyChar;
@ -2709,7 +2759,7 @@ public class Protocol {
}
WorldMap.component = null;
if (InterfaceList.topLevelInterface != -1) {
Static57.method1320(0, 0, 0, GameShell.canvasWidth, InterfaceList.topLevelInterface, 0, GameShell.canvasHeight);
InterfaceList.method1320(0, 0, 0, GameShell.canvasWidth, InterfaceList.topLevelInterface, 0, GameShell.canvasHeight);
}
InterfaceList.transmitTimer++;
while (true) {
@ -2721,7 +2771,7 @@ public class Protocol {
if (priorityRequest == null) {
while (true) {
do {
priorityRequest = (HookRequest) Static115.mediumPriorityRequests.removeHead();
priorityRequest = (HookRequest) InterfaceList.mediumPriorityRequests.removeHead();
if (priorityRequest == null) {
while (true) {
do {
@ -2747,7 +2797,7 @@ public class Protocol {
if (MiniMenu.anInt1742 != -1) {
Cheat.teleport(Camera.originX + MiniMenu.anInt1742, Camera.originZ - -MiniMenu.anInt2954, Player.level);
}
Static187.anInt4422 = 0;
anInt4422 = 0;
MiniMenu.anInt3096 = 0;
} else if (MiniMenu.anInt3096 == 2) {
if (MiniMenu.anInt1742 != -1) {
@ -2762,7 +2812,7 @@ public class Protocol {
Cross.x = Mouse.clickX;
}
MiniMenu.anInt3096 = 0;
} else if (Static187.anInt4422 == 2) {
} else if (anInt4422 == 2) {
if (MiniMenu.anInt1742 != -1) {
outboundBuffer.p1isaac(179);
outboundBuffer.p2(Camera.originZ + MiniMenu.anInt2954);
@ -2772,8 +2822,8 @@ public class Protocol {
Cross.x = Mouse.clickX;
Cross.y = Mouse.clickY;
}
Static187.anInt4422 = 0;
} else if (MiniMenu.anInt1742 != -1 && MiniMenu.anInt3096 == 0 && Static187.anInt4422 == 0) {
anInt4422 = 0;
} else if (MiniMenu.anInt1742 != -1 && MiniMenu.anInt3096 == 0 && anInt4422 == 0) {
@Pc(1871) boolean local1871 = PathFinder.findPath(PlayerList.self.movementQueueZ[0], 0, 0, true, 0, MiniMenu.anInt1742, 0, 0, 0, MiniMenu.anInt2954, PlayerList.self.movementQueueX[0]);
if (local1871) {
Cross.y = Mouse.clickY;
@ -2784,30 +2834,30 @@ public class Protocol {
}
MiniMenu.anInt1742 = -1;
Static7.method843();
if (Static180.aClass13_22 != component) {
if (InterfaceList.aClass13_22 != component) {
if (component != null) {
InterfaceList.redraw(component);
}
if (Static180.aClass13_22 != null) {
InterfaceList.redraw(Static180.aClass13_22);
if (InterfaceList.aClass13_22 != null) {
InterfaceList.redraw(InterfaceList.aClass13_22);
}
}
if (local1508 != Static43.aClass13_11 && Static191.anInt4504 == Static133.anInt5235) {
if (local1508 != aClass13_11 && Static191.anInt4504 == anInt5235) {
if (local1508 != null) {
InterfaceList.redraw(local1508);
}
if (Static43.aClass13_11 != null) {
InterfaceList.redraw(Static43.aClass13_11);
if (aClass13_11 != null) {
InterfaceList.redraw(aClass13_11);
}
}
if (Static43.aClass13_11 == null) {
if (Static133.anInt5235 > 0) {
Static133.anInt5235--;
if (aClass13_11 == null) {
if (anInt5235 > 0) {
anInt5235--;
}
} else if (Static133.anInt5235 < Static191.anInt4504) {
Static133.anInt5235++;
if (Static191.anInt4504 == Static133.anInt5235) {
InterfaceList.redraw(Static43.aClass13_11);
} else if (anInt5235 < Static191.anInt4504) {
anInt5235++;
if (Static191.anInt4504 == anInt5235) {
InterfaceList.redraw(aClass13_11);
}
}
if (Camera.cameraType == 1) {
@ -2818,37 +2868,37 @@ public class Protocol {
Camera.updateLoginScreenCamera();
}
for (y = 0; y < 5; y++) {
@Pc(2001) int local2001 = Static31.anIntArray76[y]++;
@Pc(2001) int local2001 = anIntArray76[y]++;
}
y = Mouse.getIdleLoops();
x = Keyboard.getIdleLoops();
if (y > 15000 && x > 15000) {
Static267.anInt5775 = 250;
anInt5775 = 250;
Mouse.setIdleLoops(14500);
outboundBuffer.p1isaac(245);
}
if (Static33.openUrlRequest != null && Static33.openUrlRequest.status == 1) {
if (Static33.openUrlRequest.result != null) {
Static169.openUrl(Static175.url, Static164.newTab);
ScriptRunner.openUrl(ScriptRunner.url, Static164.newTab);
}
Static175.url = null;
ScriptRunner.url = null;
Static33.openUrlRequest = null;
Static164.newTab = false;
}
Static131.anInt3251++;
MiniMap.anInt2252++;
Static143.anInt3486++;
if (Static143.anInt3486 > 500) {
Static143.anInt3486 = 0;
anInt3486++;
if (anInt3486 > 500) {
anInt3486 = 0;
modelId = (int) (Math.random() * 8.0D);
if ((modelId & 0x4) == 4) {
Static230.anInt5161 += Static220.anInt4941;
Camera.anInt5161 += Static220.anInt4941;
}
if ((modelId & 0x2) == 2) {
Static206.anInt4774 += anInt659;
Camera.anInt4774 += anInt659;
}
if ((modelId & 0x1) == 1) {
Static132.anInt3291 += Static248.anInt4229;
Camera.anInt3291 += Camera.anInt4229;
}
}
if (MiniMap.anInt2252 > 500) {
@ -2861,8 +2911,8 @@ public class Protocol {
MiniMap.anInt4130 += MiniMap.anInt4262;
}
}
if (Static132.anInt3291 < -50) {
Static248.anInt4229 = 2;
if (Camera.anInt3291 < -50) {
Camera.anInt4229 = 2;
}
if (MiniMap.anInt1814 < -60) {
MiniMap.anInt5755 = 2;
@ -2870,19 +2920,19 @@ public class Protocol {
if (MiniMap.anInt4130 < -20) {
MiniMap.anInt4262 = 1;
}
if (Static206.anInt4774 < -55) {
if (Camera.anInt4774 < -55) {
anInt659 = 2;
}
if (Static206.anInt4774 > 55) {
if (Camera.anInt4774 > 55) {
anInt659 = -2;
}
if (Static230.anInt5161 < -40) {
if (Camera.anInt5161 < -40) {
Static220.anInt4941 = 1;
}
if (Static132.anInt3291 > 50) {
Static248.anInt4229 = -2;
if (Camera.anInt3291 > 50) {
Camera.anInt4229 = -2;
}
if (Static230.anInt5161 > 40) {
if (Camera.anInt5161 > 40) {
Static220.anInt4941 = -1;
}
if (MiniMap.anInt4130 > 10) {
@ -2905,7 +2955,7 @@ public class Protocol {
outboundBuffer.offset = 0;
}
} catch (@Pc(2266) IOException local2266) {
Static175.method3279();
method3279();
}
return;
}
@ -2974,7 +3024,7 @@ public class Protocol {
if (local43 == 65535) {
local43 = -1;
}
Static223.animateNpc(local47, local43, npc);
animateNpc(local47, local43, npc);
}
boolean hasFaceEntity = (local18 & 0x4) != 0;
@ -3047,7 +3097,7 @@ public class Protocol {
local334[i1] = inboundBuffer.g1sub();
local337[i1] = inboundBuffer.g2();
}
Static159.method3037(local337, npc, local334, local331);
method3037(local337, npc, local334, local331);
}
boolean hasFaceLocation = (local18 & 0x200) != 0;
@ -3226,4 +3276,172 @@ public class Protocol {
}
buffer.offset += 24;
}
@OriginalMember(owner = "client!nm", name = "a", descriptor = "(Z)V")
public static void method3279() {
if (anInt5775 > 0) {
LoginManager.processLogout();
} else {
aClass95_4 = socket;
socket = null;
client.setGameState(40);
}
}
@OriginalMember(owner = "client!fc", name = "a", descriptor = "(Lclient!wa;I)Lclient!na;")
public static JagString formatChatMessage(@OriginalArg(0) Buffer arg0) {
return method4350(arg0);
}
@OriginalMember(owner = "client!uj", name = "a", descriptor = "(Lclient!wa;II)Lclient!na;")
public static JagString method4350(@OriginalArg(0) Buffer arg0) {
try {
@Pc(7) int local7 = arg0.gsmarts();
if (local7 > 32767) {
local7 = 32767;
}
@Pc(15) byte[] local15 = new byte[local7];
arg0.offset += WordPack.codec.method1552(0, local7, local15, arg0.data, arg0.offset);
return JagString.decodeString(local15, local7, 0);
} catch (@Pc(47) Exception local47) {
return WordPack.CABBAGE;
}
}
@OriginalMember(owner = "client!mi", name = "a", descriptor = "([IBLclient!km;[I[I)V")
public static void method3037(@OriginalArg(0) int[] arg0, @OriginalArg(2) Npc arg1, @OriginalArg(3) int[] arg2, @OriginalArg(4) int[] arg3) {
for (@Pc(3) int local3 = 0; local3 < arg3.length; local3++) {
@Pc(15) int local15 = arg3[local3];
@Pc(19) int local19 = arg0[local3];
@Pc(23) int local23 = arg2[local3];
for (@Pc(25) int local25 = 0; local19 != 0 && arg1.aClass147Array3.length > local25; local25++) {
if ((local19 & 0x1) != 0) {
if (local15 == -1) {
arg1.aClass147Array3[local25] = null;
} else {
@Pc(60) SeqType local60 = SeqTypeList.get(local15);
@Pc(65) Npc_Class147 local65 = arg1.aClass147Array3[local25];
@Pc(68) int local68 = local60.anInt5347;
if (local65 != null) {
if (local15 == local65.anInt5396) {
if (local68 == 0) {
local65 = arg1.aClass147Array3[local25] = null;
} else if (local68 == 1) {
local65.anInt5399 = 0;
local65.anInt5400 = 0;
local65.anInt5398 = 1;
local65.anInt5404 = 0;
local65.anInt5408 = local23;
SoundPlayer.playSeqSound(arg1.zFine, local60, arg1.xFine, false, 0);
} else if (local68 == 2) {
local65.anInt5400 = 0;
}
} else if (local60.forcedPriority >= SeqTypeList.get(local65.anInt5396).forcedPriority) {
local65 = arg1.aClass147Array3[local25] = null;
}
}
if (local65 == null) {
local65 = arg1.aClass147Array3[local25] = new Npc_Class147();
local65.anInt5398 = 1;
local65.anInt5404 = 0;
local65.anInt5408 = local23;
local65.anInt5396 = local15;
local65.anInt5400 = 0;
local65.anInt5399 = 0;
SoundPlayer.playSeqSound(arg1.zFine, local60, arg1.xFine, false, 0);
}
}
}
local19 >>>= 0x1;
}
}
}
@OriginalMember(owner = "client!sc", name = "a", descriptor = "(IIILclient!km;)V")
public static void animateNpc(@OriginalArg(0) int arg0, @OriginalArg(1) int animationId, @OriginalArg(3) Npc npc) {
if (npc.seqId == animationId && animationId != -1) {
@Pc(10) SeqType seqType = SeqTypeList.get(animationId);
@Pc(13) int local13 = seqType.anInt5347;
if (local13 == 1) {
npc.anInt3373 = 1;
npc.anInt3425 = 0;
npc.anInt3360 = 0;
npc.anInt3371 = 0;
npc.anInt3420 = arg0;
SoundPlayer.playSeqSound(npc.zFine, seqType, npc.xFine, false, npc.anInt3425);
}
if (local13 == 2) {
npc.anInt3371 = 0;
}
} else if (animationId == -1 || npc.seqId == -1 || SeqTypeList.get(animationId).forcedPriority >= SeqTypeList.get(npc.seqId).forcedPriority) {
npc.anInt3360 = 0;
npc.seqId = animationId;
npc.anInt3373 = 1;
npc.anInt3371 = 0;
npc.anInt3420 = arg0;
npc.anInt3405 = npc.movementQueueSize;
npc.anInt3425 = 0;
if (npc.seqId != -1) {
SoundPlayer.playSeqSound(npc.zFine, SeqTypeList.get(npc.seqId), npc.xFine, false, npc.anInt3425);
}
}
}
@OriginalMember(owner = "client!sj", name = "a", descriptor = "(ILclient!na;)V")
public static void method3954(@OriginalArg(1) JagString arg0) {
client.settings = arg0;
if (GameShell.signLink.applet == null) {
return;
}
try {
@Pc(17) JagString local17 = aClass100_989.fromParameters(GameShell.signLink.applet);
@Pc(23) JagString local23 = aClass100_1029.fromParameters(GameShell.signLink.applet);
@Pc(48) JagString local48 = JagString.concatenate(new JagString[] { local17, aClass100_667, arg0, aClass100_1095, local23 });
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) });
}
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;
}
}

29
client/src/main/java/rt4/ReflectionCheck.java
View file

@ -182,7 +182,7 @@ public final class ReflectionCheck extends Node {
}
local17.anIntArray139[local59] = local71;
local17.anIntArray137[local59] = local95;
local17.aClass212Array2[local59] = arg0.getDeclaredField(local104, Static6.method85(local93));
local17.aClass212Array2[local59] = arg0.getDeclaredField(local104, method85(local93));
} else if (local71 == 3 || local71 == 4) {
local93 = new String(arg1.gjstr().method3148());
local104 = new String(arg1.gjstr().method3148());
@ -203,9 +203,9 @@ public final class ReflectionCheck extends Node {
local17.anIntArray139[local59] = local71;
@Pc(234) Class[] local234 = new Class[local95];
for (local210 = 0; local210 < local95; local210++) {
local234[local210] = Static6.method85(local171[local210]);
local234[local210] = method85(local171[local210]);
}
local17.aClass212Array1[local59] = arg0.getDeclaredMethod(Static6.method85(local93), local234, local104);
local17.aClass212Array1[local59] = arg0.getDeclaredMethod(method85(local93), local234, local104);
local17.aByteArrayArrayArray6[local59] = local193;
}
} catch (@Pc(269) ClassNotFoundException local269) {
@ -227,4 +227,27 @@ public final class ReflectionCheck extends Node {
public static void method4625() {
aClass69_113 = new LinkedList();
}
@OriginalMember(owner = "client!ag", name = "a", descriptor = "(ILjava/lang/String;)Ljava/lang/Class;")
public static Class method85(@OriginalArg(1) String arg0) throws ClassNotFoundException {
if (arg0.equals("B")) {
return Byte.TYPE;
} else if (arg0.equals("I")) {
return Integer.TYPE;
} else if (arg0.equals("S")) {
return Short.TYPE;
} else if (arg0.equals("J")) {
return Long.TYPE;
} else if (arg0.equals("Z")) {
return Boolean.TYPE;
} else if (arg0.equals("F")) {
return Float.TYPE;
} else if (arg0.equals("D")) {
return Double.TYPE;
} else if (arg0.equals("C")) {
return Character.TYPE;
} else {
return Class.forName(arg0);
}
}
}

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

@ -20,7 +20,7 @@ public final class Resampler {
@OriginalMember(owner = "client!vj", name = "<init>", descriptor = "(II)V")
public Resampler(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
if (arg1 != arg0) {
@Pc(12) int local12 = Static180.method3330(arg1, arg0);
@Pc(12) int local12 = method3330(arg1, arg0);
@Pc(16) int local16 = arg1 / local12;
this.anInt5769 = local16;
@Pc(23) int local23 = arg0 / local12;
@ -52,6 +52,20 @@ public final class Resampler {
}
}
@OriginalMember(owner = "client!og", name = "a", descriptor = "(III)I")
public static int method3330(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) {
if (arg0 > 22050) {
arg1 = arg0;
arg0 = 22050;
}
while (arg0 != 0) {
@Pc(21) int local21 = arg1 % arg0;
arg1 = arg0;
arg0 = local21;
}
return arg1;
}
@OriginalMember(owner = "client!vj", name = "a", descriptor = "([BB)[B")
public final byte[] method4520(@OriginalArg(0) byte[] arg0) {
if (this.anIntArrayArray40 != null) {

264
client/src/main/java/rt4/SceneGraph.java
View file

@ -9,6 +9,10 @@ public class SceneGraph {
public static final byte[][][] tileFlags = new byte[4][104][104];
@OriginalMember(owner = "client!mi", name = "Y", descriptor = "[[[Lclient!ih;")
public static final LinkedList[][][] objStacks = new LinkedList[4][104][104];
@OriginalMember(owner = "client!te", name = "B", descriptor = "[I")
public static final int[] anIntArray469 = new int[] { 0, -1, 0, 1 };
@OriginalMember(owner = "client!fb", name = "q", descriptor = "[I")
public static final int[] anIntArray154 = new int[] { -1, -1, 1, 1 };
@OriginalMember(owner = "client!kc", name = "o", descriptor = "[[[Lclient!bj;")
public static Tile[][][] tiles;
@ -838,7 +842,7 @@ public class SceneGraph {
overlay -= rowLightness[local234];
}
if (local209 >= 0 && local202 > 0) {
local142[local168][local209] = Static54.method1309(overlay / local202, local178 / local202, local173 * 256 / local200);
local142[local168][local209] = method1309(overlay / local202, local178 / local202, local173 * 256 / local200);
}
}
}
@ -889,7 +893,7 @@ public class SceneGraph {
if (overlay == 0) {
setTile(local152, local168, local173, 0, 0, -1, local200, local202, local209, local349, ColorUtils.multiplyLightnessSafe(local267, local234), ColorUtils.multiplyLightnessSafe(local273, local234), ColorUtils.multiplyLightnessSafe(local326, local234), ColorUtils.multiplyLightnessSafe(local332, local234), 0, 0, 0, 0, local254, 0);
if (GlRenderer.enabled && local152 > 0 && local234 != -1 && FluTypeList.get(local178 - 1).aBoolean198) {
Static242.method4197(0, 0, true, false, local168, local173, local200 - tileHeights[0][local168][local173], -tileHeights[0][local168 + 1][local173] + local202, local209 - tileHeights[0][local168 + 1][local173 + 1], local349 - tileHeights[0][local168][local173 + 1]);
ShadowManager.method4197(0, 0, true, false, local168, local173, local200 - tileHeights[0][local168][local173], -tileHeights[0][local168 + 1][local173] + local202, local209 - tileHeights[0][local168 + 1][local173 + 1], local349 - tileHeights[0][local168][local173 + 1]);
}
if (GlRenderer.enabled && !underwater && anIntArrayArray11 != null && local152 == 0) {
for (local322 = local168 - 1; local322 <= local168 + 1; local322++) {
@ -970,7 +974,7 @@ public class SceneGraph {
}
setTile(local152, local168, local173, local322, local1242, texture, local200, local202, local209, local349, ColorUtils.multiplyLightnessSafe(local267, local234), ColorUtils.multiplyLightnessSafe(local273, local234), ColorUtils.multiplyLightnessSafe(local326, local234), ColorUtils.multiplyLightnessSafe(local332, local234), ColorUtils.multiplyLightnessGrayscale(local1301, local267), ColorUtils.multiplyLightnessGrayscale(local1301, local273), ColorUtils.multiplyLightnessGrayscale(local1301, local326), ColorUtils.multiplyLightnessGrayscale(local1301, local332), local254, local1353);
if (GlRenderer.enabled && local152 > 0) {
Static242.method4197(local322, local1242, local1301 == -2 || !local1248.aBoolean311, local234 == -1 || !FluTypeList.get(local178 - 1).aBoolean198, local168, local173, local200 - tileHeights[0][local168][local173], local202 - tileHeights[0][local168 + 1][local173], local209 - tileHeights[0][local168 + 1][local173 + 1], -tileHeights[0][local168][local173 + 1] + local349);
ShadowManager.method4197(local322, local1242, local1301 == -2 || !local1248.aBoolean311, local234 == -1 || !FluTypeList.get(local178 - 1).aBoolean198, local168, local173, local200 - tileHeights[0][local168][local173], local202 - tileHeights[0][local168 + 1][local173], local209 - tileHeights[0][local168 + 1][local173 + 1], -tileHeights[0][local168][local173 + 1] + local349);
}
}
}
@ -1029,7 +1033,7 @@ public class SceneGraph {
for (local152 = 0; local152 < 104; local152++) {
for (local2204 = 0; local2204 < 104; local2204++) {
if ((tileFlags[1][local152][local2204] & 0x2) == 2) {
Static224.method3884(local152, local2204);
method3884(local152, local2204);
}
}
}
@ -1214,4 +1218,256 @@ public class SceneGraph {
}
}
}
@OriginalMember(owner = "client!ib", name = "a", descriptor = "(IIIIIIIILclient!th;IZJ)Z")
public static boolean method2256(@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) Entity arg8, @OriginalArg(9) int arg9, @OriginalArg(10) boolean arg10, @OriginalArg(11) long arg11) {
@Pc(6) boolean local6 = tileHeights == underwaterTileHeights;
@Pc(8) int local8 = 0;
@Pc(17) int local17;
for (@Pc(10) int local10 = arg1; local10 < arg1 + arg3; local10++) {
for (local17 = arg2; local17 < arg2 + arg4; local17++) {
if (local10 < 0 || local17 < 0 || local10 >= width || local17 >= length) {
return false;
}
@Pc(42) Tile local42 = tiles[arg0][local10][local17];
if (local42 != null && local42.sceneryLen >= 5) {
return false;
}
}
}
@Pc(58) Scenery local58 = new Scenery();
local58.key = arg11;
local58.level = arg0;
local58.anInt1699 = arg5;
local58.anInt1703 = arg6;
local58.anInt1706 = arg7;
local58.entity = arg8;
local58.anInt1714 = arg9;
local58.xMin = arg1;
local58.zMin = arg2;
local58.xMax = arg1 + arg3 - 1;
local58.zMax = arg2 + arg4 - 1;
@Pc(108) int local108;
for (local17 = arg1; local17 < arg1 + arg3; local17++) {
for (local108 = arg2; local108 < arg2 + arg4; local108++) {
@Pc(115) int local115 = 0;
if (local17 > arg1) {
local115++;
}
if (local17 < arg1 + arg3 - 1) {
local115 += 4;
}
if (local108 > arg2) {
local115 += 8;
}
if (local108 < arg2 + arg4 - 1) {
local115 += 2;
}
for (@Pc(141) int local141 = arg0; local141 >= 0; local141--) {
if (tiles[local141][local17][local108] == null) {
tiles[local141][local17][local108] = new Tile(local141, local17, local108);
}
}
@Pc(174) Tile local174 = tiles[arg0][local17][local108];
local174.scenery[local174.sceneryLen] = local58;
local174.interiorFlags[local174.sceneryLen] = local115;
local174.allInteriorFlags |= local115;
local174.sceneryLen++;
if (local6 && anIntArrayArray11[local17][local108] != 0) {
local8 = anIntArrayArray11[local17][local108];
}
}
}
if (local6 && local8 != 0) {
for (local17 = arg1; local17 < arg1 + arg3; local17++) {
for (local108 = arg2; local108 < arg2 + arg4; local108++) {
if (anIntArrayArray11[local17][local108] == 0) {
anIntArrayArray11[local17][local108] = local8;
}
}
}
}
if (arg10) {
scenery[sceneryLen++] = local58;
}
return true;
}
@OriginalMember(owner = "client!dg", name = "a", descriptor = "(IIIIILclient!th;IJZ)Z")
public static boolean method1141(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) Entity arg5, @OriginalArg(6) int arg6, @OriginalArg(7) long arg7, @OriginalArg(8) boolean arg8) {
if (arg5 == null) {
return true;
}
@Pc(7) int local7 = arg1 - arg4;
@Pc(11) int local11 = arg2 - arg4;
@Pc(15) int local15 = arg1 + arg4;
@Pc(19) int local19 = arg2 + arg4;
if (arg8) {
if (arg6 > 640 && arg6 < 1408) {
local19 += 128;
}
if (arg6 > 1152 && arg6 < 1920) {
local15 += 128;
}
if (arg6 > 1664 || arg6 < 384) {
local11 -= 128;
}
if (arg6 > 128 && arg6 < 896) {
local7 -= 128;
}
}
local7 /= 128;
local11 /= 128;
local15 /= 128;
local19 /= 128;
return method2256(arg0, local7, local11, local15 + 1 - local7, local19 - local11 + 1, arg1, arg2, arg3, arg5, arg6, true, arg7);
}
@OriginalMember(owner = "client!dg", name = "a", descriptor = "(IIIIIILclient!mj;)V")
public static void method1144(@OriginalArg(1) int z, @OriginalArg(2) int x, @OriginalArg(3) int level, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) CollisionMap collision) {
@Pc(9) long key = 0L;
if (arg3 == 0) {
key = getWallKey(level, x, z);
} else if (arg3 == 1) {
key = getWallDecorKey(level, x, z);
} else if (arg3 == 2) {
key = getSceneryKey(level, x, z);
} else if (arg3 == 3) {
key = getGroundDecorKey(level, x, z);
}
@Pc(57) int shape = (int) key >> 14 & 0x1F;
@Pc(70) int id = (int) (key >>> 32) & Integer.MAX_VALUE;
@Pc(74) LocType type = LocTypeList.get(id);
if (type.hasAreaSound()) {
AreaSoundManager.remove(x, type, z, level);
}
@Pc(92) int angle = (int) key >> 20 & 0x3;
if (key == 0L) {
return;
}
@Pc(100) Entity local100 = null;
@Pc(102) Entity local102 = null;
if (arg3 == 0) {
@Pc(110) Wall wall = removeWall(level, x, z);
if (wall != null) {
local100 = wall.primary;
local102 = wall.secondary;
}
if (type.anInt4435 != 0) {
collision.unflagWall(angle, type.aBoolean207, z, shape, x);
}
} else if (arg3 == 1) {
@Pc(233) WallDecor wallDecor = removeWallDecor(level, x, z);
if (wallDecor != null) {
local100 = wallDecor.primary;
local102 = wallDecor.secondary;
}
} else if (arg3 == 2) {
@Pc(148) Scenery scenery = removeScenery(level, x, z);
if (scenery != null) {
local100 = scenery.entity;
}
if (type.anInt4435 != 0 && type.width + x < 104 && type.width + z < 104 && x + type.length < 104 && z + type.length < 104) {
collision.unflagScenery(x, type.width, type.aBoolean207, angle, type.length, z);
}
} else if (arg3 == 3) {
@Pc(211) GroundDecor groundDecor = removeGroundDecor(level, x, z);
if (groundDecor != null) {
local100 = groundDecor.entity;
}
if (type.anInt4435 == 1) {
collision.unflagGroundDecor(z, x);
}
}
if (!GlRenderer.enabled || !type.aBoolean212) {
return;
}
if (shape == 2) {
if (local100 instanceof Loc) {
((Loc) local100).method1046();
} else {
Loc.method181(type, 0, angle + 4, 0, shape, x, z, arg4);
}
if (local102 instanceof Loc) {
((Loc) local102).method1046();
} else {
Loc.method181(type, 0, angle + 1 & 0x3, 0, shape, x, z, arg4);
}
} else if (shape == 5) {
if (local100 instanceof Loc) {
((Loc) local100).method1046();
} else {
Loc.method181(type, anIntArray469[angle] * 8, angle, Static34.anIntArray80[angle] * 8, 4, x, z, arg4);
}
} else if (shape == 6) {
if (local100 instanceof Loc) {
((Loc) local100).method1046();
} else {
Loc.method181(type, anIntArray154[angle] * 8, angle + 4, Static114.anIntArray565[angle] * 8, 4, x, z, arg4);
}
} else if (shape == 7) {
if (local100 instanceof Loc) {
((Loc) local100).method1046();
} else {
Loc.method181(type, 0, (angle + 2 & 0x3) + 4, 0, 4, x, z, arg4);
}
} else if (shape == 8) {
if (local100 instanceof Loc) {
((Loc) local100).method1046();
} else {
Loc.method181(type, anIntArray154[angle] * 8, angle + 4, Static114.anIntArray565[angle] * 8, 4, x, z, arg4);
}
if (local102 instanceof Loc) {
((Loc) local102).method1046();
} else {
Loc.method181(type, anIntArray154[angle] * 8, (angle + 2 & 0x3) + 4, Static114.anIntArray565[angle] * 8, 4, x, z, arg4);
}
} else if (shape == 11) {
if (local100 instanceof Loc) {
((Loc) local100).method1046();
} else {
Loc.method181(type, 0, angle + 4, 0, 10, x, z, arg4);
}
} else if (local100 instanceof Loc) {
((Loc) local100).method1046();
} else {
Loc.method181(type, 0, angle, 0, shape, x, z, arg4);
}
}
@OriginalMember(owner = "client!ed", name = "a", descriptor = "(IIII)I")
public static int method1309(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2) {
if (arg0 > 243) {
arg1 >>= 0x4;
} else if (arg0 > 217) {
arg1 >>= 0x3;
} else if (arg0 > 192) {
arg1 >>= 0x2;
} else if (arg0 > 179) {
arg1 >>= 0x1;
}
return (arg0 >> 1) + (arg1 >> 5 << 7) + (arg2 >> 2 << 10);
}
@OriginalMember(owner = "client!sd", name = "c", descriptor = "(II)V")
public static void method3884(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
@Pc(7) Tile local7 = tiles[0][arg0][arg1];
for (@Pc(9) int local9 = 0; local9 < 3; local9++) {
@Pc(30) Tile local30 = tiles[local9][arg0][arg1] = tiles[local9 + 1][arg0][arg1];
if (local30 != null) {
local30.anInt672--;
for (@Pc(40) int local40 = 0; local40 < local30.sceneryLen; local40++) {
@Pc(49) Scenery local49 = local30.scenery[local40];
if ((local49.key >> 29 & 0x3L) == 2L && local49.xMin == arg0 && local49.zMin == arg1) {
local49.level--;
}
}
}
}
if (tiles[0][arg0][arg1] == null) {
tiles[0][arg0][arg1] = new Tile(0, arg0, arg1);
}
tiles[0][arg0][arg1].aClass3_Sub5_1 = local7;
tiles[3][arg0][arg1] = null;
}
}

1360
client/src/main/java/rt4/ScriptRunner.java
View file

File diff suppressed because it is too large Load diff

9
client/src/main/java/rt4/ServerActiveProperties.java
View file

@ -19,7 +19,12 @@ public final class ServerActiveProperties extends Node {
this.events = arg0;
}
@OriginalMember(owner = "client!bf", name = "a", descriptor = "(IB)Z")
@OriginalMember(owner = "client!qc", name = "a", descriptor = "(BI)I")
public static int method3594(@OriginalArg(1) int arg0) {
return arg0 >> 11 & 0x7F;
}
@OriginalMember(owner = "client!bf", name = "a", descriptor = "(IB)Z")
public final boolean method503(@OriginalArg(0) int arg0) {
return (this.events >> arg0 + 1 & 0x1) != 0;
}
@ -66,6 +71,6 @@ public final class ServerActiveProperties extends Node {
@OriginalMember(owner = "client!bf", name = "i", descriptor = "(I)I")
public final int getTargetMask() {
return Static199.method3594(this.events);
return method3594(this.events);
}
}

2
client/src/main/java/rt4/Static242.java → client/src/main/java/rt4/ShadowManager.java
View file

@ -5,7 +5,7 @@ import org.openrs2.deob.annotation.OriginalArg;
import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc;
public final class Static242 {
public final class ShadowManager {
@OriginalMember(owner = "client!tj", name = "a", descriptor = "Lclient!ek;")
public static SoftwareIndexedSprite shadowMapImage;

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

@ -559,7 +559,38 @@ public final class SoftwareModel extends Model {
return (arg0 & 0xFF80) + arg1;
}
@OriginalMember(owner = "client!w", name = "e", descriptor = "(I)V")
@OriginalMember(owner = "client!nj", name = "a", descriptor = "(IIZ[I[I)V")
public static void method3223(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int[] arg2, @OriginalArg(4) int[] arg3) {
if (arg0 >= arg1) {
return;
}
@Pc(22) int local22 = (arg1 + arg0) / 2;
@Pc(24) int local24 = arg0;
@Pc(28) int local28 = arg2[local22];
arg2[local22] = arg2[arg1];
arg2[arg1] = local28;
@Pc(42) int local42 = arg3[local22];
arg3[local22] = arg3[arg1];
arg3[arg1] = local42;
for (@Pc(54) int local54 = arg0; local54 < arg1; local54++) {
if (arg2[local54] > (local54 & 0x1) + local28) {
@Pc(79) int local79 = arg2[local54];
arg2[local54] = arg2[local24];
arg2[local24] = local79;
@Pc(93) int local93 = arg3[local54];
arg3[local54] = arg3[local24];
arg3[local24++] = local93;
}
}
arg2[arg1] = arg2[local24];
arg2[local24] = local28;
arg3[arg1] = arg3[local24];
arg3[local24] = local42;
method3223(arg0, local24 - 1, arg2, arg3);
method3223(local24 + 1, arg1, arg2, arg3);
}
@OriginalMember(owner = "client!w", name = "e", descriptor = "(I)V")
private void method4579(@OriginalArg(0) int arg0) {
if (aBooleanArray132[arg0]) {
this.method4587(arg0);
@ -802,7 +833,7 @@ public final class SoftwareModel extends Model {
@Pc(223) int local223;
@Pc(208) int local208;
@Pc(227) int local227;
if (arg8 > 0L && Static39.aBoolean77 && local53 > 0) {
if (arg8 > 0L && ScriptRunner.aBoolean77 && local53 > 0) {
if (local71 > 0) {
local204 = local91 / local38;
local208 = local78 / local53;
@ -817,7 +848,7 @@ public final class SoftwareModel extends Model {
local223 = local146 / local53;
local227 = local123 / local38;
}
if (Static150.anInt3582 >= local204 && Static150.anInt3582 <= local208 && Static34.anInt1053 >= local223 && Static34.anInt1053 <= local227) {
if (GlModel.anInt3582 >= local204 && GlModel.anInt3582 <= local208 && Static34.anInt1053 >= local223 && Static34.anInt1053 <= local227) {
local204 = 999999;
local208 = -999999;
local223 = 999999;
@ -860,9 +891,9 @@ public final class SoftwareModel extends Model {
}
}
}
if (Static150.anInt3582 >= local204 && Static150.anInt3582 <= local208 && Static34.anInt1053 >= local223 && Static34.anInt1053 <= local227) {
if (GlModel.anInt3582 >= local204 && GlModel.anInt3582 <= local208 && Static34.anInt1053 >= local223 && Static34.anInt1053 <= local227) {
if (this.aBoolean303) {
Model.aLongArray11[Static2.anInt7++] = arg8;
Model.aLongArray11[MiniMenu.anInt7++] = arg8;
} else {
local190 = true;
}
@ -1627,8 +1658,8 @@ public final class SoftwareModel extends Model {
}
}
} else {
if (arg1 && this.method4589(Static150.anInt3582 + Rasteriser.centerX, Static34.anInt1053 + Rasteriser.centerY, anIntArray551[local51], anIntArray551[local56], anIntArray551[local61], local65, local69, local73)) {
Model.aLongArray11[Static2.anInt7++] = arg2;
if (arg1 && this.method4589(GlModel.anInt3582 + Rasteriser.centerX, Static34.anInt1053 + Rasteriser.centerY, anIntArray551[local51], anIntArray551[local56], anIntArray551[local61], local65, local69, local73)) {
Model.aLongArray11[MiniMenu.anInt7++] = arg2;
arg1 = false;
}
if ((local65 - local69) * (anIntArray551[local61] - anIntArray551[local56]) - (anIntArray551[local51] - anIntArray551[local56]) * (local73 - local69) > 0) {
@ -1662,7 +1693,7 @@ public final class SoftwareModel extends Model {
}
}
if (aBoolean307) {
Static172.method3223(0, local5 - 1, anIntArray550, anIntArray549);
method3223(0, local5 - 1, anIntArray550, anIntArray549);
if (this.aByteArray73 == null) {
for (local11 = 0; local11 < local5; local11++) {
this.method4579(anIntArray549[local11]);

291
client/src/main/java/rt4/Static1.java
View file

@ -10,7 +10,11 @@ public final class Static1 {
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!a", name = "h", descriptor = "I")
@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;")
@ -18,6 +22,12 @@ public final class Static1 {
@OriginalMember(owner = "client!a", name = "i", descriptor = "I")
public static int anInt6 = 0;
@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) {
@ -57,11 +67,11 @@ public final class Static1 {
}
@Pc(61) GlTile local61 = method4212(local10, local50);
@Pc(67) byte local67 = arg7[local12][local17];
@Pc(71) int[] local71 = Static228.anIntArrayArray35[local67];
@Pc(71) int[] local71 = anIntArrayArray35[local67];
local61.anInt2482 += local71.length / 2;
local61.anInt2484++;
if (local50.aBoolean310 && local30 != 0) {
local61.anInt2482 += Static80.anIntArray419[local67];
local61.anInt2482 += anIntArray419[local67];
}
}
if ((arg8[local12][local17] & 0xFF) != 0 || local38 != 0 && arg7[local12][local17] == 0) {
@ -264,11 +274,11 @@ public final class Static1 {
@Pc(1261) GlTile local1261 = method4212(local10, local1250);
@Pc(1267) byte local1267 = arg7[local12][local17];
@Pc(1273) byte local1273 = arg5[local12][local17];
local168 = Static19.method588(local1250.texture, local1250.anInt5899, arg6[local12][local17]);
local143 = Static19.method588(local1250.texture, local1250.anInt5899, arg6[local12 + 1][local17]);
local163 = Static19.method588(local1250.texture, local1250.anInt5899, arg6[local12 + 1][local17 + 1]);
local153 = Static19.method588(local1250.texture, local1250.anInt5899, arg6[local12][local17 + 1]);
Static58.method1324(local168, arg2, arg1, local12, arg0, local143, local1273, local30, local163, local38 != 0 && local1250.aBoolean310, local1267, local17, arg4, local153, local1261);
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];
@ -462,10 +472,10 @@ public final class Static1 {
@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 = Static19.method588(local2324.texture, local2324.anInt5899, arg6[local12][local17]) << 8 | 0xFF;
@Pc(2365) int local2365 = Static19.method588(local2324.texture, local2324.anInt5899, arg6[local12 + 1][local17]) << 8 | 0xFF;
@Pc(2385) int local2385 = Static19.method588(local2324.texture, local2324.anInt5899, arg6[local12 + 1][local17 + 1]) << 8 | 0xFF;
@Pc(2403) int local2403 = Static19.method588(local2324.texture, local2324.anInt5899, arg6[local12][local17 + 1]) << 8 | 0xFF;
@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];
@ -474,32 +484,32 @@ public final class Static1 {
@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 = Static207.method3683(local2403, 0.0F, local2345, local2365, null, arg2, local12, arg4, local2385, 0, true, local2329, arg1, local17, 64, arg0, 64);
@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 = Static207.method3683(local2403, 0.0F, local2345, local2365, null, arg2, local12, arg4, local2385, 0, local2456, local2329, arg1, local17, 0, arg0, 128);
@Pc(2571) int local2571 = Static207.method3683(local2403, 0.0F, local2345, local2365, null, arg2, local12, arg4, local2385, 0, local2441, local2329, arg1, local17, 128, arg0, 128);
@Pc(2592) int local2592 = Static207.method3683(local2403, 0.0F, local2345, local2365, null, arg2, local12, arg4, local2385, 0, local2422, local2329, arg1, local17, 0, arg0, 0);
@Pc(2613) int local2613 = Static207.method3683(local2403, 0.0F, local2345, local2365, null, arg2, local12, arg4, local2385, 0, local2482, local2329, arg1, local17, 128, arg0, 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] = Static207.method3683(local2403, 0.0F, local2345, local2365, null, arg2, local12, arg4, local2385, 0, local1055[2], local2329, arg1, local17, 64, arg0, 128);
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++] = Static207.method3683(local2403, 0.0F, local2345, local2365, null, arg2, local12, arg4, local2385, 0, local1068[2], local2329, arg1, local17, 0, arg0, 64);
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++] = Static207.method3683(local2403, 0.0F, local2345, local2365, null, arg2, local12, arg4, local2385, 0, local1086[2], local2329, arg1, local17, 64, arg0, 0);
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++] = Static207.method3683(local2403, 0.0F, local2345, local2365, null, arg2, local12, arg4, local2385, 0, local2318[2], local2329, arg1, local17, 128, arg0, 64);
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);
@ -540,7 +550,7 @@ public final class Static1 {
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);
Static214.method4364(arg2, 0, WorldMap.width, 0, 0, WorldMap.length, arg1, 0);
WorldMap.method4364(arg2, 0, WorldMap.width, 0, 0, WorldMap.length, arg1, 0);
if (GlRenderer.enabled) {
WorldMap.aClass3_Sub2_Sub1_2 = new GlSprite(local63);
} else {
@ -553,9 +563,9 @@ public final class Static1 {
}
}
WorldMap.aClass3_Sub2_Sub1_2.method1415(arg0, arg3);
@Pc(147) int local147 = arg1 * Static109.anInt2884 / WorldMap.length + 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 * Static109.anInt2882 / WorldMap.width;
@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) {
@ -568,14 +578,14 @@ public final class Static1 {
SoftwareRaster.fillRectAlpha(local161, local147, local167, local153, local169, 128);
SoftwareRaster.drawRect(local161, local147, local167, local153, local169);
}
if (Static201.anInt1864 <= 0) {
if (WorldMap.anInt1864 <= 0) {
return;
}
@Pc(225) int local225;
if (Static91.anInt2428 > 10) {
local225 = (20 - Static91.anInt2428) * 25;
if (anInt2428 > 10) {
local225 = (20 - anInt2428) * 25;
} else {
local225 = Static91.anInt2428 * 25;
local225 = anInt2428 * 25;
}
for (@Pc(238) MapElement local238 = (MapElement) WorldMap.mapElements.head(); local238 != null; local238 = (MapElement) WorldMap.mapElements.next()) {
if (local238.id == Static9.anInt172) {
@ -600,4 +610,229 @@ public final class Static1 {
}
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 = Static182.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 - Static182.method3361(arg14, arg13, arg4, arg6, arg16)) / arg1);
}
}

53
client/src/main/java/rt4/Static10.java
View file

@ -6,53 +6,62 @@ import org.openrs2.deob.annotation.Pc;
public final class Static10 {
@OriginalMember(owner = "client!nj", name = "k", descriptor = "I")
public static int anInt4165;
@OriginalMember(owner = "client!pe", name = "r", descriptor = "I")
public static int anInt4457;
@OriginalMember(owner = "client!fb", name = "h", descriptor = "[I")
public static int[] anIntArray153;
@OriginalMember(owner = "client!lb", name = "z", descriptor = "I")
public static int anInt3473;
@OriginalMember(owner = "client!an", name = "c", descriptor = "(III)V")
public static void method348(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) {
if (Static189.anInt4457 != arg1) {
if (anInt4457 != arg1) {
Static173.anIntArray367 = new int[arg1];
for (@Pc(10) int local10 = 0; local10 < arg1; local10++) {
Static173.anIntArray367[local10] = (local10 << 12) / arg1;
}
Static165.anInt4042 = arg1 == 64 ? 2048 : 4096;
Static34.anInt1060 = arg1 - 1;
Static189.anInt4457 = arg1;
anInt4457 = arg1;
}
if (Static172.anInt4165 == arg0) {
if (anInt4165 == arg0) {
return;
}
if (Static189.anInt4457 == arg0) {
Static64.anIntArray153 = Static173.anIntArray367;
if (anInt4457 == arg0) {
anIntArray153 = Static173.anIntArray367;
} else {
Static64.anIntArray153 = new int[arg0];
anIntArray153 = new int[arg0];
for (@Pc(61) int local61 = 0; local61 < arg0; local61++) {
Static64.anIntArray153[local61] = (local61 << 12) / arg0;
anIntArray153[local61] = (local61 << 12) / arg0;
}
}
Static172.anInt4165 = arg0;
Static141.anInt3473 = arg0 - 1;
anInt4165 = arg0;
anInt3473 = arg0 - 1;
}
@OriginalMember(owner = "client!an", name = "a", descriptor = "(IIIIIII)V")
public static void method352(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5) {
@Pc(11) int local11 = Static78.method1690(TextureOp29.anInt2869, arg5, TextureOp29.anInt5773);
@Pc(17) int local17 = Static78.method1690(TextureOp29.anInt2869, arg0, TextureOp29.anInt5773);
@Pc(23) int local23 = Static78.method1690(TextureOp29.anInt5063, arg3, TextureOp29.anInt4164);
@Pc(29) int local29 = Static78.method1690(TextureOp29.anInt5063, arg2, TextureOp29.anInt4164);
@Pc(42) int local42 = Static78.method1690(TextureOp29.anInt2869, arg5 + arg1, TextureOp29.anInt5773);
@Pc(51) int local51 = Static78.method1690(TextureOp29.anInt2869, arg0 - arg1, TextureOp29.anInt5773);
@Pc(11) int local11 = Static231.method1690(TextureOp29.anInt2869, arg5, TextureOp29.anInt5773);
@Pc(17) int local17 = Static231.method1690(TextureOp29.anInt2869, arg0, TextureOp29.anInt5773);
@Pc(23) int local23 = Static231.method1690(TextureOp29.anInt5063, arg3, TextureOp29.anInt4164);
@Pc(29) int local29 = Static231.method1690(TextureOp29.anInt5063, arg2, TextureOp29.anInt4164);
@Pc(42) int local42 = Static231.method1690(TextureOp29.anInt2869, arg5 + arg1, TextureOp29.anInt5773);
@Pc(51) int local51 = Static231.method1690(TextureOp29.anInt2869, arg0 - arg1, TextureOp29.anInt5773);
@Pc(53) int local53;
for (local53 = local11; local53 < local42; local53++) {
Static131.method2576(Static71.anIntArrayArray10[local53], local23, local29, arg4);
TextureOp29SubOp4.method2576(TextureOp29SubOp4.anIntArrayArray10[local53], local23, local29, arg4);
}
for (local53 = local17; local53 > local51; local53--) {
Static131.method2576(Static71.anIntArrayArray10[local53], local23, local29, arg4);
TextureOp29SubOp4.method2576(TextureOp29SubOp4.anIntArrayArray10[local53], local23, local29, arg4);
}
@Pc(95) int local95 = Static78.method1690(TextureOp29.anInt5063, arg1 + arg3, TextureOp29.anInt4164);
@Pc(104) int local104 = Static78.method1690(TextureOp29.anInt5063, arg2 - arg1, TextureOp29.anInt4164);
@Pc(95) int local95 = Static231.method1690(TextureOp29.anInt5063, arg1 + arg3, TextureOp29.anInt4164);
@Pc(104) int local104 = Static231.method1690(TextureOp29.anInt5063, arg2 - arg1, TextureOp29.anInt4164);
for (local53 = local42; local53 <= local51; local53++) {
@Pc(117) int[] local117 = Static71.anIntArrayArray10[local53];
Static131.method2576(local117, local23, local95, arg4);
Static131.method2576(local117, local104, local29, arg4);
@Pc(117) int[] local117 = TextureOp29SubOp4.anIntArrayArray10[local53];
TextureOp29SubOp4.method2576(local117, local23, local95, arg4);
TextureOp29SubOp4.method2576(local117, local104, local29, arg4);
}
}
}

11
client/src/main/java/rt4/Static103.java
View file

@ -51,8 +51,10 @@ public final class Static103 {
public static int anInt2161;
@OriginalMember(owner = "client!sa", name = "W", descriptor = "Z")
public static boolean instantScreenFade = true;
@OriginalMember(owner = "client!gl", name = "f", descriptor = "I")
public static int anInt2263;
@OriginalMember(owner = "client!i", name = "b", descriptor = "(IIIII)I")
@OriginalMember(owner = "client!i", name = "b", descriptor = "(IIIII)I")
public static int method2235(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) {
if (instantScreenFade) {
arg0 = 1000000;
@ -101,16 +103,11 @@ public final class Static103 {
}
FogManager.method3060(anInt5731, aFloat7, aFloat36, aFloat5);
FogManager.method3062(anInt3709, anInt2161);
FogManager.method3063((float) Static85.anInt2263, (float) Static159.anInt3893, (float) Static148.anInt3534);
FogManager.method3063((float) anInt2263, (float) Static73.anInt3893, (float) Static73.anInt3534);
FogManager.method3058();
return anInt3709;
}
@OriginalMember(owner = "client!i", name = "e", descriptor = "(BI)I")
public static int method2236(@OriginalArg(1) int arg0) {
return arg0 & 0xFF;
}
@OriginalMember(owner = "client!gm", name = "f", descriptor = "(B)V")
public static void setInstantFade() {
instantScreenFade = true;

82
client/src/main/java/rt4/Static105.java
View file

@ -1,82 +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 Static105 {
@OriginalMember(owner = "client!ib", name = "a", descriptor = "(IIIIIIIILclient!th;IZJ)Z")
public static boolean method2256(@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) Entity arg8, @OriginalArg(9) int arg9, @OriginalArg(10) boolean arg10, @OriginalArg(11) long arg11) {
@Pc(6) boolean local6 = SceneGraph.tileHeights == SceneGraph.underwaterTileHeights;
@Pc(8) int local8 = 0;
@Pc(17) int local17;
for (@Pc(10) int local10 = arg1; local10 < arg1 + arg3; local10++) {
for (local17 = arg2; local17 < arg2 + arg4; local17++) {
if (local10 < 0 || local17 < 0 || local10 >= SceneGraph.width || local17 >= SceneGraph.length) {
return false;
}
@Pc(42) Tile local42 = SceneGraph.tiles[arg0][local10][local17];
if (local42 != null && local42.sceneryLen >= 5) {
return false;
}
}
}
@Pc(58) Scenery local58 = new Scenery();
local58.key = arg11;
local58.level = arg0;
local58.anInt1699 = arg5;
local58.anInt1703 = arg6;
local58.anInt1706 = arg7;
local58.entity = arg8;
local58.anInt1714 = arg9;
local58.xMin = arg1;
local58.zMin = arg2;
local58.xMax = arg1 + arg3 - 1;
local58.zMax = arg2 + arg4 - 1;
@Pc(108) int local108;
for (local17 = arg1; local17 < arg1 + arg3; local17++) {
for (local108 = arg2; local108 < arg2 + arg4; local108++) {
@Pc(115) int local115 = 0;
if (local17 > arg1) {
local115++;
}
if (local17 < arg1 + arg3 - 1) {
local115 += 4;
}
if (local108 > arg2) {
local115 += 8;
}
if (local108 < arg2 + arg4 - 1) {
local115 += 2;
}
for (@Pc(141) int local141 = arg0; local141 >= 0; local141--) {
if (SceneGraph.tiles[local141][local17][local108] == null) {
SceneGraph.tiles[local141][local17][local108] = new Tile(local141, local17, local108);
}
}
@Pc(174) Tile local174 = SceneGraph.tiles[arg0][local17][local108];
local174.scenery[local174.sceneryLen] = local58;
local174.interiorFlags[local174.sceneryLen] = local115;
local174.allInteriorFlags |= local115;
local174.sceneryLen++;
if (local6 && SceneGraph.anIntArrayArray11[local17][local108] != 0) {
local8 = SceneGraph.anIntArrayArray11[local17][local108];
}
}
}
if (local6 && local8 != 0) {
for (local17 = arg1; local17 < arg1 + arg3; local17++) {
for (local108 = arg2; local108 < arg2 + arg4; local108++) {
if (SceneGraph.anIntArrayArray11[local17][local108] == 0) {
SceneGraph.anIntArrayArray11[local17][local108] = local8;
}
}
}
}
if (arg10) {
SceneGraph.scenery[SceneGraph.sceneryLen++] = local58;
}
return true;
}
}

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

@ -1,10 +0,0 @@
package rt4;
import org.openrs2.deob.annotation.OriginalMember;
public final class Static107 {
@OriginalMember(owner = "client!id", name = "b", descriptor = "I")
public static int anInt2875 = -1;
}

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

@ -1,16 +0,0 @@
package rt4;
import org.openrs2.deob.annotation.OriginalMember;
public final class Static109 {
@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!ig", name = "i", descriptor = "I")
public static int anInt2886;
}

51
client/src/main/java/rt4/Static111.java
View file

@ -1,51 +0,0 @@
package rt4;
import org.openrs2.deob.annotation.OriginalArg;
import org.openrs2.deob.annotation.OriginalMember;
public final class Static111 {
@OriginalMember(owner = "client!ii", name = "a", descriptor = "(Lclient!be;III)V")
public static void method2291(@OriginalArg(0) Component arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2) {
if (arg0.xMode == 0) {
arg0.y = arg0.baseY;
} else if (arg0.xMode == 1) {
arg0.y = (arg1 - arg0.height) / 2 + arg0.baseY;
} else if (arg0.xMode == 2) {
arg0.y = arg1 - arg0.height - arg0.baseY;
} else if (arg0.xMode == 3) {
arg0.y = arg0.baseY * arg1 >> 14;
} else if (arg0.xMode == 4) {
arg0.y = (arg1 * arg0.baseY >> 14) + (arg1 - arg0.height) / 2;
} else {
arg0.y = arg1 - (arg1 * arg0.baseY >> 14) - arg0.height;
}
if (arg0.yMode == 0) {
arg0.x = arg0.baseX;
} else if (arg0.yMode == 1) {
arg0.x = arg0.baseX + (arg2 - arg0.width) / 2;
} else if (arg0.yMode == 2) {
arg0.x = arg2 - arg0.baseX - arg0.width;
} else if (arg0.yMode == 3) {
arg0.x = arg0.baseX * arg2 >> 14;
} else if (arg0.yMode == 4) {
arg0.x = (arg0.baseX * arg2 >> 14) + (arg2 - arg0.width) / 2;
} else {
arg0.x = arg2 - (arg2 * arg0.baseX >> 14) - arg0.width;
}
if (!Static121.qaOpTest || InterfaceList.getServerActiveProperties(arg0).events == 0 && arg0.type != 0) {
return;
}
if (arg0.y < 0) {
arg0.y = 0;
} else if (arg0.height + arg0.y > arg1) {
arg0.y = arg1 - arg0.height;
}
if (arg0.x < 0) {
arg0.x = 0;
} else if (arg2 < arg0.x + arg0.width) {
arg0.x = arg2 - arg0.width;
}
}
}

60
client/src/main/java/rt4/Static112.java
View file

@ -7,27 +7,33 @@ 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 = Static183.anInt4271;
@Pc(9) int local9 = Static229.anInt5138;
@Pc(11) int local11 = Static13.anInt436;
@Pc(13) int local13 = Static24.anInt761;
if (Static39.aClass3_Sub2_Sub1_1 == null || Static181.aClass3_Sub2_Sub1_9 == null) {
@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)) {
Static39.aClass3_Sub2_Sub1_1 = SoftwareSprite.loadSoftwareAlphaSprite(client.js5Archive8, Static40.anInt1736);
Static181.aClass3_Sub2_Sub1_9 = SoftwareSprite.loadSoftwareAlphaSprite(client.js5Archive8, 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 (Static39.aClass3_Sub2_Sub1_1 instanceof SoftwareAlphaSprite) {
Static39.aClass3_Sub2_Sub1_1 = new GlAlphaSprite((SoftwareSprite) Static39.aClass3_Sub2_Sub1_1);
if (aClass3_Sub2_Sub1_1 instanceof SoftwareAlphaSprite) {
aClass3_Sub2_Sub1_1 = new GlAlphaSprite((SoftwareSprite) aClass3_Sub2_Sub1_1);
} else {
Static39.aClass3_Sub2_Sub1_1 = new GlSprite((SoftwareSprite) Static39.aClass3_Sub2_Sub1_1);
aClass3_Sub2_Sub1_1 = new GlSprite((SoftwareSprite) aClass3_Sub2_Sub1_1);
}
if (Static181.aClass3_Sub2_Sub1_9 instanceof SoftwareAlphaSprite) {
Static181.aClass3_Sub2_Sub1_9 = new GlAlphaSprite((SoftwareSprite) Static181.aClass3_Sub2_Sub1_9);
if (aClass3_Sub2_Sub1_9 instanceof SoftwareAlphaSprite) {
aClass3_Sub2_Sub1_9 = new GlAlphaSprite((SoftwareSprite) aClass3_Sub2_Sub1_9);
} else {
Static181.aClass3_Sub2_Sub1_9 = new GlSprite((SoftwareSprite) Static181.aClass3_Sub2_Sub1_9);
aClass3_Sub2_Sub1_9 = new GlSprite((SoftwareSprite) aClass3_Sub2_Sub1_9);
}
}
} else if (GlRenderer.enabled) {
@ -38,13 +44,13 @@ public final class Static112 {
}
@Pc(112) int local112;
@Pc(114) int local114;
if (Static39.aClass3_Sub2_Sub1_1 != null && Static181.aClass3_Sub2_Sub1_9 != null) {
local112 = local13 / Static39.aClass3_Sub2_Sub1_1.width;
if (aClass3_Sub2_Sub1_1 != null && aClass3_Sub2_Sub1_9 != null) {
local112 = local13 / aClass3_Sub2_Sub1_1.width;
for (local114 = 0; local114 < local112; local114++) {
Static39.aClass3_Sub2_Sub1_1.render(local114 * Static39.aClass3_Sub2_Sub1_1.width + local3, local9);
aClass3_Sub2_Sub1_1.render(local114 * aClass3_Sub2_Sub1_1.width + local3, local9);
}
Static181.aClass3_Sub2_Sub1_9.render(local3, local9);
Static181.aClass3_Sub2_Sub1_9.renderHorizontalFlip(local3 + local13 - Static181.aClass3_Sub2_Sub1_9.width, 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) {
@ -66,10 +72,10 @@ public final class Static112 {
}
}
}
if ((Static165.aClass3_Sub2_Sub1_8 == null || aClass3_Sub2_Sub1_6 == null || Static204.aClass3_Sub2_Sub1_10 == null) && client.js5Archive8.isFileReady(Static40.anInt2261) && client.js5Archive8.isFileReady(Static40.anInt3324) && client.js5Archive8.isFileReady(Static40.anInt5556)) {
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);
Static204.aClass3_Sub2_Sub1_10 = SoftwareSprite.loadSoftwareAlphaSprite(client.js5Archive8, Static40.anInt5556);
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);
@ -81,15 +87,15 @@ public final class Static112 {
} else {
aClass3_Sub2_Sub1_6 = new GlSprite((SoftwareSprite) aClass3_Sub2_Sub1_6);
}
if (Static204.aClass3_Sub2_Sub1_10 instanceof SoftwareAlphaSprite) {
Static204.aClass3_Sub2_Sub1_10 = new GlAlphaSprite((SoftwareSprite) Static204.aClass3_Sub2_Sub1_10);
if (aClass3_Sub2_Sub1_10 instanceof SoftwareAlphaSprite) {
aClass3_Sub2_Sub1_10 = new GlAlphaSprite((SoftwareSprite) aClass3_Sub2_Sub1_10);
} else {
Static204.aClass3_Sub2_Sub1_10 = new GlSprite((SoftwareSprite) Static204.aClass3_Sub2_Sub1_10);
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 && Static204.aClass3_Sub2_Sub1_10 != null) {
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);
@ -99,8 +105,8 @@ public final class Static112 {
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);
}
Static204.aClass3_Sub2_Sub1_10.render(local3, local11 + local9 - Static204.aClass3_Sub2_Sub1_10.height);
Static204.aClass3_Sub2_Sub1_10.renderHorizontalFlip(local3 + local13 - Static204.aClass3_Sub2_Sub1_10.width, local9 - -local11 + -Static204.aClass3_Sub2_Sub1_10.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;
@ -110,7 +116,7 @@ public final class Static112 {
}
Fonts.b12Full.renderLeft(MiniMenu.getOp(local203), local3 + 3, local219, local418, 0);
}
Static121.method2407(Static183.anInt4271, Static229.anInt5138, Static13.anInt436, Static24.anInt761);
Static121.method2407(InterfaceList.anInt4271, InterfaceList.anInt5138, InterfaceList.anInt436, InterfaceList.anInt761);
}
}

23
client/src/main/java/rt4/Static113.java
View file

@ -1,23 +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 Static113 {
@OriginalMember(owner = "client!il", name = "O", descriptor = "I")
public static int anInt4612;
@OriginalMember(owner = "client!il", name = "a", descriptor = "(BII)Z")
public static boolean method3557(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) {
if (arg1 == 11) {
arg1 = 10;
}
if (arg1 >= 5 && arg1 <= 8) {
arg1 = 4;
}
@Pc(30) LocType local30 = LocTypeList.get(arg0);
return local30.isReady(arg1);
}
}

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

@ -22,7 +22,7 @@ public final class Static114 {
SoftwareRaster.drawRect(6, 6, local24 + 8, 4 + 4 + local31, 16777215);
}
Fonts.p12Full.method2852(arg1, 10, 10, local24, local31, 16777215, -1, 1, 1, 0);
Static133.method4012(6, local24 + 8, 6, local31 + 4 + 4);
InterfaceList.method4012(6, local24 + 8, 6, local31 + 4 + 4);
if (!arg0) {
Static121.method2407(10, 10, local31, local24);
} else if (GlRenderer.enabled) {

115
client/src/main/java/rt4/Static115.java
View file

@ -1,115 +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 Static115 {
@OriginalMember(owner = "client!ja", name = "f", descriptor = "Lclient!ih;")
public static final LinkedList mediumPriorityRequests = new LinkedList();
@OriginalMember(owner = "client!ja", name = "r", descriptor = "I")
public static int anInt2941 = -1;
@OriginalMember(owner = "client!ja", name = "s", descriptor = "Lclient!na;")
public static final JagString HTTP_PROTOCOL = JagString.parse("http:)4)4");
@OriginalMember(owner = "client!od", name = "g", descriptor = "S")
public static short aShort25 = 256;
@OriginalMember(owner = "client!an", name = "db", descriptor = "S")
public static short aShort9 = 205;
@OriginalMember(owner = "client!mc", name = "tb", descriptor = "S")
public static short aShort22 = 1;
@OriginalMember(owner = "client!ac", name = "k", descriptor = "S")
public static short aShort1 = 32767;
@OriginalMember(owner = "client!nc", name = "n", descriptor = "I")
public static int anInt4055 = 0;
@OriginalMember(owner = "client!tm", name = "i", descriptor = "I")
public static int anInt5377 = 0;
@OriginalMember(owner = "client!bn", name = "eb", descriptor = "I")
public static int anInt773 = 0;
@OriginalMember(owner = "client!ah", name = "n", descriptor = "I")
public static int anInt983 = 0;
@OriginalMember(owner = "client!sc", name = "p", descriptor = "I")
public static int anInt5029 = 0;
@OriginalMember(owner = "client!kd", name = "yb", descriptor = "S")
public static short aShort21 = 32767;
@OriginalMember(owner = "client!ee", name = "f", descriptor = "S")
public static short aShort12 = 1;
@OriginalMember(owner = "client!ja", name = "a", descriptor = "(IIIIB)V")
public static void method2310(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) {
if (Cross.type == 1) {
Sprites.crosses[Cross.milliseconds / 100].render(Cross.x - 8, Cross.y + -8);
}
if (Cross.type == 2) {
Sprites.crosses[Cross.milliseconds / 100 + 4].render(Cross.x - 8, Cross.y + -8);
}
Player.setTutorialIsland();
}
@OriginalMember(owner = "client!ja", name = "a", descriptor = "(IIIIIZ)V")
public static void method2314(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) boolean arg4) {
if (arg0 < 1) {
arg0 = 1;
}
if (arg2 < 1) {
arg2 = 1;
}
if (GlRenderer.enabled) {
@Pc(25) int local25 = arg2 - 334;
if (local25 < 0) {
local25 = 0;
} else if (local25 > 100) {
local25 = 100;
}
@Pc(51) int local51 = local25 * (aShort9 - aShort25) / 100 + aShort25;
if (aShort22 > local51) {
local51 = aShort22;
} else if (aShort1 < local51) {
local51 = aShort1;
}
@Pc(73) int local73 = local51 * arg2 * 512 / (arg0 * 334);
@Pc(115) int local115;
@Pc(122) int local122;
@Pc(86) short local86;
if (local73 < aShort12) {
local86 = aShort12;
local51 = arg0 * 334 * local86 / (arg2 * 512);
if (aShort1 < local51) {
local51 = aShort1;
local115 = arg2 * 512 * local51 / (local86 * 334);
local122 = (arg0 - local115) / 2;
if (arg4) {
GlRaster.method1177();
GlRaster.method1186(arg3, arg1, local122, arg2, 0);
GlRaster.method1186(arg0 + arg3 - local122, arg1, local122, arg2, 0);
}
arg3 += local122;
arg0 -= local122 * 2;
}
} else if (aShort21 < local73) {
local86 = aShort21;
local51 = local86 * arg0 * 334 / (arg2 * 512);
if (aShort22 > local51) {
local51 = aShort22;
local115 = local86 * arg0 * 334 / (local51 * 512);
local122 = (arg2 - local115) / 2;
if (arg4) {
GlRaster.method1177();
GlRaster.method1186(arg3, arg1, arg0, local122, 0);
GlRaster.method1186(arg3, arg1 + arg2 - local122, arg0, local122, 0);
}
arg2 -= local122 * 2;
arg1 += local122;
}
}
anInt5029 = local51 * arg2 / 334;
}
anInt4055 = (short) arg0;
anInt5377 = (short) arg2;
anInt773 = arg1;
anInt983 = arg3;
}
}

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

@ -1,78 +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 Static118 {
@OriginalMember(owner = "client!jd", name = "i", descriptor = "Lclient!be;")
public static Component clickedInventoryComponent;
@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 != Static180.aClass13_22) {
continue;
}
method2354(local15.id, arg1);
if (local15.createdComponents != null) {
method2354(local15.id, local15.createdComponents);
}
@Pc(73) ComponentPointer local73 = (ComponentPointer) InterfaceList.openInterfaces.get((long) local15.id);
if (local73 != null) {
Static96.method1949(local73.anInt5878);
}
}
if (local15.type == 6) {
@Pc(105) int local105;
if (local15.modelSeqId != -1 || local15.anInt462 != -1) {
@Pc(100) boolean local100 = Static154.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 += Static178.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 * Static178.anInt4247;
local105 = local15.modelRotationSpeed << 16 >> 16;
local15.modelXAngle = local243 + local15.modelXAngle & 0x7FF;
local105 *= Static178.anInt4247;
local15.modelYAngle = local15.modelYAngle + local105 & 0x7FF;
InterfaceList.redraw(local15);
}
}
}
}
}
}

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

@ -1,10 +0,0 @@
package rt4;
import org.openrs2.deob.annotation.OriginalMember;
public final class Static119 {
@OriginalMember(owner = "client!je", name = "eb", descriptor = "[I")
public static int[] anIntArray282;
}

38
client/src/main/java/rt4/Static123.java
View file

@ -5,7 +5,9 @@ import org.openrs2.deob.annotation.Pc;
public final class Static123 {
@OriginalMember(owner = "client!jj", name = "e", descriptor = "I")
@OriginalMember(owner = "client!qk", name = "b", descriptor = "Lclient!na;")
public static final JagString aClass100_900 = JagString.parse("tbrefresh");
@OriginalMember(owner = "client!jj", name = "e", descriptor = "I")
public static int anInt3058 = 0;
@OriginalMember(owner = "client!jj", name = "j", descriptor = "Z")
@ -13,12 +15,22 @@ public final class Static123 {
@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 {
Static206.aClass100_900.browserControlCall(client.instance);
aClass100_900.browserControlCall(client.instance);
} catch (@Pc(26) Throwable local26) {
}
}
@ -32,7 +44,7 @@ public final class Static123 {
@Pc(14) int local14;
if (Static8.anIntArray8 != null) {
for (local14 = 0; local14 < Static8.anIntArray8.length; local14++) {
if (Static8.anIntArray8[local14] != -1000000 && (local10.anInt4444 <= Static8.anIntArray8[local14] || local10.anInt4447 <= Static8.anIntArray8[local14]) && (local10.anInt4460 <= Static96.anIntArray234[local14] || local10.anInt4445 <= Static96.anIntArray234[local14]) && (local10.anInt4460 >= Static127.anIntArray292[local14] || local10.anInt4445 >= Static127.anIntArray292[local14]) && (local10.anInt4458 <= Static234.anIntArray454[local14] || local10.anInt4449 <= Static234.anIntArray454[local14]) && (local10.anInt4458 >= Static206.anIntArray427[local14] || local10.anInt4449 >= Static206.anIntArray427[local14])) {
if (Static8.anIntArray8[local14] != -1000000 && (local10.anInt4444 <= Static8.anIntArray8[local14] || local10.anInt4447 <= Static8.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;
}
}
@ -42,7 +54,7 @@ public final class Static123 {
@Pc(158) int local158;
@Pc(137) boolean local137;
if (local10.anInt4453 == 1) {
local14 = local10.anInt4452 + SceneGraph.visibility - Static167.anInt4069;
local14 = local10.anInt4452 + SceneGraph.visibility - anInt4069;
if (local14 >= 0 && local14 <= SceneGraph.visibility + SceneGraph.visibility) {
local115 = local10.anInt4461 + SceneGraph.visibility - Static193.anInt4539;
if (local115 < 0) {
@ -60,7 +72,7 @@ public final class Static123 {
}
}
if (local137) {
local158 = Static149.anInt3555 - local10.anInt4460;
local158 = anInt3555 - local10.anInt4460;
if (local158 > 32) {
local10.anInt4462 = 1;
} else {
@ -80,11 +92,11 @@ public final class Static123 {
} else if (local10.anInt4453 == 2) {
local14 = local10.anInt4461 + SceneGraph.visibility - Static193.anInt4539;
if (local14 >= 0 && local14 <= SceneGraph.visibility + SceneGraph.visibility) {
local115 = local10.anInt4452 + SceneGraph.visibility - Static167.anInt4069;
local115 = local10.anInt4452 + SceneGraph.visibility - anInt4069;
if (local115 < 0) {
local115 = 0;
}
local126 = local10.anInt4446 + SceneGraph.visibility - Static167.anInt4069;
local126 = local10.anInt4446 + SceneGraph.visibility - anInt4069;
if (local126 > SceneGraph.visibility + SceneGraph.visibility) {
local126 = SceneGraph.visibility + SceneGraph.visibility;
}
@ -106,8 +118,8 @@ public final class Static123 {
local10.anInt4462 = 4;
local158 = -local158;
}
local10.anInt4448 = (local10.anInt4460 - Static149.anInt3555 << 8) / local158;
local10.anInt4456 = (local10.anInt4445 - Static149.anInt3555 << 8) / 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;
@ -125,11 +137,11 @@ public final class Static123 {
local126 = SceneGraph.visibility + SceneGraph.visibility;
}
if (local115 <= local126) {
@Pc(408) int local408 = local10.anInt4452 + SceneGraph.visibility - Static167.anInt4069;
@Pc(408) int local408 = local10.anInt4452 + SceneGraph.visibility - anInt4069;
if (local408 < 0) {
local408 = 0;
}
local158 = local10.anInt4446 + SceneGraph.visibility - Static167.anInt4069;
local158 = local10.anInt4446 + SceneGraph.visibility - anInt4069;
if (local158 > SceneGraph.visibility + SceneGraph.visibility) {
local158 = SceneGraph.visibility + SceneGraph.visibility;
}
@ -144,8 +156,8 @@ public final class Static123 {
}
if (local430) {
local10.anInt4462 = 5;
local10.anInt4448 = (local10.anInt4460 - Static149.anInt3555 << 8) / local14;
local10.anInt4456 = (local10.anInt4445 - Static149.anInt3555 << 8) / local14;
local10.anInt4448 = (local10.anInt4460 - anInt3555 << 8) / local14;
local10.anInt4456 = (local10.anInt4445 - anInt3555 << 8) / local14;
local10.anInt4454 = (local10.anInt4458 - Static217.anInt4903 << 8) / local14;
local10.anInt4450 = (local10.anInt4449 - Static217.anInt4903 << 8) / local14;
SceneGraph.aClass120Array2[SceneGraph.anInt4870++] = local10;

17
client/src/main/java/rt4/Static126.java
View file

@ -5,6 +5,11 @@ import org.openrs2.deob.annotation.Pc;
public final class Static126 {
@OriginalMember(owner = "client!sc", name = "z", descriptor = "[Z")
public static final boolean[] aBooleanArray116 = new boolean[100];
@OriginalMember(owner = "client!rg", name = "s", descriptor = "I")
public static int anInt5574 = -1;
@OriginalMember(owner = "client!jm", name = "a", descriptor = "(Z)V")
public static void method2460() {
if (InterfaceList.topLevelInterface != -1) {
@ -14,16 +19,16 @@ public final class Static126 {
if (InterfaceList.aBooleanArray100[local15]) {
InterfaceList.rectangleRedraw[local15] = true;
}
Static223.aBooleanArray116[local15] = InterfaceList.aBooleanArray100[local15];
aBooleanArray116[local15] = InterfaceList.aBooleanArray100[local15];
InterfaceList.aBooleanArray100[local15] = false;
}
Static97.anInt2503 = -1;
Static169.mouseOverInventoryInterface = null;
Static87.anInt2503 = -1;
InterfaceList.mouseOverInventoryInterface = null;
Static182.anInt4311 = client.loop;
if (GlRenderer.enabled) {
Static263.aBoolean299 = true;
ScriptRunner.aBoolean299 = true;
}
Static214.anInt5574 = -1;
anInt5574 = -1;
if (InterfaceList.topLevelInterface != -1) {
InterfaceList.rectangles = 0;
Static9.method182();
@ -33,6 +38,6 @@ public final class Static126 {
} else {
SoftwareRaster.method2503();
}
Static178.anInt4247 = 0;
Protocol.anInt4247 = 0;
}
}

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

@ -1,163 +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 Static127 {
@OriginalMember(owner = "client!hh", name = "a", descriptor = "Lclient!na;")
public static final JagString aClass100_520 = JagString.parse("(U4");
@OriginalMember(owner = "client!mj", name = "g", descriptor = "Lclient!na;")
public static final JagString aClass100_761 = JagString.parse("(U3");
@OriginalMember(owner = "client!wh", name = "u", descriptor = "Lclient!na;")
public static final JagString aClass100_1097 = JagString.parse("(U2");
@OriginalMember(owner = "client!bm", name = "p", descriptor = "Lclient!na;")
public static final JagString aClass100_133 = JagString.parse("(U1");
@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!dm", name = "n", descriptor = "Lclient!na;")
public static final JagString PERCENT_SIGN = JagString.parse("(U");
@OriginalMember(owner = "client!k", name = "j", descriptor = "I")
public static int anInt3126;
@OriginalMember(owner = "client!k", name = "l", descriptor = "[I")
public static int[] anIntArray292;
@OriginalMember(owner = "client!k", name = "m", descriptor = "Z")
public static boolean neverRemoveRoofs = false;
@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 (Static182.aBooleanArray97[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;
}
}
}

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

@ -1,13 +0,0 @@
package rt4;
import org.openrs2.deob.annotation.OriginalMember;
public final class Static13 {
@OriginalMember(owner = "client!bc", name = "X", descriptor = "I")
public static int anInt436;
@OriginalMember(owner = "client!bc", name = "Z", descriptor = "I")
public static int anInt437;
}

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

@ -1,10 +0,0 @@
package rt4;
import org.openrs2.deob.annotation.OriginalMember;
public final class Static130 {
@OriginalMember(owner = "client!kc", name = "p", descriptor = "[I")
public static int[] anIntArray299;
}

29
client/src/main/java/rt4/Static131.java
View file

@ -13,35 +13,6 @@ public final class Static131 {
@OriginalMember(owner = "client!kd", name = "Bb", descriptor = "I")
public static int anInt3260 = -1;
@OriginalMember(owner = "client!kd", name = "a", descriptor = "([IIIII)V")
public static void method2576(@OriginalArg(0) int[] arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3) {
arg1--;
@Pc(14) int local14 = arg2 - 1;
@Pc(17) int local17 = local14 - 7;
while (local17 > arg1) {
@Pc(22) int local22 = arg1 + 1;
arg0[local22] = arg3;
@Pc(27) int local27 = local22 + 1;
arg0[local27] = arg3;
@Pc(32) int local32 = local27 + 1;
arg0[local32] = arg3;
@Pc(37) int local37 = local32 + 1;
arg0[local37] = arg3;
@Pc(42) int local42 = local37 + 1;
arg0[local42] = arg3;
@Pc(47) int local47 = local42 + 1;
arg0[local47] = arg3;
@Pc(52) int local52 = local47 + 1;
arg0[local52] = arg3;
arg1 = local52 + 1;
arg0[arg1] = arg3;
}
while (local14 > arg1) {
arg1++;
arg0[arg1] = arg3;
}
}
@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];

144
client/src/main/java/rt4/Static132.java
View file

@ -1,144 +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 Static132 {
@OriginalMember(owner = "client!ke", name = "U", descriptor = "I")
public static int anInt3291 = 0;
@OriginalMember(owner = "client!ke", name = "f", descriptor = "(B)V")
public static void method2608() {
@Pc(7) int local7 = 0;
for (@Pc(23) int local23 = 0; local23 < 104; local23++) {
for (@Pc(30) int local30 = 0; local30 < 104; local30++) {
if (Static254.method4348(true, local23, local30, SceneGraph.tiles, local7)) {
local7++;
}
if (local7 >= 512) {
return;
}
}
}
}
@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) - Static149.anInt3555;
@Pc(14) int local14;
@Pc(15) int local15 = local14 = (arg7 << 7) - Static217.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 = SceneGraph.tileHeights[arg1][arg6][arg7] - Static123.anInt3947;
@Pc(49) int local49 = SceneGraph.tileHeights[arg1][arg6 + 1][arg7] - Static123.anInt3947;
@Pc(63) int local63 = SceneGraph.tileHeights[arg1][arg6 + 1][arg7 + 1] - Static123.anInt3947;
@Pc(75) int local75 = SceneGraph.tileHeights[arg1][arg6][arg7 + 1] - Static123.anInt3947;
@Pc(85) int local85 = local15 * arg4 + local7 * arg5 >> 16;
@Pc(95) int local95 = local15 * arg5 - local7 * arg4 >> 16;
@Pc(97) int local97 = local85;
@Pc(107) int local107 = local37 * arg3 - local95 * arg2 >> 16;
@Pc(117) int local117 = local37 * arg2 + local95 * arg3 >> 16;
@Pc(119) int local119 = local107;
if (local117 < 50) {
return;
}
local85 = local14 * arg4 + local21 * arg5 >> 16;
@Pc(143) int local143 = local14 * arg5 - local21 * arg4 >> 16;
local21 = local85;
local85 = local49 * arg3 - local143 * arg2 >> 16;
@Pc(165) int local165 = local49 * arg2 + local143 * arg3 >> 16;
local49 = local85;
if (local165 < 50) {
return;
}
local85 = local27 * arg4 + local20 * arg5 >> 16;
local27 = local27 * arg5 - local20 * arg4 >> 16;
@Pc(193) int local193 = local85;
local85 = local63 * arg3 - local27 * arg2 >> 16;
local27 = local63 * arg2 + local27 * arg3 >> 16;
local63 = local85;
if (local27 < 50) {
return;
}
local85 = local26 * arg4 + local6 * arg5 >> 16;
@Pc(239) int local239 = local26 * arg5 - local6 * arg4 >> 16;
@Pc(241) int local241 = local85;
local85 = local75 * arg3 - local239 * arg2 >> 16;
@Pc(261) int local261 = local75 * arg2 + local239 * arg3 >> 16;
if (local261 < 50) {
return;
}
@Pc(275) int local275 = Rasteriser.centerX + (local97 << 9) / local117;
@Pc(283) int local283 = Rasteriser.centerY + (local119 << 9) / local117;
@Pc(291) int local291 = Rasteriser.centerX + (local21 << 9) / local165;
@Pc(299) int local299 = Rasteriser.centerY + (local49 << 9) / local165;
@Pc(307) int local307 = Rasteriser.centerX + (local193 << 9) / local27;
@Pc(315) int local315 = Rasteriser.centerY + (local63 << 9) / local27;
@Pc(323) int local323 = Rasteriser.centerX + (local241 << 9) / local261;
@Pc(331) int local331 = Rasteriser.centerY + (local85 << 9) / local261;
Rasteriser.alpha = 0;
@Pc(475) int local475;
if ((local307 - local323) * (local299 - local331) - (local315 - local331) * (local291 - local323) > 0) {
if (MiniMenu.aBoolean187 && Static19.method583(MiniMenu.anInt2388 + Rasteriser.centerX, MiniMenu.anInt3259 + Rasteriser.centerY, local315, local331, local299, local307, local323, local291)) {
MiniMenu.anInt1742 = arg6;
MiniMenu.anInt2954 = arg7;
}
if (!GlRenderer.enabled && !arg8) {
Rasteriser.testX = false;
if (local307 < 0 || local323 < 0 || local291 < 0 || local307 > Rasteriser.width || local323 > Rasteriser.width || local291 > Rasteriser.width) {
Rasteriser.testX = true;
}
if (arg0.anInt4869 == -1) {
if (arg0.anInt4865 != 12345678) {
Rasteriser.fillGouraudTriangle(local315, local331, local299, local307, local323, local291, arg0.anInt4865, arg0.anInt4864, arg0.anInt4867);
}
} else if (!Preferences.manyGroundTextures) {
local475 = Rasteriser.textureProvider.getAverageColor(arg0.anInt4869);
Rasteriser.fillGouraudTriangle(local315, local331, local299, local307, local323, local291, Static216.method1640(local475, arg0.anInt4865), Static216.method1640(local475, arg0.anInt4864), Static216.method1640(local475, arg0.anInt4867));
} else if (arg0.aBoolean241) {
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 {
Rasteriser.fillTexturedTriangle(local315, local331, local299, local307, local323, local291, arg0.anInt4865, arg0.anInt4864, arg0.anInt4867, local193, local241, local21, local63, local85, local49, local27, local261, local165, arg0.anInt4869);
}
}
}
if ((local275 - local291) * (local331 - local299) - (local283 - local299) * (local323 - local291) <= 0) {
return;
}
if (MiniMenu.aBoolean187 && Static19.method583(MiniMenu.anInt2388 + Rasteriser.centerX, MiniMenu.anInt3259 + Rasteriser.centerY, local283, local299, local331, local275, local291, local323)) {
MiniMenu.anInt1742 = arg6;
MiniMenu.anInt2954 = arg7;
}
if (GlRenderer.enabled || arg8) {
return;
}
Rasteriser.testX = false;
if (local275 < 0 || local291 < 0 || local323 < 0 || local275 > Rasteriser.width || local291 > Rasteriser.width || local323 > Rasteriser.width) {
Rasteriser.testX = true;
}
if (arg0.anInt4869 == -1) {
if (arg0.anInt4872 != 12345678) {
Rasteriser.fillGouraudTriangle(local283, local299, local331, local275, local291, local323, arg0.anInt4872, arg0.anInt4867, arg0.anInt4864);
}
} else if (Preferences.manyGroundTextures) {
Rasteriser.fillTexturedTriangle(local283, local299, local331, local275, local291, local323, arg0.anInt4872, arg0.anInt4867, arg0.anInt4864, local97, local21, local241, local119, local49, local85, local117, local165, local261, arg0.anInt4869);
} else {
local475 = Rasteriser.textureProvider.getAverageColor(arg0.anInt4869);
Rasteriser.fillGouraudTriangle(local283, local299, local331, local275, local291, local323, Static216.method1640(local475, arg0.anInt4872), Static216.method1640(local475, arg0.anInt4867), Static216.method1640(local475, arg0.anInt4864));
}
}
@OriginalMember(owner = "client!we", name = "b", descriptor = "(BI)V")
public static void method3214(@OriginalArg(1) int arg0) {
for (@Pc(11) Node local11 = InterfaceList.properties.head(); local11 != null; local11 = InterfaceList.properties.next()) {
if ((local11.key >> 48 & 0xFFFFL) == (long) arg0) {
local11.unlink();
}
}
}
}

26
client/src/main/java/rt4/Static133.java
View file

@ -1,26 +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 Static133 {
@OriginalMember(owner = "client!kf", name = "f", descriptor = "I")
public static int anInt5230;
@OriginalMember(owner = "client!kf", name = "d", descriptor = "[Lclient!cl;")
public static final AnimFrameset[] aClass3_Sub2_Sub7Array7 = new AnimFrameset[14];
@OriginalMember(owner = "client!kf", name = "l", descriptor = "I")
public static int anInt5235 = 0;
@OriginalMember(owner = "client!kf", name = "a", descriptor = "(IIBII)V")
public static void method4012(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3) {
for (@Pc(12) int local12 = 0; local12 < InterfaceList.rectangles; local12++) {
if (InterfaceList.rectangleWidth[local12] + InterfaceList.rectangleX[local12] > arg0 && arg1 + arg0 > InterfaceList.rectangleX[local12] && arg2 < InterfaceList.rectangleHeight[local12] + InterfaceList.rectangleY[local12] && InterfaceList.rectangleY[local12] < arg2 + arg3) {
InterfaceList.aBooleanArray100[local12] = true;
}
}
}
}

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

@ -16,11 +16,11 @@ public final class Static134 {
@OriginalMember(owner = "client!kh", name = "a", descriptor = "(IIIBII)V")
public static void method2622(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4) {
@Pc(8) int local8 = arg2 + 1;
Static131.method2576(Static71.anIntArrayArray10[arg2], arg4, arg1, arg0);
TextureOp29SubOp4.method2576(TextureOp29SubOp4.anIntArrayArray10[arg2], arg4, arg1, arg0);
@Pc(17) int local17 = arg3 - 1;
Static131.method2576(Static71.anIntArrayArray10[arg3], arg4, arg1, arg0);
TextureOp29SubOp4.method2576(TextureOp29SubOp4.anIntArrayArray10[arg3], arg4, arg1, arg0);
for (@Pc(29) int local29 = local8; local29 <= local17; local29++) {
@Pc(40) int[] local40 = Static71.anIntArrayArray10[local29];
@Pc(40) int[] local40 = TextureOp29SubOp4.anIntArrayArray10[local29];
local40[arg4] = local40[arg1] = arg0;
}
}

55
client/src/main/java/rt4/Static138.java
View file

@ -1,55 +0,0 @@
package rt4;
import org.openrs2.deob.annotation.OriginalMember;
public final class Static138 {
@OriginalMember(owner = "client!km", name = "tc", descriptor = "Lclient!na;")
private static final JagString aClass100_641 = JagString.parse("Dec");
@OriginalMember(owner = "client!km", name = "vc", descriptor = "Lclient!na;")
private static final JagString aClass100_642 = JagString.parse("Jul");
@OriginalMember(owner = "client!km", name = "xc", descriptor = "Lclient!na;")
private static final JagString aClass100_644 = JagString.parse("May");
@OriginalMember(owner = "client!km", name = "yc", descriptor = "Lclient!na;")
private static final JagString aClass100_645 = JagString.parse("Nov");
@OriginalMember(owner = "client!km", name = "zc", descriptor = "Lclient!na;")
private static final JagString aClass100_646 = JagString.parse("Mar");
@OriginalMember(owner = "client!km", name = "Gc", descriptor = "Lclient!na;")
private static final JagString aClass100_649 = JagString.parse("Jan");
@OriginalMember(owner = "client!km", name = "Hc", descriptor = "Lclient!na;")
private static final JagString aClass100_650 = JagString.parse("Feb");
@OriginalMember(owner = "client!km", name = "Tc", descriptor = "Lclient!na;")
private static final JagString aClass100_655 = JagString.parse("Apr");
@OriginalMember(owner = "client!km", name = "Wc", descriptor = "Lclient!na;")
private static final JagString aClass100_656 = JagString.parse("Jun");
@OriginalMember(owner = "client!km", name = "Qc", descriptor = "Lclient!na;")
private static final JagString aClass100_653 = JagString.parse("Aug");
@OriginalMember(owner = "client!km", name = "cd", descriptor = "Lclient!na;")
private static final JagString aClass100_657 = JagString.parse("Sep");
@OriginalMember(owner = "client!km", name = "dd", descriptor = "Lclient!na;")
private static final JagString aClass100_658 = JagString.parse("Oct");
@OriginalMember(owner = "client!km", name = "Ac", descriptor = "[Lclient!na;")
public static final JagString[] aClass100Array102 = new JagString[] { aClass100_649, aClass100_650, aClass100_646, aClass100_655, aClass100_644, aClass100_656, aClass100_642, aClass100_653, aClass100_657, aClass100_658, aClass100_645, aClass100_641 };
@OriginalMember(owner = "client!km", name = "Mc", descriptor = "Lclient!na;")
public static final JagString LOGINSCREEN = JagString.parse("loginscreen");
@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!km", name = "Sc", descriptor = "Lclient!na;")
public static final JagString TRADE = JagString.parse(":trade:");
}

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

@ -1,22 +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 Static14 {
@OriginalMember(owner = "client!bd", name = "b", descriptor = "Lclient!na;")
public static final JagString aClass100_80 = JagString.parse("(U(Y");
@OriginalMember(owner = "client!bd", name = "a", descriptor = "(BI)V")
public static void method475(@OriginalArg(1) int arg0) {
@Pc(8) Inv local8 = (Inv) Inv.objectContainerCache.get((long) arg0);
if (local8 != null) {
for (@Pc(24) int local24 = 0; local24 < local8.objectIds.length; local24++) {
local8.objectIds[local24] = -1;
local8.anIntArray422[local24] = 0;
}
}
}
}

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

@ -1,10 +0,0 @@
package rt4;
import org.openrs2.deob.annotation.OriginalMember;
public final class Static141 {
@OriginalMember(owner = "client!lb", name = "z", descriptor = "I")
public static int anInt3473;
}

19
client/src/main/java/rt4/Static143.java
View file

@ -1,19 +0,0 @@
package rt4;
import org.openrs2.deob.annotation.OriginalMember;
public final class Static143 {
@OriginalMember(owner = "client!ld", name = "b", descriptor = "[Lclient!nc;")
public static final MapMarker[] hintMapMarkers = new MapMarker[4];
@OriginalMember(owner = "client!ld", name = "c", descriptor = "I")
public static int anInt3484 = -1;
@OriginalMember(owner = "client!ld", name = "d", descriptor = "Lclient!na;")
public static final JagString aClass100_668 = JagString.parse("Hidden)2use");
@OriginalMember(owner = "client!ld", name = "i", descriptor = "I")
public static int anInt3486 = 0;
}

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

@ -8,8 +8,12 @@ public final class Static145 {
@OriginalMember(owner = "client!lf", name = "k", descriptor = "I")
public static int anInt3502 = -1;
@OriginalMember(owner = "client!vg", name = "e", descriptor = "[I")
public static int[] anIntArray516;
@OriginalMember(owner = "client!ri", name = "d", descriptor = "[I")
public static int[] anIntArray188;
@OriginalMember(owner = "client!lf", name = "a", descriptor = "(I)V")
@OriginalMember(owner = "client!lf", name = "a", descriptor = "(I)V")
public static void method2742() {
if (client.gameState == 10 && GlRenderer.enabled) {
client.setGameState(28);
@ -44,20 +48,20 @@ public final class Static145 {
for (local15 = 192; local15 < 255; local15++) {
Static221.anIntArray235[local15] = Flames.anIntArray445[3];
}
Static270.anIntArray562 = new int[32768];
Static263.anIntArray516 = new int[32768];
Static267.anIntArray562 = new int[32768];
anIntArray516 = new int[32768];
Static69.method1545(null);
Static103.anIntArray254 = new int[32768];
Static216.anIntArray188 = new int[32768];
anIntArray188 = new int[32768];
Static221.aClass3_Sub2_Sub1_Sub1_3 = new SoftwareSprite(128, 254);
}
@OriginalMember(owner = "client!lf", name = "b", descriptor = "(I)V")
public static void method2744() {
@Pc(3) int local3 = Static229.anInt5138;
@Pc(9) int local9 = Static24.anInt761;
@Pc(11) int local11 = Static183.anInt4271;
@Pc(15) int local15 = Static13.anInt436;
@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.method1186(local11, local3, local9, local15, 6116423);
GlRaster.method1186(local11 + 1, local3 + 1, local9 - 2, 16, 0);
@ -78,7 +82,7 @@ public final class Static145 {
}
Fonts.b12Full.renderLeft(MiniMenu.getOp(local107), local11 + 3, local127, local129, 0);
}
Static121.method2407(Static183.anInt4271, Static229.anInt5138, Static13.anInt436, Static24.anInt761);
Static121.method2407(InterfaceList.anInt4271, InterfaceList.anInt5138, InterfaceList.anInt436, InterfaceList.anInt761);
}
}

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

@ -14,7 +14,7 @@ public final class Static146 {
@OriginalMember(owner = "client!lg", name = "a", descriptor = "(I)V")
public static void method2750(@OriginalArg(0) int arg0) {
Static235.anInt5276 = arg0;
Static156.anInt5276 = arg0;
for (@Pc(3) int local3 = 0; local3 < SceneGraph.width; local3++) {
for (@Pc(8) int local8 = 0; local8 < SceneGraph.length; local8++) {
if (SceneGraph.tiles[arg0][local3][local8] == null) {

73
client/src/main/java/rt4/Static147.java
View file

@ -8,8 +8,18 @@ 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")
@OriginalMember(owner = "client!lh", name = "b", descriptor = "(II)V")
public static void method2761(@OriginalArg(0) int arg0) {
UnderwaterMaterialRenderer.anInt3241 = arg0;
MaterialManager.resetArgument(3);
@ -25,7 +35,7 @@ public final class Static147 {
@Pc(29) int local29;
@Pc(39) int local39;
for (local5 = 0; local5 < local3; local5++) {
local15 = arg0.anIntArray168[local5] - Static149.anInt3555;
local15 = arg0.anIntArray168[local5] - Static123.anInt3555;
local22 = arg0.anIntArray160[local5] - Static123.anInt3947;
local29 = arg0.anIntArray163[local5] - Static217.anInt4903;
local39 = local29 * arg3 + local15 * arg4 >> 16;
@ -36,12 +46,12 @@ public final class Static147 {
return;
}
if (arg0.anIntArray161 != null) {
Static68.anIntArray159[local5] = local39;
Static68.anIntArray170[local5] = local61;
Static68.anIntArray169[local5] = local71;
anIntArray159[local5] = local39;
anIntArray170[local5] = local61;
anIntArray169[local5] = local71;
}
Static68.anIntArray165[local5] = Rasteriser.centerX + (local39 << 9) / local71;
Static68.anIntArray164[local5] = Rasteriser.centerY + (local61 << 9) / local71;
anIntArray165[local5] = Rasteriser.centerX + (local39 << 9) / local71;
anIntArray164[local5] = Rasteriser.centerY + (local61 << 9) / local71;
}
Rasteriser.alpha = 0;
local3 = arg0.anIntArray166.length;
@ -49,14 +59,14 @@ public final class Static147 {
local15 = arg0.anIntArray166[local5];
local22 = arg0.anIntArray162[local5];
local29 = arg0.anIntArray158[local5];
local39 = Static68.anIntArray165[local15];
@Pc(148) int local148 = Static68.anIntArray165[local22];
@Pc(152) int local152 = Static68.anIntArray165[local29];
@Pc(156) int local156 = Static68.anIntArray164[local15];
@Pc(160) int local160 = Static68.anIntArray164[local22];
@Pc(164) int local164 = Static68.anIntArray164[local29];
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 && Static19.method583(MiniMenu.anInt2388 + Rasteriser.centerX, MiniMenu.anInt3259 + Rasteriser.centerY, local156, local160, local164, local39, local148, local152)) {
if (MiniMenu.aBoolean187 && method583(MiniMenu.anInt2388 + Rasteriser.centerX, MiniMenu.anInt3259 + Rasteriser.centerY, local156, local160, local164, local39, local148, local152)) {
MiniMenu.anInt1742 = arg5;
MiniMenu.anInt2954 = arg6;
}
@ -71,11 +81,11 @@ public final class Static147 {
}
} else if (!Preferences.manyGroundTextures) {
@Pc(373) int local373 = Rasteriser.textureProvider.getAverageColor(arg0.anIntArray161[local5]);
Rasteriser.fillGouraudTriangle(local156, local160, local164, local39, local148, local152, Static216.method1640(local373, arg0.anIntArray167[local5]), Static216.method1640(local373, arg0.anIntArray172[local5]), Static216.method1640(local373, arg0.anIntArray171[local5]));
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], Static68.anIntArray159[0], Static68.anIntArray159[1], Static68.anIntArray159[3], Static68.anIntArray170[0], Static68.anIntArray170[1], Static68.anIntArray170[3], Static68.anIntArray169[0], Static68.anIntArray169[1], Static68.anIntArray169[3], arg0.anIntArray161[local5]);
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], Static68.anIntArray159[local15], Static68.anIntArray159[local22], Static68.anIntArray159[local29], Static68.anIntArray170[local15], Static68.anIntArray170[local22], Static68.anIntArray170[local29], Static68.anIntArray169[local15], Static68.anIntArray169[local22], Static68.anIntArray169[local29], arg0.anIntArray161[local5]);
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]);
}
}
}
@ -88,4 +98,33 @@ public final class Static147 {
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;
}
}

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

@ -1,13 +0,0 @@
package rt4;
import org.openrs2.deob.annotation.OriginalMember;
public final class Static148 {
@OriginalMember(owner = "client!li", name = "t", descriptor = "I")
public static int anInt3534;
@OriginalMember(owner = "client!li", name = "w", descriptor = "Lclient!sc;")
public static HashTable aClass133_13;
}

15
client/src/main/java/rt4/Static149.java
View file

@ -1,15 +0,0 @@
package rt4;
import org.openrs2.deob.annotation.OriginalMember;
public final class Static149 {
@OriginalMember(owner = "client!lj", name = "B", descriptor = "I")
public static int anInt3555;
@OriginalMember(owner = "client!lj", name = "w", descriptor = "I")
public static int clickedInventoryComponentX = 0;
@OriginalMember(owner = "client!lj", name = "z", descriptor = "[I")
public static int[] anIntArray338 = new int[2];
}

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

@ -1,36 +0,0 @@
package rt4;
import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc;
public final class Static15 {
@OriginalMember(owner = "client!dc", name = "M", descriptor = "Lclient!na;")
public static final JagString aClass100_268 = JagString.parse(")4");
@OriginalMember(owner = "client!he", name = "gb", descriptor = "Lclient!na;")
public static final JagString aClass100_518 = JagString.parse("www");
@OriginalMember(owner = "client!e", name = "Tc", descriptor = "Lclient!na;")
public static final JagString aClass100_365 = JagString.parse("www)2wtqa");
@OriginalMember(owner = "client!lk", name = "J", descriptor = "Lclient!na;")
public static final JagString aClass100_687 = JagString.parse(")4p=");
@OriginalMember(owner = "client!en", name = "x", descriptor = "Lclient!na;")
public static final JagString aClass100_424 = JagString.parse("http:)4)4");
@OriginalMember(owner = "client!gf", name = "I", descriptor = "Lclient!na;")
public static final JagString aClass100_886 = JagString.parse(")3runescape)3com)4l=");
@OriginalMember(owner = "client!v", name = "a", descriptor = "Lclient!na;")
public static final JagString aClass100_98 = JagString.parse(")4a=");
@OriginalMember(owner = "client!be", name = "a", descriptor = "(Z)Lclient!na;")
public static JagString method479() {
@Pc(8) JagString local8 = aClass100_518;
@Pc(10) JagString local10 = JagString.EMPTY;
if (client.modeWhere != 0) {
local8 = aClass100_365;
}
if (client.settings != null) {
local10 = JagString.concatenate(new JagString[] { aClass100_687, client.settings});
}
return JagString.concatenate(new JagString[] { aClass100_424, local8, aClass100_886, JagString.parseInt(client.language), aClass100_98, JagString.parseInt(client.affiliate), local10, aClass100_268 });
}
}

72
client/src/main/java/rt4/Static150.java
View file

@ -1,72 +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 Static150 {
@OriginalMember(owner = "client!lk", name = "V", descriptor = "I")
public static int anInt3582 = 0;
@OriginalMember(owner = "client!lk", name = "a", descriptor = "(IIILclient!be;Z)V")
public static void method2801(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) Component arg2, @OriginalArg(4) boolean arg3) {
@Pc(4) int local4 = arg2.width;
@Pc(7) int local7 = arg2.height;
if (arg2.dynamicWidthValue == 0) {
arg2.width = arg2.baseWidth;
} else if (arg2.dynamicWidthValue == 1) {
arg2.width = arg1 - arg2.baseWidth;
} else if (arg2.dynamicWidthValue == 2) {
arg2.width = arg2.baseWidth * arg1 >> 14;
} else if (arg2.dynamicWidthValue == 3) {
if (arg2.type == 2) {
arg2.width = arg2.baseWidth * 32 + (arg2.baseWidth - 1) * arg2.anInt512;
} else if (arg2.type == 7) {
arg2.width = arg2.baseWidth * 115 + arg2.anInt512 * (arg2.baseWidth - 1);
}
}
if (arg2.dynamicHeightValue == 0) {
arg2.height = arg2.baseHeight;
} else if (arg2.dynamicHeightValue == 1) {
arg2.height = arg0 - arg2.baseHeight;
} else if (arg2.dynamicHeightValue == 2) {
arg2.height = arg0 * arg2.baseHeight >> 14;
} else if (arg2.dynamicHeightValue == 3) {
if (arg2.type == 2) {
arg2.height = (arg2.baseHeight - 1) * arg2.anInt516 + arg2.baseHeight * 32;
} else if (arg2.type == 7) {
arg2.height = arg2.baseHeight * 12 + (arg2.baseHeight - 1) * arg2.anInt516;
}
}
if (arg2.dynamicWidthValue == 4) {
arg2.width = arg2.aspectWidth * arg2.height / arg2.aspectHeight;
}
if (arg2.dynamicHeightValue == 4) {
arg2.height = arg2.aspectHeight * arg2.width / arg2.aspectWidth;
}
if (Static121.qaOpTest && (InterfaceList.getServerActiveProperties(arg2).events != 0 || arg2.type == 0)) {
if (arg2.height < 5 && arg2.width < 5) {
arg2.height = 5;
arg2.width = 5;
} else {
if (arg2.width <= 0) {
arg2.width = 5;
}
if (arg2.height <= 0) {
arg2.height = 5;
}
}
}
if (arg2.clientCode == 1337) {
Static280.aClass13_26 = arg2;
}
if (arg3 && arg2.onResize != null && (local4 != arg2.width || arg2.height != local7)) {
@Pc(305) HookRequest local305 = new HookRequest();
local305.arguments = arg2.onResize;
local305.source = arg2;
InterfaceList.lowPriorityRequests.addTail(local305);
}
}
}

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

@ -12,7 +12,7 @@ public final class Static152 {
@OriginalMember(owner = "client!wl", name = "a", descriptor = "(IBIIIII)V")
public static void method4670(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5) {
@Pc(18) int local18 = arg2 - arg4;
Static251.method4278(arg2);
Static241.method4278(arg2);
@Pc(23) int local23 = 0;
if (local18 < 0) {
local18 = 0;
@ -27,14 +27,14 @@ public final class Static152 {
@Pc(78) int local78;
@Pc(87) int local87;
if (arg1 >= TextureOp29.anInt5773 && TextureOp29.anInt2869 >= arg1) {
@Pc(52) int[] local52 = Static71.anIntArrayArray10[arg1];
local61 = Static78.method1690(TextureOp29.anInt5063, arg5 - arg2, TextureOp29.anInt4164);
local69 = Static78.method1690(TextureOp29.anInt5063, arg2 + arg5, TextureOp29.anInt4164);
local78 = Static78.method1690(TextureOp29.anInt5063, arg5 - local18, TextureOp29.anInt4164);
local87 = Static78.method1690(TextureOp29.anInt5063, arg5 + local18, TextureOp29.anInt4164);
Static131.method2576(local52, local61, local78, arg3);
Static131.method2576(local52, local78, local87, arg0);
Static131.method2576(local52, local87, local69, arg3);
@Pc(52) int[] local52 = TextureOp29SubOp4.anIntArrayArray10[arg1];
local61 = Static231.method1690(TextureOp29.anInt5063, arg5 - arg2, TextureOp29.anInt4164);
local69 = Static231.method1690(TextureOp29.anInt5063, arg2 + arg5, TextureOp29.anInt4164);
local78 = Static231.method1690(TextureOp29.anInt5063, arg5 - local18, TextureOp29.anInt4164);
local87 = Static231.method1690(TextureOp29.anInt5063, arg5 + local18, TextureOp29.anInt4164);
TextureOp29SubOp4.method2576(local52, local61, local78, arg3);
TextureOp29SubOp4.method2576(local52, local78, local87, arg0);
TextureOp29SubOp4.method2576(local52, local87, local69, arg3);
}
@Pc(107) int local107 = -1;
while (local23 < local32) {
@ -59,31 +59,31 @@ public final class Static152 {
local61 = arg1 + local32;
if (TextureOp29.anInt5773 <= local61 && TextureOp29.anInt2869 >= local161) {
if (local32 >= local18) {
local69 = Static78.method1690(TextureOp29.anInt5063, local23 + arg5, TextureOp29.anInt4164);
local78 = Static78.method1690(TextureOp29.anInt5063, arg5 - local23, TextureOp29.anInt4164);
local69 = Static231.method1690(TextureOp29.anInt5063, local23 + arg5, TextureOp29.anInt4164);
local78 = Static231.method1690(TextureOp29.anInt5063, arg5 - local23, TextureOp29.anInt4164);
if (TextureOp29.anInt2869 >= local61) {
Static131.method2576(Static71.anIntArrayArray10[local61], local78, local69, arg3);
TextureOp29SubOp4.method2576(TextureOp29SubOp4.anIntArrayArray10[local61], local78, local69, arg3);
}
if (local161 >= TextureOp29.anInt5773) {
Static131.method2576(Static71.anIntArrayArray10[local161], local78, local69, arg3);
TextureOp29SubOp4.method2576(TextureOp29SubOp4.anIntArrayArray10[local161], local78, local69, arg3);
}
} else {
local69 = Static241.anIntArray522[local32];
local78 = Static78.method1690(TextureOp29.anInt5063, local23 + arg5, TextureOp29.anInt4164);
local87 = Static78.method1690(TextureOp29.anInt5063, arg5 - local23, TextureOp29.anInt4164);
local264 = Static78.method1690(TextureOp29.anInt5063, arg5 + local69, TextureOp29.anInt4164);
local273 = Static78.method1690(TextureOp29.anInt5063, arg5 - local69, TextureOp29.anInt4164);
local78 = Static231.method1690(TextureOp29.anInt5063, local23 + arg5, TextureOp29.anInt4164);
local87 = Static231.method1690(TextureOp29.anInt5063, arg5 - local23, TextureOp29.anInt4164);
local264 = Static231.method1690(TextureOp29.anInt5063, arg5 + local69, TextureOp29.anInt4164);
local273 = Static231.method1690(TextureOp29.anInt5063, arg5 - local69, TextureOp29.anInt4164);
if (TextureOp29.anInt2869 >= local61) {
local280 = Static71.anIntArrayArray10[local61];
Static131.method2576(local280, local87, local273, arg3);
Static131.method2576(local280, local273, local264, arg0);
Static131.method2576(local280, local264, local78, arg3);
local280 = TextureOp29SubOp4.anIntArrayArray10[local61];
TextureOp29SubOp4.method2576(local280, local87, local273, arg3);
TextureOp29SubOp4.method2576(local280, local273, local264, arg0);
TextureOp29SubOp4.method2576(local280, local264, local78, arg3);
}
if (local161 >= TextureOp29.anInt5773) {
local280 = Static71.anIntArrayArray10[local161];
Static131.method2576(local280, local87, local273, arg3);
Static131.method2576(local280, local273, local264, arg0);
Static131.method2576(local280, local264, local78, arg3);
local280 = TextureOp29SubOp4.anIntArrayArray10[local161];
TextureOp29SubOp4.method2576(local280, local87, local273, arg3);
TextureOp29SubOp4.method2576(local280, local273, local264, arg0);
TextureOp29SubOp4.method2576(local280, local264, local78, arg3);
}
}
}
@ -94,30 +94,30 @@ public final class Static152 {
local69 = arg5 + local32;
local78 = arg5 - local32;
if (local69 >= TextureOp29.anInt4164 && TextureOp29.anInt5063 >= local78) {
local69 = Static78.method1690(TextureOp29.anInt5063, local69, TextureOp29.anInt4164);
local78 = Static78.method1690(TextureOp29.anInt5063, local78, TextureOp29.anInt4164);
local69 = Static231.method1690(TextureOp29.anInt5063, local69, TextureOp29.anInt4164);
local78 = Static231.method1690(TextureOp29.anInt5063, local78, TextureOp29.anInt4164);
if (local23 < local18) {
local87 = local40 >= local23 ? local40 : Static241.anIntArray522[local23];
local264 = Static78.method1690(TextureOp29.anInt5063, local87 + arg5, TextureOp29.anInt4164);
local273 = Static78.method1690(TextureOp29.anInt5063, arg5 - local87, TextureOp29.anInt4164);
local264 = Static231.method1690(TextureOp29.anInt5063, local87 + arg5, TextureOp29.anInt4164);
local273 = Static231.method1690(TextureOp29.anInt5063, arg5 - local87, TextureOp29.anInt4164);
if (TextureOp29.anInt2869 >= local61) {
local280 = Static71.anIntArrayArray10[local61];
Static131.method2576(local280, local78, local273, arg3);
Static131.method2576(local280, local273, local264, arg0);
Static131.method2576(local280, local264, local69, arg3);
local280 = TextureOp29SubOp4.anIntArrayArray10[local61];
TextureOp29SubOp4.method2576(local280, local78, local273, arg3);
TextureOp29SubOp4.method2576(local280, local273, local264, arg0);
TextureOp29SubOp4.method2576(local280, local264, local69, arg3);
}
if (local161 >= TextureOp29.anInt5773) {
local280 = Static71.anIntArrayArray10[local161];
Static131.method2576(local280, local78, local273, arg3);
Static131.method2576(local280, local273, local264, arg0);
Static131.method2576(local280, local264, local69, arg3);
local280 = TextureOp29SubOp4.anIntArrayArray10[local161];
TextureOp29SubOp4.method2576(local280, local78, local273, arg3);
TextureOp29SubOp4.method2576(local280, local273, local264, arg0);
TextureOp29SubOp4.method2576(local280, local264, local69, arg3);
}
} else {
if (TextureOp29.anInt2869 >= local61) {
Static131.method2576(Static71.anIntArrayArray10[local61], local78, local69, arg3);
TextureOp29SubOp4.method2576(TextureOp29SubOp4.anIntArrayArray10[local61], local78, local69, arg3);
}
if (local161 >= TextureOp29.anInt5773) {
Static131.method2576(Static71.anIntArrayArray10[local161], local78, local69, arg3);
TextureOp29SubOp4.method2576(TextureOp29SubOp4.anIntArrayArray10[local161], local78, local69, arg3);
}
}
}

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

@ -1,40 +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 Static154 {
@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;
}
for (@Pc(14) int local14 = 0; local14 < arg0.anIntArray43.length; local14++) {
@Pc(34) int local34 = Static127.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;
}
}
return true;
}
@OriginalMember(owner = "client!md", name = "a", descriptor = "(JB)Lclient!na;")
public static JagString method2929(@OriginalArg(0) long arg0) {
return Static59.method1376(arg0);
}
}

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

@ -1,10 +0,0 @@
package rt4;
import org.openrs2.deob.annotation.OriginalMember;
public final class Static155 {
@OriginalMember(owner = "client!me", name = "nb", descriptor = "I")
public static int anInt3751;
}

265
client/src/main/java/rt4/Static156.java
View file

@ -1,5 +1,6 @@
package rt4;
import com.jogamp.opengl.GL2;
import org.openrs2.deob.annotation.OriginalArg;
import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc;
@ -8,8 +9,14 @@ 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;
@OriginalMember(owner = "client!mf", name = "a", descriptor = "(IIIII[[[B[I[I[I[I[IIBII)V")
@OriginalMember(owner = "client!mf", name = "a", descriptor = "(IIIII[[[B[I[I[I[I[IIBII)V")
public static void method2954(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) byte[][][] arg5, @OriginalArg(6) int[] arg6, @OriginalArg(7) int[] arg7, @OriginalArg(8) int[] arg8, @OriginalArg(9) int[] arg9, @OriginalArg(10) int[] arg10, @OriginalArg(11) int arg11, @OriginalArg(12) byte arg12, @OriginalArg(13) int arg13, @OriginalArg(14) int arg14) {
if (arg0 < 0) {
arg0 = 0;
@ -21,30 +28,30 @@ public final class Static156 {
} else if (arg2 >= SceneGraph.length * 128) {
arg2 = SceneGraph.length * 128 - 1;
}
Static109.anInt2886 = MathUtils.sin[arg3];
Static160.anInt2886 = MathUtils.sin[arg3];
Static121.anInt3038 = MathUtils.cos[arg3];
Static231.anInt5205 = MathUtils.sin[arg4];
Static81.anInt2222 = MathUtils.cos[arg4];
Static149.anInt3555 = arg0;
Static123.anInt3555 = arg0;
Static123.anInt3947 = arg1;
Static217.anInt4903 = arg2;
Static167.anInt4069 = arg0 / 128;
Static123.anInt4069 = arg0 / 128;
Static193.anInt4539 = arg2 / 128;
Static31.anInt987 = Static167.anInt4069 - SceneGraph.visibility;
if (Static31.anInt987 < 0) {
Static31.anInt987 = 0;
LightingManager.anInt987 = Static123.anInt4069 - SceneGraph.visibility;
if (LightingManager.anInt987 < 0) {
LightingManager.anInt987 = 0;
}
Static80.anInt4698 = Static193.anInt4539 - SceneGraph.visibility;
if (Static80.anInt4698 < 0) {
Static80.anInt4698 = 0;
LightingManager.anInt4698 = Static193.anInt4539 - SceneGraph.visibility;
if (LightingManager.anInt4698 < 0) {
LightingManager.anInt4698 = 0;
}
Static2.anInt15 = Static167.anInt4069 + SceneGraph.visibility;
if (Static2.anInt15 > SceneGraph.width) {
Static2.anInt15 = SceneGraph.width;
LightingManager.anInt15 = Static123.anInt4069 + SceneGraph.visibility;
if (LightingManager.anInt15 > SceneGraph.width) {
LightingManager.anInt15 = SceneGraph.width;
}
Static215.anInt4866 = Static193.anInt4539 + SceneGraph.visibility;
if (Static215.anInt4866 > SceneGraph.length) {
Static215.anInt4866 = SceneGraph.length;
LightingManager.anInt4866 = Static193.anInt4539 + SceneGraph.visibility;
if (LightingManager.anInt4866 > SceneGraph.length) {
LightingManager.anInt4866 = SceneGraph.length;
}
@Pc(99) short local99;
if (GlRenderer.enabled) {
@ -56,9 +63,9 @@ public final class Static156 {
@Pc(113) int local113;
for (local104 = 0; local104 < SceneGraph.visibility + SceneGraph.visibility + 2; local104++) {
for (local113 = 0; local113 < SceneGraph.visibility + SceneGraph.visibility + 2; local113++) {
@Pc(130) int local130 = (local104 - SceneGraph.visibility << 7) - (Static149.anInt3555 & 0x7F);
@Pc(130) int local130 = (local104 - SceneGraph.visibility << 7) - (Static123.anInt3555 & 0x7F);
@Pc(140) int local140 = (local113 - SceneGraph.visibility << 7) - (Static217.anInt4903 & 0x7F);
@Pc(146) int local146 = Static167.anInt4069 + local104 - SceneGraph.visibility;
@Pc(146) int local146 = Static123.anInt4069 + local104 - SceneGraph.visibility;
@Pc(152) int local152 = Static193.anInt4539 + local113 - SceneGraph.visibility;
if (local146 >= 0 && local152 >= 0 && local146 < SceneGraph.width && local152 < SceneGraph.length) {
@Pc(176) int local176;
@ -80,14 +87,14 @@ public final class Static156 {
}
}
Static8.anIntArray8 = arg6;
Static127.anIntArray292 = arg7;
Static123.anIntArray292 = arg7;
Static96.anIntArray234 = arg8;
Static234.anIntArray454 = arg9;
Static206.anIntArray427 = arg10;
Static123.anIntArray454 = arg9;
Static123.anIntArray427 = arg10;
Static123.method2419();
if (SceneGraph.underWaterGroundTiles != null) {
SceneGraph.setUnderwater(true);
Static248.method3292(arg0, arg1, arg2, null, 0, (byte) 0, arg13, arg14);
method3292(arg0, arg1, arg2, null, 0, (byte) 0, arg13, arg14);
if (GlRenderer.enabled) {
MaterialManager.renderingUnderwater = false;
MaterialManager.setMaterial(0, 0);
@ -96,11 +103,223 @@ public final class Static156 {
}
SceneGraph.setUnderwater(false);
}
Static248.method3292(arg0, arg1, arg2, arg5, arg11, arg12, arg13, arg14);
method3292(arg0, arg1, arg2, arg5, arg11, arg12, arg13, arg14);
}
@OriginalMember(owner = "client!mf", name = "a", descriptor = "(BLclient!wa;)Lclient!ta;")
public static TextureOp29SubOp4 method2960(@OriginalArg(1) Buffer arg0) {
return new TextureOp29SubOp4(arg0.g2b(), arg0.g2b(), arg0.g2b(), arg0.g2b(), arg0.g3(), arg0.g3(), arg0.g1());
}
@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) {
anInt437++;
anInt1142 = 0;
@Pc(9) int local9 = arg6 - 16;
@Pc(13) int local13 = arg6 + 16;
@Pc(17) int local17 = arg7 - 16;
@Pc(21) int local21 = arg7 + 16;
@Pc(32) int local32;
@Pc(37) int local37;
@Pc(183) int local183;
for (@Pc(23) int local23 = anInt5276; local23 < SceneGraph.levels; local23++) {
@Pc(30) Tile[][] local30 = SceneGraph.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 (SceneGraph.aBooleanArrayArray1[local32 + SceneGraph.visibility - Static123.anInt4069][local37 + SceneGraph.visibility - Static193.anInt4539] && (arg3 == null || local23 < arg4 || arg3[local23][local32][local37] != arg5)) {
local46.aBoolean45 = true;
local46.aBoolean46 = true;
if (local46.sceneryLen > 0) {
local46.aBoolean47 = true;
} else {
local46.aBoolean47 = false;
}
anInt1142++;
} else {
local46.aBoolean45 = false;
local46.aBoolean46 = false;
local46.anInt663 = 0;
if (local32 >= local9 && local32 <= local13 && local37 >= local17 && local37 <= local21) {
if (local46.wall != null) {
@Pc(103) Wall local103 = local46.wall;
local103.primary.method4545(0, local23, local103.anInt3051, local103.xFine, local103.zFine);
if (local103.secondary != null) {
local103.secondary.method4545(0, local23, local103.anInt3051, local103.xFine, local103.zFine);
}
}
if (local46.wallDecor != null) {
@Pc(134) WallDecor local134 = local46.wallDecor;
local134.primary.method4545(local134.anInt1388, local23, local134.anInt1391, local134.anInt1390, local134.anInt1393);
if (local134.secondary != null) {
local134.secondary.method4545(local134.anInt1388, local23, local134.anInt1391, local134.anInt1390, local134.anInt1393);
}
}
if (local46.groundDecor != null) {
@Pc(167) GroundDecor local167 = local46.groundDecor;
local167.entity.method4545(0, local23, local167.anInt733, local167.xFine, local167.zFine);
}
if (local46.scenery != null) {
for (local183 = 0; local183 < local46.sceneryLen; local183++) {
@Pc(192) Scenery local192 = local46.scenery[local183];
local192.entity.method4545(local192.anInt1714, local23, local192.anInt1706, local192.anInt1699, local192.anInt1703);
}
}
}
}
}
}
}
}
@Pc(240) boolean local240 = SceneGraph.tileHeights == SceneGraph.underwaterTileHeights;
if (GlRenderer.enabled) {
@Pc(244) GL2 gl = GlRenderer.gl;
gl.glPushMatrix();
gl.glTranslatef((float) -arg0, (float) -arg1, (float) -arg2);
if (local240) {
UnderwaterMaterialRenderer.applyFogFade();
MaterialManager.setMaterial(-1, 3);
MaterialManager.renderingUnderwater = true;
UnderwaterMaterialRenderer.method4609();
Static152.anInt3604 = -1;
Static247.anInt730 = -1;
for (local32 = 0; local32 < SceneGraph.underwaterHdTiles[0].length; local32++) {
@Pc(285) GlTile local285 = SceneGraph.underwaterHdTiles[0][local32];
@Pc(294) float local294 = 251.5F - (local285.blend ? 1.0F : 0.5F);
if (local285.underwaterColor != Static152.anInt3604) {
Static152.anInt3604 = local285.underwaterColor;
WaterMaterialRenderer.method619(local285.underwaterColor);
FogManager.method3066(WaterMaterialRenderer.method2422());
}
local285.method1944(SceneGraph.tiles, local294, false);
}
UnderwaterMaterialRenderer.method4608();
} else {
local32 = anInt5276;
while (true) {
if (local32 >= SceneGraph.levels) {
LightingManager.method2402(Static123.anInt4069, Static193.anInt4539, SceneGraph.tiles);
break;
}
for (local37 = 0; local37 < SceneGraph.underwaterHdTiles[local32].length; local37++) {
@Pc(336) GlTile local336 = SceneGraph.underwaterHdTiles[local32][local37];
@Pc(350) float local350 = 201.5F - (float) local32 * 50.0F - (local336.blend ? 1.0F : 0.5F);
if (local336.texture != -1 && Rasteriser.textureProvider.getMaterialType(local336.texture) == MaterialManager.WATER && Preferences.highWaterDetail) {
WaterMaterialRenderer.method619(local336.underwaterColor);
}
local336.method1944(SceneGraph.tiles, local350, false);
}
if (local32 == 0 && Preferences.sceneryShadowsType > 0) {
GlRenderer.method4159(101.5F);
ShadowManager.method4198(Static123.anInt4069, Static193.anInt4539, SceneGraph.visibility, arg1, SceneGraph.aBooleanArrayArray1, SceneGraph.tileHeights[0]);
}
local32++;
}
}
gl.glPopMatrix();
}
@Pc(434) int local434;
@Pc(438) int local438;
@Pc(450) Tile local450;
@Pc(399) int local399;
@Pc(406) Tile[][] local406;
@Pc(415) int local415;
@Pc(428) int local428;
for (local399 = anInt5276; local399 < SceneGraph.levels; local399++) {
local406 = SceneGraph.tiles[local399];
for (local37 = -SceneGraph.visibility; local37 <= 0; local37++) {
local415 = Static123.anInt4069 + local37;
local183 = Static123.anInt4069 - local37;
if (local415 >= LightingManager.anInt987 || local183 < LightingManager.anInt15) {
for (local428 = -SceneGraph.visibility; local428 <= 0; local428++) {
local434 = Static193.anInt4539 + local428;
local438 = Static193.anInt4539 - local428;
if (local415 >= LightingManager.anInt987) {
if (local434 >= LightingManager.anInt4698) {
local450 = local406[local415][local434];
if (local450 != null && local450.aBoolean45) {
Static247.method4245(local450, true);
}
}
if (local438 < LightingManager.anInt4866) {
local450 = local406[local415][local438];
if (local450 != null && local450.aBoolean45) {
Static247.method4245(local450, true);
}
}
}
if (local183 < LightingManager.anInt15) {
if (local434 >= LightingManager.anInt4698) {
local450 = local406[local183][local434];
if (local450 != null && local450.aBoolean45) {
Static247.method4245(local450, true);
}
}
if (local438 < LightingManager.anInt4866) {
local450 = local406[local183][local438];
if (local450 != null && local450.aBoolean45) {
Static247.method4245(local450, true);
}
}
}
if (anInt1142 == 0) {
if (!local240) {
MiniMenu.aBoolean187 = false;
}
return;
}
}
}
}
}
for (local399 = anInt5276; local399 < SceneGraph.levels; local399++) {
local406 = SceneGraph.tiles[local399];
for (local37 = -SceneGraph.visibility; local37 <= 0; local37++) {
local415 = Static123.anInt4069 + local37;
local183 = Static123.anInt4069 - local37;
if (local415 >= LightingManager.anInt987 || local183 < LightingManager.anInt15) {
for (local428 = -SceneGraph.visibility; local428 <= 0; local428++) {
local434 = Static193.anInt4539 + local428;
local438 = Static193.anInt4539 - local428;
if (local415 >= LightingManager.anInt987) {
if (local434 >= LightingManager.anInt4698) {
local450 = local406[local415][local434];
if (local450 != null && local450.aBoolean45) {
Static247.method4245(local450, false);
}
}
if (local438 < LightingManager.anInt4866) {
local450 = local406[local415][local438];
if (local450 != null && local450.aBoolean45) {
Static247.method4245(local450, false);
}
}
}
if (local183 < LightingManager.anInt15) {
if (local434 >= LightingManager.anInt4698) {
local450 = local406[local183][local434];
if (local450 != null && local450.aBoolean45) {
Static247.method4245(local450, false);
}
}
if (local438 < LightingManager.anInt4866) {
local450 = local406[local183][local438];
if (local450 != null && local450.aBoolean45) {
Static247.method4245(local450, false);
}
}
}
if (anInt1142 == 0) {
if (!local240) {
MiniMenu.aBoolean187 = false;
}
return;
}
}
}
}
}
MiniMenu.aBoolean187 = false;
}
}

60
client/src/main/java/rt4/Static159.java
View file

@ -1,60 +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 Static159 {
@OriginalMember(owner = "client!mi", name = "Z", descriptor = "I")
public static int anInt3893;
@OriginalMember(owner = "client!mi", name = "a", descriptor = "([IBLclient!km;[I[I)V")
public static void method3037(@OriginalArg(0) int[] arg0, @OriginalArg(2) Npc arg1, @OriginalArg(3) int[] arg2, @OriginalArg(4) int[] arg3) {
for (@Pc(3) int local3 = 0; local3 < arg3.length; local3++) {
@Pc(15) int local15 = arg3[local3];
@Pc(19) int local19 = arg0[local3];
@Pc(23) int local23 = arg2[local3];
for (@Pc(25) int local25 = 0; local19 != 0 && arg1.aClass147Array3.length > local25; local25++) {
if ((local19 & 0x1) != 0) {
if (local15 == -1) {
arg1.aClass147Array3[local25] = null;
} else {
@Pc(60) SeqType local60 = SeqTypeList.get(local15);
@Pc(65) Npc_Class147 local65 = arg1.aClass147Array3[local25];
@Pc(68) int local68 = local60.anInt5347;
if (local65 != null) {
if (local15 == local65.anInt5396) {
if (local68 == 0) {
local65 = arg1.aClass147Array3[local25] = null;
} else if (local68 == 1) {
local65.anInt5399 = 0;
local65.anInt5400 = 0;
local65.anInt5398 = 1;
local65.anInt5404 = 0;
local65.anInt5408 = local23;
SoundPlayer.playSeqSound(arg1.zFine, local60, arg1.xFine, false, 0);
} else if (local68 == 2) {
local65.anInt5400 = 0;
}
} else if (local60.forcedPriority >= SeqTypeList.get(local65.anInt5396).forcedPriority) {
local65 = arg1.aClass147Array3[local25] = null;
}
}
if (local65 == null) {
local65 = arg1.aClass147Array3[local25] = new Npc_Class147();
local65.anInt5398 = 1;
local65.anInt5404 = 0;
local65.anInt5408 = local23;
local65.anInt5396 = local15;
local65.anInt5400 = 0;
local65.anInt5399 = 0;
SoundPlayer.playSeqSound(arg1.zFine, local60, arg1.xFine, false, 0);
}
}
}
local19 >>>= 0x1;
}
}
}
}

90
client/src/main/java/rt4/Static16.java
View file

@ -1,90 +0,0 @@
package rt4;
import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc;
public final class Static16 {
@OriginalMember(owner = "client!bf", name = "B", descriptor = "I")
public static int anInt548 = -1;
@OriginalMember(owner = "client!bf", name = "G", descriptor = "I")
public static int anInt551 = 0;
@OriginalMember(owner = "client!bf", name = "I", descriptor = "[I")
public static final int[] anIntArray52 = new int[] { 16776960, 16711680, 65280, 65535, 16711935, 16777215 };
@OriginalMember(owner = "client!bf", name = "c", descriptor = "(I)V")
public static void method501() {
if (!GlRenderer.enabled || Static231.aBoolean252) {
return;
}
@Pc(14) Tile[][][] local14 = SceneGraph.tiles;
for (@Pc(22) int local22 = 0; local22 < local14.length; local22++) {
@Pc(30) Tile[][] local30 = local14[local22];
for (@Pc(32) int local32 = 0; local32 < local30.length; local32++) {
for (@Pc(42) int local42 = 0; local42 < local30[local32].length; local42++) {
@Pc(54) Tile local54 = local30[local32][local42];
if (local54 != null) {
@Pc(71) GlModel local71;
if (local54.groundDecor != null && local54.groundDecor.entity instanceof GlModel) {
local71 = (GlModel) local54.groundDecor.entity;
if ((local54.groundDecor.key & Long.MIN_VALUE) == 0L) {
local71.method4111(false, true, true, false, true, true);
} else {
local71.method4111(true, true, true, true, true, true);
}
}
if (local54.wallDecor != null) {
if (local54.wallDecor.primary instanceof GlModel) {
local71 = (GlModel) local54.wallDecor.primary;
if ((local54.wallDecor.key & Long.MIN_VALUE) == 0L) {
local71.method4111(false, true, true, false, true, true);
} else {
local71.method4111(true, true, true, true, true, true);
}
}
if (local54.wallDecor.secondary instanceof GlModel) {
local71 = (GlModel) local54.wallDecor.secondary;
if ((Long.MIN_VALUE & local54.wallDecor.key) == 0L) {
local71.method4111(false, true, true, false, true, true);
} else {
local71.method4111(true, true, true, true, true, true);
}
}
}
if (local54.wall != null) {
if (local54.wall.primary instanceof GlModel) {
local71 = (GlModel) local54.wall.primary;
if ((local54.wall.key & Long.MIN_VALUE) == 0L) {
local71.method4111(false, true, true, false, true, true);
} else {
local71.method4111(true, true, true, true, true, true);
}
}
if (local54.wall.secondary instanceof GlModel) {
local71 = (GlModel) local54.wall.secondary;
if ((Long.MIN_VALUE & local54.wall.key) == 0L) {
local71.method4111(false, true, true, false, true, true);
} else {
local71.method4111(true, true, true, true, true, true);
}
}
}
for (@Pc(270) int local270 = 0; local270 < local54.sceneryLen; local270++) {
if (local54.scenery[local270].entity instanceof GlModel) {
@Pc(293) GlModel local293 = (GlModel) local54.scenery[local270].entity;
if ((Long.MIN_VALUE & local54.scenery[local270].key) == 0L) {
local293.method4111(false, true, true, false, true, true);
} else {
local293.method4111(true, true, true, true, true, true);
}
}
}
}
}
}
}
Static231.aBoolean252 = true;
}
}

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

@ -6,7 +6,10 @@ import org.openrs2.deob.annotation.Pc;
public final class Static160 {
@OriginalMember(owner = "client!mj", name = "a", descriptor = "(IILclient!be;IB)V")
@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);
@ -32,15 +35,15 @@ public final class Static160 {
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 * Static231.anInt5205 + arg0 * Static81.anInt2222 >> 16;
@Pc(19) int local19 = arg3 * Static81.anInt2222 - arg0 * Static231.anInt5205 >> 16;
@Pc(29) int local29 = arg1 * Static109.anInt2886 + local19 * Static121.anInt3038 >> 16;
@Pc(39) int local39 = arg1 * Static121.anInt3038 - local19 * Static109.anInt2886 >> 16;
@Pc(29) int local29 = arg1 * anInt2886 + local19 * Static121.anInt3038 >> 16;
@Pc(39) int local39 = arg1 * Static121.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 * Static109.anInt2886 + local19 * Static121.anInt3038 >> 16;
@Pc(76) int local76 = arg2 * Static121.anInt3038 - local19 * Static109.anInt2886 >> 16;
@Pc(66) int local66 = arg2 * anInt2886 + local19 * Static121.anInt3038 >> 16;
@Pc(76) int local76 = arg2 * Static121.anInt3038 - local19 * anInt2886 >> 16;
if (local66 < 1) {
local66 = 1;
}

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

@ -1,22 +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 Static163 {
@OriginalMember(owner = "client!n", name = "e", descriptor = "Lclient!na;")
public static final JagString aClass100_767 = JagString.parse(")2");
@OriginalMember(owner = "client!n", name = "a", descriptor = "(IIIIII)V")
public static void method3105(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4) {
@Pc(11) int local11 = Static78.method1690(TextureOp29.anInt2869, arg2, TextureOp29.anInt5773);
@Pc(17) int local17 = Static78.method1690(TextureOp29.anInt2869, arg4, TextureOp29.anInt5773);
@Pc(23) int local23 = Static78.method1690(TextureOp29.anInt5063, arg3, TextureOp29.anInt4164);
@Pc(35) int local35 = Static78.method1690(TextureOp29.anInt5063, arg1, TextureOp29.anInt4164);
for (@Pc(37) int local37 = local11; local37 <= local17; local37++) {
Static131.method2576(Static71.anIntArrayArray10[local37], local23, local35, arg0);
}
}
}

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

@ -6,6 +6,8 @@ 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;
@ -139,15 +141,57 @@ public final class Static164 {
@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 = Static270.method4595(arg1, arg3, arg0, 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 = Static270.method4595(arg1, arg2, arg0, arg4);
@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;
}
}
}

29
client/src/main/java/rt4/Static165.java
View file

@ -63,15 +63,6 @@ public final class Static165 {
}
}
@OriginalMember(owner = "client!nb", name = "a", descriptor = "(II)Lclient!na;")
public static JagString method3165() {
@Pc(21) JagString local21 = new JagString();
local21.length = 1;
local21.chars = new byte[1];
local21.chars[0] = -96;
return local21;
}
@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) {
@ -83,7 +74,7 @@ public final class Static165 {
@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) {
Static131.method2576(Static71.anIntArrayArray10[arg0], arg1 - arg2, arg2 + arg1, arg4);
TextureOp29SubOp4.method2576(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;
@ -125,8 +116,8 @@ public final class Static165 {
local48 += -local98;
@Pc(179) int local179 = arg1 - local17;
local98 -= local60;
Static131.method2576(Static71.anIntArrayArray10[local109], local179, local160, arg4);
Static131.method2576(Static71.anIntArrayArray10[local105], local179, local160, arg4);
TextureOp29SubOp4.method2576(TextureOp29SubOp4.anIntArrayArray10[local109], local179, local160, arg4);
TextureOp29SubOp4.method2576(TextureOp29SubOp4.anIntArrayArray10[local105], local179, local160, arg4);
}
}
@ -149,9 +140,9 @@ public final class Static165 {
@Pc(95) int local95;
@Pc(104) int local104;
if (arg4 >= TextureOp29.anInt5773 && TextureOp29.anInt2869 >= arg4) {
local95 = Static78.method1690(TextureOp29.anInt5063, arg2 + arg3, TextureOp29.anInt4164);
local104 = Static78.method1690(TextureOp29.anInt5063, arg3 - arg2, TextureOp29.anInt4164);
Static131.method2576(Static71.anIntArrayArray10[arg4], local104, local95, arg0);
local95 = Static231.method1690(TextureOp29.anInt5063, arg2 + arg3, TextureOp29.anInt4164);
local104 = Static231.method1690(TextureOp29.anInt5063, arg3 - arg2, TextureOp29.anInt4164);
TextureOp29SubOp4.method2576(TextureOp29SubOp4.anIntArrayArray10[arg4], local104, local95, arg0);
}
@Pc(118) int local118 = local67 * (arg1 - 1);
while (local17 > 0) {
@ -178,13 +169,13 @@ public final class Static165 {
local42 += -local118;
local104 = local17 + arg4;
if (TextureOp29.anInt5773 <= local104 && TextureOp29.anInt2869 >= local95) {
@Pc(213) int local213 = Static78.method1690(TextureOp29.anInt5063, local15 + arg3, TextureOp29.anInt4164);
@Pc(222) int local222 = Static78.method1690(TextureOp29.anInt5063, arg3 - local15, TextureOp29.anInt4164);
@Pc(213) int local213 = Static231.method1690(TextureOp29.anInt5063, local15 + arg3, TextureOp29.anInt4164);
@Pc(222) int local222 = Static231.method1690(TextureOp29.anInt5063, arg3 - local15, TextureOp29.anInt4164);
if (local95 >= TextureOp29.anInt5773) {
Static131.method2576(Static71.anIntArrayArray10[local95], local222, local213, arg0);
TextureOp29SubOp4.method2576(TextureOp29SubOp4.anIntArrayArray10[local95], local222, local213, arg0);
}
if (TextureOp29.anInt2869 >= local104) {
Static131.method2576(Static71.anIntArrayArray10[local104], local222, local213, arg0);
TextureOp29SubOp4.method2576(TextureOp29SubOp4.anIntArrayArray10[local104], local222, local213, arg0);
}
}
local118 -= local67;

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

@ -1,5 +0,0 @@
package rt4;
public final class Static166 {
}

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

@ -1,10 +0,0 @@
package rt4;
import org.openrs2.deob.annotation.OriginalMember;
public final class Static167 {
@OriginalMember(owner = "client!nd", name = "s", descriptor = "I")
public static int anInt4069;
}

72
client/src/main/java/rt4/Static169.java
View file

@ -1,72 +0,0 @@
package rt4;
import java.awt.Frame;
import org.openrs2.deob.annotation.OriginalArg;
import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc;
public final class Static169 {
@OriginalMember(owner = "client!nf", name = "h", descriptor = "Lclient!be;")
public static Component mouseOverInventoryInterface;
@OriginalMember(owner = "client!nf", name = "i", descriptor = "I")
public static int anInt4075 = -1;
@OriginalMember(owner = "client!nf", name = "a", descriptor = "(Lclient!na;BZ)V")
public static void openUrl(@OriginalArg(0) JagString arg0, @OriginalArg(2) boolean arg1) {
if (!arg1) {
try {
GameShell.instance.getAppletContext().showDocument(arg0.method3127(GameShell.instance.getCodeBase()), "_top");
} catch (@Pc(22) Exception local22) {
}
return;
}
if (GlRenderer.enabled && GameShell.openWindowJavaScript) {
try {
BrowserControl.call(GameShell.signLink.applet, "openjs", new Object[] { arg0.method3127(GameShell.instance.getCodeBase()).toString() });
return;
} catch (@Pc(48) Throwable local48) {
}
}
try {
GameShell.instance.getAppletContext().showDocument(arg0.method3127(GameShell.instance.getCodeBase()), "_blank");
} catch (@Pc(59) Exception local59) {
}
}
@OriginalMember(owner = "client!nf", name = "a", descriptor = "(IIIIILsignlink!ll;)Ljava/awt/Frame;")
public static Frame method3176(@OriginalArg(2) int arg0, @OriginalArg(3) int arg1, @OriginalArg(4) int arg2, @OriginalArg(5) SignLink arg3) {
if (!arg3.isFullScreenSupported()) {
return null;
}
@Pc(20) DisplayMode[] local20 = DisplayMode.method3558(arg3);
if (local20 == null) {
return null;
}
@Pc(27) boolean local27 = false;
for (@Pc(29) int local29 = 0; local29 < local20.length; local29++) {
if (arg2 == local20[local29].width && arg1 == local20[local29].height && (!local27 || local20[local29].bitDepth > arg0)) {
arg0 = local20[local29].bitDepth;
local27 = true;
}
}
if (!local27) {
return null;
}
@Pc(90) PrivilegedRequest local90 = arg3.enterFullScreen(arg0, arg1, arg2);
while (local90.status == 0) {
ThreadUtils.sleep(10L);
}
@Pc(103) Frame local103 = (Frame) local90.result;
if (local103 == null) {
return null;
} else if (local90.status == 2) {
DisplayMode.exitFullScreen(local103, arg3);
return null;
} else {
return local103;
}
}
}

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

@ -13,7 +13,7 @@ public final class Static171 {
return -1;
}
for (@Pc(20) int local20 = 0; local20 < WorldMap.labels.anInt5074; local20++) {
if (WorldMap.labels.aClass100Array153[local20].method3140(Static101.aClass100_538, Static197.aClass100_872).method3142(arg0)) {
if (WorldMap.labels.aClass100Array153[local20].method3140(WorldMap.aClass100_538, WorldMap.aClass100_872).method3142(arg0)) {
return local20;
}
}
@ -24,7 +24,7 @@ public final class Static171 {
public static int method3219(@OriginalArg(1) int arg0, @OriginalArg(2) Random arg1) {
if (arg0 <= 0) {
throw new IllegalArgumentException();
} else if (Static209.method3702(arg0)) {
} else if (method3702(arg0)) {
return (int) (((long) arg1.nextInt() & 0xFFFFFFFFL) * (long) arg0 >> 32);
} else {
@Pc(38) int local38 = Integer.MIN_VALUE - (int) (4294967296L % (long) arg0);
@ -32,8 +32,18 @@ public final class Static171 {
do {
local41 = arg1.nextInt();
} while (local38 <= local41);
return Static39.method990(local41, arg0);
return method990(local41, arg0);
}
}
@OriginalMember(owner = "client!d", name = "c", descriptor = "(III)I")
public static int method990(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
@Pc(11) int local11 = arg1 - 1 & arg0 >> 31;
return local11 + (arg0 + (arg0 >>> 31)) % arg1;
}
@OriginalMember(owner = "client!ra", name = "a", descriptor = "(BI)Z")
public static boolean method3702(@OriginalArg(1) int arg0) {
return arg0 == (-arg0 & arg0);
}
}

46
client/src/main/java/rt4/Static172.java
View file

@ -1,46 +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 Static172 {
@OriginalMember(owner = "client!nj", name = "k", descriptor = "I")
public static int anInt4165;
@OriginalMember(owner = "client!nj", name = "h", descriptor = "Lclient!ih;")
public static final LinkedList aClass69_97 = new LinkedList();
@OriginalMember(owner = "client!nj", name = "a", descriptor = "(IIZ[I[I)V")
public static void method3223(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int[] arg2, @OriginalArg(4) int[] arg3) {
if (arg0 >= arg1) {
return;
}
@Pc(22) int local22 = (arg1 + arg0) / 2;
@Pc(24) int local24 = arg0;
@Pc(28) int local28 = arg2[local22];
arg2[local22] = arg2[arg1];
arg2[arg1] = local28;
@Pc(42) int local42 = arg3[local22];
arg3[local22] = arg3[arg1];
arg3[arg1] = local42;
for (@Pc(54) int local54 = arg0; local54 < arg1; local54++) {
if (arg2[local54] > (local54 & 0x1) + local28) {
@Pc(79) int local79 = arg2[local54];
arg2[local54] = arg2[local24];
arg2[local24] = local79;
@Pc(93) int local93 = arg3[local54];
arg3[local54] = arg3[local24];
arg3[local24++] = local93;
}
}
arg2[arg1] = arg2[local24];
arg2[local24] = local28;
arg3[arg1] = arg3[local24];
arg3[local24] = local42;
method3223(arg0, local24 - 1, arg2, arg3);
method3223(local24 + 1, arg1, arg2, arg3);
}
}

43
client/src/main/java/rt4/Static173.java
View file

@ -11,7 +11,7 @@ public final class Static173 {
@OriginalMember(owner = "client!nk", name = "a", descriptor = "(Z[J[I)V")
public static void method3243(@OriginalArg(1) long[] arg0, @OriginalArg(2) int[] arg1) {
Static83.method436(arg0, 0, arg0.length - 1, arg1);
method436(arg0, 0, arg0.length - 1, arg1);
}
@OriginalMember(owner = "client!nk", name = "a", descriptor = "(IIIIIB)V")
@ -42,27 +42,58 @@ public final class Static173 {
if (TextureOp29.anInt5773 > arg4) {
arg4 = TextureOp29.anInt5773;
} else {
Static131.method2576(Static71.anIntArrayArray10[arg4++], arg1, arg3, arg0);
TextureOp29SubOp4.method2576(TextureOp29SubOp4.anIntArrayArray10[arg4++], arg1, arg3, arg0);
}
if (arg2 <= TextureOp29.anInt2869) {
Static131.method2576(Static71.anIntArrayArray10[arg2--], arg1, arg3, arg0);
TextureOp29SubOp4.method2576(TextureOp29SubOp4.anIntArrayArray10[arg2--], arg1, arg3, arg0);
} else {
arg2 = TextureOp29.anInt2869;
}
@Pc(98) int local98;
if (local24 && local43) {
for (local98 = arg4; local98 <= arg2; local98++) {
@Pc(105) int[] local105 = Static71.anIntArrayArray10[local98];
@Pc(105) int[] local105 = TextureOp29SubOp4.anIntArrayArray10[local98];
local105[arg1] = local105[arg3] = arg0;
}
} else if (local24) {
for (local98 = arg4; local98 <= arg2; local98++) {
Static71.anIntArrayArray10[local98][arg1] = arg0;
TextureOp29SubOp4.anIntArrayArray10[local98][arg1] = arg0;
}
} else if (local43) {
for (local98 = arg4; local98 <= arg2; local98++) {
Static71.anIntArrayArray10[local98][arg3] = arg0;
TextureOp29SubOp4.anIntArrayArray10[local98][arg3] = arg0;
}
}
}
@OriginalMember(owner = "client!gj", name = "a", descriptor = "([JII[II)V")
public static void method436(@OriginalArg(0) long[] arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int[] arg3) {
if (arg1 >= arg2) {
return;
}
@Pc(20) int local20 = arg1;
@Pc(26) int local26 = (arg2 + arg1) / 2;
@Pc(30) long local30 = arg0[local26];
arg0[local26] = arg0[arg2];
arg0[arg2] = local30;
@Pc(44) int local44 = arg3[local26];
arg3[local26] = arg3[arg2];
arg3[arg2] = local44;
for (@Pc(56) int local56 = arg1; local56 < arg2; local56++) {
if (arg0[local56] < local30 + (long) (local56 & 0x1)) {
@Pc(76) long local76 = arg0[local56];
arg0[local56] = arg0[local20];
arg0[local20] = local76;
@Pc(90) int local90 = arg3[local56];
arg3[local56] = arg3[local20];
arg3[local20++] = local90;
}
}
arg0[arg2] = arg0[local20];
arg0[local20] = local30;
arg3[arg2] = arg3[local20];
arg3[local20] = local44;
method436(arg0, arg1, local20 - 1, arg3);
method436(arg0, local20 + 1, arg2, arg3);
}
}

23
client/src/main/java/rt4/Static175.java
View file

@ -1,23 +0,0 @@
package rt4;
import org.openrs2.deob.annotation.OriginalMember;
public final class Static175 {
@OriginalMember(owner = "client!nm", name = "W", descriptor = "Lclient!na;")
public static JagString url;
@OriginalMember(owner = "client!nm", name = "U", descriptor = "I")
public static int mapFilesMissingCount = 0;
@OriginalMember(owner = "client!nm", name = "a", descriptor = "(Z)V")
public static void method3279() {
if (Static267.anInt5775 > 0) {
LoginManager.processLogout();
} else {
Static233.aClass95_4 = Protocol.socket;
Protocol.socket = null;
client.setGameState(40);
}
}
}

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

@ -18,7 +18,13 @@ public final class Static176 {
public static final JagString aClass100_783 = JagString.parse(")4p=");
@OriginalMember(owner = "client!rc", name = "G", descriptor = "Lclient!na;")
public static final JagString aClass100_230 = JagString.parse("");
@OriginalMember(owner = "client!ob", name = "f", descriptor = "Lclient!ve;")
@OriginalMember(owner = "client!ja", name = "s", descriptor = "Lclient!na;")
public static final JagString HTTP_PROTOCOL = JagString.parse("http:)4)4");
@OriginalMember(owner = "client!vd", name = "F", descriptor = "Lclient!na;")
public static final JagString aClass100_945 = JagString.parse("0");
@OriginalMember(owner = "client!q", name = "a", descriptor = "Lclient!na;")
public static final JagString aClass100_260 = JagString.parse(")1a2)1m");
@OriginalMember(owner = "client!ob", name = "f", descriptor = "Lclient!ve;")
public static Js5 aClass153_76;
@OriginalMember(owner = "client!ob", name = "a", descriptor = "[Z")
@ -35,7 +41,7 @@ public final class Static176 {
@OriginalMember(owner = "client!ob", name = "a", descriptor = "(IB)Z")
public static boolean hopWorld(@OriginalArg(0) int arg0) {
@Pc(3) World local3 = Static54.getWorld(arg0);
@Pc(3) World local3 = ScriptRunner.getWorld(arg0);
if (local3 == null) {
return false;
} else if (SignLink.anInt5928 == 1 || SignLink.anInt5928 == 2 || client.modeWhere == 2) {
@ -57,7 +63,7 @@ public final class Static176 {
if (client.settings != null) {
local89 = JagString.concatenate(new JagString[] { aClass100_783, client.settings});
}
@Pc(182) JagString local182 = JagString.concatenate(new JagString[] { Static115.HTTP_PROTOCOL, local3.hostname, local62, aClass100_1107, JagString.parseInt(client.language), aClass100_801, JagString.parseInt(client.affiliate), local89, Static139.aClass100_659, client.objectTag ? aClass100_184 : Static260.aClass100_945, aClass100_420, client.javaScript ? aClass100_184 : Static260.aClass100_945, Static198.aClass100_260, client.advertSuppressed ? aClass100_184 : Static260.aClass100_945 });
@Pc(182) JagString local182 = JagString.concatenate(new JagString[] { HTTP_PROTOCOL, local3.hostname, local62, aClass100_1107, JagString.parseInt(client.language), aClass100_801, JagString.parseInt(client.affiliate), local89, Static139.aClass100_659, client.objectTag ? aClass100_184 : aClass100_945, aClass100_420, client.javaScript ? aClass100_184 : aClass100_945, aClass100_260, client.advertSuppressed ? aClass100_184 : aClass100_945 });
try {
client.instance.getAppletContext().showDocument(local182.method3107(), "_self");
return true;
@ -67,10 +73,4 @@ public final class Static176 {
}
}
@OriginalMember(owner = "client!ob", name = "a", descriptor = "(IIIIII)V")
public static void method3308(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4) {
for (@Pc(8) int local8 = arg2; local8 <= arg0; local8++) {
Static131.method2576(Static71.anIntArrayArray10[local8], arg3, arg1, arg4);
}
}
}

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

@ -1,10 +0,0 @@
package rt4;
import org.openrs2.deob.annotation.OriginalMember;
public final class Static178 {
@OriginalMember(owner = "client!od", name = "i", descriptor = "I")
public static int anInt4247 = 0;
}

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

@ -28,7 +28,7 @@ public final class Static18 {
} else if (local5 > 100) {
local5 = 100;
}
local29 = local5 * (Static187.aShort27 - Static263.aShort30) / 100 + Static263.aShort30;
local29 = local5 * (ScriptRunner.aShort27 - ScriptRunner.aShort30) / 100 + ScriptRunner.aShort30;
arg3 = local29 * arg3 >> 8;
}
local5 = 2048 - arg6 & 0x7FF;
@ -59,7 +59,7 @@ public final class Static18 {
@OriginalMember(owner = "client!bh", name = "a", descriptor = "(B)Lclient!ba;")
public static World getFirstWorld() {
Static51.worldPos = 0;
WorldList.worldPos = 0;
return WorldList.getNextWorld();
}

30
client/src/main/java/rt4/Static180.java
View file

@ -1,30 +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 Static180 {
@OriginalMember(owner = "client!og", name = "e", descriptor = "Lclient!be;")
public static Component aClass13_22;
@OriginalMember(owner = "client!og", name = "a", descriptor = "(BIILclient!fe;III)V")
public static void method3326(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) PathingEntity arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5) {
Static198.method1026(arg5, arg1, arg2.zFine, arg4, arg0, arg2.xFine, arg3);
}
@OriginalMember(owner = "client!og", name = "a", descriptor = "(III)I")
public static int method3330(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) {
if (arg0 > 22050) {
arg1 = arg0;
arg0 = 22050;
}
while (arg0 != 0) {
@Pc(21) int local21 = arg1 % arg0;
arg1 = arg0;
arg0 = local21;
}
return arg1;
}
}

25
client/src/main/java/rt4/Static181.java
View file

@ -1,25 +0,0 @@
package rt4;
import org.openrs2.deob.annotation.OriginalArg;
import org.openrs2.deob.annotation.OriginalMember;
public final class Static181 {
@OriginalMember(owner = "client!oi", name = "h", descriptor = "Lclient!qf;")
public static Sprite aClass3_Sub2_Sub1_9;
@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);
} else {
Static165.method3162(arg5, arg0, arg7, arg8, arg3, arg2, arg1, arg6, arg4);
}
}
@OriginalMember(owner = "client!oi", name = "a", descriptor = "(I[I[Ljava/lang/Object;)V")
public static void method3346(@OriginalArg(1) int[] arg0, @OriginalArg(2) Object[] arg1) {
Static53.method1292(arg1, arg0.length - 1, arg0, 0);
}
}

45
client/src/main/java/rt4/Static183.java
View file

@ -1,45 +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 Static183 {
@OriginalMember(owner = "client!ok", name = "b", descriptor = "I")
public static int anInt4271;
@OriginalMember(owner = "client!ok", name = "f", descriptor = "J")
public static long prevClickTime = 0L;
@OriginalMember(owner = "client!ok", name = "a", descriptor = "(IIB)Lclient!ce;")
public static SecondaryLinkedList method3333(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
@Pc(9) SecondaryLinkedList local9 = new SecondaryLinkedList();
for (@Pc(14) Map local14 = (Map) MapList.aClass69_120.head(); local14 != null; local14 = (Map) MapList.aClass69_120.next()) {
if (local14.aBoolean50 && local14.method664(arg1, arg0)) {
local9.addTail(local14);
}
}
return local9;
}
@OriginalMember(owner = "client!ok", name = "a", descriptor = "(IIIIIII)V")
public static void method3334(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5) {
@Pc(5) int local5 = arg4 + arg1;
@Pc(14) int local14 = arg3 - arg4;
@Pc(29) int local29 = arg4 + arg5;
@Pc(31) int local31;
for (local31 = arg1; local31 < local5; local31++) {
Static131.method2576(Static71.anIntArrayArray10[local31], arg5, arg0, arg2);
}
for (local31 = arg3; local31 > local14; local31--) {
Static131.method2576(Static71.anIntArrayArray10[local31], arg5, arg0, arg2);
}
@Pc(70) int local70 = arg0 - arg4;
for (local31 = local5; local31 <= local14; local31++) {
@Pc(83) int[] local83 = Static71.anIntArrayArray10[local31];
Static131.method2576(local83, arg5, local29, arg2);
Static131.method2576(local83, local70, arg0, arg2);
}
}
}

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