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

Moved around more static methods, nothing final

Browse source 
Some of these are "incorrect" - I wanted to decrease the # of static classes first by grouping them if they're slightly related.
Then I'll do a second pass in each class to reorganize later.
This commit is contained in:
Pazaz 2022-05-16 01:13:34 -04:00
parent c988509e8e
commit ba4debb0d3
No known key found for this signature in database
GPG key ID: 8658637376F9B835
150 changed files with 2805 additions and 3034 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -9,6 +9,10 @@ public class Camera {
public static final int[][][] anIntArrayArrayArray9 = new int[2][][]; public static final int[][][] anIntArrayArrayArray9 = new int[2][][];
@OriginalMember(owner = "client!sa", name = "Q", descriptor = "[I") @OriginalMember(owner = "client!sa", name = "Q", descriptor = "[I")
public static final int[] cameraJitter = new int[5]; public static final int[] cameraJitter = new int[5];
@OriginalMember(owner = "client!wh", name = "m", descriptor = "[I")
public static final int[] cameraAmplitude = new int[5];
@OriginalMember(owner = "client!qg", name = "Y", descriptor = "[I")
public static final int[] cameraFrequency = new int[5];
@OriginalMember(owner = "client!fl", name = "s", descriptor = "I") @OriginalMember(owner = "client!fl", name = "s", descriptor = "I")
public static double pitchTarget = 128; public static double pitchTarget = 128;
@ -52,6 +56,14 @@ public class Camera {
public static int renderX; public static int renderX;
@OriginalMember(owner = "client!kh", name = "f", descriptor = "I") @OriginalMember(owner = "client!kh", name = "f", descriptor = "I")
public static int renderZ; public static int renderZ;
@OriginalMember(owner = "client!uc", name = "f", descriptor = "I")
public static int anInt4232;
@OriginalMember(owner = "client!ug", name = "h", descriptor = "I")
public static int anInt5449;
@OriginalMember(owner = "client!vj", name = "d", descriptor = "I")
public static int anInt5765;
@OriginalMember(owner = "client!tm", name = "g", descriptor = "I")
public static int anInt5375;
public static double mod(double a, double b) { public static double mod(double a, double b) {
return ((a % b) + b) % b; return ((a % b) + b) % b;
@ -78,7 +90,7 @@ public class Camera {
if (local80 < 3 && (SceneGraph.tileFlags[1][local64][local73] & 0x2) == 2) { if (local80 < 3 && (SceneGraph.tileFlags[1][local64][local73] & 0x2) == 2) {
local80++; local80++;
} }
@Pc(117) int local117 = (Static232.aByteArrayArrayArray13[local80][local64][local73] & 0xFF) * 8 + local43 - SceneGraph.tileHeights[local80][local64][local73]; @Pc(117) int local117 = (SceneGraph.aByteArrayArrayArray13[local80][local64][local73] & 0xFF) * 8 + local43 - SceneGraph.tileHeights[local80][local64][local73];
if (local117 > local45) { if (local117 > local45) {
local45 = local117; local45 = local117;
} }
@ -101,12 +113,12 @@ public class Camera {
@OriginalMember(owner = "client!jl", name = "c", descriptor = "(I)V") @OriginalMember(owner = "client!jl", name = "c", descriptor = "(I)V")
public static void updateLockedCamera() { public static void updateLockedCamera() {
@Pc(9) int local9 = Static248.anInt4232 * 128 + 64; @Pc(9) int local9 = anInt4232 * 128 + 64;
@Pc(15) int local15 = Static245.anInt5375 * 128 + 64; @Pc(15) int local15 = anInt5375 * 128 + 64;
@Pc(23) int local23 = SceneGraph.getTileHeight(Player.level, local15, local9) - Static231.anInt5203; @Pc(23) int local23 = SceneGraph.getTileHeight(Player.level, local15, local9) - Static231.anInt5203;
if (Static113.anInt4612 >= 100) { if (Static113.anInt4612 >= 100) {
renderX = Static245.anInt5375 * 128 + 64; renderX = anInt5375 * 128 + 64;
renderZ = Static248.anInt4232 * 128 + 64; renderZ = anInt4232 * 128 + 64;
Static5.anInt40 = SceneGraph.getTileHeight(Player.level, renderX, renderZ) - Static231.anInt5203; Static5.anInt40 = SceneGraph.getTileHeight(Player.level, renderX, renderZ) - Static231.anInt5203;
} else { } else {
if (renderX < local15) { if (renderX < local15) {
@ -146,8 +158,8 @@ public class Camera {
} }
} }
} }
local9 = Static265.anInt5765 * 128 + 64; local9 = anInt5765 * 128 + 64;
local15 = Static251.anInt5449 * 128 + 64; local15 = anInt5449 * 128 + 64;
local23 = SceneGraph.getTileHeight(Player.level, local15, local9) - Static260.anInt1744; local23 = SceneGraph.getTileHeight(Player.level, local15, local9) - Static260.anInt1744;
@Pc(236) int local236 = local23 - Static5.anInt40; @Pc(236) int local236 = local23 - Static5.anInt40;
@Pc(241) int local241 = local9 - renderZ; @Pc(241) int local241 = local9 - renderZ;
@ -267,13 +279,13 @@ public class Camera {
@OriginalMember(owner = "client!vd", name = "a", descriptor = "(IIIIBI)V") @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) { 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; Static133.anInt5230 = arg2;
Static265.anInt5765 = arg1; anInt5765 = arg1;
Static233.anInt5217 = arg4; Static233.anInt5217 = arg4;
Static251.anInt5449 = arg3; anInt5449 = arg3;
Static260.anInt1744 = arg0; Static260.anInt1744 = arg0;
if (Static233.anInt5217 >= 100) { if (Static233.anInt5217 >= 100) {
@Pc(30) int local30 = Static251.anInt5449 * 128 + 64; @Pc(30) int local30 = anInt5449 * 128 + 64;
@Pc(36) int local36 = Static265.anInt5765 * 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) - Static260.anInt1744;
@Pc(49) int local49 = local44 - Static5.anInt40; @Pc(49) int local49 = local44 - Static5.anInt40;
@Pc(54) int local54 = local30 - renderX; @Pc(54) int local54 = local30 - renderX;
@ -295,12 +307,12 @@ public class Camera {
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) { 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; Static113.anInt4612 = arg3;
Static231.anInt5203 = arg2; Static231.anInt5203 = arg2;
Static245.anInt5375 = arg5; anInt5375 = arg5;
Static233.anInt5225 = arg1; Static233.anInt5225 = arg1;
Static248.anInt4232 = arg4; anInt4232 = arg4;
if (arg0 && Static113.anInt4612 >= 100) { if (arg0 && Static113.anInt4612 >= 100) {
renderX = Static245.anInt5375 * 128 + 64; renderX = anInt5375 * 128 + 64;
renderZ = Static248.anInt4232 * 128 + 64; renderZ = anInt4232 * 128 + 64;
Static5.anInt40 = SceneGraph.getTileHeight(Player.level, renderX, renderZ) - Static231.anInt5203; Static5.anInt40 = SceneGraph.getTileHeight(Player.level, renderX, renderZ) - Static231.anInt5203;
} }
cameraType = 2; cameraType = 2;
@ -317,4 +329,35 @@ public class Camera {
anInt1694 = -1; anInt1694 = -1;
cameraType = 1; cameraType = 1;
} }
@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;
if (cameraX - playerX < -500 || cameraX - playerX > 500 || cameraZ - playerZ < -500 || cameraZ - playerZ > 500) {
cameraX = playerX;
cameraZ = playerZ;
}
if (cameraZ != playerZ) {
cameraZ += (playerZ - cameraZ) / 16;
}
if (cameraX != playerX) {
cameraX += (playerX - cameraX) / 16;
}
if (Preferences.aBoolean63) {
for (@Pc(93) int local93 = 0; local93 < InterfaceList.keyQueueSize; local93++) {
@Pc(104) int code = InterfaceList.keyCodes[local93];
if (code == Keyboard.KEY_UP) {
pitchTarget += 47;
} else if (code == Keyboard.KEY_DOWN) {
pitchTarget -= 17;
} else if (code == Keyboard.KEY_LEFT) {
yawTarget -= 65;
} else if (code == Keyboard.KEY_RIGHT) {
yawTarget += 191;
}
}
clampCameraAngle();
}
}
} }

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

@ -7,6 +7,9 @@ import org.openrs2.deob.annotation.Pc;
import java.io.IOException; import java.io.IOException;
public class ClientProt { public class ClientProt {
@OriginalMember(owner = "client!wc", name = "g", descriptor = "I")
public static int anInt5804 = 0;
@OriginalMember(owner = "client!vg", name = "a", descriptor = "(Lclient!na;IIBI)V") @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) { public static void method4512(@OriginalArg(0) JagString arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(4) int arg3) {
@Pc(8) Component local8 = InterfaceList.method1418(arg3, arg1); @Pc(8) Component local8 = InterfaceList.method1418(arg3, arg1);
@ -23,7 +26,7 @@ public class ClientProt {
} }
@Pc(37) boolean local37 = true; @Pc(37) boolean local37 = true;
if (local8.anInt453 > 0) { if (local8.anInt453 > 0) {
local37 = Static249.method4265(local8); local37 = MiniMenu.method4265(local8);
} }
if (!local37 || !InterfaceList.getServerActiveProperties(local8).method503(arg2 - 1)) { if (!local37 || !InterfaceList.getServerActiveProperties(local8).method503(arg2 - 1)) {
return; return;
@ -104,8 +107,8 @@ public class ClientProt {
Protocol.outboundBuffer.p1a(Keyboard.pressedKeys[Keyboard.KEY_CTRL] ? 1 : 0); Protocol.outboundBuffer.p1a(Keyboard.pressedKeys[Keyboard.KEY_CTRL] ? 1 : 0);
Protocol.outboundBuffer.p2(Camera.originX + local23); Protocol.outboundBuffer.p2(Camera.originX + local23);
Protocol.outboundBuffer.p2add(Camera.originZ + local27); Protocol.outboundBuffer.p2add(Camera.originZ + local27);
Static84.anInt2255 = PathFinder.queueZ[0]; LoginManager.mapFlagZ = PathFinder.queueZ[0];
Static115.mapFlagX = PathFinder.queueX[0]; LoginManager.mapFlagX = PathFinder.queueX[0];
for (@Pc(126) int local126 = 1; local126 < local13; local126++) { for (@Pc(126) int local126 = 1; local126 < local13; local126++) {
arg0--; arg0--;
Protocol.outboundBuffer.p1a(PathFinder.queueX[arg0] - local23); Protocol.outboundBuffer.p1a(PathFinder.queueX[arg0] - local23);
@ -166,53 +169,53 @@ public class ClientProt {
Static175.mapFilesMissingCount = 0; Static175.mapFilesMissingCount = 0;
@Pc(12) boolean fileExists = true; @Pc(12) boolean fileExists = true;
@Pc(14) int id; @Pc(14) int id;
for (id = 0; id < Static273.mapFilesBuffer.length; id++) { for (id = 0; id < LoginManager.mapFilesBuffer.length; id++) {
if (Static36.mapFileIds[id] != -1 && Static273.mapFilesBuffer[id] == null) { if (LoginManager.mapFileIds[id] != -1 && LoginManager.mapFilesBuffer[id] == null) {
Static273.mapFilesBuffer[id] = client.js5Archive5.getFile(Static36.mapFileIds[id], 0); LoginManager.mapFilesBuffer[id] = client.js5Archive5.getFile(LoginManager.mapFileIds[id], 0);
if (Static273.mapFilesBuffer[id] == null) { if (LoginManager.mapFilesBuffer[id] == null) {
Static175.mapFilesMissingCount++; Static175.mapFilesMissingCount++;
fileExists = false; fileExists = false;
} }
} }
if (Static172.locationsMapFileIds[id] != -1 && Static156.locationMapFilesBuffer[id] == null) { if (LoginManager.locationsMapFileIds[id] != -1 && LoginManager.locationMapFilesBuffer[id] == null) {
Static156.locationMapFilesBuffer[id] = client.js5Archive5.getFileXTEA(Static172.locationsMapFileIds[id], Static72.regionsXteaKeys[id], 0); LoginManager.locationMapFilesBuffer[id] = client.js5Archive5.getFileXTEA(LoginManager.locationsMapFileIds[id], LoginManager.regionsXteaKeys[id], 0);
if (Static156.locationMapFilesBuffer[id] == null) { if (LoginManager.locationMapFilesBuffer[id] == null) {
fileExists = false; fileExists = false;
Static175.mapFilesMissingCount++; Static175.mapFilesMissingCount++;
} }
} }
if (GlRenderer.enabled) { if (GlRenderer.enabled) {
if (Static99.underWaterMapFileIds[id] != -1 && Static186.underWaterMapFilesBuffer[id] == null) { if (LoginManager.underWaterMapFileIds[id] != -1 && LoginManager.underWaterMapFilesBuffer[id] == null) {
Static186.underWaterMapFilesBuffer[id] = client.js5Archive5.getFile(Static99.underWaterMapFileIds[id], 0); LoginManager.underWaterMapFilesBuffer[id] = client.js5Archive5.getFile(LoginManager.underWaterMapFileIds[id], 0);
if (Static186.underWaterMapFilesBuffer[id] == null) { if (LoginManager.underWaterMapFilesBuffer[id] == null) {
fileExists = false; fileExists = false;
Static175.mapFilesMissingCount++; Static175.mapFilesMissingCount++;
} }
} }
if (Static35.underWaterLocationsMapFileIds[id] != -1 && Static19.underWaterLocationsMapFilesBuffer[id] == null) { if (LoginManager.underWaterLocationsMapFileIds[id] != -1 && LoginManager.underWaterLocationsMapFilesBuffer[id] == null) {
Static19.underWaterLocationsMapFilesBuffer[id] = client.js5Archive5.getFile(Static35.underWaterLocationsMapFileIds[id], 0); LoginManager.underWaterLocationsMapFilesBuffer[id] = client.js5Archive5.getFile(LoginManager.underWaterLocationsMapFileIds[id], 0);
if (Static19.underWaterLocationsMapFilesBuffer[id] == null) { if (LoginManager.underWaterLocationsMapFilesBuffer[id] == null) {
Static175.mapFilesMissingCount++; Static175.mapFilesMissingCount++;
fileExists = false; fileExists = false;
} }
} }
} }
if (Static175.npcSpawnsFileIds != null && Static191.npcSpawnsFilesBuffer[id] == null && Static175.npcSpawnsFileIds[id] != -1) { if (LoginManager.npcSpawnsFileIds != null && LoginManager.npcSpawnsFilesBuffer[id] == null && LoginManager.npcSpawnsFileIds[id] != -1) {
Static191.npcSpawnsFilesBuffer[id] = client.js5Archive5.getFileXTEA(Static175.npcSpawnsFileIds[id], Static72.regionsXteaKeys[id], 0); LoginManager.npcSpawnsFilesBuffer[id] = client.js5Archive5.getFileXTEA(LoginManager.npcSpawnsFileIds[id], LoginManager.regionsXteaKeys[id], 0);
if (Static191.npcSpawnsFilesBuffer[id] == null) { if (LoginManager.npcSpawnsFilesBuffer[id] == null) {
Static175.mapFilesMissingCount++; Static175.mapFilesMissingCount++;
fileExists = false; fileExists = false;
} }
} }
} }
if (Static235.mapElementList == null) { if (LoginManager.mapElementList == null) {
if (Static158.aClass3_Sub2_Sub4_3 == null || !client.js5Archive23.isGroupNameValid(JagString.concatenate(new JagString[] { Static158.aClass3_Sub2_Sub4_3.group, Static50.aClass100_363 }))) { if (LoginManager.map == null || !client.js5Archive23.isGroupNameValid(JagString.concatenate(new JagString[] { LoginManager.map.group, Static50.aClass100_363 }))) {
Static235.mapElementList = new MapElementList(0); LoginManager.mapElementList = new MapElementList(0);
} else if (client.js5Archive23.allFilesComplete(JagString.concatenate(new JagString[] { Static158.aClass3_Sub2_Sub4_3.group, Static50.aClass100_363 }))) { } else if (client.js5Archive23.allFilesComplete(JagString.concatenate(new JagString[] { LoginManager.map.group, Static50.aClass100_363 }))) {
Static235.mapElementList = MapElementList.create(JagString.concatenate(new JagString[] { Static158.aClass3_Sub2_Sub4_3.group, Static50.aClass100_363 }), client.js5Archive23); LoginManager.mapElementList = MapElementList.create(JagString.concatenate(new JagString[] { LoginManager.map.group, Static50.aClass100_363 }), client.js5Archive23);
} else { } else {
fileExists = false; fileExists = false;
Static175.mapFilesMissingCount++; Static175.mapFilesMissingCount++;
@ -224,15 +227,15 @@ public class ClientProt {
return; return;
} }
Static271.anInt5804 = 0; anInt5804 = 0;
fileExists = true; fileExists = true;
@Pc(320) int chunkX; @Pc(320) int chunkX;
@Pc(309) int chunkZ; @Pc(309) int chunkZ;
for (id = 0; id < Static273.mapFilesBuffer.length; id++) { for (id = 0; id < LoginManager.mapFilesBuffer.length; id++) {
@Pc(294) byte[] local294 = Static156.locationMapFilesBuffer[id]; @Pc(294) byte[] local294 = LoginManager.locationMapFilesBuffer[id];
if (local294 != null) { if (local294 != null) {
chunkZ = (Static238.regionBitPacked[id] & 0xFF) * 64 - Camera.originZ; chunkZ = (LoginManager.regionBitPacked[id] & 0xFF) * 64 - Camera.originZ;
chunkX = (Static238.regionBitPacked[id] >> 8) * 64 - Camera.originX; chunkX = (LoginManager.regionBitPacked[id] >> 8) * 64 - Camera.originX;
if (Static230.dynamicMapRegion) { if (Static230.dynamicMapRegion) {
chunkZ = 10; chunkZ = 10;
chunkX = 10; chunkX = 10;
@ -240,10 +243,10 @@ public class ClientProt {
fileExists &= Static49.method1201(chunkX, chunkZ, local294); fileExists &= Static49.method1201(chunkX, chunkZ, local294);
} }
if (GlRenderer.enabled) { if (GlRenderer.enabled) {
local294 = Static19.underWaterLocationsMapFilesBuffer[id]; local294 = LoginManager.underWaterLocationsMapFilesBuffer[id];
if (local294 != null) { if (local294 != null) {
chunkX = (Static238.regionBitPacked[id] >> 8) * 64 - Camera.originX; chunkX = (LoginManager.regionBitPacked[id] >> 8) * 64 - Camera.originX;
chunkZ = (Static238.regionBitPacked[id] & 0xFF) * 64 - Camera.originZ; chunkZ = (LoginManager.regionBitPacked[id] & 0xFF) * 64 - Camera.originZ;
if (Static230.dynamicMapRegion) { if (Static230.dynamicMapRegion) {
chunkZ = 10; chunkZ = 10;
chunkX = 10; chunkX = 10;
@ -266,8 +269,8 @@ public class ClientProt {
@Pc(420) boolean hasUnderWaterMap = false; @Pc(420) boolean hasUnderWaterMap = false;
@Pc(427) int i; @Pc(427) int i;
if (GlRenderer.enabled && Preferences.highWaterDetail) { if (GlRenderer.enabled && Preferences.highWaterDetail) {
for (i = 0; i < Static273.mapFilesBuffer.length; i++) { for (i = 0; i < LoginManager.mapFilesBuffer.length; i++) {
if (Static19.underWaterLocationsMapFilesBuffer[i] != null || Static186.underWaterMapFilesBuffer[i] != null) { if (LoginManager.underWaterLocationsMapFilesBuffer[i] != null || LoginManager.underWaterMapFilesBuffer[i] != null) {
hasUnderWaterMap = true; hasUnderWaterMap = true;
break; break;
} }
@ -312,7 +315,7 @@ public class ClientProt {
Static73.setLightPosition(chunkX, i); Static73.setLightPosition(chunkX, i);
} }
Static26.method743(false); Static26.method743(false);
if (Static191.npcSpawnsFilesBuffer != null) { if (LoginManager.npcSpawnsFilesBuffer != null) {
Static158.decodeNpcFiles(); Static158.decodeNpcFiles();
} }
} }
@ -346,7 +349,7 @@ public class ClientProt {
} }
SceneGraph.method2255(); SceneGraph.method2255();
if (GlRenderer.enabled && hasUnderWaterMap) { if (GlRenderer.enabled && hasUnderWaterMap) {
Static278.setRenderTiles(true); SceneGraph.setRenderTiles(true);
SceneGraph.method3535(true); SceneGraph.method3535(true);
if (!Static230.dynamicMapRegion) { if (!Static230.dynamicMapRegion) {
Static87.method1805(true); Static87.method1805(true);
@ -363,7 +366,7 @@ public class ClientProt {
Static45.method1169(PathFinder.collisionMaps, true); Static45.method1169(PathFinder.collisionMaps, true);
ping(true); ping(true);
SceneGraph.method2255(); SceneGraph.method2255();
Static278.setRenderTiles(false); SceneGraph.setRenderTiles(false);
} }
if (GlRenderer.enabled) { if (GlRenderer.enabled) {
for (chunkX = 0; chunkX < 13; chunkX++) { for (chunkX = 0; chunkX < 13; chunkX++) {
@ -387,15 +390,15 @@ public class ClientProt {
Protocol.outboundBuffer.p4(1057001181); Protocol.outboundBuffer.p4(1057001181);
} }
if (!Static230.dynamicMapRegion) { if (!Static230.dynamicMapRegion) {
@Pc(815) int local815 = (Static52.anInt1695 + 6) / 8; @Pc(815) int local815 = (LoginManager.centralZoneZ + 6) / 8;
@Pc(821) int local821 = (Static52.anInt1695 - 6) / 8; @Pc(821) int local821 = (LoginManager.centralZoneZ - 6) / 8;
chunkX = (Static80.centralZoneX - 6) / 8; chunkX = (LoginManager.centralZoneX - 6) / 8;
chunkZ = (Static80.centralZoneX + 6) / 8; chunkZ = (LoginManager.centralZoneX + 6) / 8;
for (@Pc(837) int local837 = chunkX - 1; local837 <= chunkZ + 1; local837++) { for (@Pc(837) int local837 = chunkX - 1; local837 <= chunkZ + 1; local837++) {
for (@Pc(850) int local850 = local821 - 1; local850 <= local815 + 1; local850++) { for (@Pc(850) int local850 = local821 - 1; local850 <= local815 + 1; local850++) {
if (local837 < chunkX || local837 > chunkZ || local850 < local821 || local850 > local815) { if (local837 < chunkX || local837 > chunkZ || local850 < local821 || local850 > local815) {
client.js5Archive5.method4486(JagString.concatenate(new JagString[] { Static103.aClass100_558, JagString.parseInt(local837), Static86.UNDERSCORE, JagString.parseInt(local850) })); client.js5Archive5.method4486(JagString.concatenate(new JagString[] { LoginManager.aClass100_558, JagString.parseInt(local837), LoginManager.UNDERSCORE, JagString.parseInt(local850) }));
client.js5Archive5.method4486(JagString.concatenate(new JagString[] { Static270.aClass100_1090, JagString.parseInt(local837), Static86.UNDERSCORE, JagString.parseInt(local850) })); client.js5Archive5.method4486(JagString.concatenate(new JagString[] { LoginManager.aClass100_1090, JagString.parseInt(local837), LoginManager.UNDERSCORE, JagString.parseInt(local850) }));
} }
} }
} }
@ -501,7 +504,7 @@ public class ClientProt {
Protocol.outboundBuffer.p4(Static56.aClass13_12.id); Protocol.outboundBuffer.p4(Static56.aClass13_12.id);
Protocol.outboundBuffer.p2le(Static40.aClass13_14.createdComponentId); Protocol.outboundBuffer.p2le(Static40.aClass13_14.createdComponentId);
} }
} else if ((Static116.anInt2952 == 1 || Static277.method4640(MiniMenu.size - 1)) && MiniMenu.size > 2) { } else if ((Static116.anInt2952 == 1 || MiniMenu.method4640(MiniMenu.size - 1)) && MiniMenu.size > 2) {
Static226.method3901(); Static226.method3901();
} else if (MiniMenu.size > 0) { } else if (MiniMenu.size > 0) {
Static59.method1372(); Static59.method1372();

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

@ -14,6 +14,8 @@ public final class Component {
public static final SoftLruHashTable models = new SoftLruHashTable(50); public static final SoftLruHashTable models = new SoftLruHashTable(50);
@OriginalMember(owner = "client!gn", name = "i", descriptor = "Lclient!n;") @OriginalMember(owner = "client!gn", name = "i", descriptor = "Lclient!n;")
public static final SoftLruHashTable fonts = new SoftLruHashTable(20); public static final SoftLruHashTable fonts = new SoftLruHashTable(20);
@OriginalMember(owner = "client!rc", name = "C", descriptor = "Z")
public static boolean aBoolean72 = false;
@OriginalMember(owner = "client!be", name = "b", descriptor = "[Ljava/lang/Object;") @OriginalMember(owner = "client!be", name = "b", descriptor = "[Ljava/lang/Object;")
public Object[] onFriendTransmit; public Object[] onFriendTransmit;
@ -518,7 +520,7 @@ public final class Component {
if (this.anIntArray37 != null) { if (this.anIntArray37 != null) {
return true; return true;
} }
@Pc(18) SoftwareIndexedSprite local18 = Static164.loadSoftwareIndexedSprite(this.spriteId, InterfaceList.aClass153_12); @Pc(18) SoftwareIndexedSprite local18 = SpriteLoader.loadSoftwareIndexedSprite(this.spriteId, InterfaceList.aClass153_12);
if (local18 == null) { if (local18 == null) {
return false; return false;
} }
@ -784,7 +786,7 @@ public final class Component {
@OriginalMember(owner = "client!be", name = "a", descriptor = "(ZI)Lclient!qf;") @OriginalMember(owner = "client!be", name = "a", descriptor = "(ZI)Lclient!qf;")
public final Sprite method482(@OriginalArg(1) int arg0) { public final Sprite method482(@OriginalArg(1) int arg0) {
Static211.aBoolean72 = false; aBoolean72 = false;
if (arg0 < 0 || arg0 >= this.anIntArray36.length) { if (arg0 < 0 || arg0 >= this.anIntArray36.length) {
return null; return null;
} }
@ -798,7 +800,7 @@ public final class Component {
} }
local43 = SpriteLoader.loadSprites(local29, InterfaceList.aClass153_12); local43 = SpriteLoader.loadSprites(local29, InterfaceList.aClass153_12);
if (local43 == null) { if (local43 == null) {
Static211.aBoolean72 = true; aBoolean72 = true;
} else { } else {
sprites.put(local43, (long) local29); sprites.put(local43, (long) local29);
} }
@ -849,7 +851,7 @@ public final class Component {
@OriginalMember(owner = "client!be", name = "a", descriptor = "(ILclient!tk;IIIZLclient!hh;)Lclient!ak;") @OriginalMember(owner = "client!be", name = "a", descriptor = "(ILclient!tk;IIIZLclient!hh;)Lclient!ak;")
public final Model method488(@OriginalArg(0) int arg0, @OriginalArg(1) SeqType arg1, @OriginalArg(2) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) boolean arg4, @OriginalArg(6) PlayerAppearance arg5) { public final Model method488(@OriginalArg(0) int arg0, @OriginalArg(1) SeqType arg1, @OriginalArg(2) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) boolean arg4, @OriginalArg(6) PlayerAppearance arg5) {
Static211.aBoolean72 = false; aBoolean72 = false;
@Pc(10) int local10; @Pc(10) int local10;
@Pc(13) int local13; @Pc(13) int local13;
if (arg4) { if (arg4) {
@ -870,7 +872,7 @@ public final class Component {
if (local61 == null) { if (local61 == null) {
@Pc(69) RawModel local69 = Static77.create(InterfaceList.aClass153_85, local13); @Pc(69) RawModel local69 = Static77.create(InterfaceList.aClass153_85, local13);
if (local69 == null) { if (local69 == null) {
Static211.aBoolean72 = true; aBoolean72 = true;
return null; return null;
} }
local61 = local69.createModel(64, 768, -50, -10, -50); local61 = local69.createModel(64, 768, -50, -10, -50);
@ -883,7 +885,7 @@ public final class Component {
} else if (local10 == 2) { } else if (local10 == 2) {
local61 = NpcTypeList.get(local13).getHeadModel(arg1, arg3, arg0, arg2); local61 = NpcTypeList.get(local13).getHeadModel(arg1, arg3, arg0, arg2);
if (local61 == null) { if (local61 == null) {
Static211.aBoolean72 = true; aBoolean72 = true;
return null; return null;
} else { } else {
return local61; return local61;
@ -894,7 +896,7 @@ public final class Component {
} }
local61 = arg5.method1956(arg3, arg1, arg2, arg0); local61 = arg5.method1956(arg3, arg1, arg2, arg0);
if (local61 == null) { if (local61 == null) {
Static211.aBoolean72 = true; aBoolean72 = true;
return null; return null;
} else { } else {
return local61; return local61;
@ -903,7 +905,7 @@ public final class Component {
@Pc(164) ObjType local164 = ObjTypeList.get(local13); @Pc(164) ObjType local164 = ObjTypeList.get(local13);
@Pc(173) Model local173 = local164.getModel(arg0, arg3, arg1, 10, arg2); @Pc(173) Model local173 = local164.getModel(arg0, arg3, arg1, 10, arg2);
if (local173 == null) { if (local173 == null) {
Static211.aBoolean72 = true; aBoolean72 = true;
return null; return null;
} else { } else {
return local173; return local173;
@ -911,7 +913,7 @@ public final class Component {
} else if (local10 == 6) { } else if (local10 == 6) {
local61 = NpcTypeList.get(local13).getBodyModel(null, 0, 0, arg0, arg3, arg2, null, 0, arg1); local61 = NpcTypeList.get(local13).getBodyModel(null, 0, 0, arg0, arg3, arg2, null, 0, arg1);
if (local61 == null) { if (local61 == null) {
Static211.aBoolean72 = true; aBoolean72 = true;
return null; return null;
} else { } else {
return local61; return local61;
@ -926,7 +928,7 @@ public final class Component {
@Pc(235) int local235 = this.anInt498; @Pc(235) int local235 = this.anInt498;
@Pc(246) Model local246 = arg5.method1946(arg0, local235, local227, arg3, arg1, arg2, local232); @Pc(246) Model local246 = arg5.method1946(arg0, local235, local227, arg3, arg1, arg2, local232);
if (local246 == null) { if (local246 == null) {
Static211.aBoolean72 = true; aBoolean72 = true;
return null; return null;
} else { } else {
return local246; return local246;
@ -937,7 +939,7 @@ public final class Component {
@OriginalMember(owner = "client!be", name = "a", descriptor = "(BZ)Lclient!qf;") @OriginalMember(owner = "client!be", name = "a", descriptor = "(BZ)Lclient!qf;")
public final Sprite method489(@OriginalArg(1) boolean arg0) { public final Sprite method489(@OriginalArg(1) boolean arg0) {
Static211.aBoolean72 = false; aBoolean72 = false;
@Pc(12) int local12; @Pc(12) int local12;
if (arg0) { if (arg0) {
local12 = this.anInt519; local12 = this.anInt519;
@ -959,7 +961,7 @@ public final class Component {
local85 = SpriteLoader.loadSoftwareSprite(0, InterfaceList.aClass153_12, local12); local85 = SpriteLoader.loadSoftwareSprite(0, InterfaceList.aClass153_12, local12);
} }
if (local85 == null) { if (local85 == null) {
Static211.aBoolean72 = true; aBoolean72 = true;
return null; return null;
} }
if (this.vFlip) { if (this.vFlip) {
@ -1176,7 +1178,7 @@ public final class Component {
@OriginalMember(owner = "client!be", name = "a", descriptor = "([Lclient!ok;I)Lclient!rk;") @OriginalMember(owner = "client!be", name = "a", descriptor = "([Lclient!ok;I)Lclient!rk;")
public final Font method491(@OriginalArg(0) IndexedSprite[] arg0) { public final Font method491(@OriginalArg(0) IndexedSprite[] arg0) {
Static211.aBoolean72 = false; aBoolean72 = false;
if (this.font == -1) { if (this.font == -1) {
return null; return null;
} }
@ -1184,9 +1186,9 @@ public final class Component {
if (local21 != null) { if (local21 != null) {
return local21; return local21;
} }
local21 = Static127.method2462(this.font, InterfaceList.aClass153_12, InterfaceList.aClass153_64); local21 = Font.method2462(this.font, InterfaceList.aClass153_12, InterfaceList.aClass153_64);
if (local21 == null) { if (local21 == null) {
Static211.aBoolean72 = true; aBoolean72 = true;
} else { } else {
local21.setNameIcons(arg0, null); local21.setNameIcons(arg0, null);
fonts.put(local21, (long) this.font); fonts.put(local21, (long) this.font);

4
client/src/main/java/rt4/Static255.java → client/src/main/java/rt4/DeadClass.java
View file

@ -2,7 +2,9 @@ package rt4;
import org.openrs2.deob.annotation.OriginalMember; import org.openrs2.deob.annotation.OriginalMember;
public final class Static255 { // Has no usages.
public final class DeadClass {
@OriginalMember(owner = "client!ul", name = "I", descriptor = "Lclient!gn;") @OriginalMember(owner = "client!ul", name = "I", descriptor = "Lclient!gn;")
public static final LruHashTable cache = new LruHashTable(4); public static final LruHashTable cache = new LruHashTable(4);

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

@ -12,6 +12,8 @@ public final class DisplayMode {
@OriginalMember(owner = "client!ib", name = "i", descriptor = "[Lclient!od;") @OriginalMember(owner = "client!ib", name = "i", descriptor = "[Lclient!od;")
public static DisplayMode[] aClass114Array1; public static DisplayMode[] aClass114Array1;
@OriginalMember(owner = "client!rc", name = "M", descriptor = "Z")
public static boolean aBoolean73 = false;
@OriginalMember(owner = "client!od", name = "j", descriptor = "I") @OriginalMember(owner = "client!od", name = "j", descriptor = "I")
public int width; public int width;
@ -148,7 +150,7 @@ public final class DisplayMode {
} }
if (arg2 && arg1 > 0) { if (arg2 && arg1 > 0) {
GameShell.canvas.setIgnoreRepaint(true); GameShell.canvas.setIgnoreRepaint(true);
if (!Static211.aBoolean73) { if (!aBoolean73) {
SceneGraph.clear(); SceneGraph.clear();
SoftwareRaster.frameBuffer = null; SoftwareRaster.frameBuffer = null;
SoftwareRaster.frameBuffer = Static131.create(GameShell.canvasHeight, GameShell.canvasWidth, GameShell.canvas); SoftwareRaster.frameBuffer = Static131.create(GameShell.canvasHeight, GameShell.canvasWidth, GameShell.canvas);
@ -174,10 +176,10 @@ public final class DisplayMode {
ThreadUtils.sleep(100L); ThreadUtils.sleep(100L);
} }
if (local300.status == 1) { if (local300.status == 1) {
Static211.aBoolean73 = true; aBoolean73 = true;
} }
} }
if (Static211.aBoolean73) { if (aBoolean73) {
GlRenderer.init(GameShell.canvas, Preferences.antiAliasingMode * 2); GlRenderer.init(GameShell.canvas, Preferences.antiAliasingMode * 2);
} }
} }

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

@ -159,4 +159,12 @@ public final class FogManager {
public static float method3068() { public static float method3068() {
return aFloat21; return aFloat21;
} }
@OriginalMember(owner = "client!si", name = "a", descriptor = "(IZ)V")
public static void method3935(@OriginalArg(0) int arg0) {
method3060(anInt3923, ((float) arg0 * 0.1F + 0.7F) * 1.1523438F, 0.69921875F, 0.69921875F);
method3063(-50.0F, -60.0F, -50.0F);
method3062(anInt3922, 0);
method3058();
}
} }

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

@ -213,6 +213,11 @@ public abstract class Font extends SecondaryNode {
return local27; return local27;
} }
@OriginalMember(owner = "client!k", name = "a", descriptor = "(IIBLclient!ve;Lclient!ve;)Lclient!rk;")
public static Font method2462(@OriginalArg(1) int arg0, @OriginalArg(3) Js5 arg1, @OriginalArg(4) Js5 arg2) {
return SpriteLoader.decode(arg1, 0, arg0) ? method799(arg2.getFile(arg0, 0)) : null;
}
@OriginalMember(owner = "client!rk", name = "a", descriptor = "(Lclient!na;IIIIIIIII)I") @OriginalMember(owner = "client!rk", name = "a", descriptor = "(Lclient!na;IIIIIIIII)I")
public final int method2852(@OriginalArg(0) JagString 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, @OriginalArg(9) int arg9) { public final int method2852(@OriginalArg(0) JagString 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, @OriginalArg(9) int arg9) {
return this.renderParagraphAlpha(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9); return this.renderParagraphAlpha(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);

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

@ -45,13 +45,13 @@ public class Fonts {
@OriginalMember(owner = "client!hn", name = "a", descriptor = "(Lclient!ve;ILclient!ve;)V") @OriginalMember(owner = "client!hn", name = "a", descriptor = "(Lclient!ve;ILclient!ve;)V")
public static void load(@OriginalArg(0) Js5 arg0, @OriginalArg(2) Js5 arg1) { public static void load(@OriginalArg(0) Js5 arg0, @OriginalArg(2) Js5 arg1) {
p11Full = Static127.method2462(Sprites.p11FullId, arg1, arg0); p11Full = Font.method2462(Sprites.p11FullId, arg1, arg0);
if (GlRenderer.enabled) { if (GlRenderer.enabled) {
p11FullSoftware = SoftwareFont.method2412(Sprites.p11FullId, arg0, arg1); p11FullSoftware = SoftwareFont.method2412(Sprites.p11FullId, arg0, arg1);
} else { } else {
p11FullSoftware = (SoftwareFont) p11Full; p11FullSoftware = (SoftwareFont) p11Full;
} }
p12Full = Static127.method2462(Sprites.p12FullId, arg1, arg0); p12Full = Font.method2462(Sprites.p12FullId, arg1, arg0);
b12Full = Static127.method2462(Sprites.b12FullId, arg1, arg0); b12Full = Font.method2462(Sprites.b12FullId, arg1, arg0);
} }
} }

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

@ -177,6 +177,51 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
VARIABLE_RENDER_RATE_NS = (int)(VARIABLE_RENDER_RATE * 1_000_000.0d); VARIABLE_RENDER_RATE_NS = (int)(VARIABLE_RENDER_RATE * 1_000_000.0d);
} }
@OriginalMember(owner = "client!qh", name = "a", descriptor = "(Z)V")
public static void method3662() {
@Pc(8) Container local8;
if (fullScreenFrame != null) {
local8 = fullScreenFrame;
} else if (frame == null) {
local8 = signLink.applet;
} else {
local8 = frame;
}
frameWidth = local8.getSize().width;
frameHeight = local8.getSize().height;
@Pc(35) Insets local35;
if (local8 == frame) {
local35 = frame.getInsets();
frameHeight -= local35.bottom + local35.top;
frameWidth -= local35.right + local35.left;
}
if (DisplayMode.getWindowMode() >= 2) {
canvasWidth = frameWidth;
leftMargin = 0;
topMargin = 0;
canvasHeight = frameHeight;
} else {
topMargin = 0;
leftMargin = (frameWidth - 765) / 2;
canvasHeight = 503;
canvasWidth = 765;
}
if (GlRenderer.enabled) {
GlRenderer.setCanvasSize(canvasWidth, canvasHeight);
}
canvas.setSize(canvasWidth, canvasHeight);
if (local8 == frame) {
local35 = frame.getInsets();
canvas.setLocation(local35.left + leftMargin, topMargin + local35.top);
} else {
canvas.setLocation(leftMargin, topMargin);
}
if (InterfaceList.topLevelInterface != -1) {
Static210.method3712(true);
}
Static139.method2704();
}
@OriginalMember(owner = "client!rc", name = "focusLost", descriptor = "(Ljava/awt/event/FocusEvent;)V") @OriginalMember(owner = "client!rc", name = "focusLost", descriptor = "(Ljava/awt/event/FocusEvent;)V")
@Override @Override
public final void focusLost(@OriginalArg(0) FocusEvent event) { public final void focusLost(@OriginalArg(0) FocusEvent event) {

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

@ -1035,7 +1035,7 @@ public final class GlModel extends Model {
} }
if (Static150.anInt3582 >= local187 && Static150.anInt3582 <= local191 && Static34.anInt1053 >= local206 && Static34.anInt1053 <= local210) { if (Static150.anInt3582 >= local187 && Static150.anInt3582 <= local191 && Static34.anInt1053 >= local206 && Static34.anInt1053 <= local210) {
if (this.aBoolean303) { if (this.aBoolean303) {
Static259.aLongArray11[Static2.anInt7++] = arg8; Model.aLongArray11[Static2.anInt7++] = arg8;
} else { } else {
if (anIntArray468.length < this.anInt5296) { if (anIntArray468.length < this.anInt5296) {
anIntArray468 = new int[this.anInt5296]; anIntArray468 = new int[this.anInt5296];
@ -1053,7 +1053,7 @@ public final class GlModel extends Model {
@Pc(703) short local703 = this.aShortArray82[local362]; @Pc(703) short local703 = this.aShortArray82[local362];
@Pc(708) short local708 = this.aShortArray83[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])) { if (this.method4118(Static150.anInt3582, Static34.anInt1053, anIntArray467[local698], anIntArray467[local703], anIntArray467[local708], anIntArray468[local698], anIntArray468[local703], anIntArray468[local708])) {
Static259.aLongArray11[Static2.anInt7++] = arg8; Model.aLongArray11[Static2.anInt7++] = arg8;
break label118; break label118;
} }
local362++; local362++;

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

@ -199,6 +199,58 @@ public final class JagString implements StringInterface {
return concatenate(new JagString[] { parseInt(arg0 >> 24 & 0xFF), aClass100_994, parseInt(arg0 >> 16 & 0xFF), aClass100_994, parseInt(arg0 >> 8 & 0xFF), aClass100_994, parseInt(arg0 & 0xFF) }); return concatenate(new JagString[] { parseInt(arg0 >> 24 & 0xFF), aClass100_994, parseInt(arg0 >> 16 & 0xFF), aClass100_994, parseInt(arg0 >> 8 & 0xFF), aClass100_994, parseInt(arg0 & 0xFF) });
} }
@OriginalMember(owner = "client!k", name = "a", descriptor = "(Lclient!be;Lclient!na;I)Lclient!na;")
public static JagString method2465(@OriginalArg(0) Component arg0, @OriginalArg(1) JagString arg1) {
if (arg1.indexOf(Static127.PERCENT_SIGN) == -1) {
return arg1;
}
while (true) {
@Pc(14) int local14 = arg1.indexOf(Static127.aClass100_133);
if (local14 == -1) {
while (true) {
local14 = arg1.indexOf(Static127.aClass100_1097);
if (local14 == -1) {
while (true) {
local14 = arg1.indexOf(Static127.aClass100_761);
if (local14 == -1) {
while (true) {
local14 = arg1.indexOf(Static127.aClass100_520);
if (local14 == -1) {
while (true) {
local14 = arg1.indexOf(Static127.aClass100_1002);
if (local14 == -1) {
while (true) {
local14 = arg1.indexOf(Static127.aClass100_591);
if (local14 == -1) {
return arg1;
}
@Pc(246) JagString local246 = EMPTY;
if (Player.lastLogAddress != null) {
local246 = formatIp(Player.lastLogAddress.intArg2);
if (Player.lastLogAddress.result != null) {
@Pc(265) byte[] local265 = ((String) Player.lastLogAddress.result).getBytes(StandardCharsets.ISO_8859_1);
local246 = decodeString(local265, local265.length, 0);
}
}
arg1 = concatenate(new JagString[] { arg1.substring(local14, 0), local246, arg1.substring(local14 + 4) });
}
}
arg1 = concatenate(new JagString[] { arg1.substring(local14, 0), StringUtils.method4510(Static127.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(Static127.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(Static127.method3212(0, arg0)), arg1.substring(local14 + 2) });
}
}
@OriginalMember(owner = "client!na", name = "a", descriptor = "(Z)Ljava/net/URL;") @OriginalMember(owner = "client!na", name = "a", descriptor = "(Z)Ljava/net/URL;")
public final URL method3107() throws MalformedURLException { public final URL method3107() throws MalformedURLException {
return new URL(new String(this.chars, 0, this.length)); return new URL(new String(this.chars, 0, this.length));

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

@ -73,7 +73,7 @@ public final class Light {
@OriginalMember(owner = "client!gi", name = "<init>", descriptor = "(Lclient!wa;)V") @OriginalMember(owner = "client!gi", name = "<init>", descriptor = "(Lclient!wa;)V")
public Light(@OriginalArg(0) Buffer arg0) { public Light(@OriginalArg(0) Buffer arg0) {
if (anIntArray150 == null) { if (anIntArray150 == null) {
Static84.method1771(); method1771();
} }
this.anInt2241 = arg0.g1(); this.anInt2241 = arg0.g1();
this.aBoolean124 = (this.anInt2241 & 0x10) != 0; this.aBoolean124 = (this.anInt2241 & 0x10) != 0;
@ -98,6 +98,11 @@ public final class Light {
} }
} }
@OriginalMember(owner = "client!gk", name = "b", descriptor = "(B)V")
public static void method1771() {
anIntArray150 = Static206.method3679(0.4F);
}
@OriginalMember(owner = "client!gi", name = "a", descriptor = "(BIIII)V") @OriginalMember(owner = "client!gi", name = "a", descriptor = "(BIIII)V")
public final void method1762(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3) { public final void method1762(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3) {
this.anInt2233 = arg0; this.anInt2233 = arg0;

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

@ -14,6 +14,18 @@ public class LoginManager {
public static final JagString ZAP = JagString.parse("zap"); public static final JagString ZAP = JagString.parse("zap");
@OriginalMember(owner = "client!ef", name = "h", descriptor = "Lclient!na;") @OriginalMember(owner = "client!ef", name = "h", descriptor = "Lclient!na;")
public static final JagString UNZAP = JagString.parse("unzap"); public static final JagString UNZAP = JagString.parse("unzap");
@OriginalMember(owner = "client!wj", name = "f", descriptor = "Lclient!na;")
public static final JagString aClass100_1103 = JagString.parse("ul");
@OriginalMember(owner = "client!i", name = "ic", descriptor = "Lclient!na;")
public static final JagString aClass100_558 = JagString.parse("m");
@OriginalMember(owner = "client!wb", name = "e", descriptor = "Lclient!na;")
public static final JagString aClass100_1090 = JagString.parse("l");
@OriginalMember(owner = "client!oe", name = "o", descriptor = "Lclient!na;")
public static final JagString aClass100_807 = JagString.parse("n");
@OriginalMember(owner = "client!nb", name = "a", descriptor = "Lclient!na;")
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!rl", name = "X", descriptor = "I") @OriginalMember(owner = "client!rl", name = "X", descriptor = "I")
public static int anInt4937 = 0; public static int anInt4937 = 0;
@OriginalMember(owner = "client!sd", name = "X", descriptor = "Z") @OriginalMember(owner = "client!sd", name = "X", descriptor = "Z")
@ -54,6 +66,44 @@ public class LoginManager {
public static boolean mapQuickChat = false; public static boolean mapQuickChat = false;
@OriginalMember(owner = "client!c", name = "hb", descriptor = "Z") @OriginalMember(owner = "client!c", name = "hb", descriptor = "Z")
public static boolean parentalAdvertConsent = false; public static boolean parentalAdvertConsent = false;
@OriginalMember(owner = "client!we", name = "H", descriptor = "[[B")
public static byte[][] mapFilesBuffer;
@OriginalMember(owner = "client!mf", name = "O", descriptor = "[[B")
public static byte[][] locationMapFilesBuffer;
@OriginalMember(owner = "client!cl", name = "V", descriptor = "[I")
public static int[] underWaterLocationsMapFileIds;
@OriginalMember(owner = "client!pg", name = "jb", descriptor = "[[B")
public static byte[][] npcSpawnsFilesBuffer;
@OriginalMember(owner = "client!client", name = "lb", descriptor = "[I")
public static int[] mapFileIds;
@OriginalMember(owner = "client!pa", name = "L", descriptor = "[[B")
public static byte[][] underWaterMapFilesBuffer;
@OriginalMember(owner = "client!fl", name = "D", descriptor = "[[I")
public static int[][] regionsXteaKeys;
@OriginalMember(owner = "client!te", name = "H", descriptor = "[I")
public static int[] regionBitPacked;
@OriginalMember(owner = "client!nm", name = "P", descriptor = "[I")
public static int[] npcSpawnsFileIds;
@OriginalMember(owner = "client!hk", name = "bb", descriptor = "[I")
public static int[] underWaterMapFileIds;
@OriginalMember(owner = "client!nj", name = "j", descriptor = "[I")
public static int[] locationsMapFileIds;
@OriginalMember(owner = "client!bi", name = "Y", descriptor = "[[B")
public static byte[][] underWaterLocationsMapFilesBuffer;
@OriginalMember(owner = "client!gf", name = "R", descriptor = "I")
public static int centralZoneX;
@OriginalMember(owner = "client!eb", name = "u", descriptor = "I")
public static int centralZoneZ;
@OriginalMember(owner = "client!dc", name = "ab", descriptor = "I")
public static int centralPlane = 0;
@OriginalMember(owner = "client!mh", name = "hb", descriptor = "Lclient!bn;")
public static Map map;
@OriginalMember(owner = "client!tb", name = "X", descriptor = "Lclient!se;")
public static MapElementList mapElementList;
@OriginalMember(owner = "client!ja", name = "n", descriptor = "I")
public static int mapFlagX = 0;
@OriginalMember(owner = "client!gk", name = "h", descriptor = "I")
public static int mapFlagZ = 0;
@OriginalMember(owner = "client!dm", name = "d", descriptor = "(I)V") @OriginalMember(owner = "client!dm", name = "d", descriptor = "(I)V")
public static void clear() { public static void clear() {
@ -432,7 +482,7 @@ public class LoginManager {
reply = 2; reply = 2;
step = 0; step = 0;
client.method4221(); client.method4221();
Static80.centralZoneX = -1; centralZoneX = -1;
Protocol.readRebuildPacket(false); Protocol.readRebuildPacket(false);
Protocol.opcode = -1; Protocol.opcode = -1;
return; return;
@ -499,45 +549,225 @@ public class LoginManager {
public static void setupLoadingScreenRegion() { public static void setupLoadingScreenRegion() {
@Pc(10) int local10 = (Camera.renderX >> 10) + (Camera.originX >> 3); @Pc(10) int local10 = (Camera.renderX >> 10) + (Camera.originX >> 3);
@Pc(23) int local23 = (Camera.renderZ >> 10) + (Camera.originZ >> 3); @Pc(23) int local23 = (Camera.renderZ >> 10) + (Camera.originZ >> 3);
Static156.locationMapFilesBuffer = new byte[18][]; locationMapFilesBuffer = new byte[18][];
Static35.underWaterLocationsMapFileIds = new int[18]; underWaterLocationsMapFileIds = new int[18];
Static191.npcSpawnsFilesBuffer = new byte[18][]; npcSpawnsFilesBuffer = new byte[18][];
Static36.mapFileIds = new int[18]; mapFileIds = new int[18];
Static72.regionsXteaKeys = new int[18][4]; regionsXteaKeys = new int[18][4];
Static186.underWaterMapFilesBuffer = new byte[18][]; underWaterMapFilesBuffer = new byte[18][];
Static238.regionBitPacked = new int[18]; regionBitPacked = new int[18];
Static273.mapFilesBuffer = new byte[18][]; mapFilesBuffer = new byte[18][];
Static175.npcSpawnsFileIds = new int[18]; npcSpawnsFileIds = new int[18];
Static99.underWaterMapFileIds = new int[18]; underWaterMapFileIds = new int[18];
Static172.locationsMapFileIds = new int[18]; locationsMapFileIds = new int[18];
Static19.underWaterLocationsMapFilesBuffer = new byte[18][]; underWaterLocationsMapFilesBuffer = new byte[18][];
@Pc(74) int local74 = 0; @Pc(74) int local74 = 0;
@Pc(80) int local80; @Pc(80) int local80;
for (local80 = (local10 - 6) / 8; local80 <= (local10 + 6) / 8; local80++) { for (local80 = (local10 - 6) / 8; local80 <= (local10 + 6) / 8; local80++) {
for (@Pc(97) int local97 = (local23 - 6) / 8; local97 <= (local23 + 6) / 8; local97++) { for (@Pc(97) int local97 = (local23 - 6) / 8; local97 <= (local23 + 6) / 8; local97++) {
@Pc(115) int local115 = (local80 << 8) + local97; @Pc(115) int local115 = (local80 << 8) + local97;
Static238.regionBitPacked[local74] = local115; regionBitPacked[local74] = local115;
Static36.mapFileIds[local74] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static103.aClass100_558, JagString.parseInt(local80), Static86.UNDERSCORE, JagString.parseInt(local97) })); mapFileIds[local74] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { aClass100_558, JagString.parseInt(local80), UNDERSCORE, JagString.parseInt(local97) }));
Static172.locationsMapFileIds[local74] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static270.aClass100_1090, JagString.parseInt(local80), Static86.UNDERSCORE, JagString.parseInt(local97) })); locationsMapFileIds[local74] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { aClass100_1090, JagString.parseInt(local80), UNDERSCORE, JagString.parseInt(local97) }));
Static175.npcSpawnsFileIds[local74] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static179.aClass100_807, JagString.parseInt(local80), Static86.UNDERSCORE, JagString.parseInt(local97) })); npcSpawnsFileIds[local74] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { aClass100_807, JagString.parseInt(local80), UNDERSCORE, JagString.parseInt(local97) }));
Static99.underWaterMapFileIds[local74] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static165.aClass100_772, JagString.parseInt(local80), Static86.UNDERSCORE, JagString.parseInt(local97) })); underWaterMapFileIds[local74] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { aClass100_772, JagString.parseInt(local80), UNDERSCORE, JagString.parseInt(local97) }));
Static35.underWaterLocationsMapFileIds[local74] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static278.aClass100_1103, JagString.parseInt(local80), Static86.UNDERSCORE, JagString.parseInt(local97) })); underWaterLocationsMapFileIds[local74] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { aClass100_1103, JagString.parseInt(local80), UNDERSCORE, JagString.parseInt(local97) }));
if (Static175.npcSpawnsFileIds[local74] == -1) { if (npcSpawnsFileIds[local74] == -1) {
Static36.mapFileIds[local74] = -1; mapFileIds[local74] = -1;
Static172.locationsMapFileIds[local74] = -1; locationsMapFileIds[local74] = -1;
Static99.underWaterMapFileIds[local74] = -1; underWaterMapFileIds[local74] = -1;
Static35.underWaterLocationsMapFileIds[local74] = -1; underWaterLocationsMapFileIds[local74] = -1;
} }
local74++; local74++;
} }
} }
for (local80 = local74; local80 < Static175.npcSpawnsFileIds.length; local80++) { for (local80 = local74; local80 < npcSpawnsFileIds.length; local80++) {
Static175.npcSpawnsFileIds[local80] = -1; npcSpawnsFileIds[local80] = -1;
Static36.mapFileIds[local80] = -1; mapFileIds[local80] = -1;
Static172.locationsMapFileIds[local80] = -1; locationsMapFileIds[local80] = -1;
Static99.underWaterMapFileIds[local80] = -1; underWaterMapFileIds[local80] = -1;
Static35.underWaterLocationsMapFileIds[local80] = -1; underWaterLocationsMapFileIds[local80] = -1;
} }
Static127.method2463(0, local23, local10, 8, true, 8); method2463(0, local23, local10, 8, true, 8);
}
@OriginalMember(owner = "client!wj", name = "b", descriptor = "(B)V")
public static void processLogout() {
if (Protocol.socket != null) {
Protocol.socket.close();
Protocol.socket = null;
}
client.method3768();
SceneGraph.clear();
@Pc(19) int local19;
for (local19 = 0; local19 < 4; local19++) {
PathFinder.collisionMaps[local19].resetFlags();
}
WorldMap.clear(false);
System.gc();
MidiPlayer.method801();
MidiPlayer.jingle = false;
MusicPlayer.groupId = -1;
AreaSoundManager.clear(true);
Static230.dynamicMapRegion = false;
Camera.originZ = 0;
centralZoneX = 0;
centralZoneZ = 0;
Camera.originX = 0;
for (local19 = 0; local19 < Static143.hintMapMarkers.length; local19++) {
Static143.hintMapMarkers[local19] = null;
}
PlayerList.size = 0;
NpcList.size = 0;
for (local19 = 0; local19 < 2048; local19++) {
PlayerList.players[local19] = null;
PlayerList.appearanceCache[local19] = null;
}
for (local19 = 0; local19 < 32768; local19++) {
NpcList.npcs[local19] = null;
}
for (local19 = 0; local19 < 4; local19++) {
for (@Pc(115) int local115 = 0; local115 < 104; local115++) {
for (@Pc(122) int local122 = 0; local122 < 104; local122++) {
SceneGraph.objStacks[local19][local115][local122] = null;
}
}
}
Camera.resetCameraEffects();
Protocol.verifyId = 0;
VarpDomain.reset();
Static73.method1596(true);
}
@OriginalMember(owner = "client!k", name = "a", descriptor = "(IIIIZIZ)V")
public static void method2463(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) boolean arg4, @OriginalArg(5) int arg5) {
if (centralZoneX == arg2 && arg1 == centralZoneZ && (centralPlane == arg0 || SceneGraph.allLevelsAreVisible())) {
return;
}
centralZoneX = arg2;
centralZoneZ = arg1;
centralPlane = arg0;
if (SceneGraph.allLevelsAreVisible()) {
centralPlane = 0;
}
if (arg4) {
client.setGameState(28);
} else {
client.setGameState(25);
}
Static114.drawTextOnScreen(true, LocalizedText.LOADING);
@Pc(53) int local53 = Camera.originZ;
@Pc(55) int local55 = Camera.originX;
Camera.originZ = arg1 * 8 - 48;
Camera.originX = (arg2 - 6) * 8;
map = MapList.getContainingSource(centralZoneX * 8, centralZoneZ * 8);
@Pc(81) int local81 = Camera.originZ - local53;
@Pc(86) int local86 = Camera.originX - local55;
mapElementList = null;
@Pc(96) int local96;
@Pc(103) Npc local103;
@Pc(109) int local109;
if (arg4) {
NpcList.size = 0;
for (local96 = 0; local96 < 32768; local96++) {
local103 = NpcList.npcs[local96];
if (local103 != null) {
local103.xFine -= local86 * 128;
local103.zFine -= local81 * 128;
if (local103.xFine >= 0 && local103.xFine <= 13184 && local103.zFine >= 0 && local103.zFine <= 13184) {
for (local109 = 0; local109 < 10; local109++) {
local103.movementQueueX[local109] -= local86;
local103.movementQueueZ[local109] -= local81;
}
NpcList.ids[NpcList.size++] = local96;
} else {
NpcList.npcs[local96].setNpcType(null);
NpcList.npcs[local96] = null;
}
}
}
} else {
for (local96 = 0; local96 < 32768; local96++) {
local103 = NpcList.npcs[local96];
if (local103 != null) {
for (local109 = 0; local109 < 10; local109++) {
local103.movementQueueX[local109] -= local86;
local103.movementQueueZ[local109] -= local81;
}
local103.xFine -= local86 * 128;
local103.zFine -= local81 * 128;
}
}
}
for (local96 = 0; local96 < 2048; local96++) {
@Pc(265) Player local265 = PlayerList.players[local96];
if (local265 != null) {
for (local109 = 0; local109 < 10; local109++) {
local265.movementQueueX[local109] -= local86;
local265.movementQueueZ[local109] -= local81;
}
local265.xFine -= local86 * 128;
local265.zFine -= local81 * 128;
}
}
Player.level = arg0;
PlayerList.self.teleport(arg5, false, arg3);
@Pc(322) byte local322 = 104;
@Pc(324) byte local324 = 0;
@Pc(326) byte local326 = 0;
@Pc(328) byte local328 = 1;
@Pc(330) byte local330 = 104;
@Pc(332) byte local332 = 1;
if (local81 < 0) {
local328 = -1;
local330 = -1;
local326 = 103;
}
if (local86 < 0) {
local332 = -1;
local324 = 103;
local322 = -1;
}
for (@Pc(358) int local358 = local324; local358 != local322; local358 += local332) {
for (@Pc(367) int local367 = local326; local367 != local330; local367 += local328) {
@Pc(378) int local378 = local86 + local358;
@Pc(382) int local382 = local367 + local81;
for (@Pc(384) int local384 = 0; local384 < 4; local384++) {
if (local378 >= 0 && local382 >= 0 && local378 < 104 && local382 < 104) {
SceneGraph.objStacks[local384][local358][local367] = SceneGraph.objStacks[local384][local378][local382];
} else {
SceneGraph.objStacks[local384][local358][local367] = null;
}
}
}
}
for (@Pc(451) SceneryStack local451 = (SceneryStack) Static26.sceneryList.head(); local451 != null; local451 = (SceneryStack) Static26.sceneryList.next()) {
local451.z -= local81;
local451.x -= local86;
if (local451.x < 0 || local451.z < 0 || local451.x >= 104 || local451.z >= 104) {
local451.unlink();
}
}
if (arg4) {
Camera.renderX -= local86 * 128;
Camera.renderZ -= local81 * 128;
Camera.anInt4232 -= local81;
Camera.anInt5449 -= local86;
Camera.anInt5765 -= local81;
Camera.anInt5375 -= local86;
} else {
Camera.cameraType = 1;
}
SoundPlayer.anInt4451 = 0;
if (mapFlagX != 0) {
mapFlagZ -= local81;
mapFlagX -= local86;
}
if (GlRenderer.enabled && arg4 && (Math.abs(local86) > 104 || Math.abs(local81) > 104)) {
Static103.setInstantFade();
}
Static107.anInt2875 = -1;
Static99.aClass69_64.clear();
Static217.aClass69_116.clear();
} }
} }

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

@ -25,6 +25,14 @@ public class MiniMap {
public static int state = 0; public static int state = 0;
@OriginalMember(owner = "client!we", name = "w", descriptor = "I") @OriginalMember(owner = "client!we", name = "w", descriptor = "I")
public static int anInt4130 = 0; public static int anInt4130 = 0;
@OriginalMember(owner = "client!ej", name = "W", descriptor = "I")
public static int anInt1814 = 0;
@OriginalMember(owner = "client!vg", name = "d", descriptor = "I")
public static int anInt5755 = 2;
@OriginalMember(owner = "client!oe", name = "n", descriptor = "I")
public static int anInt4262 = 1;
@OriginalMember(owner = "client!gi", name = "H", descriptor = "I")
public static int anInt2252 = 0;
@OriginalMember(owner = "client!ma", name = "a", descriptor = "([IIIIII)V") @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) { public static void renderTile(@OriginalArg(0) int[] pixels, @OriginalArg(1) int index, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4) {
@ -217,7 +225,7 @@ public class MiniMap {
SoftwareRaster.setClip(arg2, arg1, arg2 + arg3.width, arg1 + arg3.height); SoftwareRaster.setClip(arg2, arg1, arg2 + arg3.width, arg1 + arg3.height);
} }
if (state != 2 && state != 5 && sprite != null) { if (state != 2 && state != 5 && sprite != null) {
@Pc(48) int local48 = Static59.anInt1814 + (int)Camera.yawTarget & 0x7FF; @Pc(48) int local48 = anInt1814 + (int)Camera.yawTarget & 0x7FF;
@Pc(57) int local57 = PlayerList.self.xFine / 32 + 48; @Pc(57) int local57 = PlayerList.self.xFine / 32 + 48;
@Pc(67) int local67 = 464 - PlayerList.self.zFine / 32; @Pc(67) int local67 = 464 - PlayerList.self.zFine / 32;
if (GlRenderer.enabled) { if (GlRenderer.enabled) {
@ -233,37 +241,37 @@ public class MiniMap {
@Pc(200) int local200; @Pc(200) int local200;
@Pc(239) int local239; @Pc(239) int local239;
@Pc(271) int local271; @Pc(271) int local271;
if (Static235.mapElementList != null) { if (LoginManager.mapElementList != null) {
for (@Pc(117) int local117 = 0; local117 < Static235.mapElementList.anInt5074; local117++) { for (@Pc(117) int local117 = 0; local117 < LoginManager.mapElementList.anInt5074; local117++) {
if (Static235.mapElementList.method3892(local117)) { if (LoginManager.mapElementList.method3892(local117)) {
local146 = (Static235.mapElementList.aShortArray73[local117] - Camera.originX) * 4 + 2 - PlayerList.self.xFine / 32; local146 = (LoginManager.mapElementList.aShortArray73[local117] - Camera.originX) * 4 + 2 - PlayerList.self.xFine / 32;
local150 = MathUtils.sin[local48]; local150 = MathUtils.sin[local48];
local154 = MathUtils.cos[local48]; local154 = MathUtils.cos[local48];
@Pc(156) Font local156 = Fonts.p11Full; @Pc(156) Font local156 = Fonts.p11Full;
@Pc(164) int local164 = local150 * 256 / (anInt4130 + 256); @Pc(164) int local164 = local150 * 256 / (anInt4130 + 256);
local181 = (Static235.mapElementList.aShortArray72[local117] - Camera.originZ) * 4 + 2 - PlayerList.self.zFine / 32; local181 = (LoginManager.mapElementList.aShortArray72[local117] - Camera.originZ) * 4 + 2 - PlayerList.self.zFine / 32;
@Pc(189) int local189 = local154 * 256 / (anInt4130 + 256); @Pc(189) int local189 = local154 * 256 / (anInt4130 + 256);
local200 = local181 * local189 - local146 * local164 >> 16; local200 = local181 * local189 - local146 * local164 >> 16;
if (Static235.mapElementList.method3894(local117) == 1) { if (LoginManager.mapElementList.method3894(local117) == 1) {
local156 = Fonts.p12Full; local156 = Fonts.p12Full;
} }
if (Static235.mapElementList.method3894(local117) == 2) { if (LoginManager.mapElementList.method3894(local117) == 2) {
local156 = Fonts.b12Full; local156 = Fonts.b12Full;
} }
local231 = local164 * local181 + local189 * local146 >> 16; local231 = local164 * local181 + local189 * local146 >> 16;
local239 = local156.getMaxLineWidth(Static235.mapElementList.aClass100Array153[local117], 100); local239 = local156.getMaxLineWidth(LoginManager.mapElementList.aClass100Array153[local117], 100);
@Pc(245) int local245 = local231 - local239 / 2; @Pc(245) int local245 = local231 - local239 / 2;
if (local245 >= -arg3.width && local245 <= arg3.width && local200 >= -arg3.height && local200 <= arg3.height) { if (local245 >= -arg3.width && local245 <= arg3.width && local200 >= -arg3.height && local200 <= arg3.height) {
local271 = 16777215; local271 = 16777215;
if (Static235.mapElementList.anIntArray444[local117] != -1) { if (LoginManager.mapElementList.anIntArray444[local117] != -1) {
local271 = Static235.mapElementList.anIntArray444[local117]; local271 = LoginManager.mapElementList.anIntArray444[local117];
} }
if (GlRenderer.enabled) { if (GlRenderer.enabled) {
GlFont.method1188((GlSprite) arg3.method489(false)); GlFont.method1188((GlSprite) arg3.method489(false));
} else { } else {
SoftwareRaster.method2486(arg3.anIntArray37, arg3.anIntArray45); SoftwareRaster.method2486(arg3.anIntArray37, arg3.anIntArray45);
} }
local156.renderParagraphAlpha(Static235.mapElementList.aClass100Array153[local117], arg2 + local245 + arg3.width / 2, arg1 + arg3.height / 2 + -local200, local239, 50, local271, 0, 1, 0, 0); local156.renderParagraphAlpha(LoginManager.mapElementList.aClass100Array153[local117], arg2 + local245 + arg3.width / 2, arg1 + arg3.height / 2 + -local200, local239, 50, local271, 0, 1, 0, 0);
if (GlRenderer.enabled) { if (GlRenderer.enabled) {
GlFont.method1173(); GlFont.method1173();
} else { } else {
@ -375,9 +383,9 @@ public class MiniMap {
} }
} }
} }
if (Static115.mapFlagX != 0) { if (LoginManager.mapFlagX != 0) {
local146 = Static115.mapFlagX * 4 + 2 - PlayerList.self.xFine / 32; local146 = LoginManager.mapFlagX * 4 + 2 - PlayerList.self.xFine / 32;
local181 = Static84.anInt2255 * 4 + 2 - PlayerList.self.zFine / 32; local181 = LoginManager.mapFlagZ * 4 + 2 - PlayerList.self.zFine / 32;
method1446(arg3, Sprites.mapflags, local181, local146, arg1, arg2); method1446(arg3, Sprites.mapflags, local181, local146, arg1, arg2);
} }
if (GlRenderer.enabled) { if (GlRenderer.enabled) {
@ -402,7 +410,7 @@ public class MiniMap {
return; return;
} }
@Pc(21) int local21 = arg3 * arg3 + arg2 * arg2; @Pc(21) int local21 = arg3 * arg3 + arg2 * arg2;
@Pc(27) int local27 = Static59.anInt1814 + (int)Camera.yawTarget & 0x7FF; @Pc(27) int local27 = anInt1814 + (int)Camera.yawTarget & 0x7FF;
@Pc(39) int local39 = Math.max(arg0.width / 2, arg0.height / 2) + 10; @Pc(39) int local39 = Math.max(arg0.width / 2, arg0.height / 2) + 10;
if (local39 * local39 < local21) { if (local39 * local39 < local21) {
return; return;

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

@ -63,6 +63,10 @@ public class MiniMenu {
public static final JagString COLOR_WHITE = JagString.parse("<col=ffffff>"); public static final JagString COLOR_WHITE = JagString.parse("<col=ffffff>");
@OriginalMember(owner = "client!cb", name = "ab", descriptor = "Lclient!na;") @OriginalMember(owner = "client!cb", name = "ab", descriptor = "Lclient!na;")
public static final JagString aClass100_164 = JagString.parse(" )2> <col=00ffff>"); public static final JagString aClass100_164 = JagString.parse(" )2> <col=00ffff>");
@OriginalMember(owner = "client!ud", name = "Q", descriptor = "Lclient!na;")
public static final JagString aClass100_1039 = JagString.parse(" x ");
@OriginalMember(owner = "client!hd", name = "l", descriptor = "Lclient!na;")
public static final JagString NULL = JagString.parse("null");
@OriginalMember(owner = "client!ck", name = "D", descriptor = "Lclient!na;") @OriginalMember(owner = "client!ck", name = "D", descriptor = "Lclient!na;")
public static JagString aClass100_203 = null; public static JagString aClass100_203 = null;
@OriginalMember(owner = "client!hn", name = "W", descriptor = "Lclient!na;") @OriginalMember(owner = "client!hn", name = "W", descriptor = "Lclient!na;")
@ -476,7 +480,7 @@ public class MiniMenu {
Protocol.outboundBuffer.p1isaac(92); Protocol.outboundBuffer.p1isaac(92);
Protocol.outboundBuffer.p2leadd(local36); Protocol.outboundBuffer.p2leadd(local36);
} else { } else {
Chat.add(JagString.EMPTY, 0, JagString.concatenate(new JagString[] { JagString.parseInt(local693.objCounts[local15]), Static249.aClass100_1039, ObjTypeList.get(local36).name})); Chat.add(JagString.EMPTY, 0, JagString.concatenate(new JagString[] { JagString.parseInt(local693.objCounts[local15]), aClass100_1039, ObjTypeList.get(local36).name}));
} }
anInt2043 = 0; anInt2043 = 0;
aClass13_7 = InterfaceList.getComponent(local19); aClass13_7 = InterfaceList.getComponent(local19);
@ -493,7 +497,7 @@ public class MiniMenu {
Protocol.outboundBuffer.p1(Static107.anInt2878); Protocol.outboundBuffer.p1(Static107.anInt2878);
Protocol.outboundBuffer.p2((int)Camera.yawTarget); Protocol.outboundBuffer.p2((int)Camera.yawTarget);
Protocol.outboundBuffer.p1(57); Protocol.outboundBuffer.p1(57);
Protocol.outboundBuffer.p1(Static59.anInt1814); Protocol.outboundBuffer.p1(MiniMap.anInt1814);
Protocol.outboundBuffer.p1(MiniMap.anInt4130); Protocol.outboundBuffer.p1(MiniMap.anInt4130);
Protocol.outboundBuffer.p1(89); Protocol.outboundBuffer.p1(89);
Protocol.outboundBuffer.p2(PlayerList.self.xFine); Protocol.outboundBuffer.p2(PlayerList.self.xFine);
@ -738,7 +742,7 @@ public class MiniMenu {
local1955 = local693.anIntArrayArray4[0][1]; local1955 = local693.anIntArrayArray4[0][1];
if (VarpDomain.activeVarps[local1955] != local693.anIntArray48[0]) { if (VarpDomain.activeVarps[local1955] != local693.anIntArray48[0]) {
VarpDomain.activeVarps[local1955] = local693.anIntArray48[0]; VarpDomain.activeVarps[local1955] = local693.anIntArray48[0];
Static85.refreshMagicVarp(local1955); VarpDomain.refreshMagicVarp(local1955);
} }
} }
} }
@ -764,7 +768,7 @@ public class MiniMenu {
if (local693.anIntArrayArray4 != null && local693.anIntArrayArray4[0][0] == 5) { if (local693.anIntArrayArray4 != null && local693.anIntArrayArray4[0][0] == 5) {
local1955 = local693.anIntArrayArray4[0][1]; local1955 = local693.anIntArrayArray4[0][1];
VarpDomain.activeVarps[local1955] = 1 - VarpDomain.activeVarps[local1955]; VarpDomain.activeVarps[local1955] = 1 - VarpDomain.activeVarps[local1955];
Static85.refreshMagicVarp(local1955); VarpDomain.refreshMagicVarp(local1955);
} }
} }
if (local23 == 33) { if (local23 == 33) {
@ -808,7 +812,7 @@ public class MiniMenu {
local693 = InterfaceList.getComponent(local19); local693 = InterfaceList.getComponent(local19);
@Pc(2287) boolean local2287 = true; @Pc(2287) boolean local2287 = true;
if (local693.anInt453 > 0) { if (local693.anInt453 > 0) {
local2287 = Static249.method4265(local693); local2287 = method4265(local693);
} }
if (local2287) { if (local2287) {
Protocol.outboundBuffer.p1isaac(10); Protocol.outboundBuffer.p1isaac(10);
@ -896,7 +900,7 @@ public class MiniMenu {
InterfaceList.redraw(local693); InterfaceList.redraw(local693);
aClass100_203 = JagString.concatenate(new JagString[] { aClass100_32, ObjTypeList.get(local36).name, COLOR_WHITE}); aClass100_203 = JagString.concatenate(new JagString[] { aClass100_32, ObjTypeList.get(local36).name, COLOR_WHITE});
if (aClass100_203 == null) { if (aClass100_203 == null) {
aClass100_203 = Static92.NULL; aClass100_203 = NULL;
} }
return; return;
} }
@ -1075,7 +1079,7 @@ public class MiniMenu {
} }
@Pc(112) long local112 = -1L; @Pc(112) long local112 = -1L;
for (local15 = 0; local15 < Static2.anInt7; local15++) { for (local15 = 0; local15 < Static2.anInt7; local15++) {
@Pc(121) long local121 = Static259.aLongArray11[local15]; @Pc(121) long local121 = Model.aLongArray11[local15];
x = (int) local121 & 0x7F; x = (int) local121 & 0x7F;
@Pc(133) int local133 = (int) local121 >> 29 & 0x3; @Pc(133) int local133 = (int) local121 >> 29 & 0x3;
@Pc(140) int local140 = (int) (local121 >>> 32) & Integer.MAX_VALUE; @Pc(140) int local140 = (int) (local121 >>> 32) & Integer.MAX_VALUE;
@ -1454,4 +1458,26 @@ public class MiniMenu {
anInt1742 = -1; anInt1742 = -1;
anInt2954 = -1; anInt2954 = -1;
} }
@OriginalMember(owner = "client!wi", name = "c", descriptor = "(II)Z")
public static boolean method4640(@OriginalArg(0) int arg0) {
if (arg0 < 0) {
return false;
}
@Pc(12) int local12 = actions[arg0];
if (local12 >= 2000) {
local12 -= 2000;
}
return local12 == 1003;
}
@OriginalMember(owner = "client!ud", name = "a", descriptor = "(ILclient!be;)Z")
public static boolean method4265(@OriginalArg(1) Component arg0) {
if (arg0.anInt453 == 205) {
Static267.anInt5775 = 250;
return true;
} else {
return false;
}
}
} }

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

@ -8,6 +8,8 @@ import org.openrs2.deob.annotation.Pc;
@OriginalClass("client!ak") @OriginalClass("client!ak")
public abstract class Model extends Entity { public abstract class Model extends Entity {
@OriginalMember(owner = "client!vc", name = "V", descriptor = "[J")
public static final long[] aLongArray11 = new long[1000];
@OriginalMember(owner = "client!ak", name = "s", descriptor = "Z") @OriginalMember(owner = "client!ak", name = "s", descriptor = "Z")
public boolean aBoolean303 = false; public boolean aBoolean303 = false;

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

@ -48,6 +48,8 @@ public final class Mouse implements MouseListener, MouseMotionListener, FocusLis
public static volatile int anInt3521 = -1; public static volatile int anInt3521 = -1;
@OriginalMember(owner = "client!sa", name = "Y", descriptor = "I") @OriginalMember(owner = "client!sa", name = "Y", descriptor = "I")
public static volatile int anInt4973 = 0; public static volatile int anInt4973 = 0;
@OriginalMember(owner = "client!wi", name = "W", descriptor = "I")
public static int anInt5850 = 0;
public int mouseWheelX; public int mouseWheelX;
public int mouseWheelY; public int mouseWheelY;

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

@ -35,7 +35,7 @@ public final class MsiType {
return local17; return local17;
} }
MsiTypeList.spritesArchive.isFileReady(this.spriteId); MsiTypeList.spritesArchive.isFileReady(this.spriteId);
local17 = Static164.loadSoftwareIndexedSprite(this.spriteId, MsiTypeList.spritesArchive); local17 = SpriteLoader.loadSoftwareIndexedSprite(this.spriteId, MsiTypeList.spritesArchive);
if (local17 != null) { if (local17 != null) {
local17.adjustPalette(MsiTypeList.redDelta, MsiTypeList.greenDelta, MsiTypeList.blueDelta); local17.adjustPalette(MsiTypeList.redDelta, MsiTypeList.greenDelta, MsiTypeList.blueDelta);
local17.innerWidth = local17.width; local17.innerWidth = local17.width;

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

@ -93,8 +93,8 @@ public final class Npc extends PathingEntity {
if (Static101.anInt2640 != 0) { if (Static101.anInt2640 != 0) {
model.rotateX(Static101.anInt2640); model.rotateX(Static101.anInt2640);
} }
if (Static102.anInt2680 != 0) { if (PathingEntity.anInt2680 != 0) {
model.rotateZ(Static102.anInt2680); model.rotateZ(PathingEntity.anInt2680);
} }
if (Static62.anInt1938 != 0) { if (Static62.anInt1938 != 0) {
model.translate(0, Static62.anInt1938, 0); model.translate(0, Static62.anInt1938, 0);

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

@ -12,6 +12,8 @@ public abstract class PathingEntity extends Entity {
public static final int[] ANGLES = new int[] { 768, 1024, 1280, 512, 1536, 256, 0, 1792 }; public static final int[] ANGLES = new int[] { 768, 1024, 1280, 512, 1536, 256, 0, 1792 };
@OriginalMember(owner = "client!ac", name = "l", descriptor = "Lclient!ck;") @OriginalMember(owner = "client!ac", name = "l", descriptor = "Lclient!ck;")
public static final BasType aClass20_1 = new BasType(); public static final BasType aClass20_1 = new BasType();
@OriginalMember(owner = "client!hn", name = "Y", descriptor = "I")
public static int anInt2680 = 0;
@OriginalMember(owner = "client!fe", name = "A", descriptor = "I") @OriginalMember(owner = "client!fe", name = "A", descriptor = "I")
public int spotAnimStart; public int spotAnimStart;
@ -354,7 +356,7 @@ public abstract class PathingEntity extends Entity {
@OriginalMember(owner = "client!fe", name = "a", descriptor = "(BLclient!ak;I)V") @OriginalMember(owner = "client!fe", name = "a", descriptor = "(BLclient!ak;I)V")
protected final void method2685(@OriginalArg(1) Model arg0, @OriginalArg(2) int arg1) { protected final void method2685(@OriginalArg(1) Model arg0, @OriginalArg(2) int arg1) {
Static102.anInt2680 = 0; anInt2680 = 0;
Static101.anInt2640 = 0; Static101.anInt2640 = 0;
Static62.anInt1938 = 0; Static62.anInt1938 = 0;
@Pc(21) BasType local21 = this.getBasType(); @Pc(21) BasType local21 = this.getBasType();
@ -393,9 +395,9 @@ public abstract class PathingEntity extends Entity {
if (Static101.anInt2640 != 0) { if (Static101.anInt2640 != 0) {
arg0.rotateX(Static101.anInt2640); arg0.rotateX(Static101.anInt2640);
} }
Static102.anInt2680 = (int) (Math.atan2((double) (local245 - local238), (double) local24) * 325.95D) & 0x7FF; anInt2680 = (int) (Math.atan2((double) (local245 - local238), (double) local24) * 325.95D) & 0x7FF;
if (Static102.anInt2680 != 0) { if (anInt2680 != 0) {
arg0.rotateZ(Static102.anInt2680); arg0.rotateZ(anInt2680);
} }
Static62.anInt1938 = local224 + local87; Static62.anInt1938 = local224 + local87;
if (local201 + local134 < Static62.anInt1938) { if (local201 + local134 < Static62.anInt1938) {

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

@ -390,8 +390,8 @@ public final class Player extends PathingEntity {
if (Static101.anInt2640 != 0) { if (Static101.anInt2640 != 0) {
local184.rotateX(Static101.anInt2640); local184.rotateX(Static101.anInt2640);
} }
if (Static102.anInt2680 != 0) { if (PathingEntity.anInt2680 != 0) {
local184.rotateZ(Static102.anInt2680); local184.rotateZ(PathingEntity.anInt2680);
} }
if (Static62.anInt1938 != 0) { if (Static62.anInt1938 != 0) {
local184.translate(0, Static62.anInt1938, 0); local184.translate(0, Static62.anInt1938, 0);

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

@ -40,6 +40,10 @@ public final class PlayerAppearance {
public static final PlayerAppearance DEFAULT = new PlayerAppearance(); public static final PlayerAppearance DEFAULT = new PlayerAppearance();
@OriginalMember(owner = "client!mc", name = "ab", descriptor = "[I") @OriginalMember(owner = "client!mc", name = "ab", descriptor = "[I")
public static final int[] FEMALE_FEATURES = new int[] { 7, 8, 9, 10, 11, 12, 13, 15 }; public static final int[] FEMALE_FEATURES = new int[] { 7, 8, 9, 10, 11, 12, 13, 15 };
@OriginalMember(owner = "client!wh", name = "j", descriptor = "[Lclient!cl;")
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!cj", name = "e", descriptor = "[[S") @OriginalMember(owner = "client!cj", name = "e", descriptor = "[[S")
public static short[][] aShortArrayArray2; public static short[][] aShortArrayArray2;
@OriginalMember(owner = "client!nj", name = "m", descriptor = "[[S") @OriginalMember(owner = "client!nj", name = "m", descriptor = "[[S")
@ -366,16 +370,16 @@ public final class PlayerAppearance {
local374 = arg0[local353].anInt5399; local374 = arg0[local353].anInt5399;
local367 = arg0[local353].anInt5398; local367 = arg0[local353].anInt5398;
local381 = local858.frames[local374]; local381 = local858.frames[local374];
Static276.aClass3_Sub2_Sub7Array8[local353] = SeqTypeList.getAnimFrameset(local381 >>> 16); aClass3_Sub2_Sub7Array8[local353] = SeqTypeList.getAnimFrameset(local381 >>> 16);
local381 &= 0xFFFF; local381 &= 0xFFFF;
Static241.anIntArray520[local353] = local381; Static241.anIntArray520[local353] = local381;
if (Static276.aClass3_Sub2_Sub7Array8[local353] != null) { if (aClass3_Sub2_Sub7Array8[local353] != null) {
local836 |= Static276.aClass3_Sub2_Sub7Array8[local353].isColorTransformed(local381); local836 |= aClass3_Sub2_Sub7Array8[local353].isColorTransformed(local381);
local827 |= Static276.aClass3_Sub2_Sub7Array8[local353].isAlphaTransformed(local381); local827 |= aClass3_Sub2_Sub7Array8[local353].isAlphaTransformed(local381);
local838 |= local858.aBoolean278; local838 |= local858.aBoolean278;
} }
if ((local858.tween || SeqType.applyTweening) && local367 != -1 && local367 < local858.frames.length) { if ((local858.tween || SeqType.applyTweening) && local367 != -1 && local367 < local858.frames.length) {
Static262.anIntArray515[local353] = local858.anIntArray474[local374]; anIntArray515[local353] = local858.anIntArray474[local374];
Static73.anIntArray183[local353] = arg0[local353].anInt5404; Static73.anIntArray183[local353] = arg0[local353].anInt5404;
local979 = local858.frames[local367]; local979 = local858.frames[local367];
Static133.aClass3_Sub2_Sub7Array7[local353] = SeqTypeList.getAnimFrameset(local979 >>> 16); Static133.aClass3_Sub2_Sub7Array7[local353] = SeqTypeList.getAnimFrameset(local979 >>> 16);
@ -386,7 +390,7 @@ public final class PlayerAppearance {
local827 |= Static133.aClass3_Sub2_Sub7Array7[local353].isAlphaTransformed(local991); local827 |= Static133.aClass3_Sub2_Sub7Array7[local353].isAlphaTransformed(local991);
} }
} else { } else {
Static262.anIntArray515[local353] = 0; anIntArray515[local353] = 0;
Static73.anIntArray183[local353] = 0; Static73.anIntArray183[local353] = 0;
Static133.aClass3_Sub2_Sub7Array7[local353] = null; Static133.aClass3_Sub2_Sub7Array7[local353] = null;
anIntArray187[local353] = -1; anIntArray187[local353] = -1;
@ -463,8 +467,8 @@ public final class PlayerAppearance {
local481 = 0; local481 = 0;
local598 = 1; local598 = 1;
while (local481 < local346) { while (local481 < local346) {
if (Static276.aClass3_Sub2_Sub7Array8[local481] != null) { if (aClass3_Sub2_Sub7Array8[local481] != null) {
local1284.method4565(Static276.aClass3_Sub2_Sub7Array8[local481], Static241.anIntArray520[local481], Static133.aClass3_Sub2_Sub7Array7[local481], anIntArray187[local481], Static73.anIntArray183[local481] - 1, Static262.anIntArray515[local481], local598, aClass144Array2[local481].aBoolean278, this.anIntArrayArray19[local481]); 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]);
} }
local481++; local481++;
local598 <<= 0x1; local598 <<= 0x1;
@ -477,7 +481,7 @@ public final class PlayerAppearance {
local1284.method4558(local1154, local979, local1156, local451, arg4 - 1, local457, arg2.aBoolean278); local1284.method4558(local1154, local979, local1156, local451, arg4 - 1, local457, arg2.aBoolean278);
} }
for (local481 = 0; local481 < local346; local481++) { for (local481 = 0; local481 < local346; local481++) {
Static276.aClass3_Sub2_Sub7Array8[local481] = null; aClass3_Sub2_Sub7Array8[local481] = null;
Static133.aClass3_Sub2_Sub7Array7[local481] = null; Static133.aClass3_Sub2_Sub7Array7[local481] = null;
aClass144Array2[local481] = null; aClass144Array2[local481] = null;
} }

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

@ -147,7 +147,7 @@ public class Protocol {
if (local218 == 65535) { if (local218 == 65535) {
local218 = -1; local218 = -1;
} }
Static92.method1881(Player.level, local39, local31, local19, local45, local23, local218); SceneGraph.method1881(Player.level, local39, local31, local19, local45, local23, local218);
} else if (opcode == ServerProt.LOCATION_PACKET_202) { } else if (opcode == ServerProt.LOCATION_PACKET_202) {
int local15 = inboundBuffer.g1(); int local15 = inboundBuffer.g1();
int local23 = local15 >> 2; int local23 = local15 >> 2;
@ -164,7 +164,7 @@ public class Protocol {
int local247 = inboundBuffer.g2(); int local247 = inboundBuffer.g2();
int local633 = inboundBuffer.g2lesadd(); int local633 = inboundBuffer.g2lesadd();
if (!GlRenderer.enabled) { if (!GlRenderer.enabled) {
Static170.method2574(local625, local247, local633, local232, local39, local613, local19, local605, local31, local23, local609, local228); SceneGraph.method2574(local625, local247, local633, local232, local39, local613, local19, local605, local31, local23, local609, local228);
} }
} else if (opcode == ServerProt.LOCATION_PACKET_14) { } else if (opcode == ServerProt.LOCATION_PACKET_14) {
int local15 = inboundBuffer.g1(); int local15 = inboundBuffer.g1();
@ -352,27 +352,27 @@ public class Protocol {
if (!Static230.dynamicMapRegion) { if (!Static230.dynamicMapRegion) {
local13 = inboundBuffer.g2sub(); local13 = inboundBuffer.g2sub();
local20 = (length - inboundBuffer.offset) / 16; local20 = (length - inboundBuffer.offset) / 16;
Static72.regionsXteaKeys = new int[local20][4]; LoginManager.regionsXteaKeys = new int[local20][4];
for (local26 = 0; local26 < local20; local26++) { for (local26 = 0; local26 < local20; local26++) {
for (local31 = 0; local31 < 4; local31++) { for (local31 = 0; local31 < 4; local31++) {
Static72.regionsXteaKeys[local26][local31] = inboundBuffer.g4me(); LoginManager.regionsXteaKeys[local26][local31] = inboundBuffer.g4me();
} }
} }
local26 = inboundBuffer.g1ssub(); local26 = inboundBuffer.g1ssub();
local31 = inboundBuffer.g2(); local31 = inboundBuffer.g2();
local60 = inboundBuffer.g2sub(); local60 = inboundBuffer.g2sub();
local64 = inboundBuffer.g2sub(); local64 = inboundBuffer.g2sub();
Static238.regionBitPacked = new int[local20]; LoginManager.regionBitPacked = new int[local20];
Static273.mapFilesBuffer = new byte[local20][]; LoginManager.mapFilesBuffer = new byte[local20][];
Static191.npcSpawnsFilesBuffer = null; LoginManager.npcSpawnsFilesBuffer = null;
Static99.underWaterMapFileIds = new int[local20]; LoginManager.underWaterMapFileIds = new int[local20];
Static156.locationMapFilesBuffer = new byte[local20][]; LoginManager.locationMapFilesBuffer = new byte[local20][];
Static19.underWaterLocationsMapFilesBuffer = new byte[local20][]; LoginManager.underWaterLocationsMapFilesBuffer = new byte[local20][];
Static175.npcSpawnsFileIds = null; LoginManager.npcSpawnsFileIds = null;
Static36.mapFileIds = new int[local20]; LoginManager.mapFileIds = new int[local20];
Static186.underWaterMapFilesBuffer = new byte[local20][]; LoginManager.underWaterMapFilesBuffer = new byte[local20][];
Static172.locationsMapFileIds = new int[local20]; LoginManager.locationsMapFileIds = new int[local20];
Static35.underWaterLocationsMapFileIds = new int[local20]; LoginManager.underWaterLocationsMapFileIds = new int[local20];
local20 = 0; local20 = 0;
@Pc(100) boolean local100 = false; @Pc(100) boolean local100 = false;
if ((local31 / 8 == 48 || local31 / 8 == 49) && local60 / 8 == 48) { if ((local31 / 8 == 48 || local31 / 8 == 49) && local60 / 8 == 48) {
@ -385,22 +385,22 @@ public class Protocol {
for (local151 = (local60 - 6) / 8; local151 <= (local60 + 6) / 8; local151++) { for (local151 = (local60 - 6) / 8; local151 <= (local60 + 6) / 8; local151++) {
local169 = (local138 << 8) + local151; local169 = (local138 << 8) + local151;
if (local100 && (local151 == 49 || local151 == 149 || local151 == 147 || local138 == 50 || local138 == 49 && local151 == 47)) { if (local100 && (local151 == 49 || local151 == 149 || local151 == 147 || local138 == 50 || local138 == 49 && local151 == 47)) {
Static238.regionBitPacked[local20] = local169; LoginManager.regionBitPacked[local20] = local169;
Static36.mapFileIds[local20] = -1; LoginManager.mapFileIds[local20] = -1;
Static172.locationsMapFileIds[local20] = -1; LoginManager.locationsMapFileIds[local20] = -1;
Static99.underWaterMapFileIds[local20] = -1; LoginManager.underWaterMapFileIds[local20] = -1;
Static35.underWaterLocationsMapFileIds[local20] = -1; LoginManager.underWaterLocationsMapFileIds[local20] = -1;
} else { } else {
Static238.regionBitPacked[local20] = local169; LoginManager.regionBitPacked[local20] = local169;
Static36.mapFileIds[local20] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static103.aClass100_558, JagString.parseInt(local138), Static86.UNDERSCORE, JagString.parseInt(local151) })); LoginManager.mapFileIds[local20] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { LoginManager.aClass100_558, JagString.parseInt(local138), LoginManager.UNDERSCORE, JagString.parseInt(local151) }));
Static172.locationsMapFileIds[local20] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static270.aClass100_1090, JagString.parseInt(local138), Static86.UNDERSCORE, JagString.parseInt(local151) })); LoginManager.locationsMapFileIds[local20] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { LoginManager.aClass100_1090, JagString.parseInt(local138), LoginManager.UNDERSCORE, JagString.parseInt(local151) }));
Static99.underWaterMapFileIds[local20] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static165.aClass100_772, JagString.parseInt(local138), Static86.UNDERSCORE, JagString.parseInt(local151) })); LoginManager.underWaterMapFileIds[local20] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { LoginManager.aClass100_772, JagString.parseInt(local138), LoginManager.UNDERSCORE, JagString.parseInt(local151) }));
Static35.underWaterLocationsMapFileIds[local20] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static278.aClass100_1103, JagString.parseInt(local138), Static86.UNDERSCORE, JagString.parseInt(local151) })); LoginManager.underWaterLocationsMapFileIds[local20] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { LoginManager.aClass100_1103, JagString.parseInt(local138), LoginManager.UNDERSCORE, JagString.parseInt(local151) }));
} }
local20++; local20++;
} }
} }
Static127.method2463(local26, local60, local31, local64, false, local13); LoginManager.method2463(local26, local60, local31, local64, false, local13);
return; return;
} }
local13 = inboundBuffer.g2leadd(); local13 = inboundBuffer.g2leadd();
@ -423,24 +423,24 @@ public class Protocol {
} }
inboundBuffer.accessBytes(); inboundBuffer.accessBytes();
local60 = (length - inboundBuffer.offset) / 16; local60 = (length - inboundBuffer.offset) / 16;
Static72.regionsXteaKeys = new int[local60][4]; LoginManager.regionsXteaKeys = new int[local60][4];
for (local64 = 0; local64 < local60; local64++) { for (local64 = 0; local64 < local60; local64++) {
for (local391 = 0; local391 < 4; local391++) { for (local391 = 0; local391 < 4; local391++) {
Static72.regionsXteaKeys[local64][local391] = inboundBuffer.g4me(); LoginManager.regionsXteaKeys[local64][local391] = inboundBuffer.g4me();
} }
} }
local64 = inboundBuffer.g2(); local64 = inboundBuffer.g2();
Static35.underWaterLocationsMapFileIds = new int[local60]; LoginManager.underWaterLocationsMapFileIds = new int[local60];
Static172.locationsMapFileIds = new int[local60]; LoginManager.locationsMapFileIds = new int[local60];
Static36.mapFileIds = new int[local60]; LoginManager.mapFileIds = new int[local60];
Static19.underWaterLocationsMapFilesBuffer = new byte[local60][]; LoginManager.underWaterLocationsMapFilesBuffer = new byte[local60][];
Static175.npcSpawnsFileIds = null; LoginManager.npcSpawnsFileIds = null;
Static99.underWaterMapFileIds = new int[local60]; LoginManager.underWaterMapFileIds = new int[local60];
Static156.locationMapFilesBuffer = new byte[local60][]; LoginManager.locationMapFilesBuffer = new byte[local60][];
Static273.mapFilesBuffer = new byte[local60][]; LoginManager.mapFilesBuffer = new byte[local60][];
Static238.regionBitPacked = new int[local60]; LoginManager.regionBitPacked = new int[local60];
Static191.npcSpawnsFilesBuffer = null; LoginManager.npcSpawnsFilesBuffer = null;
Static186.underWaterMapFilesBuffer = new byte[local60][]; LoginManager.underWaterMapFilesBuffer = new byte[local60][];
local60 = 0; local60 = 0;
for (local391 = 0; local391 < 4; local391++) { for (local391 = 0; local391 < 4; local391++) {
for (local138 = 0; local138 < 13; local138++) { for (local138 = 0; local138 < 13; local138++) {
@ -452,26 +452,26 @@ public class Protocol {
@Pc(571) int local571 = local561 / 8 + (local555 / 8 << 8); @Pc(571) int local571 = local561 / 8 + (local555 / 8 << 8);
@Pc(573) int local573; @Pc(573) int local573;
for (local573 = 0; local573 < local60; local573++) { for (local573 = 0; local573 < local60; local573++) {
if (local571 == Static238.regionBitPacked[local573]) { if (local571 == LoginManager.regionBitPacked[local573]) {
local571 = -1; local571 = -1;
break; break;
} }
} }
if (local571 != -1) { if (local571 != -1) {
Static238.regionBitPacked[local60] = local571; LoginManager.regionBitPacked[local60] = local571;
@Pc(609) int local609 = local571 & 0xFF; @Pc(609) int local609 = local571 & 0xFF;
local573 = local571 >> 8 & 0xFF; local573 = local571 >> 8 & 0xFF;
Static36.mapFileIds[local60] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static103.aClass100_558, JagString.parseInt(local573), Static86.UNDERSCORE, JagString.parseInt(local609) })); LoginManager.mapFileIds[local60] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { LoginManager.aClass100_558, JagString.parseInt(local573), LoginManager.UNDERSCORE, JagString.parseInt(local609) }));
Static172.locationsMapFileIds[local60] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static270.aClass100_1090, JagString.parseInt(local573), Static86.UNDERSCORE, JagString.parseInt(local609) })); LoginManager.locationsMapFileIds[local60] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { LoginManager.aClass100_1090, JagString.parseInt(local573), LoginManager.UNDERSCORE, JagString.parseInt(local609) }));
Static99.underWaterMapFileIds[local60] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static165.aClass100_772, JagString.parseInt(local573), Static86.UNDERSCORE, JagString.parseInt(local609) })); LoginManager.underWaterMapFileIds[local60] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { LoginManager.aClass100_772, JagString.parseInt(local573), LoginManager.UNDERSCORE, JagString.parseInt(local609) }));
Static35.underWaterLocationsMapFileIds[local60] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static278.aClass100_1103, JagString.parseInt(local573), Static86.UNDERSCORE, JagString.parseInt(local609) })); LoginManager.underWaterLocationsMapFileIds[local60] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { LoginManager.aClass100_1103, JagString.parseInt(local573), LoginManager.UNDERSCORE, JagString.parseInt(local609) }));
local60++; local60++;
} }
} }
} }
} }
} }
Static127.method2463(local26, local64, local20, local31, false, local13); LoginManager.method2463(local26, local64, local20, local31, false, local13);
} }
@OriginalMember(owner = "client!gk", name = "a", descriptor = "(IIBLclient!e;)V") @OriginalMember(owner = "client!gk", name = "a", descriptor = "(IIBLclient!e;)V")
@ -1036,7 +1036,7 @@ public class Protocol {
return true; return true;
} else if (opcode == ServerProt.CLEAR_MINIMAP_FLAG) { } else if (opcode == ServerProt.CLEAR_MINIMAP_FLAG) {
opcode = -1; opcode = -1;
Static115.mapFlagX = 0; LoginManager.mapFlagX = 0;
return true; return true;
} else if (opcode == ServerProt.IF_SETSCROLLPOS) { } else if (opcode == ServerProt.IF_SETSCROLLPOS) {
int id = inboundBuffer.g4me(); int id = inboundBuffer.g4me();
@ -1180,7 +1180,7 @@ public class Protocol {
int optId = inboundBuffer.g1(); int optId = inboundBuffer.g1();
JagString option = inboundBuffer.gjstr(); JagString option = inboundBuffer.gjstr();
if (optId >= 1 && optId <= 8) { if (optId >= 1 && optId <= 8) {
if (option.equalsIgnoreCase(Static92.NULL)) { if (option.equalsIgnoreCase(MiniMenu.NULL)) {
option = null; option = null;
} }
Player.options[optId - 1] = option; Player.options[optId - 1] = option;
@ -1236,7 +1236,7 @@ public class Protocol {
opcode = -1; opcode = -1;
return true; return true;
} else if (opcode == ServerProt.UPDATE_UID192) { } else if (opcode == ServerProt.UPDATE_UID192) {
Static271.writeRandom(inboundBuffer); writeRandom(inboundBuffer);
opcode = -1; opcode = -1;
return true; return true;
} else if (opcode == ServerProt.RESET_CLIENT_VARCACHE) { } else if (opcode == ServerProt.RESET_CLIENT_VARCACHE) {
@ -1582,7 +1582,7 @@ public class Protocol {
for (int i = 0; i < VarpDomain.activeVarps.length; i++) { for (int i = 0; i < VarpDomain.activeVarps.length; i++) {
if (VarpDomain.varp[i] != VarpDomain.activeVarps[i]) { if (VarpDomain.varp[i] != VarpDomain.activeVarps[i]) {
VarpDomain.activeVarps[i] = VarpDomain.varp[i]; VarpDomain.activeVarps[i] = VarpDomain.varp[i];
Static85.refreshMagicVarp(i); VarpDomain.refreshMagicVarp(i);
VarpDomain.updatedVarps[VarpDomain.updatedVarpsWriterIndex++ & 0x1F] = i; VarpDomain.updatedVarps[VarpDomain.updatedVarpsWriterIndex++ & 0x1F] = i;
} }
} }
@ -1682,8 +1682,8 @@ public class Protocol {
setVerifyId(tracknum); setVerifyId(tracknum);
Static176.customCameraActive[cameraId] = true; Static176.customCameraActive[cameraId] = true;
Camera.cameraJitter[cameraId] = jitter; Camera.cameraJitter[cameraId] = jitter;
Static276.cameraAmplitude[cameraId] = amplitude; Camera.cameraAmplitude[cameraId] = amplitude;
Static202.cameraFrequency[cameraId] = frequency; Camera.cameraFrequency[cameraId] = frequency;
Static31.anIntArray76[cameraId] = shake4; Static31.anIntArray76[cameraId] = shake4;
opcode = -1; opcode = -1;
return true; return true;
@ -1781,7 +1781,7 @@ public class Protocol {
} else if (opcode == ServerProt.VARBIT_SMALL) { } else if (opcode == ServerProt.VARBIT_SMALL) {
int value = inboundBuffer.g1add(); int value = inboundBuffer.g1add();
int id = inboundBuffer.g2le(); int id = inboundBuffer.g2le();
Static272.setVarbit(value, id); VarpDomain.setVarbit(value, id);
opcode = -1; opcode = -1;
return true; return true;
} else if (opcode == ServerProt.IF_OPENTOP) { } else if (opcode == ServerProt.IF_OPENTOP) {
@ -1891,7 +1891,7 @@ public class Protocol {
x -= Camera.originX; x -= Camera.originX;
z -= Camera.originZ; z -= Camera.originZ;
int plane = pos >> 28 & 0x3; int plane = pos >> 28 & 0x3;
Static92.method1881(plane, rotation, type, z, type2, x, seqId); SceneGraph.method1881(plane, rotation, type, z, type2, x, seqId);
opcode = -1; opcode = -1;
return true; return true;
} else if (opcode == ServerProt.MESSAGE_PRIVATE) { } else if (opcode == ServerProt.MESSAGE_PRIVATE) {
@ -2020,7 +2020,7 @@ public class Protocol {
} else if (opcode == ServerProt.VARBIT_LARGE) { } else if (opcode == ServerProt.VARBIT_LARGE) {
int value = inboundBuffer.g4le(); int value = inboundBuffer.g4le();
int id = inboundBuffer.g2leadd(); int id = inboundBuffer.g2leadd();
Static272.setVarbit(value, id); VarpDomain.setVarbit(value, id);
opcode = -1; opcode = -1;
return true; return true;
} else if (opcode == ServerProt.UPDATE_INV_PARTIAL) { } else if (opcode == ServerProt.UPDATE_INV_PARTIAL) {
@ -2065,7 +2065,7 @@ public class Protocol {
opcode = -1; opcode = -1;
return true; return true;
} else if (opcode == ServerProt.LOGOUT) { } else if (opcode == ServerProt.LOGOUT) {
Static278.processLogout(); LoginManager.processLogout();
opcode = -1; opcode = -1;
return false; return false;
} else if (opcode == ServerProt.GRAND_EXCHANGE_OFFERS) { } else if (opcode == ServerProt.GRAND_EXCHANGE_OFFERS) {
@ -2296,7 +2296,7 @@ public class Protocol {
return true; return true;
} else { } else {
TracingException.report("T1 - " + opcode + "," + opcode3 + "," + opcode4 + " - " + length, null); TracingException.report("T1 - " + opcode + "," + opcode3 + "," + opcode4 + " - " + length, null);
Static278.processLogout(); LoginManager.processLogout();
return true; return true;
} }
} }
@ -2314,7 +2314,7 @@ public class Protocol {
local61 = local61 + inboundBuffer.data[local63] + ","; local61 = local61 + inboundBuffer.data[local63] + ",";
} }
TracingException.report(local61, local19); TracingException.report(local61, local19);
Static278.processLogout(); LoginManager.processLogout();
return true; return true;
} }
} }
@ -2508,7 +2508,7 @@ public class Protocol {
} }
// VarpDomain // VarpDomain
for (i = Static38.poll(true); i != -1; i = Static38.poll(false)) { for (i = Static38.poll(true); i != -1; i = Static38.poll(false)) {
Static85.refreshMagicVarp(i); VarpDomain.refreshMagicVarp(i);
VarpDomain.updatedVarps[VarpDomain.updatedVarpsWriterIndex++ & 0x1F] = i; VarpDomain.updatedVarps[VarpDomain.updatedVarpsWriterIndex++ & 0x1F] = i;
} }
@Pc(782) int modelId; @Pc(782) int modelId;
@ -2686,7 +2686,7 @@ public class Protocol {
outboundBuffer.p2add(Static18.anInt588); outboundBuffer.p2add(Static18.anInt588);
outboundBuffer.p1sub(local1363); outboundBuffer.p1sub(local1363);
} }
} else if ((Static116.anInt2952 == 1 || Static277.method4640(MiniMenu.size - 1)) && MiniMenu.size > 2) { } else if ((Static116.anInt2952 == 1 || MiniMenu.method4640(MiniMenu.size - 1)) && MiniMenu.size > 2) {
Static226.method3901(); Static226.method3901();
} else if (MiniMenu.size > 0) { } else if (MiniMenu.size > 0) {
Static59.method1372(); Static59.method1372();
@ -2730,7 +2730,7 @@ public class Protocol {
priorityRequest = (HookRequest) InterfaceList.lowPriorityRequests.removeHead(); priorityRequest = (HookRequest) InterfaceList.lowPriorityRequests.removeHead();
if (priorityRequest == null) { if (priorityRequest == null) {
if (WorldMap.component == null) { if (WorldMap.component == null) {
Static137.anInt3337 = 0; Static36.anInt3337 = 0;
} }
if (Static40.aClass13_14 != null) { if (Static40.aClass13_14 != null) {
ClientProt.method28(); ClientProt.method28();
@ -2813,7 +2813,7 @@ public class Protocol {
} }
} }
if (Camera.cameraType == 1) { if (Camera.cameraType == 1) {
Static250.method4273(); Camera.method4273();
} else if (Camera.cameraType == 2) { } else if (Camera.cameraType == 2) {
Camera.updateLockedCamera(); Camera.updateLockedCamera();
} else { } else {
@ -2838,7 +2838,7 @@ public class Protocol {
Static164.newTab = false; Static164.newTab = false;
} }
Static131.anInt3251++; Static131.anInt3251++;
Static82.anInt2252++; MiniMap.anInt2252++;
Static143.anInt3486++; Static143.anInt3486++;
if (Static143.anInt3486 > 500) { if (Static143.anInt3486 > 500) {
Static143.anInt3486 = 0; Static143.anInt3486 = 0;
@ -2853,24 +2853,24 @@ public class Protocol {
Static132.anInt3291 += Static248.anInt4229; Static132.anInt3291 += Static248.anInt4229;
} }
} }
if (Static82.anInt2252 > 500) { if (MiniMap.anInt2252 > 500) {
Static82.anInt2252 = 0; MiniMap.anInt2252 = 0;
modelId = (int) (Math.random() * 8.0D); modelId = (int) (Math.random() * 8.0D);
if ((modelId & 0x1) == 1) { if ((modelId & 0x1) == 1) {
Static59.anInt1814 += Static263.anInt5755; MiniMap.anInt1814 += MiniMap.anInt5755;
} }
if ((modelId & 0x2) == 2) { if ((modelId & 0x2) == 2) {
MiniMap.anInt4130 += Static179.anInt4262; MiniMap.anInt4130 += MiniMap.anInt4262;
} }
} }
if (Static132.anInt3291 < -50) { if (Static132.anInt3291 < -50) {
Static248.anInt4229 = 2; Static248.anInt4229 = 2;
} }
if (Static59.anInt1814 < -60) { if (MiniMap.anInt1814 < -60) {
Static263.anInt5755 = 2; MiniMap.anInt5755 = 2;
} }
if (MiniMap.anInt4130 < -20) { if (MiniMap.anInt4130 < -20) {
Static179.anInt4262 = 1; MiniMap.anInt4262 = 1;
} }
if (Static206.anInt4774 < -55) { if (Static206.anInt4774 < -55) {
anInt659 = 2; anInt659 = 2;
@ -2888,10 +2888,10 @@ public class Protocol {
Static220.anInt4941 = -1; Static220.anInt4941 = -1;
} }
if (MiniMap.anInt4130 > 10) { if (MiniMap.anInt4130 > 10) {
Static179.anInt4262 = -1; MiniMap.anInt4262 = -1;
} }
if (Static59.anInt1814 > 60) { if (MiniMap.anInt1814 > 60) {
Static263.anInt5755 = -2; MiniMap.anInt5755 = -2;
} }
if (Static131.anInt3251 > 50) { if (Static131.anInt3251 > 50) {
outboundBuffer.p1isaac(93); outboundBuffer.p1isaac(93);
@ -3201,4 +3201,16 @@ public class Protocol {
outboundBuffer.p1isaac(177); outboundBuffer.p1isaac(177);
outboundBuffer.p2(verifyId); outboundBuffer.p2(verifyId);
} }
@OriginalMember(owner = "client!wc", name = "a", descriptor = "(Lclient!wa;I)V")
public static void writeRandom(@OriginalArg(0) Buffer arg0) {
if (client.uid != null) {
try {
client.uid.seek(0L);
client.uid.write(arg0.data, arg0.offset, 24);
} catch (@Pc(16) Exception local16) {
}
}
arg0.offset += 24;
}
} }

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

@ -68,6 +68,12 @@ public class SceneGraph {
public static Scenery[] aClass31Array2; public static Scenery[] aClass31Array2;
@OriginalMember(owner = "client!gf", name = "O", descriptor = "[[[I") @OriginalMember(owner = "client!gf", name = "O", descriptor = "[[[I")
public static int[][][] underwaterTileHeights; public static int[][][] underwaterTileHeights;
@OriginalMember(owner = "client!oj", name = "E", descriptor = "[[Lclient!hg;")
public static GlTile[][] underwaterHdTiles;
@OriginalMember(owner = "client!jm", name = "r", descriptor = "I")
public static int anInt3114;
@OriginalMember(owner = "client!sm", name = "e", descriptor = "[[[B")
public static byte[][][] aByteArrayArrayArray13;
@OriginalMember(owner = "client!km", name = "f", descriptor = "(I)Z") @OriginalMember(owner = "client!km", name = "f", descriptor = "(I)Z")
public static boolean allLevelsAreVisible() { public static boolean allLevelsAreVisible() {
@ -316,4 +322,223 @@ public class SceneGraph {
@Pc(7) Tile local7 = tiles[arg0][arg1][arg2]; @Pc(7) Tile local7 = tiles[arg0][arg1][arg2];
return local7 == null || local7.groundDecor == null ? 0L : local7.groundDecor.key; return local7 == null || local7.groundDecor == null ? 0L : local7.groundDecor.key;
} }
@OriginalMember(owner = "client!wj", name = "a", descriptor = "(Z)V")
public static void setRenderTiles(@OriginalArg(0) boolean arg0) {
if (arg0) {
tiles = underWaterGroundTiles;
tileHeights = underwaterTileHeights;
underwaterHdTiles = underWaterHdTiles;
} else {
tiles = surfaceGroundTiles;
tileHeights = surfaceTileHeights;
underwaterHdTiles = surfaceHdTiles;
}
anInt3114 = tiles.length;
}
@OriginalMember(owner = "client!wj", name = "a", descriptor = "(IIZLclient!wa;IIBII)V")
public static void readTile(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) boolean arg2, @OriginalArg(3) Buffer arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(7) int arg6, @OriginalArg(8) int arg7) {
@Pc(32) int local32;
if (arg5 < 0 || arg5 >= 104 || arg4 < 0 || arg4 >= 104) {
while (true) {
local32 = arg3.g1();
if (local32 == 0) {
break;
}
if (local32 == 1) {
arg3.g1();
break;
}
if (local32 <= 49) {
arg3.g1();
}
}
return;
}
if (!arg2) {
tileFlags[arg7][arg5][arg4] = 0;
}
while (true) {
local32 = arg3.g1();
if (local32 == 0) {
if (arg2) {
tileHeights[0][arg5][arg4] = surfaceTileHeights[0][arg5][arg4];
} else if (arg7 == 0) {
tileHeights[0][arg5][arg4] = -PerlinNoise.getTileHeight(arg4 + arg1 + 556238, arg0 + arg5 + 932731) * 8;
} else {
tileHeights[arg7][arg5][arg4] = tileHeights[arg7 - 1][arg5][arg4] - 240;
}
break;
}
if (local32 == 1) {
@Pc(111) int local111 = arg3.g1();
if (arg2) {
tileHeights[0][arg5][arg4] = surfaceTileHeights[0][arg5][arg4] + local111 * 8;
} else {
if (local111 == 1) {
local111 = 0;
}
if (arg7 == 0) {
tileHeights[0][arg5][arg4] = -local111 * 8;
} else {
tileHeights[arg7][arg5][arg4] = tileHeights[arg7 - 1][arg5][arg4] - local111 * 8;
}
}
break;
}
if (local32 <= 49) {
tileOverlays[arg7][arg5][arg4] = arg3.g1s();
tileShapes[arg7][arg5][arg4] = (byte) ((local32 - 2) / 4);
tileAngles[arg7][arg5][arg4] = (byte) (local32 + arg6 - 2 & 0x3);
} else if (local32 > 81) {
tileUnderlays[arg7][arg5][arg4] = (byte) (local32 - 81);
} else if (!arg2) {
tileFlags[arg7][arg5][arg4] = (byte) (local32 - 49);
}
}
}
@OriginalMember(owner = "client!hd", name = "a", descriptor = "(IIIIIIII)V")
public static void method1881(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5, @OriginalArg(7) int arg6) {
if (arg5 < 0 || arg3 < 0 || arg5 >= 103 || arg3 >= 103) {
return;
}
@Pc(38) int local38;
if (arg4 == 0) {
@Pc(28) Wall local28 = getWall(arg0, arg5, arg3);
if (local28 != null) {
local38 = Integer.MAX_VALUE & (int) (local28.key >>> 32);
if (arg2 == 2) {
local28.primary = new Loc(local38, 2, arg1 + 4, arg0, arg5, arg3, arg6, false, local28.primary);
local28.aClass8_6 = new Loc(local38, 2, arg1 + 1 & 0x3, arg0, arg5, arg3, arg6, false, local28.aClass8_6);
} else {
local28.primary = new Loc(local38, arg2, arg1, arg0, arg5, arg3, arg6, false, local28.primary);
}
}
}
if (arg4 == 1) {
@Pc(106) WallDecor local106 = getWallDecor(arg0, arg5, arg3);
if (local106 != null) {
local38 = (int) (local106.key >>> 32) & Integer.MAX_VALUE;
if (arg2 == 4 || arg2 == 5) {
local106.primary = new Loc(local38, 4, arg1, arg0, arg5, arg3, arg6, false, local106.primary);
} else if (arg2 == 6) {
local106.primary = new Loc(local38, 4, arg1 + 4, arg0, arg5, arg3, arg6, false, local106.primary);
} else if (arg2 == 7) {
local106.primary = new Loc(local38, 4, (arg1 + 2 & 0x3) + 4, arg0, arg5, arg3, arg6, false, local106.primary);
} else if (arg2 == 8) {
local106.primary = new Loc(local38, 4, arg1 + 4, arg0, arg5, arg3, arg6, false, local106.primary);
local106.aClass8_2 = new Loc(local38, 4, (arg1 + 2 & 0x3) + 4, arg0, arg5, arg3, arg6, false, local106.aClass8_2);
}
}
}
if (arg4 == 2) {
if (arg2 == 11) {
arg2 = 10;
}
@Pc(255) Scenery local255 = getScenery(arg0, arg5, arg3);
if (local255 != null) {
local255.primary = new Loc((int) (local255.key >>> 32) & Integer.MAX_VALUE, arg2, arg1, arg0, arg5, arg3, arg6, false, local255.primary);
}
}
if (arg4 == 3) {
@Pc(290) GroundDecor local290 = getGroundDecor(arg0, arg5, arg3);
if (local290 != null) {
local290.primary = new Loc(Integer.MAX_VALUE & (int) (local290.key >>> 32), 22, arg1, arg0, arg5, arg3, arg6, false, local290.primary);
}
}
}
@OriginalMember(owner = "client!nh", name = "a", descriptor = "(IIIILclient!th;JZ)V")
public static void method2570(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) Entity arg4, @OriginalArg(5) long arg5, @OriginalArg(6) boolean arg6) {
if (arg4 == null) {
return;
}
@Pc(6) GroundDecor local6 = new GroundDecor();
local6.primary = arg4;
local6.anInt732 = arg1 * 128 + 64;
local6.anInt736 = arg2 * 128 + 64;
local6.anInt733 = arg3;
local6.key = arg5;
local6.aBoolean49 = arg6;
if (tiles[arg0][arg1][arg2] == null) {
tiles[arg0][arg1][arg2] = new Tile(arg0, arg1, arg2);
}
tiles[arg0][arg1][arg2].groundDecor = local6;
}
@OriginalMember(owner = "client!nh", name = "a", descriptor = "(IIIIIIIIIIIII)V")
public static void method2574(@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, @OriginalArg(9) int arg9, @OriginalArg(11) int arg10, @OriginalArg(12) int arg11) {
@Pc(7) AttachLocRequest local7 = new AttachLocRequest();
local7.angle = arg6;
local7.anInt1205 = arg3;
local7.anInt1187 = arg1;
local7.anInt1200 = arg5;
local7.entityId = arg2;
local7.x = arg8;
local7.anInt1197 = arg10;
local7.z = arg4;
local7.locId = arg11;
local7.anInt1188 = arg7;
local7.anInt1191 = arg0;
local7.shape = arg9;
AttachLocRequest.queue.addTail(local7);
}
@OriginalMember(owner = "client!ia", name = "a", descriptor = "(IB)I")
public static int method2251(@OriginalArg(0) int arg0) {
@Pc(11) int local11 = arg0 & 0x3F;
@Pc(17) int local17 = arg0 >> 6 & 0x3;
if (local11 == 18) {
if (local17 == 0) {
return 1;
}
if (local17 == 1) {
return 2;
}
if (local17 == 2) {
return 4;
}
if (local17 == 3) {
return 8;
}
} else if (local11 == 19 || local11 == 21) {
if (local17 == 0) {
return 16;
}
if (local17 == 1) {
return 32;
}
if (local17 == 2) {
return 64;
}
if (local17 == 3) {
return 128;
}
}
return 0;
}
@OriginalMember(owner = "client!vf", name = "a", descriptor = "(IIIILclient!th;Lclient!th;IIJ)V")
public static void method4508(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) Entity arg4, @OriginalArg(5) Entity arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7, @OriginalArg(8) long arg8) {
if (arg4 == null && arg5 == null) {
return;
}
@Pc(8) Wall local8 = new Wall();
local8.key = arg8;
local8.anInt3048 = arg1 * 128 + 64;
local8.anInt3044 = arg2 * 128 + 64;
local8.anInt3051 = arg3;
local8.primary = arg4;
local8.aClass8_6 = arg5;
local8.anInt3049 = arg6;
local8.anInt3052 = arg7;
for (@Pc(42) int local42 = arg0; local42 >= 0; local42--) {
if (tiles[local42][arg1][arg2] == null) {
tiles[local42][arg1][arg2] = new Tile(local42, arg1, arg2);
}
}
tiles[arg0][arg1][arg2].wall = local8;
}
} }

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

@ -3716,7 +3716,7 @@ public final class ScriptRunner {
if (opcode == 6017) { if (opcode == 6017) {
isp--; isp--;
Preferences.stereo = intStack[isp] == 1; Preferences.stereo = intStack[isp] == 1;
Static211.method930(); client.method930();
Preferences.write(GameShell.signLink); Preferences.write(GameShell.signLink);
Preferences.sentToServer = false; Preferences.sentToServer = false;
continue; continue;
@ -4277,25 +4277,25 @@ public final class ScriptRunner {
if (opcode == Cs2Opcodes.isValidChar) { if (opcode == Cs2Opcodes.isValidChar) {
isp--; isp--;
int1 = intStack[isp]; int1 = intStack[isp];
intStack[isp++] = isValidChar(int1) ? 1 : 0; intStack[isp++] = StringUtils.isValidChar(int1) ? 1 : 0;
continue; continue;
} }
if (opcode == Cs2Opcodes.isAlphaNumeric) { if (opcode == Cs2Opcodes.isAlphaNumeric) {
isp--; isp--;
int1 = intStack[isp]; int1 = intStack[isp];
intStack[isp++] = Static83.isAlphaNumeric(int1) ? 1 : 0; intStack[isp++] = StringUtils.isAlphaNumeric(int1) ? 1 : 0;
continue; continue;
} }
if (opcode == Cs2Opcodes.isLetter) { if (opcode == Cs2Opcodes.isLetter) {
isp--; isp--;
int1 = intStack[isp]; int1 = intStack[isp];
intStack[isp++] = Static258.isLetter(int1) ? 1 : 0; intStack[isp++] = StringUtils.isLetter(int1) ? 1 : 0;
continue; continue;
} }
if (opcode == Cs2Opcodes.isDigit) { if (opcode == Cs2Opcodes.isDigit) {
isp--; isp--;
int1 = intStack[isp]; int1 = intStack[isp];
intStack[isp++] = Static24.isDigit(int1) ? 1 : 0; intStack[isp++] = StringUtils.isDigit(int1) ? 1 : 0;
continue; continue;
} }
if (opcode == Cs2Opcodes.length) { if (opcode == Cs2Opcodes.length) {
@ -4498,14 +4498,4 @@ public final class ScriptRunner {
run(200000, request); run(200000, request);
} }
@OriginalMember(owner = "client!we", name = "b", descriptor = "(II)Z")
public static boolean isValidChar(@OriginalArg(1) int arg0) {
if (arg0 >= 32 && arg0 <= 126) {
return true;
} else if (arg0 >= 160 && arg0 <= 255) {
return true;
} else {
return arg0 == 128 || arg0 == 140 || arg0 == 151 || arg0 == 156 || arg0 == 159;
}
}
} }

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

@ -30,6 +30,17 @@ public final class SoftLruHashTable {
this.aClass133_18 = new HashTable(local11); this.aClass133_18 = new HashTable(local11);
} }
@OriginalMember(owner = "client!gk", name = "a", descriptor = "(Lclient!rg;Lclient!rg;B)V")
public static void method1772(@OriginalArg(0) SecondaryNode arg0, @OriginalArg(1) SecondaryNode arg1) {
if (arg1.aClass3_Sub2_66 != null) {
arg1.method4365();
}
arg1.aClass3_Sub2_66 = arg0;
arg1.aClass3_Sub2_67 = arg0.aClass3_Sub2_67;
arg1.aClass3_Sub2_66.aClass3_Sub2_67 = arg1;
arg1.aClass3_Sub2_67.aClass3_Sub2_66 = arg1;
}
@OriginalMember(owner = "client!n", name = "a", descriptor = "(BLjava/lang/Object;J)V") @OriginalMember(owner = "client!n", name = "a", descriptor = "(BLjava/lang/Object;J)V")
public final void put(@OriginalArg(1) Object arg0, @OriginalArg(2) long arg1) { public final void put(@OriginalArg(1) Object arg0, @OriginalArg(2) long arg1) {
this.method3098(arg1); this.method3098(arg1);
@ -82,7 +93,7 @@ public final class SoftLruHashTable {
} else if (++local9.secondaryKey > (long) arg0) { } else if (++local9.secondaryKey > (long) arg0) {
@Pc(33) ReferenceNode local33 = ReferenceNodeFactory.SOFT_REFERENCE_NODE_FACTORY.create(local9); @Pc(33) ReferenceNode local33 = ReferenceNodeFactory.SOFT_REFERENCE_NODE_FACTORY.create(local9);
this.aClass133_18.put(local33, local9.key); this.aClass133_18.put(local33, local9.key);
Static84.method1772(local9, local33); method1772(local9, local33);
local9.unlink(); local9.unlink();
local9.method4365(); local9.method4365();
} }

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

@ -862,7 +862,7 @@ public final class SoftwareModel extends Model {
} }
if (Static150.anInt3582 >= local204 && Static150.anInt3582 <= local208 && Static34.anInt1053 >= local223 && Static34.anInt1053 <= local227) { if (Static150.anInt3582 >= local204 && Static150.anInt3582 <= local208 && Static34.anInt1053 >= local223 && Static34.anInt1053 <= local227) {
if (this.aBoolean303) { if (this.aBoolean303) {
Static259.aLongArray11[Static2.anInt7++] = arg8; Model.aLongArray11[Static2.anInt7++] = arg8;
} else { } else {
local190 = true; local190 = true;
} }
@ -1628,7 +1628,7 @@ public final class SoftwareModel extends Model {
} }
} else { } else {
if (arg1 && this.method4589(Static150.anInt3582 + Rasteriser.centerX, Static34.anInt1053 + Rasteriser.centerY, anIntArray551[local51], anIntArray551[local56], anIntArray551[local61], local65, local69, local73)) { if (arg1 && this.method4589(Static150.anInt3582 + Rasteriser.centerX, Static34.anInt1053 + Rasteriser.centerY, anIntArray551[local51], anIntArray551[local56], anIntArray551[local61], local65, local69, local73)) {
Static259.aLongArray11[Static2.anInt7++] = arg2; Model.aLongArray11[Static2.anInt7++] = arg2;
arg1 = false; arg1 = false;
} }
if ((local65 - local69) * (anIntArray551[local61] - anIntArray551[local56]) - (anIntArray551[local51] - anIntArray551[local56]) * (local73 - local69) > 0) { if ((local65 - local69) * (anIntArray551[local61] - anIntArray551[local56]) - (anIntArray551[local51] - anIntArray551[local56]) * (local73 - local69) > 0) {

24
client/src/main/java/rt4/SpriteLoader.java
View file

@ -315,11 +315,33 @@ public class SpriteLoader {
@OriginalMember(owner = "client!da", name = "a", descriptor = "(ILclient!ve;Z)Lclient!ok;") @OriginalMember(owner = "client!da", name = "a", descriptor = "(ILclient!ve;Z)Lclient!ok;")
public static IndexedSprite loadIndexedSpriteAutoDetect(@OriginalArg(0) int arg0, @OriginalArg(1) Js5 arg1) { public static IndexedSprite loadIndexedSpriteAutoDetect(@OriginalArg(0) int arg0, @OriginalArg(1) Js5 arg1) {
return decode(arg1, arg0) ? Static276.method4614() : null; return decode(arg1, arg0) ? method4614() : null;
} }
@OriginalMember(owner = "client!kc", name = "a", descriptor = "(ILclient!ve;I)Lclient!qf;") @OriginalMember(owner = "client!kc", name = "a", descriptor = "(ILclient!ve;I)Lclient!qf;")
public static Sprite loadSpriteAutoDetect(@OriginalArg(1) Js5 arg0, @OriginalArg(2) int arg1) { public static Sprite loadSpriteAutoDetect(@OriginalArg(1) Js5 arg0, @OriginalArg(2) int arg1) {
return decode(arg0, arg1) ? method1764() : null; return decode(arg0, arg1) ? method1764() : null;
} }
@OriginalMember(owner = "client!wh", name = "b", descriptor = "(B)Lclient!ok;")
public static IndexedSprite method4614() {
@Pc(27) IndexedSprite local27;
if (GlRenderer.enabled) {
local27 = new GlIndexedSprite(width, height, xOffsets[0], yOffsets[0], innerWidths[0], innerHeights[0], pixels[0], palette);
} else {
local27 = new SoftwareIndexedSprite(width, height, xOffsets[0], yOffsets[0], innerWidths[0], innerHeights[0], pixels[0], palette);
}
clear();
return local27;
}
@OriginalMember(owner = "client!na", name = "a", descriptor = "(IZILclient!ve;)Lclient!ek;")
public static SoftwareIndexedSprite loadSoftwareIndexedSprite(@OriginalArg(2) int arg0, @OriginalArg(3) Js5 arg1) {
return decode(arg1, 0, arg0) ? Static134.method2619() : null;
}
@OriginalMember(owner = "client!na", name = "a", descriptor = "(Lclient!ve;IZ)Lclient!mm;")
public static SoftwareSprite method3117(@OriginalArg(0) Js5 arg0, @OriginalArg(1) int arg1) {
return decode(arg0, arg1) ? method3537() : null;
}
} }

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

@ -6,6 +6,10 @@ import org.openrs2.deob.annotation.Pc;
public final class Static1 { public final class Static1 {
@OriginalMember(owner = "client!wi", name = "hb", descriptor = "[[Z")
public static final boolean[][] aBooleanArrayArray4 = new boolean[][] { { true, true, true }, { false, false }, { false, true }, { true, false }, { false, true, true }, { true, false, true }, { false, true, false }, { true, false, false } };
@OriginalMember(owner = "client!kc", name = "s", descriptor = "[I")
public static final int[] anIntArray300 = new int[] { 1, 1, 1, 1, 4, 1, 1, 5, 6, 1, 5, 0, 7, 0, 4, 1, 7, 2, 1, 1, 6, 1, 1, 3, 6, 1, 7, 0, 0, 6, 7, 0, 1, 7, 6, 1, 1, 1, 5, 4, 3, 2, 1, 1, 0, 4, 1, 5 };
@OriginalMember(owner = "client!a", name = "h", descriptor = "I") @OriginalMember(owner = "client!a", name = "h", descriptor = "I")
public static int anInt5; public static int anInt5;
@ -83,9 +87,9 @@ public final class Static1 {
if (local242.aBoolean310 && local242.anInt5899 != -1) { if (local242.aBoolean310 && local242.anInt5899 != -1) {
local264 = arg5[local12 - 1][local17 + 1]; local264 = arg5[local12 - 1][local17 + 1];
local274 = arg7[local12 - 1][local17 + 1]; local274 = arg7[local12 - 1][local17 + 1];
local287 = Static130.anIntArray300[local274 * 4 + (local264 + 2 & 0x3)]; local287 = anIntArray300[local274 * 4 + (local264 + 2 & 0x3)];
local299 = Static130.anIntArray300[(local264 + 3 & 0x3) + local274 * 4]; local299 = anIntArray300[(local264 + 3 & 0x3) + local274 * 4];
if (!Static277.aBooleanArrayArray4[local299][1] || !Static277.aBooleanArrayArray4[local287][0]) { if (!aBooleanArrayArray4[local299][1] || !aBooleanArrayArray4[local287][0]) {
for (local317 = 0; local317 < 8; local317++) { for (local317 = 0; local317 < 8; local317++) {
if (local317 == 0) { if (local317 == 0) {
local127++; local127++;
@ -104,9 +108,9 @@ public final class Static1 {
if (local242.aBoolean310 && local242.anInt5899 != -1) { if (local242.aBoolean310 && local242.anInt5899 != -1) {
local264 = arg5[local12 - 1][local17 - 1]; local264 = arg5[local12 - 1][local17 - 1];
local274 = arg7[local12 - 1][local17 - 1]; local274 = arg7[local12 - 1][local17 - 1];
local287 = Static130.anIntArray300[local274 * 4 + (local264 & 0x3)]; local287 = anIntArray300[local274 * 4 + (local264 & 0x3)];
local299 = Static130.anIntArray300[(local264 + 3 & 0x3) + local274 * 4]; local299 = anIntArray300[(local264 + 3 & 0x3) + local274 * 4];
if (!Static277.aBooleanArrayArray4[local287][1] || !Static277.aBooleanArrayArray4[local299][0]) { if (!aBooleanArrayArray4[local287][1] || !aBooleanArrayArray4[local299][0]) {
for (local317 = 0; local317 < 8; local317++) { for (local317 = 0; local317 < 8; local317++) {
if (local127 == local317) { if (local127 == local317) {
local166[local127++] = local214; local166[local127++] = local214;
@ -124,9 +128,9 @@ public final class Static1 {
if (local242.aBoolean310 && local242.anInt5899 != -1) { if (local242.aBoolean310 && local242.anInt5899 != -1) {
local264 = arg5[local12 + 1][local17 - 1]; local264 = arg5[local12 + 1][local17 - 1];
local274 = arg7[local12 + 1][local17 - 1]; local274 = arg7[local12 + 1][local17 - 1];
local299 = Static130.anIntArray300[local274 * 4 + (local264 + 1 & 0x3)]; local299 = anIntArray300[local274 * 4 + (local264 + 1 & 0x3)];
local287 = Static130.anIntArray300[local274 * 4 + (local264 & 0x3)]; local287 = anIntArray300[local274 * 4 + (local264 & 0x3)];
if (!Static277.aBooleanArrayArray4[local299][1] || !Static277.aBooleanArrayArray4[local287][0]) { if (!aBooleanArrayArray4[local299][1] || !aBooleanArrayArray4[local287][0]) {
for (local317 = 0; local317 < 8; local317++) { for (local317 = 0; local317 < 8; local317++) {
if (local127 == local317) { if (local127 == local317) {
local166[local127++] = local202; local166[local127++] = local202;
@ -144,9 +148,9 @@ public final class Static1 {
if (local242.aBoolean310 && local242.anInt5899 != -1) { if (local242.aBoolean310 && local242.anInt5899 != -1) {
local264 = arg5[local12 + 1][local17 + 1]; local264 = arg5[local12 + 1][local17 + 1];
local274 = arg7[local12 + 1][local17 + 1]; local274 = arg7[local12 + 1][local17 + 1];
local299 = Static130.anIntArray300[local274 * 4 + (local264 + 1 & 0x3)]; local299 = anIntArray300[local274 * 4 + (local264 + 1 & 0x3)];
local287 = Static130.anIntArray300[local274 * 4 + (local264 + 2 & 0x3)]; local287 = anIntArray300[local274 * 4 + (local264 + 2 & 0x3)];
if (!Static277.aBooleanArrayArray4[local287][1] || !Static277.aBooleanArrayArray4[local299][0]) { if (!aBooleanArrayArray4[local287][1] || !aBooleanArrayArray4[local299][0]) {
for (local317 = 0; local317 < 8; local317++) { for (local317 = 0; local317 < 8; local317++) {
if (local127 == local317) { if (local127 == local317) {
local166[local127++] = local226; local166[local127++] = local226;
@ -162,7 +166,7 @@ public final class Static1 {
if (local143 != 0 && local38 != local143) { if (local143 != 0 && local38 != local143) {
local242 = FloTypeList.method4395(local143 - 1); local242 = FloTypeList.method4395(local143 - 1);
if (local242.aBoolean310 && local242.anInt5899 != -1) { if (local242.aBoolean310 && local242.anInt5899 != -1) {
local129 = Static130.anIntArray300[arg7[local12][local17 + 1] * 4 + (arg5[local12][local17 + 1] + 2 & 0x3)]; local129 = anIntArray300[arg7[local12][local17 + 1] * 4 + (arg5[local12][local17 + 1] + 2 & 0x3)];
for (local777 = 0; local777 < 8; local777++) { for (local777 = 0; local777 < 8; local777++) {
if (local127 == local777) { if (local127 == local777) {
local166[local127++] = local143; local166[local127++] = local143;
@ -177,7 +181,7 @@ public final class Static1 {
if (local163 != 0 && local38 != local163) { if (local163 != 0 && local38 != local163) {
local242 = FloTypeList.method4395(local163 - 1); local242 = FloTypeList.method4395(local163 - 1);
if (local242.aBoolean310 && local242.anInt5899 != -1) { if (local242.aBoolean310 && local242.anInt5899 != -1) {
local133 = Static130.anIntArray300[(arg5[local12 - 1][local17] + 3 & 0x3) + arg7[local12 - 1][local17] * 4]; local133 = anIntArray300[(arg5[local12 - 1][local17] + 3 & 0x3) + arg7[local12 - 1][local17] * 4];
for (local777 = 0; local777 < 8; local777++) { for (local777 = 0; local777 < 8; local777++) {
if (local127 == local777) { if (local127 == local777) {
local166[local127++] = local163; local166[local127++] = local163;
@ -192,7 +196,7 @@ public final class Static1 {
if (local153 != 0 && local38 != local153) { if (local153 != 0 && local38 != local153) {
local242 = FloTypeList.method4395(local153 - 1); local242 = FloTypeList.method4395(local153 - 1);
if (local242.aBoolean310 && local242.anInt5899 != -1) { if (local242.aBoolean310 && local242.anInt5899 != -1) {
local131 = Static130.anIntArray300[(arg5[local12][local17 - 1] & 0x3) + arg7[local12][local17 - 1] * 4]; local131 = anIntArray300[(arg5[local12][local17 - 1] & 0x3) + arg7[local12][local17 - 1] * 4];
for (local777 = 0; local777 < 8; local777++) { for (local777 = 0; local777 < 8; local777++) {
if (local777 == local127) { if (local777 == local127) {
local166[local127++] = local153; local166[local127++] = local153;
@ -207,7 +211,7 @@ public final class Static1 {
if (local190 != 0 && local38 != local190) { if (local190 != 0 && local38 != local190) {
local242 = FloTypeList.method4395(local190 - 1); local242 = FloTypeList.method4395(local190 - 1);
if (local242.aBoolean310 && local242.anInt5899 != -1) { if (local242.aBoolean310 && local242.anInt5899 != -1) {
local168 = Static130.anIntArray300[(arg5[local12 + 1][local17] + 1 & 0x3) + arg7[local12 + 1][local17] * 4]; local168 = anIntArray300[(arg5[local12 + 1][local17] + 1 & 0x3) + arg7[local12 + 1][local17] * 4];
for (local777 = 0; local777 < 8; local777++) { for (local777 = 0; local777 < 8; local777++) {
if (local127 == local777) { if (local127 == local777) {
local166[local127++] = local190; local166[local127++] = local190;
@ -221,10 +225,10 @@ public final class Static1 {
} }
for (local1035 = 0; local1035 < local127; local1035++) { for (local1035 = 0; local1035 < local127; local1035++) {
local777 = local166[local1035]; local777 = local166[local1035];
local1055 = Static277.aBooleanArrayArray4[local163 == local777 ? local133 : 0]; local1055 = aBooleanArrayArray4[local163 == local777 ? local133 : 0];
local1068 = Static277.aBooleanArrayArray4[local777 == local153 ? local131 : 0]; local1068 = aBooleanArrayArray4[local777 == local153 ? local131 : 0];
@Pc(1077) boolean[] local1077 = Static277.aBooleanArrayArray4[local143 == local777 ? local129 : 0]; @Pc(1077) boolean[] local1077 = aBooleanArrayArray4[local143 == local777 ? local129 : 0];
local1086 = Static277.aBooleanArrayArray4[local190 == local777 ? local168 : 0]; local1086 = aBooleanArrayArray4[local190 == local777 ? local168 : 0];
@Pc(1092) FloType local1092 = FloTypeList.method4395(local777 - 1); @Pc(1092) FloType local1092 = FloTypeList.method4395(local777 - 1);
@Pc(1097) GlTile local1097 = Static243.method4212(local10, local1092); @Pc(1097) GlTile local1097 = Static243.method4212(local10, local1092);
local1097.anInt2482 += 5; local1097.anInt2482 += 5;
@ -291,9 +295,9 @@ public final class Static1 {
if (local1496.aBoolean310 && local1496.anInt5899 != -1) { if (local1496.aBoolean310 && local1496.anInt5899 != -1) {
local274 = arg5[local12 - 1][local17 + 1]; local274 = arg5[local12 - 1][local17 + 1];
local1527 = arg7[local12 - 1][local17 + 1]; local1527 = arg7[local12 - 1][local17 + 1];
local299 = Static130.anIntArray300[local1527 * 4 + (local274 + 2 & 0x3)]; local299 = anIntArray300[local1527 * 4 + (local274 + 2 & 0x3)];
local317 = Static130.anIntArray300[local1527 * 4 + (local274 + 3 & 0x3)]; local317 = anIntArray300[local1527 * 4 + (local274 + 3 & 0x3)];
if (Static277.aBooleanArrayArray4[local317][1] && Static277.aBooleanArrayArray4[local299][0]) { if (aBooleanArrayArray4[local317][1] && aBooleanArrayArray4[local299][0]) {
local214 = 0; local214 = 0;
} else { } else {
for (local1571 = 0; local1571 < 8; local1571++) { for (local1571 = 0; local1571 < 8; local1571++) {
@ -318,9 +322,9 @@ public final class Static1 {
if (local1496.aBoolean310 && local1496.anInt5899 != -1) { if (local1496.aBoolean310 && local1496.anInt5899 != -1) {
local274 = arg5[local12 - 1][local17 - 1]; local274 = arg5[local12 - 1][local17 - 1];
local1527 = arg7[local12 - 1][local17 - 1]; local1527 = arg7[local12 - 1][local17 - 1];
local299 = Static130.anIntArray300[(local274 & 0x3) + local1527 * 4]; local299 = anIntArray300[(local274 & 0x3) + local1527 * 4];
local317 = Static130.anIntArray300[(local274 + 3 & 0x3) + local1527 * 4]; local317 = anIntArray300[(local274 + 3 & 0x3) + local1527 * 4];
if (Static277.aBooleanArrayArray4[local299][1] && Static277.aBooleanArrayArray4[local317][0]) { if (aBooleanArrayArray4[local299][1] && aBooleanArrayArray4[local317][0]) {
local202 = 0; local202 = 0;
} else { } else {
for (local1571 = 0; local1571 < 8; local1571++) { for (local1571 = 0; local1571 < 8; local1571++) {
@ -344,9 +348,9 @@ public final class Static1 {
if (local1496.aBoolean310 && local1496.anInt5899 != -1) { if (local1496.aBoolean310 && local1496.anInt5899 != -1) {
local274 = arg5[local12 + 1][local17 - 1]; local274 = arg5[local12 + 1][local17 - 1];
local1527 = arg7[local12 + 1][local17 - 1]; local1527 = arg7[local12 + 1][local17 - 1];
local317 = Static130.anIntArray300[(local274 + 1 & 0x3) + local1527 * 4]; local317 = anIntArray300[(local274 + 1 & 0x3) + local1527 * 4];
local299 = Static130.anIntArray300[local1527 * 4 + (local274 & 0x3)]; local299 = anIntArray300[local1527 * 4 + (local274 & 0x3)];
if (Static277.aBooleanArrayArray4[local317][1] && Static277.aBooleanArrayArray4[local299][0]) { if (aBooleanArrayArray4[local317][1] && aBooleanArrayArray4[local299][0]) {
local226 = 0; local226 = 0;
} else { } else {
for (local1571 = 0; local1571 < 8; local1571++) { for (local1571 = 0; local1571 < 8; local1571++) {
@ -370,9 +374,9 @@ public final class Static1 {
if (local1496.aBoolean310 && local1496.anInt5899 != -1) { if (local1496.aBoolean310 && local1496.anInt5899 != -1) {
local1527 = arg7[local12 + 1][local17 + 1]; local1527 = arg7[local12 + 1][local17 + 1];
local274 = arg5[local12 + 1][local17 + 1]; local274 = arg5[local12 + 1][local17 + 1];
local299 = Static130.anIntArray300[(local274 + 2 & 0x3) + local1527 * 4]; local299 = anIntArray300[(local274 + 2 & 0x3) + local1527 * 4];
local317 = Static130.anIntArray300[(local274 + 1 & 0x3) + local1527 * 4]; local317 = anIntArray300[(local274 + 1 & 0x3) + local1527 * 4];
if (Static277.aBooleanArrayArray4[local299][1] && Static277.aBooleanArrayArray4[local317][0]) { if (aBooleanArrayArray4[local299][1] && aBooleanArrayArray4[local317][0]) {
local1035 = 0; local1035 = 0;
} else { } else {
for (local1571 = 0; local1571 < 8; local1571++) { for (local1571 = 0; local1571 < 8; local1571++) {
@ -393,7 +397,7 @@ public final class Static1 {
if (local163 != 0 && local163 != local127) { if (local163 != 0 && local163 != local127) {
local1496 = FloTypeList.method4395(local163 - 1); local1496 = FloTypeList.method4395(local163 - 1);
if (local1496.aBoolean310 && local1496.anInt5899 != -1) { if (local1496.aBoolean310 && local1496.anInt5899 != -1) {
local133 = Static130.anIntArray300[arg7[local12][local17 + 1] * 4 + (arg5[local12][local17 + 1] + 2 & 0x3)]; local133 = anIntArray300[arg7[local12][local17 + 1] * 4 + (arg5[local12][local17 + 1] + 2 & 0x3)];
for (local2003 = 0; local2003 < 8; local2003++) { for (local2003 = 0; local2003 < 8; local2003++) {
if (local2003 == local1386) { if (local2003 == local1386) {
local1382[local1386++] = local163; local1382[local1386++] = local163;
@ -408,7 +412,7 @@ public final class Static1 {
if (local153 != 0 && local127 != local153) { if (local153 != 0 && local127 != local153) {
local1496 = FloTypeList.method4395(local153 - 1); local1496 = FloTypeList.method4395(local153 - 1);
if (local1496.aBoolean310 && local1496.anInt5899 != -1) { if (local1496.aBoolean310 && local1496.anInt5899 != -1) {
local131 = Static130.anIntArray300[(arg5[local12 - 1][local17] + 3 & 0x3) + arg7[local12 - 1][local17] * 4]; local131 = anIntArray300[(arg5[local12 - 1][local17] + 3 & 0x3) + arg7[local12 - 1][local17] * 4];
for (local2003 = 0; local2003 < 8; local2003++) { for (local2003 = 0; local2003 < 8; local2003++) {
if (local1386 == local2003) { if (local1386 == local2003) {
local1382[local1386++] = local153; local1382[local1386++] = local153;
@ -423,7 +427,7 @@ public final class Static1 {
if (local190 != 0 && local190 != local127) { if (local190 != 0 && local190 != local127) {
local1496 = FloTypeList.method4395(local190 - 1); local1496 = FloTypeList.method4395(local190 - 1);
if (local1496.aBoolean310 && local1496.anInt5899 != -1) { if (local1496.aBoolean310 && local1496.anInt5899 != -1) {
local168 = Static130.anIntArray300[(arg5[local12][local17 - 1] & 0x3) + arg7[local12][local17 - 1] * 4]; local168 = anIntArray300[(arg5[local12][local17 - 1] & 0x3) + arg7[local12][local17 - 1] * 4];
for (local2003 = 0; local2003 < 8; local2003++) { for (local2003 = 0; local2003 < 8; local2003++) {
if (local1386 == local2003) { if (local1386 == local2003) {
local1382[local1386++] = local190; local1382[local1386++] = local190;
@ -438,7 +442,7 @@ public final class Static1 {
if (local180 != 0 && local180 != local127) { if (local180 != 0 && local180 != local127) {
local1496 = FloTypeList.method4395(local180 - 1); local1496 = FloTypeList.method4395(local180 - 1);
if (local1496.aBoolean310 && local1496.anInt5899 != -1) { if (local1496.aBoolean310 && local1496.anInt5899 != -1) {
local143 = Static130.anIntArray300[arg7[local12 + 1][local17] * 4 + (arg5[local12 + 1][local17] + 1 & 0x3)]; local143 = anIntArray300[arg7[local12 + 1][local17] * 4 + (arg5[local12 + 1][local17] + 1 & 0x3)];
for (local2003 = 0; local2003 < 8; local2003++) { for (local2003 = 0; local2003 < 8; local2003++) {
if (local2003 == local1386) { if (local2003 == local1386) {
local1382[local1386++] = local180; local1382[local1386++] = local180;
@ -452,10 +456,10 @@ public final class Static1 {
} }
for (local777 = 0; local777 < local1386; local777++) { for (local777 = 0; local777 < local1386; local777++) {
local2003 = local1382[local777]; local2003 = local1382[local777];
local1055 = Static277.aBooleanArrayArray4[local2003 == local163 ? local133 : 0]; local1055 = aBooleanArrayArray4[local2003 == local163 ? local133 : 0];
local1068 = Static277.aBooleanArrayArray4[local153 == local2003 ? local131 : 0]; local1068 = aBooleanArrayArray4[local153 == local2003 ? local131 : 0];
local1086 = Static277.aBooleanArrayArray4[local2003 == local190 ? local168 : 0]; local1086 = aBooleanArrayArray4[local2003 == local190 ? local168 : 0];
@Pc(2318) boolean[] local2318 = Static277.aBooleanArrayArray4[local2003 == local180 ? local143 : 0]; @Pc(2318) boolean[] local2318 = aBooleanArrayArray4[local2003 == local180 ? local143 : 0];
@Pc(2324) FloType local2324 = FloTypeList.method4395(local2003 - 1); @Pc(2324) FloType local2324 = FloTypeList.method4395(local2003 - 1);
@Pc(2329) GlTile local2329 = Static243.method4212(local10, local2324); @Pc(2329) GlTile local2329 = Static243.method4212(local10, local2324);
@Pc(2345) int local2345 = Static19.method588(local2324.texture, local2324.anInt5899, arg6[local12][local17]) << 8 | 0xFF; @Pc(2345) int local2345 = Static19.method588(local2324.texture, local2324.anInt5899, arg6[local12][local17]) << 8 | 0xFF;

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

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

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

@ -11,8 +11,6 @@ public final class Static103 {
@OriginalMember(owner = "client!i", name = "ec", descriptor = "[I") @OriginalMember(owner = "client!i", name = "ec", descriptor = "[I")
public static int[] anIntArray254; public static int[] anIntArray254;
@OriginalMember(owner = "client!i", name = "ic", descriptor = "Lclient!na;")
public static final JagString aClass100_558 = JagString.parse("m");
@OriginalMember(owner = "client!ig", name = "d", descriptor = "I") @OriginalMember(owner = "client!ig", name = "d", descriptor = "I")
public static int anInt2883; public static int anInt2883;
@OriginalMember(owner = "client!jm", name = "s", descriptor = "F") @OriginalMember(owner = "client!jm", name = "s", descriptor = "F")

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

@ -1,43 +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 Static104 {
@OriginalMember(owner = "client!ia", name = "a", descriptor = "(IB)I")
public static int method2251(@OriginalArg(0) int arg0) {
@Pc(11) int local11 = arg0 & 0x3F;
@Pc(17) int local17 = arg0 >> 6 & 0x3;
if (local11 == 18) {
if (local17 == 0) {
return 1;
}
if (local17 == 1) {
return 2;
}
if (local17 == 2) {
return 4;
}
if (local17 == 3) {
return 8;
}
} else if (local11 == 19 || local11 == 21) {
if (local17 == 0) {
return 16;
}
if (local17 == 1) {
return 32;
}
if (local17 == 2) {
return 64;
}
if (local17 == 3) {
return 128;
}
}
return 0;
}
}

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

@ -7,7 +7,7 @@ public final class Static110 {
@OriginalMember(owner = "client!ih", name = "a", descriptor = "(I[Lclient!hg;)V") @OriginalMember(owner = "client!ih", name = "a", descriptor = "(I[Lclient!hg;)V")
public static void method2280(@OriginalArg(0) int arg0, @OriginalArg(1) GlTile[] arg1) { public static void method2280(@OriginalArg(0) int arg0, @OriginalArg(1) GlTile[] arg1) {
Static182.aClass3_Sub14ArrayArray2[arg0] = arg1; SceneGraph.underwaterHdTiles[arg0] = arg1;
} }
} }

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

@ -5,6 +5,9 @@ import org.openrs2.deob.annotation.Pc;
public final class Static112 { public final class Static112 {
@OriginalMember(owner = "client!hd", name = "e", descriptor = "Lclient!qf;")
public static Sprite aClass3_Sub2_Sub1_6;
@OriginalMember(owner = "client!ij", name = "a", descriptor = "(B)V") @OriginalMember(owner = "client!ij", name = "a", descriptor = "(B)V")
public static void method2297() { public static void method2297() {
@Pc(3) int local3 = Static183.anInt4271; @Pc(3) int local3 = Static183.anInt4271;
@ -63,9 +66,9 @@ public final class Static112 {
} }
} }
} }
if ((Static165.aClass3_Sub2_Sub1_8 == null || Static92.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 || Static204.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); Static165.aClass3_Sub2_Sub1_8 = SoftwareSprite.loadSoftwareAlphaSprite(client.js5Archive8, Static40.anInt2261);
Static92.aClass3_Sub2_Sub1_6 = SoftwareSprite.loadSoftwareAlphaSprite(client.js5Archive8, Static40.anInt3324); aClass3_Sub2_Sub1_6 = SoftwareSprite.loadSoftwareAlphaSprite(client.js5Archive8, Static40.anInt3324);
Static204.aClass3_Sub2_Sub1_10 = SoftwareSprite.loadSoftwareAlphaSprite(client.js5Archive8, Static40.anInt5556); Static204.aClass3_Sub2_Sub1_10 = SoftwareSprite.loadSoftwareAlphaSprite(client.js5Archive8, Static40.anInt5556);
if (GlRenderer.enabled) { if (GlRenderer.enabled) {
if (Static165.aClass3_Sub2_Sub1_8 instanceof SoftwareAlphaSprite) { if (Static165.aClass3_Sub2_Sub1_8 instanceof SoftwareAlphaSprite) {
@ -73,10 +76,10 @@ public final class Static112 {
} else { } else {
Static165.aClass3_Sub2_Sub1_8 = new GlSprite((SoftwareSprite) Static165.aClass3_Sub2_Sub1_8); Static165.aClass3_Sub2_Sub1_8 = new GlSprite((SoftwareSprite) Static165.aClass3_Sub2_Sub1_8);
} }
if (Static92.aClass3_Sub2_Sub1_6 instanceof SoftwareAlphaSprite) { if (aClass3_Sub2_Sub1_6 instanceof SoftwareAlphaSprite) {
Static92.aClass3_Sub2_Sub1_6 = new GlAlphaSprite((SoftwareSprite) Static92.aClass3_Sub2_Sub1_6); aClass3_Sub2_Sub1_6 = new GlAlphaSprite((SoftwareSprite) aClass3_Sub2_Sub1_6);
} else { } else {
Static92.aClass3_Sub2_Sub1_6 = new GlSprite((SoftwareSprite) Static92.aClass3_Sub2_Sub1_6); aClass3_Sub2_Sub1_6 = new GlSprite((SoftwareSprite) aClass3_Sub2_Sub1_6);
} }
if (Static204.aClass3_Sub2_Sub1_10 instanceof SoftwareAlphaSprite) { if (Static204.aClass3_Sub2_Sub1_10 instanceof SoftwareAlphaSprite) {
Static204.aClass3_Sub2_Sub1_10 = new GlAlphaSprite((SoftwareSprite) Static204.aClass3_Sub2_Sub1_10); Static204.aClass3_Sub2_Sub1_10 = new GlAlphaSprite((SoftwareSprite) Static204.aClass3_Sub2_Sub1_10);
@ -86,15 +89,15 @@ public final class Static112 {
} }
} }
@Pc(418) int local418; @Pc(418) int local418;
if (Static165.aClass3_Sub2_Sub1_8 != null && Static92.aClass3_Sub2_Sub1_6 != null && Static204.aClass3_Sub2_Sub1_10 != null) { if (Static165.aClass3_Sub2_Sub1_8 != null && aClass3_Sub2_Sub1_6 != null && Static204.aClass3_Sub2_Sub1_10 != null) {
local203 = local13 / Static165.aClass3_Sub2_Sub1_8.width; local203 = local13 / Static165.aClass3_Sub2_Sub1_8.width;
for (local219 = 0; local219 < local203; local219++) { 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); Static165.aClass3_Sub2_Sub1_8.render(local3 + Static165.aClass3_Sub2_Sub1_8.width * local219, local11 + local9 + -Static165.aClass3_Sub2_Sub1_8.height);
} }
local219 = (local11 - 20) / Static92.aClass3_Sub2_Sub1_6.height; local219 = (local11 - 20) / aClass3_Sub2_Sub1_6.height;
for (local418 = 0; local418 < local219; local418++) { for (local418 = 0; local418 < local219; local418++) {
Static92.aClass3_Sub2_Sub1_6.render(local3, local9 + local418 * Static92.aClass3_Sub2_Sub1_6.height + 20); aClass3_Sub2_Sub1_6.render(local3, local9 + local418 * aClass3_Sub2_Sub1_6.height + 20);
Static92.aClass3_Sub2_Sub1_6.renderHorizontalFlip(local3 + local13 - Static92.aClass3_Sub2_Sub1_6.width, local9 + 20 + local418 * Static92.aClass3_Sub2_Sub1_6.height); 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.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); Static204.aClass3_Sub2_Sub1_10.renderHorizontalFlip(local3 + local13 - Static204.aClass3_Sub2_Sub1_10.width, local9 - -local11 + -Static204.aClass3_Sub2_Sub1_10.height);

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

@ -15,9 +15,6 @@ public final class Static115 {
@OriginalMember(owner = "client!ja", name = "j", descriptor = "I") @OriginalMember(owner = "client!ja", name = "j", descriptor = "I")
public static int anInt2937 = 0; public static int anInt2937 = 0;
@OriginalMember(owner = "client!ja", name = "n", descriptor = "I")
public static int mapFlagX = 0;
@OriginalMember(owner = "client!ja", name = "r", descriptor = "I") @OriginalMember(owner = "client!ja", name = "r", descriptor = "I")
public static int anInt2941 = -1; public static int anInt2941 = -1;

3
client/src/main/java/rt4/Static12.java
View file

@ -7,7 +7,4 @@ public final class Static12 {
@OriginalMember(owner = "client!bb", name = "M", descriptor = "I") @OriginalMember(owner = "client!bb", name = "M", descriptor = "I")
public static int anInt406; public static int anInt406;
@OriginalMember(owner = "client!bb", name = "t", descriptor = "[[B")
public static final byte[][] aByteArrayArray2 = new byte[250][];
} }

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

@ -13,6 +13,8 @@ public final class Static123 {
@OriginalMember(owner = "client!ml", name = "K", descriptor = "I") @OriginalMember(owner = "client!ml", name = "K", descriptor = "I")
public static int anInt3947; public static int anInt3947;
@OriginalMember(owner = "client!wi", name = "db", descriptor = "I")
public static int tileVisibilityDistance;
@OriginalMember(owner = "client!jj", name = "a", descriptor = "(Z)V") @OriginalMember(owner = "client!jj", name = "a", descriptor = "(Z)V")
public static void topBannerRefresh() { public static void topBannerRefresh() {
@ -42,15 +44,15 @@ public final class Static123 {
@Pc(158) int local158; @Pc(158) int local158;
@Pc(137) boolean local137; @Pc(137) boolean local137;
if (local10.anInt4453 == 1) { if (local10.anInt4453 == 1) {
local14 = local10.anInt4452 + Static277.tileVisibilityDistance - Static167.anInt4069; local14 = local10.anInt4452 + tileVisibilityDistance - Static167.anInt4069;
if (local14 >= 0 && local14 <= Static277.tileVisibilityDistance + Static277.tileVisibilityDistance) { if (local14 >= 0 && local14 <= tileVisibilityDistance + tileVisibilityDistance) {
local115 = local10.anInt4461 + Static277.tileVisibilityDistance - Static193.anInt4539; local115 = local10.anInt4461 + tileVisibilityDistance - Static193.anInt4539;
if (local115 < 0) { if (local115 < 0) {
local115 = 0; local115 = 0;
} }
local126 = local10.anInt4464 + Static277.tileVisibilityDistance - Static193.anInt4539; local126 = local10.anInt4464 + tileVisibilityDistance - Static193.anInt4539;
if (local126 > Static277.tileVisibilityDistance + Static277.tileVisibilityDistance) { if (local126 > tileVisibilityDistance + tileVisibilityDistance) {
local126 = Static277.tileVisibilityDistance + Static277.tileVisibilityDistance; local126 = tileVisibilityDistance + tileVisibilityDistance;
} }
local137 = false; local137 = false;
while (local115 <= local126) { while (local115 <= local126) {
@ -78,15 +80,15 @@ public final class Static123 {
} }
} }
} else if (local10.anInt4453 == 2) { } else if (local10.anInt4453 == 2) {
local14 = local10.anInt4461 + Static277.tileVisibilityDistance - Static193.anInt4539; local14 = local10.anInt4461 + tileVisibilityDistance - Static193.anInt4539;
if (local14 >= 0 && local14 <= Static277.tileVisibilityDistance + Static277.tileVisibilityDistance) { if (local14 >= 0 && local14 <= tileVisibilityDistance + tileVisibilityDistance) {
local115 = local10.anInt4452 + Static277.tileVisibilityDistance - Static167.anInt4069; local115 = local10.anInt4452 + tileVisibilityDistance - Static167.anInt4069;
if (local115 < 0) { if (local115 < 0) {
local115 = 0; local115 = 0;
} }
local126 = local10.anInt4446 + Static277.tileVisibilityDistance - Static167.anInt4069; local126 = local10.anInt4446 + tileVisibilityDistance - Static167.anInt4069;
if (local126 > Static277.tileVisibilityDistance + Static277.tileVisibilityDistance) { if (local126 > tileVisibilityDistance + tileVisibilityDistance) {
local126 = Static277.tileVisibilityDistance + Static277.tileVisibilityDistance; local126 = tileVisibilityDistance + tileVisibilityDistance;
} }
local137 = false; local137 = false;
while (local115 <= local126) { while (local115 <= local126) {
@ -116,22 +118,22 @@ public final class Static123 {
} else if (local10.anInt4453 == 4) { } else if (local10.anInt4453 == 4) {
local14 = local10.anInt4444 - anInt3947; local14 = local10.anInt4444 - anInt3947;
if (local14 > 128) { if (local14 > 128) {
local115 = local10.anInt4461 + Static277.tileVisibilityDistance - Static193.anInt4539; local115 = local10.anInt4461 + tileVisibilityDistance - Static193.anInt4539;
if (local115 < 0) { if (local115 < 0) {
local115 = 0; local115 = 0;
} }
local126 = local10.anInt4464 + Static277.tileVisibilityDistance - Static193.anInt4539; local126 = local10.anInt4464 + tileVisibilityDistance - Static193.anInt4539;
if (local126 > Static277.tileVisibilityDistance + Static277.tileVisibilityDistance) { if (local126 > tileVisibilityDistance + tileVisibilityDistance) {
local126 = Static277.tileVisibilityDistance + Static277.tileVisibilityDistance; local126 = tileVisibilityDistance + tileVisibilityDistance;
} }
if (local115 <= local126) { if (local115 <= local126) {
@Pc(408) int local408 = local10.anInt4452 + Static277.tileVisibilityDistance - Static167.anInt4069; @Pc(408) int local408 = local10.anInt4452 + tileVisibilityDistance - Static167.anInt4069;
if (local408 < 0) { if (local408 < 0) {
local408 = 0; local408 = 0;
} }
local158 = local10.anInt4446 + Static277.tileVisibilityDistance - Static167.anInt4069; local158 = local10.anInt4446 + tileVisibilityDistance - Static167.anInt4069;
if (local158 > Static277.tileVisibilityDistance + Static277.tileVisibilityDistance) { if (local158 > tileVisibilityDistance + tileVisibilityDistance) {
local158 = Static277.tileVisibilityDistance + Static277.tileVisibilityDistance; local158 = tileVisibilityDistance + tileVisibilityDistance;
} }
@Pc(430) boolean local430 = false; @Pc(430) boolean local430 = false;
label166: for (@Pc(432) int local432 = local408; local432 <= local158; local432++) { label166: for (@Pc(432) int local432 = local408; local432 <= local158; local432++) {

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

@ -5,9 +5,6 @@ import org.openrs2.deob.annotation.Pc;
public final class Static126 { public final class Static126 {
@OriginalMember(owner = "client!jm", name = "r", descriptor = "I")
public static int anInt3114;
@OriginalMember(owner = "client!jm", name = "a", descriptor = "(Z)V") @OriginalMember(owner = "client!jm", name = "a", descriptor = "(Z)V")
public static void method2460() { public static void method2460() {
if (InterfaceList.topLevelInterface != -1) { if (InterfaceList.topLevelInterface != -1) {

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

@ -1,7 +1,5 @@
package rt4; package rt4;
import java.nio.charset.StandardCharsets;
import org.openrs2.deob.annotation.OriginalArg; import org.openrs2.deob.annotation.OriginalArg;
import org.openrs2.deob.annotation.OriginalMember; import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc; import org.openrs2.deob.annotation.Pc;
@ -31,193 +29,135 @@ public final class Static127 {
@OriginalMember(owner = "client!k", name = "m", descriptor = "Z") @OriginalMember(owner = "client!k", name = "m", descriptor = "Z")
public static boolean neverRemoveRoofs = false; public static boolean neverRemoveRoofs = false;
@OriginalMember(owner = "client!k", name = "a", descriptor = "(IIBLclient!ve;Lclient!ve;)Lclient!rk;") @OriginalMember(owner = "client!we", name = "a", descriptor = "(BILclient!be;)I")
public static Font method2462(@OriginalArg(1) int arg0, @OriginalArg(3) Js5 arg1, @OriginalArg(4) Js5 arg2) { public static int method3212(@OriginalArg(1) int arg0, @OriginalArg(2) Component arg1) {
return SpriteLoader.decode(arg1, 0, arg0) ? Font.method799(arg2.getFile(arg0, 0)) : null; if (arg1.anIntArrayArray4 == null || arg0 >= arg1.anIntArrayArray4.length) {
return -2;
} }
try {
@OriginalMember(owner = "client!k", name = "a", descriptor = "(IIIIZIZ)V") @Pc(33) int[] local33 = arg1.anIntArrayArray4[arg0];
public static void method2463(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) boolean arg4, @OriginalArg(5) int arg5) { @Pc(35) byte local35 = 0;
if (Static80.centralZoneX == arg2 && arg1 == Static52.anInt1695 && (Static41.anInt1316 == arg0 || SceneGraph.allLevelsAreVisible())) { @Pc(37) int local37 = 0;
return; @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;
} }
Static80.centralZoneX = arg2; if (local46 == 15) {
Static52.anInt1695 = arg1; local48 = 1;
Static41.anInt1316 = arg0;
if (SceneGraph.allLevelsAreVisible()) {
Static41.anInt1316 = 0;
} }
if (arg4) { if (local46 == 16) {
client.setGameState(28); 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 { } else {
client.setGameState(25); local35 = local48;
} }
Static114.drawTextOnScreen(true, LocalizedText.LOADING);
@Pc(53) int local53 = Camera.originZ;
@Pc(55) int local55 = Camera.originX;
Camera.originZ = arg1 * 8 - 48;
Camera.originX = (arg2 - 6) * 8;
Static158.aClass3_Sub2_Sub4_3 = MapList.getContainingSource(Static80.centralZoneX * 8, Static52.anInt1695 * 8);
@Pc(81) int local81 = Camera.originZ - local53;
@Pc(86) int local86 = Camera.originX - local55;
Static235.mapElementList = null;
@Pc(96) int local96;
@Pc(103) Npc local103;
@Pc(109) int local109;
if (arg4) {
NpcList.size = 0;
for (local96 = 0; local96 < 32768; local96++) {
local103 = NpcList.npcs[local96];
if (local103 != null) {
local103.xFine -= local86 * 128;
local103.zFine -= local81 * 128;
if (local103.xFine >= 0 && local103.xFine <= 13184 && local103.zFine >= 0 && local103.zFine <= 13184) {
for (local109 = 0; local109 < 10; local109++) {
local103.movementQueueX[local109] -= local86;
local103.movementQueueZ[local109] -= local81;
} }
NpcList.ids[NpcList.size++] = local96; } catch (@Pc(464) Exception local464) {
} else { return -1;
NpcList.npcs[local96].setNpcType(null);
NpcList.npcs[local96] = null;
} }
} }
} }
} else {
for (local96 = 0; local96 < 32768; local96++) {
local103 = NpcList.npcs[local96];
if (local103 != null) {
for (local109 = 0; local109 < 10; local109++) {
local103.movementQueueX[local109] -= local86;
local103.movementQueueZ[local109] -= local81;
}
local103.xFine -= local86 * 128;
local103.zFine -= local81 * 128;
}
}
}
for (local96 = 0; local96 < 2048; local96++) {
@Pc(265) Player local265 = PlayerList.players[local96];
if (local265 != null) {
for (local109 = 0; local109 < 10; local109++) {
local265.movementQueueX[local109] -= local86;
local265.movementQueueZ[local109] -= local81;
}
local265.xFine -= local86 * 128;
local265.zFine -= local81 * 128;
}
}
Player.level = arg0;
PlayerList.self.teleport(arg5, false, arg3);
@Pc(322) byte local322 = 104;
@Pc(324) byte local324 = 0;
@Pc(326) byte local326 = 0;
@Pc(328) byte local328 = 1;
@Pc(330) byte local330 = 104;
@Pc(332) byte local332 = 1;
if (local81 < 0) {
local328 = -1;
local330 = -1;
local326 = 103;
}
if (local86 < 0) {
local332 = -1;
local324 = 103;
local322 = -1;
}
for (@Pc(358) int local358 = local324; local358 != local322; local358 += local332) {
for (@Pc(367) int local367 = local326; local367 != local330; local367 += local328) {
@Pc(378) int local378 = local86 + local358;
@Pc(382) int local382 = local367 + local81;
for (@Pc(384) int local384 = 0; local384 < 4; local384++) {
if (local378 >= 0 && local382 >= 0 && local378 < 104 && local382 < 104) {
SceneGraph.objStacks[local384][local358][local367] = SceneGraph.objStacks[local384][local378][local382];
} else {
SceneGraph.objStacks[local384][local358][local367] = null;
}
}
}
}
for (@Pc(451) SceneryStack local451 = (SceneryStack) Static26.sceneryList.head(); local451 != null; local451 = (SceneryStack) Static26.sceneryList.next()) {
local451.z -= local81;
local451.x -= local86;
if (local451.x < 0 || local451.z < 0 || local451.x >= 104 || local451.z >= 104) {
local451.unlink();
}
}
if (arg4) {
Camera.renderX -= local86 * 128;
Camera.renderZ -= local81 * 128;
Static248.anInt4232 -= local81;
Static251.anInt5449 -= local86;
Static265.anInt5765 -= local81;
Static245.anInt5375 -= local86;
} else {
Camera.cameraType = 1;
}
SoundPlayer.anInt4451 = 0;
if (Static115.mapFlagX != 0) {
Static84.anInt2255 -= local81;
Static115.mapFlagX -= local86;
}
if (GlRenderer.enabled && arg4 && (Math.abs(local86) > 104 || Math.abs(local81) > 104)) {
Static103.setInstantFade();
}
Static107.anInt2875 = -1;
Static99.aClass69_64.clear();
Static217.aClass69_116.clear();
}
@OriginalMember(owner = "client!k", name = "a", descriptor = "(Lclient!be;Lclient!na;I)Lclient!na;")
public static JagString method2465(@OriginalArg(0) Component arg0, @OriginalArg(1) JagString arg1) {
if (arg1.indexOf(PERCENT_SIGN) == -1) {
return arg1;
}
while (true) {
@Pc(14) int local14 = arg1.indexOf(aClass100_133);
if (local14 == -1) {
while (true) {
local14 = arg1.indexOf(aClass100_1097);
if (local14 == -1) {
while (true) {
local14 = arg1.indexOf(aClass100_761);
if (local14 == -1) {
while (true) {
local14 = arg1.indexOf(aClass100_520);
if (local14 == -1) {
while (true) {
local14 = arg1.indexOf(aClass100_1002);
if (local14 == -1) {
while (true) {
local14 = arg1.indexOf(aClass100_591);
if (local14 == -1) {
return arg1;
}
@Pc(246) JagString local246 = JagString.EMPTY;
if (Player.lastLogAddress != null) {
local246 = JagString.formatIp(Player.lastLogAddress.intArg2);
if (Player.lastLogAddress.result != null) {
@Pc(265) byte[] local265 = ((String) Player.lastLogAddress.result).getBytes(StandardCharsets.ISO_8859_1);
local246 = JagString.decodeString(local265, local265.length, 0);
}
}
arg1 = JagString.concatenate(new JagString[] { arg1.substring(local14, 0), local246, arg1.substring(local14 + 4) });
}
}
arg1 = JagString.concatenate(new JagString[] { arg1.substring(local14, 0), Static262.method4510(Static273.method3212(4, arg0)), arg1.substring(local14 + 2) });
}
}
arg1 = JagString.concatenate(new JagString[] { arg1.substring(local14, 0), Static262.method4510(Static273.method3212(3, arg0)), arg1.substring(local14 + 2) });
}
}
arg1 = JagString.concatenate(new JagString[] { arg1.substring(local14, 0), Static262.method4510(Static273.method3212(2, arg0)), arg1.substring(local14 + 2) });
}
}
arg1 = JagString.concatenate(new JagString[] { arg1.substring(local14, 0), Static262.method4510(Static273.method3212(1, arg0)), arg1.substring(local14 + 2) });
}
}
arg1 = JagString.concatenate(new JagString[] { arg1.substring(local14, 0), Static262.method4510(Static273.method3212(0, arg0)), arg1.substring(local14 + 2) });
}
}
}

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

@ -1,10 +1,5 @@
package rt4; package rt4;
import org.openrs2.deob.annotation.OriginalMember;
public final class Static128 { public final class Static128 {
@OriginalMember(owner = "client!ka", name = "t", descriptor = "[I")
public static final int[] anIntArray294 = new int[] { 0, 0, 2, 0, 0, 2, 1, 1, 0 };
} }

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

@ -7,7 +7,4 @@ public final class Static130 {
@OriginalMember(owner = "client!kc", name = "p", descriptor = "[I") @OriginalMember(owner = "client!kc", name = "p", descriptor = "[I")
public static int[] anIntArray299; public static int[] anIntArray299;
@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 };
} }

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

@ -10,9 +10,6 @@ public final class Static131 {
@OriginalMember(owner = "client!kd", name = "ob", descriptor = "I") @OriginalMember(owner = "client!kd", name = "ob", descriptor = "I")
public static int anInt3251 = 0; public static int anInt3251 = 0;
@OriginalMember(owner = "client!kd", name = "sb", descriptor = "[I")
public static final int[] anIntArray307 = new int[] { 1, 1, 0, 0, 0, 8, 0, 0, 8 };
@OriginalMember(owner = "client!kd", name = "Bb", descriptor = "I") @OriginalMember(owner = "client!kd", name = "Bb", descriptor = "I")
public static int anInt3260 = -1; public static int anInt3260 = -1;

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

@ -17,7 +17,7 @@ public final class Static132 {
if (arg0) { if (arg0) {
InterfaceList.method2275(local16); InterfaceList.method2275(local16);
} }
Static273.method3214(local16); method3214(local16);
@Pc(32) Component local32 = InterfaceList.getComponent(local9); @Pc(32) Component local32 = InterfaceList.getComponent(local9);
if (local32 != null) { if (local32 != null) {
InterfaceList.redraw(local32); InterfaceList.redraw(local32);
@ -172,4 +172,13 @@ public final class Static132 {
Rasteriser.fillGouraudTriangle(local283, local299, local331, local275, local291, local323, Static216.method1640(local475, arg0.anInt4872), Static216.method1640(local475, arg0.anInt4867), Static216.method1640(local475, arg0.anInt4864)); 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();
}
}
}
} }

3
client/src/main/java/rt4/Static136.java
View file

@ -4,9 +4,6 @@ import org.openrs2.deob.annotation.OriginalMember;
public final class Static136 { public final class Static136 {
@OriginalMember(owner = "client!kk", name = "j", descriptor = "I")
public static int anInt3325 = 0;
@OriginalMember(owner = "client!kk", name = "a", descriptor = "(I)Z") @OriginalMember(owner = "client!kk", name = "a", descriptor = "(I)Z")
public static boolean method2655() { public static boolean method2655() {
return MidiPlayer.anInt441 != 0 || Static172.midiPcmStream.method4414(); return MidiPlayer.anInt441 != 0 || Static172.midiPcmStream.method4414();

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

@ -1,16 +0,0 @@
package rt4;
import org.openrs2.deob.annotation.OriginalArg;
import org.openrs2.deob.annotation.OriginalMember;
public final class Static137 {
@OriginalMember(owner = "client!kl", name = "s", descriptor = "I")
public static int anInt3337 = 0;
@OriginalMember(owner = "client!kl", name = "a", descriptor = "(Lclient!wa;B)Lclient!kc;")
public static TextureOp29SubOp2 method2664(@OriginalArg(0) Buffer arg0) {
return new TextureOp29SubOp2(arg0.g2s(), arg0.g2s(), arg0.g2s(), arg0.g2s(), arg0.g3(), arg0.g3(), arg0.g1());
}
}

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

@ -22,7 +22,7 @@ public final class Static145 {
@OriginalMember(owner = "client!lf", name = "a", descriptor = "(ILclient!ve;)V") @OriginalMember(owner = "client!lf", name = "a", descriptor = "(ILclient!ve;)V")
public static void method2743(@OriginalArg(1) Js5 arg0) { public static void method2743(@OriginalArg(1) Js5 arg0) {
Static233.aClass36_Sub1Array1 = SpriteLoader.method3088(Flames.anInt3443, arg0); Static233.aClass36_Sub1Array1 = SpriteLoader.method3088(Flames.anInt3443, arg0);
Static96.anIntArray235 = new int[256]; Static221.anIntArray235 = new int[256];
@Pc(15) int local15; @Pc(15) int local15;
for (local15 = 0; local15 < 3; local15++) { for (local15 = 0; local15 < 3; local15++) {
@Pc(30) int local30 = Flames.anIntArray445[local15 + 1] >> 16 & 0xFF; @Pc(30) int local30 = Flames.anIntArray445[local15 + 1] >> 16 & 0xFF;
@ -35,21 +35,21 @@ public final class Static145 {
@Pc(88) int local88 = Flames.anIntArray445[local15 + 1] & 0xFF; @Pc(88) int local88 = Flames.anIntArray445[local15 + 1] & 0xFF;
@Pc(95) float local95 = ((float) local88 - local55) / 64.0F; @Pc(95) float local95 = ((float) local88 - local55) / 64.0F;
for (@Pc(97) int local97 = 0; local97 < 64; local97++) { for (@Pc(97) int local97 = 0; local97 < 64; local97++) {
Static96.anIntArray235[local97 + local15 * 64] = (int) local55 | (int) local48 << 8 | (int) local39 << 16; Static221.anIntArray235[local97 + local15 * 64] = (int) local55 | (int) local48 << 8 | (int) local39 << 16;
local48 += local80; local48 += local80;
local55 += local95; local55 += local95;
local39 += local62; local39 += local62;
} }
} }
for (local15 = 192; local15 < 255; local15++) { for (local15 = 192; local15 < 255; local15++) {
Static96.anIntArray235[local15] = Flames.anIntArray445[3]; Static221.anIntArray235[local15] = Flames.anIntArray445[3];
} }
Static270.anIntArray562 = new int[32768]; Static270.anIntArray562 = new int[32768];
Static263.anIntArray516 = new int[32768]; Static263.anIntArray516 = new int[32768];
Static69.method1545(null); Static69.method1545(null);
Static103.anIntArray254 = new int[32768]; Static103.anIntArray254 = new int[32768];
Static216.anIntArray188 = new int[32768]; Static216.anIntArray188 = new int[32768];
Static167.aClass3_Sub2_Sub1_Sub1_3 = new SoftwareSprite(128, 254); Static221.aClass3_Sub2_Sub1_Sub1_3 = new SoftwareSprite(128, 254);
} }
@OriginalMember(owner = "client!lf", name = "b", descriptor = "(I)V") @OriginalMember(owner = "client!lf", name = "b", descriptor = "(I)V")

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

@ -11,7 +11,7 @@ public final class Static147 {
@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) { public static void method2761(@OriginalArg(0) int arg0) {
Static170.anInt3241 = arg0; UnderwaterMaterialRenderer.anInt3241 = arg0;
MaterialManager.resetArgument(3); MaterialManager.resetArgument(3);
MaterialManager.resetArgument(4); MaterialManager.resetArgument(4);
} }

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

@ -2,19 +2,126 @@ package rt4;
import org.openrs2.deob.annotation.OriginalArg; import org.openrs2.deob.annotation.OriginalArg;
import org.openrs2.deob.annotation.OriginalMember; import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc;
public final class Static152 { public final class Static152 {
@OriginalMember(owner = "client!ma", name = "z", descriptor = "I") @OriginalMember(owner = "client!ma", name = "z", descriptor = "I")
public static int anInt3604 = -1; public static int anInt3604 = -1;
@OriginalMember(owner = "client!ma", name = "a", descriptor = "(IIBIIII)V") @OriginalMember(owner = "client!wl", name = "a", descriptor = "(IBIIIII)V")
public static void method2826(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5) { 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) {
if (arg4 - arg3 >= TextureOp29.anInt4164 && TextureOp29.anInt5063 >= arg4 + arg3 && TextureOp29.anInt5773 <= arg1 - arg3 && TextureOp29.anInt2869 >= arg3 + arg1) { @Pc(18) int local18 = arg2 - arg4;
Static8.method120(arg5, arg0, arg1, arg2, arg3, arg4); Static251.method4278(arg2);
@Pc(23) int local23 = 0;
if (local18 < 0) {
local18 = 0;
}
@Pc(32) int local32 = arg2;
@Pc(35) int local35 = -arg2;
@Pc(38) int local38 = -local18;
@Pc(40) int local40 = local18;
@Pc(42) int local42 = -1;
@Pc(61) int local61;
@Pc(69) int local69;
@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(107) int local107 = -1;
while (local23 < local32) {
local42 += 2;
local107 += 2;
local38 += local107;
local35 += local42;
if (local38 >= 0 && local40 >= 1) {
local40--;
Static241.anIntArray522[local40] = local23;
local38 -= local40 << 1;
}
local23++;
@Pc(264) int local264;
@Pc(273) int local273;
@Pc(280) int[] local280;
@Pc(161) int local161;
if (local35 >= 0) {
local32--;
local35 -= local32 << 1;
local161 = arg1 - local32;
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);
if (TextureOp29.anInt2869 >= local61) {
Static131.method2576(Static71.anIntArrayArray10[local61], local78, local69, arg3);
}
if (local161 >= TextureOp29.anInt5773) {
Static131.method2576(Static71.anIntArrayArray10[local161], local78, local69, arg3);
}
} else { } else {
Static280.method4670(arg2, arg1, arg3, arg5, arg0, arg4); 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);
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);
}
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);
}
}
}
}
local161 = arg1 - local23;
local61 = arg1 + local23;
if (TextureOp29.anInt5773 <= local61 && TextureOp29.anInt2869 >= local161) {
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);
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);
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);
}
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);
}
} else {
if (TextureOp29.anInt2869 >= local61) {
Static131.method2576(Static71.anIntArrayArray10[local61], local78, local69, arg3);
}
if (local161 >= TextureOp29.anInt5773) {
Static131.method2576(Static71.anIntArrayArray10[local161], local78, local69, arg3);
}
}
}
}
} }
} }
} }

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

@ -12,7 +12,7 @@ public final class Static154 {
return false; return false;
} }
for (@Pc(14) int local14 = 0; local14 < arg0.anIntArray43.length; local14++) { for (@Pc(14) int local14 = 0; local14 < arg0.anIntArray43.length; local14++) {
@Pc(34) int local34 = Static273.method3212(local14, arg0); @Pc(34) int local34 = Static127.method3212(local14, arg0);
@Pc(39) int local39 = arg0.anIntArray48[local14]; @Pc(39) int local39 = arg0.anIntArray48[local14];
if (arg0.anIntArray43[local14] == 2) { if (arg0.anIntArray43[local14] == 2) {
if (local39 <= local34) { if (local39 <= local34) {

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

@ -6,9 +6,6 @@ import org.openrs2.deob.annotation.Pc;
public final class Static156 { public final class Static156 {
@OriginalMember(owner = "client!mf", name = "O", descriptor = "[[B")
public static byte[][] locationMapFilesBuffer;
@OriginalMember(owner = "client!mf", name = "X", descriptor = "I") @OriginalMember(owner = "client!mf", name = "X", descriptor = "I")
public static int loginScreenId; public static int loginScreenId;
@ -33,19 +30,19 @@ public final class Static156 {
Static217.anInt4903 = arg2; Static217.anInt4903 = arg2;
Static167.anInt4069 = arg0 / 128; Static167.anInt4069 = arg0 / 128;
Static193.anInt4539 = arg2 / 128; Static193.anInt4539 = arg2 / 128;
Static31.anInt987 = Static167.anInt4069 - Static277.tileVisibilityDistance; Static31.anInt987 = Static167.anInt4069 - Static123.tileVisibilityDistance;
if (Static31.anInt987 < 0) { if (Static31.anInt987 < 0) {
Static31.anInt987 = 0; Static31.anInt987 = 0;
} }
Static80.anInt4698 = Static193.anInt4539 - Static277.tileVisibilityDistance; Static80.anInt4698 = Static193.anInt4539 - Static123.tileVisibilityDistance;
if (Static80.anInt4698 < 0) { if (Static80.anInt4698 < 0) {
Static80.anInt4698 = 0; Static80.anInt4698 = 0;
} }
Static2.anInt15 = Static167.anInt4069 + Static277.tileVisibilityDistance; Static2.anInt15 = Static167.anInt4069 + Static123.tileVisibilityDistance;
if (Static2.anInt15 > SceneGraph.mapSizeX) { if (Static2.anInt15 > SceneGraph.mapSizeX) {
Static2.anInt15 = SceneGraph.mapSizeX; Static2.anInt15 = SceneGraph.mapSizeX;
} }
Static215.anInt4866 = Static193.anInt4539 + Static277.tileVisibilityDistance; Static215.anInt4866 = Static193.anInt4539 + Static123.tileVisibilityDistance;
if (Static215.anInt4866 > SceneGraph.mapSizeZ) { if (Static215.anInt4866 > SceneGraph.mapSizeZ) {
Static215.anInt4866 = SceneGraph.mapSizeZ; Static215.anInt4866 = SceneGraph.mapSizeZ;
} }
@ -57,12 +54,12 @@ public final class Static156 {
} }
@Pc(104) int local104; @Pc(104) int local104;
@Pc(113) int local113; @Pc(113) int local113;
for (local104 = 0; local104 < Static277.tileVisibilityDistance + Static277.tileVisibilityDistance + 2; local104++) { for (local104 = 0; local104 < Static123.tileVisibilityDistance + Static123.tileVisibilityDistance + 2; local104++) {
for (local113 = 0; local113 < Static277.tileVisibilityDistance + Static277.tileVisibilityDistance + 2; local113++) { for (local113 = 0; local113 < Static123.tileVisibilityDistance + Static123.tileVisibilityDistance + 2; local113++) {
@Pc(130) int local130 = (local104 - Static277.tileVisibilityDistance << 7) - (Static149.anInt3555 & 0x7F); @Pc(130) int local130 = (local104 - Static123.tileVisibilityDistance << 7) - (Static149.anInt3555 & 0x7F);
@Pc(140) int local140 = (local113 - Static277.tileVisibilityDistance << 7) - (Static217.anInt4903 & 0x7F); @Pc(140) int local140 = (local113 - Static123.tileVisibilityDistance << 7) - (Static217.anInt4903 & 0x7F);
@Pc(146) int local146 = Static167.anInt4069 + local104 - Static277.tileVisibilityDistance; @Pc(146) int local146 = Static167.anInt4069 + local104 - Static123.tileVisibilityDistance;
@Pc(152) int local152 = Static193.anInt4539 + local113 - Static277.tileVisibilityDistance; @Pc(152) int local152 = Static193.anInt4539 + local113 - Static123.tileVisibilityDistance;
if (local146 >= 0 && local152 >= 0 && local146 < SceneGraph.mapSizeX && local152 < SceneGraph.mapSizeZ) { if (local146 >= 0 && local152 >= 0 && local146 < SceneGraph.mapSizeX && local152 < SceneGraph.mapSizeZ) {
@Pc(176) int local176; @Pc(176) int local176;
if (SceneGraph.underwaterTileHeights == null) { if (SceneGraph.underwaterTileHeights == null) {
@ -77,8 +74,8 @@ public final class Static156 {
} }
} }
} }
for (local104 = 0; local104 < Static277.tileVisibilityDistance + Static277.tileVisibilityDistance + 1; local104++) { for (local104 = 0; local104 < Static123.tileVisibilityDistance + Static123.tileVisibilityDistance + 1; local104++) {
for (local113 = 0; local113 < Static277.tileVisibilityDistance + Static277.tileVisibilityDistance + 1; local113++) { for (local113 = 0; local113 < Static123.tileVisibilityDistance + Static123.tileVisibilityDistance + 1; local113++) {
Static48.aBooleanArrayArray1[local104][local113] = Static89.aBooleanArrayArray3[local104][local113] || Static89.aBooleanArrayArray3[local104 + 1][local113] || Static89.aBooleanArrayArray3[local104][local113 + 1] || Static89.aBooleanArrayArray3[local104 + 1][local113 + 1]; Static48.aBooleanArrayArray1[local104][local113] = Static89.aBooleanArrayArray3[local104][local113] || Static89.aBooleanArrayArray3[local104 + 1][local113] || Static89.aBooleanArrayArray3[local104][local113 + 1] || Static89.aBooleanArrayArray3[local104 + 1][local113 + 1];
} }
} }
@ -89,7 +86,7 @@ public final class Static156 {
Static206.anIntArray427 = arg10; Static206.anIntArray427 = arg10;
Static123.method2419(); Static123.method2419();
if (SceneGraph.underWaterGroundTiles != null) { if (SceneGraph.underWaterGroundTiles != null) {
Static278.setRenderTiles(true); SceneGraph.setRenderTiles(true);
Static248.method3292(arg0, arg1, arg2, null, 0, (byte) 0, arg13, arg14); Static248.method3292(arg0, arg1, arg2, null, 0, (byte) 0, arg13, arg14);
if (GlRenderer.enabled) { if (GlRenderer.enabled) {
MaterialManager.renderingUnderwater = false; MaterialManager.renderingUnderwater = false;
@ -97,7 +94,7 @@ public final class Static156 {
FogManager.method3066(null); FogManager.method3066(null);
LightingManager.method2390(); LightingManager.method2390();
} }
Static278.setRenderTiles(false); SceneGraph.setRenderTiles(false);
} }
Static248.method3292(arg0, arg1, arg2, arg5, arg11, arg12, arg13, arg14); Static248.method3292(arg0, arg1, arg2, arg5, arg11, arg12, arg13, arg14);
} }

21
client/src/main/java/rt4/Static158.java
View file

@ -5,9 +5,6 @@ import org.openrs2.deob.annotation.Pc;
public final class Static158 { public final class Static158 {
@OriginalMember(owner = "client!mh", name = "hb", descriptor = "Lclient!bn;")
public static Map aClass3_Sub2_Sub4_3;
@OriginalMember(owner = "client!mh", name = "X", descriptor = "I") @OriginalMember(owner = "client!mh", name = "X", descriptor = "I")
public static int anInt3851 = -1; public static int anInt3851 = -1;
@OriginalMember(owner = "client!mg", name = "Q", descriptor = "I") @OriginalMember(owner = "client!mg", name = "Q", descriptor = "I")
@ -15,32 +12,32 @@ public final class Static158 {
@OriginalMember(owner = "client!mh", name = "h", descriptor = "(B)V") @OriginalMember(owner = "client!mh", name = "h", descriptor = "(B)V")
public static void decodeNpcFiles() { public static void decodeNpcFiles() {
@Pc(10) int local10 = Static191.npcSpawnsFilesBuffer.length; @Pc(10) int local10 = LoginManager.npcSpawnsFilesBuffer.length;
for (@Pc(16) int local16 = 0; local16 < local10; local16++) { for (@Pc(16) int local16 = 0; local16 < local10; local16++) {
if (Static191.npcSpawnsFilesBuffer[local16] != null) { if (LoginManager.npcSpawnsFilesBuffer[local16] != null) {
@Pc(25) int local25 = -1; @Pc(25) int local25 = -1;
for (@Pc(27) int local27 = 0; local27 < anInt3811; local27++) { for (@Pc(27) int local27 = 0; local27 < anInt3811; local27++) {
if (Static217.anIntArray434[local27] == Static238.regionBitPacked[local16]) { if (Static217.anIntArray434[local27] == LoginManager.regionBitPacked[local16]) {
local25 = local27; local25 = local27;
break; break;
} }
} }
if (local25 == -1) { if (local25 == -1) {
Static217.anIntArray434[anInt3811] = Static238.regionBitPacked[local16]; Static217.anIntArray434[anInt3811] = LoginManager.regionBitPacked[local16];
local25 = anInt3811++; local25 = anInt3811++;
} }
@Pc(67) int local67 = 0; @Pc(67) int local67 = 0;
@Pc(74) Buffer local74 = new Buffer(Static191.npcSpawnsFilesBuffer[local16]); @Pc(74) Buffer local74 = new Buffer(LoginManager.npcSpawnsFilesBuffer[local16]);
while (local74.offset < Static191.npcSpawnsFilesBuffer[local16].length && local67 < 511) { while (local74.offset < LoginManager.npcSpawnsFilesBuffer[local16].length && local67 < 511) {
@Pc(97) int local97 = local67++ << 6 | local25; @Pc(97) int local97 = local67++ << 6 | local25;
@Pc(103) int local103 = local74.g2(); @Pc(103) int local103 = local74.g2();
@Pc(107) int local107 = local103 >> 14; @Pc(107) int local107 = local103 >> 14;
@Pc(113) int local113 = local103 >> 7 & 0x3F; @Pc(113) int local113 = local103 >> 7 & 0x3F;
@Pc(125) int local125 = local113 + (Static238.regionBitPacked[local16] >> 8) * 64 - Camera.originX; @Pc(125) int local125 = local113 + (LoginManager.regionBitPacked[local16] >> 8) * 64 - Camera.originX;
@Pc(129) int local129 = local103 & 0x3F; @Pc(129) int local129 = local103 & 0x3F;
@Pc(142) int local142 = local129 + (Static238.regionBitPacked[local16] & 0xFF) * 64 - Camera.originZ; @Pc(142) int local142 = local129 + (LoginManager.regionBitPacked[local16] & 0xFF) * 64 - Camera.originZ;
@Pc(148) NpcType local148 = NpcTypeList.get(local74.g2()); @Pc(148) NpcType local148 = NpcTypeList.get(local74.g2());
if (NpcList.npcs[local97] == null && (local148.aByte10 & 0x1) > 0 && local107 == Static41.anInt1316 && local125 >= 0 && local148.size + local125 < 104 && local142 >= 0 && local142 + local148.size < 104) { if (NpcList.npcs[local97] == null && (local148.aByte10 & 0x1) > 0 && local107 == LoginManager.centralPlane && local125 >= 0 && local148.size + local125 < 104 && local142 >= 0 && local142 + local148.size < 104) {
NpcList.npcs[local97] = new Npc(); NpcList.npcs[local97] = new Npc();
@Pc(198) Npc local198 = NpcList.npcs[local97]; @Pc(198) Npc local198 = NpcList.npcs[local97];
NpcList.ids[NpcList.size++] = local97; NpcList.ids[NpcList.size++] = local97;

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

@ -150,14 +150,4 @@ public final class Static164 {
} }
} }
@OriginalMember(owner = "client!na", name = "a", descriptor = "(Lclient!ve;IZ)Lclient!mm;")
public static SoftwareSprite method3117(@OriginalArg(0) Js5 arg0, @OriginalArg(1) int arg1) {
return SpriteLoader.decode(arg0, arg1) ? SpriteLoader.method3537() : null;
}
@OriginalMember(owner = "client!na", name = "a", descriptor = "(IZILclient!ve;)Lclient!ek;")
public static SoftwareIndexedSprite loadSoftwareIndexedSprite(@OriginalArg(2) int arg0, @OriginalArg(3) Js5 arg1) {
return SpriteLoader.decode(arg1, 0, arg0) ? Static134.method2619() : null;
}
} }

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

@ -12,9 +12,6 @@ public final class Static165 {
@OriginalMember(owner = "client!nb", name = "o", descriptor = "I") @OriginalMember(owner = "client!nb", name = "o", descriptor = "I")
public static int anInt4042; public static int anInt4042;
@OriginalMember(owner = "client!nb", name = "a", descriptor = "Lclient!na;")
public static final JagString aClass100_772 = JagString.parse("um");
@OriginalMember(owner = "client!nb", name = "n", descriptor = "Lclient!na;") @OriginalMember(owner = "client!nb", name = "n", descriptor = "Lclient!na;")
public static final JagString DETAILS = JagString.parse("details"); public static final JagString DETAILS = JagString.parse("details");

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

@ -7,7 +7,4 @@ public final class Static167 {
@OriginalMember(owner = "client!nd", name = "s", descriptor = "I") @OriginalMember(owner = "client!nd", name = "s", descriptor = "I")
public static int anInt4069; public static int anInt4069;
@OriginalMember(owner = "client!nd", name = "y", descriptor = "Lclient!mm;")
public static SoftwareSprite aClass3_Sub2_Sub1_Sub1_3;
} }

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

@ -1,51 +0,0 @@
package rt4;
import org.openrs2.deob.annotation.OriginalArg;
import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc;
public final class Static170 {
@OriginalMember(owner = "client!nh", name = "Z", descriptor = "I")
public static int anInt3241 = 128;
@OriginalMember(owner = "client!nh", name = "fb", descriptor = "[I")
public static final int[] JS5_ARCHIVE_WEIGHTS = new int[] { 4, 4, 1, 2, 6, 4, 2, 49, 2, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 };
@OriginalMember(owner = "client!nh", name = "a", descriptor = "(IIIILclient!th;JZ)V")
public static void method2570(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) Entity arg4, @OriginalArg(5) long arg5, @OriginalArg(6) boolean arg6) {
if (arg4 == null) {
return;
}
@Pc(6) GroundDecor local6 = new GroundDecor();
local6.primary = arg4;
local6.anInt732 = arg1 * 128 + 64;
local6.anInt736 = arg2 * 128 + 64;
local6.anInt733 = arg3;
local6.key = arg5;
local6.aBoolean49 = arg6;
if (SceneGraph.tiles[arg0][arg1][arg2] == null) {
SceneGraph.tiles[arg0][arg1][arg2] = new Tile(arg0, arg1, arg2);
}
SceneGraph.tiles[arg0][arg1][arg2].groundDecor = local6;
}
@OriginalMember(owner = "client!nh", name = "a", descriptor = "(IIIIIIIIIIIII)V")
public static void method2574(@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, @OriginalArg(9) int arg9, @OriginalArg(11) int arg10, @OriginalArg(12) int arg11) {
@Pc(7) AttachLocRequest local7 = new AttachLocRequest();
local7.angle = arg6;
local7.anInt1205 = arg3;
local7.anInt1187 = arg1;
local7.anInt1200 = arg5;
local7.entityId = arg2;
local7.x = arg8;
local7.anInt1197 = arg10;
local7.z = arg4;
local7.locId = arg11;
local7.anInt1188 = arg7;
local7.anInt1191 = arg0;
local7.shape = arg9;
AttachLocRequest.queue.addTail(local7);
}
}

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

@ -12,9 +12,6 @@ public final class Static172 {
@OriginalMember(owner = "client!nj", name = "g", descriptor = "Lclient!ve;") @OriginalMember(owner = "client!nj", name = "g", descriptor = "Lclient!ve;")
public static Js5 aClass153_70; public static Js5 aClass153_70;
@OriginalMember(owner = "client!nj", name = "j", descriptor = "[I")
public static int[] locationsMapFileIds;
@OriginalMember(owner = "client!nj", name = "k", descriptor = "I") @OriginalMember(owner = "client!nj", name = "k", descriptor = "I")
public static int anInt4165; public static int anInt4165;

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

@ -9,121 +9,6 @@ public final class Static173 {
@OriginalMember(owner = "client!nk", name = "d", descriptor = "[I") @OriginalMember(owner = "client!nk", name = "d", descriptor = "[I")
public static int[] anIntArray367; public static int[] anIntArray367;
@OriginalMember(owner = "client!nk", name = "c", descriptor = "(IZ)V")
public static void method3240(@OriginalArg(1) boolean arg0) {
@Pc(7) int local7;
@Pc(16) Npc local16;
@Pc(107) int local107;
@Pc(113) int local113;
@Pc(133) int local133;
@Pc(149) int local149;
@Pc(158) int local158;
@Pc(171) int local171;
for (local7 = 0; local7 < NpcList.size; local7++) {
local16 = NpcList.npcs[NpcList.ids[local7]];
if (local16 != null && local16.method2682() && local16.type.aBoolean182 == arg0 && local16.type.isMultiNpcValid()) {
@Pc(42) int local42 = local16.getSize();
@Pc(97) int local97;
if (local42 == 1) {
if ((local16.xFine & 0x7F) == 64 && (local16.zFine & 0x7F) == 64) {
local97 = local16.xFine >> 7;
local107 = local16.zFine >> 7;
if (local97 >= 0 && local97 < 104 && local107 >= 0 && local107 < 104) {
local171 = Static31.anIntArrayArray6[local97][local107]++;
}
}
} else if (((local42 & 0x1) != 0 || (local16.xFine & 0x7F) == 0 && (local16.zFine & 0x7F) == 0) && ((local42 & 0x1) != 1 || (local16.xFine & 0x7F) == 64 && (local16.zFine & 0x7F) == 64)) {
local97 = local16.xFine - local42 * 64 >> 7;
local107 = local16.zFine - local42 * 64 >> 7;
local113 = local16.getSize() + local97;
if (local97 < 0) {
local97 = 0;
}
if (local113 > 104) {
local113 = 104;
}
local133 = local107 + local16.getSize();
if (local107 < 0) {
local107 = 0;
}
if (local133 > 104) {
local133 = 104;
}
for (local149 = local97; local149 < local113; local149++) {
for (local158 = local107; local158 < local133; local158++) {
local171 = Static31.anIntArrayArray6[local149][local158]++;
}
}
}
}
}
label200: for (local7 = 0; local7 < NpcList.size; local7++) {
local16 = NpcList.npcs[NpcList.ids[local7]];
@Pc(262) long local262 = (long) NpcList.ids[local7] << 32 | 0x20000000L;
if (local16 != null && local16.method2682() && local16.type.aBoolean182 == arg0 && local16.type.isMultiNpcValid()) {
local107 = local16.getSize();
if (local107 == 1) {
if ((local16.xFine & 0x7F) == 64 && (local16.zFine & 0x7F) == 64) {
local113 = local16.xFine >> 7;
local133 = local16.zFine >> 7;
if (local113 < 0 || local113 >= 104 || local133 < 0 || local133 >= 104) {
continue;
}
if (Static31.anIntArrayArray6[local113][local133] > 1) {
local171 = Static31.anIntArrayArray6[local113][local133]--;
continue;
}
}
} else if ((local107 & 0x1) == 0 && (local16.xFine & 0x7F) == 0 && (local16.zFine & 0x7F) == 0 || (local107 & 0x1) == 1 && (local16.xFine & 0x7F) == 64 && (local16.zFine & 0x7F) == 64) {
local113 = local16.xFine - local107 * 64 >> 7;
local133 = local16.zFine - local107 * 64 >> 7;
local158 = local133 + local107;
if (local133 < 0) {
local133 = 0;
}
@Pc(368) boolean local368 = true;
local149 = local113 + local107;
if (local158 > 104) {
local158 = 104;
}
if (local113 < 0) {
local113 = 0;
}
if (local149 > 104) {
local149 = 104;
}
@Pc(396) int local396;
@Pc(401) int local401;
for (local396 = local113; local396 < local149; local396++) {
for (local401 = local133; local401 < local158; local401++) {
if (Static31.anIntArrayArray6[local396][local401] <= 1) {
local368 = false;
break;
}
}
}
if (local368) {
local396 = local113;
while (true) {
if (local396 >= local149) {
continue label200;
}
for (local401 = local133; local401 < local158; local401++) {
local171 = Static31.anIntArrayArray6[local396][local401]--;
}
local396++;
}
}
}
if (!local16.type.aBoolean183) {
local262 |= Long.MIN_VALUE;
}
local16.anInt3424 = SceneGraph.getTileHeight(Player.level, local16.xFine, local16.zFine);
Static43.method1141(Player.level, local16.xFine, local16.zFine, local16.anInt3424, local107 * 64 + 60 - 64, local16, local16.anInt3381, local262, local16.aBoolean171);
}
}
}
@OriginalMember(owner = "client!nk", name = "a", descriptor = "(Z[J[I)V") @OriginalMember(owner = "client!nk", name = "a", descriptor = "(Z[J[I)V")
public static void method3243(@OriginalArg(1) long[] arg0, @OriginalArg(2) int[] arg1) { public static void method3243(@OriginalArg(1) long[] arg0, @OriginalArg(2) int[] arg1) {
Static83.method436(arg0, 0, arg0.length - 1, arg1); Static83.method436(arg0, 0, arg0.length - 1, arg1);

26
client/src/main/java/rt4/Static174.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 Static174 {
@OriginalMember(owner = "client!nl", name = "d", descriptor = "F")
public static float aFloat22;
@OriginalMember(owner = "client!nl", name = "g", descriptor = "I")
public static int anInt4191;
@OriginalMember(owner = "client!nl", name = "b", descriptor = "[[F")
public static final float[][] aFloatArrayArray2 = new float[2][8];
@OriginalMember(owner = "client!nl", name = "f", descriptor = "[[I")
public static final int[][] anIntArrayArray32 = new int[2][8];
@OriginalMember(owner = "client!nl", name = "a", descriptor = "(F)F")
public static float method3250(@OriginalArg(0) float arg0) {
@Pc(7) float local7 = (float) Math.pow(2.0D, (double) arg0) * 32.703197F;
return local7 * 3.1415927F / 11025.0F;
}
}

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

@ -4,9 +4,6 @@ import org.openrs2.deob.annotation.OriginalMember;
public final class Static175 { public final class Static175 {
@OriginalMember(owner = "client!nm", name = "P", descriptor = "[I")
public static int[] npcSpawnsFileIds;
@OriginalMember(owner = "client!nm", name = "W", descriptor = "Lclient!na;") @OriginalMember(owner = "client!nm", name = "W", descriptor = "Lclient!na;")
public static JagString url; public static JagString url;
@ -16,7 +13,7 @@ public final class Static175 {
@OriginalMember(owner = "client!nm", name = "a", descriptor = "(Z)V") @OriginalMember(owner = "client!nm", name = "a", descriptor = "(Z)V")
public static void method3279() { public static void method3279() {
if (Static267.anInt5775 > 0) { if (Static267.anInt5775 > 0) {
Static278.processLogout(); LoginManager.processLogout();
} else { } else {
Static233.aClass95_4 = Protocol.socket; Static233.aClass95_4 = Protocol.socket;
Protocol.socket = null; Protocol.socket = null;

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

@ -16,6 +16,8 @@ public final class Static176 {
public static final JagString aClass100_420 = JagString.parse(")1o"); public static final JagString aClass100_420 = JagString.parse(")1o");
@OriginalMember(owner = "client!nd", name = "x", descriptor = "Lclient!na;") @OriginalMember(owner = "client!nd", name = "x", descriptor = "Lclient!na;")
public static final JagString aClass100_783 = JagString.parse(")4p="); 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!ob", name = "f", descriptor = "Lclient!ve;")
public static Js5 aClass153_76; public static Js5 aClass153_76;
@ -47,11 +49,11 @@ public final class Static176 {
} }
return true; return true;
} else { } else {
@Pc(62) JagString local62 = Static211.aClass100_230; @Pc(62) JagString local62 = aClass100_230;
if (client.modeWhere != 0) { if (client.modeWhere != 0) {
local62 = JagString.concatenate(new JagString[] { aClass100_193, JagString.parseInt(local3.id + 7000) }); local62 = JagString.concatenate(new JagString[] { aClass100_193, JagString.parseInt(local3.id + 7000) });
} }
@Pc(89) JagString local89 = Static211.aClass100_230; @Pc(89) JagString local89 = aClass100_230;
if (client.settings != null) { if (client.settings != null) {
local89 = JagString.concatenate(new JagString[] { aClass100_783, client.settings}); local89 = JagString.concatenate(new JagString[] { aClass100_783, client.settings});
} }

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

@ -7,10 +7,4 @@ public final class Static179 {
@OriginalMember(owner = "client!oe", name = "b", descriptor = "I") @OriginalMember(owner = "client!oe", name = "b", descriptor = "I")
public static int anInt4254 = 0; public static int anInt4254 = 0;
@OriginalMember(owner = "client!oe", name = "n", descriptor = "I")
public static int anInt4262 = 1;
@OriginalMember(owner = "client!oe", name = "o", descriptor = "Lclient!na;")
public static final JagString aClass100_807 = JagString.parse("n");
} }

3
client/src/main/java/rt4/Static182.java
View file

@ -13,9 +13,6 @@ public final class Static182 {
@OriginalMember(owner = "client!oj", name = "t", descriptor = "[I") @OriginalMember(owner = "client!oj", name = "t", descriptor = "[I")
public static int[] anIntArray372; public static int[] anIntArray372;
@OriginalMember(owner = "client!oj", name = "E", descriptor = "[[Lclient!hg;")
public static GlTile[][] aClass3_Sub14ArrayArray2;
@OriginalMember(owner = "client!oj", name = "p", descriptor = "I") @OriginalMember(owner = "client!oj", name = "p", descriptor = "I")
public static final int anInt4306 = 2301979; public static final int anInt4306 = 2301979;

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

@ -8,7 +8,7 @@ public final class Static184 {
@OriginalMember(owner = "client!ol", name = "a", descriptor = "(IIIILclient!th;IJIIII)Z") @OriginalMember(owner = "client!ol", name = "a", descriptor = "(IIIILclient!th;IJIIII)Z")
public static boolean method3387(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) Entity arg4, @OriginalArg(5) int arg5, @OriginalArg(6) long arg6, @OriginalArg(7) int arg7, @OriginalArg(8) int arg8, @OriginalArg(9) int arg9, @OriginalArg(10) int arg10) { public static boolean method3387(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) Entity arg4, @OriginalArg(5) int arg5, @OriginalArg(6) long arg6, @OriginalArg(7) int arg7, @OriginalArg(8) int arg8, @OriginalArg(9) int arg9, @OriginalArg(10) int arg10) {
return arg4 == null ? true : Static105.method2256(arg0, arg7, arg8, arg9 + 1 - arg7, arg10 - arg8 + 1, arg1, arg2, arg3, arg4, arg5, true, arg6); return arg4 == null || Static105.method2256(arg0, arg7, arg8, arg9 + 1 - arg7, arg10 - arg8 + 1, arg1, arg2, arg3, arg4, arg5, true, arg6);
} }
@OriginalMember(owner = "client!ol", name = "a", descriptor = "(IIZI)I") @OriginalMember(owner = "client!ol", name = "a", descriptor = "(IIZI)I")

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

@ -15,7 +15,7 @@ public final class Static185 {
if ((SceneGraph.tileFlags[arg2][arg7][arg8] & 0x10) != 0) { if ((SceneGraph.tileFlags[arg2][arg7][arg8] & 0x10) != 0) {
return; return;
} }
if (Static4.method22(arg8, arg7, arg2) != Static41.anInt1316) { if (Static4.method22(arg8, arg7, arg2) != LoginManager.centralPlane) {
return; return;
} }
} }
@ -97,7 +97,7 @@ public final class Static185 {
} else { } else {
local387 = new Loc(arg5, 22, arg9, arg0, arg7, arg8, local62.anInt4430, local62.aBoolean209, null); local387 = new Loc(arg5, 22, arg9, arg0, arg7, arg8, local62.anInt4430, local62.aBoolean209, null);
} }
Static170.method2570(arg2, arg7, arg8, local199, local387, local261, local62.aBoolean211); SceneGraph.method2570(arg2, arg7, arg8, local199, local387, local261, local62.aBoolean211);
if (local62.anInt4435 == 1 && arg4 != null) { if (local62.anInt4435 == 1 && arg4 != null) {
arg4.method3057(arg7, arg8); arg4.method3057(arg7, arg8);
} }
@ -161,7 +161,7 @@ public final class Static185 {
} else { } else {
local387 = new Loc(arg5, 0, arg9, arg0, arg7, arg8, local62.anInt4430, local62.aBoolean209, null); local387 = new Loc(arg5, 0, arg9, arg0, arg7, arg8, local62.anInt4430, local62.aBoolean209, null);
} }
Static262.method4508(arg2, arg7, arg8, local199, local387, null, Static267.anIntArray517[arg9], 0, local261); SceneGraph.method4508(arg2, arg7, arg8, local199, local387, null, Static267.anIntArray517[arg9], 0, local261);
if (arg1) { if (arg1) {
if (arg9 == 0) { if (arg9 == 0) {
if (local62.aBoolean215) { if (local62.aBoolean215) {
@ -213,7 +213,7 @@ public final class Static185 {
} else { } else {
local387 = new Loc(arg5, 1, arg9, arg0, arg7, arg8, local62.anInt4430, local62.aBoolean209, null); local387 = new Loc(arg5, 1, arg9, arg0, arg7, arg8, local62.anInt4430, local62.aBoolean209, null);
} }
Static262.method4508(arg2, arg7, arg8, local199, local387, null, Static78.anIntArray204[arg9], 0, local261); SceneGraph.method4508(arg2, arg7, arg8, local199, local387, null, Static78.anIntArray204[arg9], 0, local261);
if (local62.aBoolean215 && arg1) { if (local62.aBoolean215 && arg1) {
if (arg9 == 0) { if (arg9 == 0) {
SceneGraph.aByteArrayArrayArray9[arg2][arg7][arg8 + 1] = 50; SceneGraph.aByteArrayArrayArray9[arg2][arg7][arg8 + 1] = 50;
@ -249,7 +249,7 @@ public final class Static185 {
local1254 = new Loc(arg5, 2, arg9 + 4, arg0, arg7, arg8, local62.anInt4430, local62.aBoolean209, null); 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); local1269 = new Loc(arg5, 2, local1226, arg0, arg7, arg8, local62.anInt4430, local62.aBoolean209, null);
} }
Static262.method4508(arg2, arg7, arg8, local199, local1254, local1269, Static267.anIntArray517[arg9], Static267.anIntArray517[local1226], local261); SceneGraph.method4508(arg2, arg7, arg8, local199, local1254, local1269, Static267.anIntArray517[arg9], Static267.anIntArray517[local1226], local261);
if (local62.aBoolean220 && arg1) { if (local62.aBoolean220 && arg1) {
if (arg9 == 0) { if (arg9 == 0) {
SceneGraph.anIntArrayArrayArray6[arg2][arg7][arg8] |= 0x1; SceneGraph.anIntArrayArrayArray6[arg2][arg7][arg8] |= 0x1;
@ -281,7 +281,7 @@ public final class Static185 {
} else { } else {
local387 = new Loc(arg5, 3, arg9, arg0, arg7, arg8, local62.anInt4430, local62.aBoolean209, null); local387 = new Loc(arg5, 3, arg9, arg0, arg7, arg8, local62.anInt4430, local62.aBoolean209, null);
} }
Static262.method4508(arg2, arg7, arg8, local199, local387, null, Static78.anIntArray204[arg9], 0, local261); SceneGraph.method4508(arg2, arg7, arg8, local199, local387, null, Static78.anIntArray204[arg9], 0, local261);
if (local62.aBoolean215 && arg1) { if (local62.aBoolean215 && arg1) {
if (arg9 == 0) { if (arg9 == 0) {
SceneGraph.aByteArrayArrayArray9[arg2][arg7][arg8 + 1] = 50; SceneGraph.aByteArrayArrayArray9[arg2][arg7][arg8 + 1] = 50;

3
client/src/main/java/rt4/Static186.java
View file

@ -4,9 +4,6 @@ import org.openrs2.deob.annotation.OriginalMember;
public final class Static186 { public final class Static186 {
@OriginalMember(owner = "client!pa", name = "L", descriptor = "[[B")
public static byte[][] underWaterMapFilesBuffer;
@OriginalMember(owner = "client!pa", name = "K", descriptor = "Z") @OriginalMember(owner = "client!pa", name = "K", descriptor = "Z")
public static boolean aBoolean205 = false; public static boolean aBoolean205 = false;

3
client/src/main/java/rt4/Static19.java
View file

@ -6,9 +6,6 @@ import org.openrs2.deob.annotation.Pc;
public final class Static19 { public final class Static19 {
@OriginalMember(owner = "client!bi", name = "Y", descriptor = "[[B")
public static byte[][] underWaterLocationsMapFilesBuffer;
@OriginalMember(owner = "client!bi", name = "a", descriptor = "(IIIIIIII)Z") @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) { 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) { if (arg1 < arg2 && arg1 < arg3 && arg1 < arg4) {

3
client/src/main/java/rt4/Static191.java
View file

@ -4,9 +4,6 @@ import org.openrs2.deob.annotation.OriginalMember;
public final class Static191 { public final class Static191 {
@OriginalMember(owner = "client!pg", name = "jb", descriptor = "[[B")
public static byte[][] npcSpawnsFilesBuffer;
@OriginalMember(owner = "client!pg", name = "fb", descriptor = "I") @OriginalMember(owner = "client!pg", name = "fb", descriptor = "I")
public static final int anInt4506 = 50; public static final int anInt4506 = 50;

31
client/src/main/java/rt4/Static195.java
View file

@ -1,41 +1,10 @@
package rt4; package rt4;
import org.openrs2.deob.annotation.OriginalMember; import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc;
public final class Static195 { public final class Static195 {
@OriginalMember(owner = "client!pk", name = "bb", descriptor = "Lclient!na;") @OriginalMember(owner = "client!pk", name = "bb", descriptor = "Lclient!na;")
public static JagString walkText; public static JagString walkText;
@OriginalMember(owner = "client!pk", name = "i", descriptor = "(I)V")
public static void method3532() {
for (@Pc(16) ProjAnimNode local16 = (ProjAnimNode) Static217.aClass69_116.head(); local16 != null; local16 = (ProjAnimNode) Static217.aClass69_116.next()) {
@Pc(21) ProjAnim local21 = local16.aClass8_Sub6_1;
if (Player.level != local21.anInt4810 || local21.anInt4800 < client.loop) {
local16.unlink();
} else if (client.loop >= local21.anInt4822) {
if (local21.anInt4819 > 0) {
@Pc(54) Npc local54 = NpcList.npcs[local21.anInt4819 - 1];
if (local54 != null && local54.xFine >= 0 && local54.xFine < 13312 && local54.zFine >= 0 && local54.zFine < 13312) {
local21.method3705(local54.zFine, client.loop, SceneGraph.getTileHeight(local21.anInt4810, local54.xFine, local54.zFine) - local21.anInt4805, local54.xFine);
}
}
if (local21.anInt4819 < 0) {
@Pc(102) int local102 = -local21.anInt4819 - 1;
@Pc(107) Player local107;
if (PlayerList.selfId == local102) {
local107 = PlayerList.self;
} else {
local107 = PlayerList.players[local102];
}
if (local107 != null && local107.xFine >= 0 && local107.xFine < 13312 && local107.zFine >= 0 && local107.zFine < 13312) {
local21.method3705(local107.zFine, client.loop, SceneGraph.getTileHeight(local21.anInt4810, local107.xFine, local107.zFine) - local21.anInt4805, local107.xFine);
}
}
local21.method3704(Static178.anInt4247);
Static43.method1141(Player.level, (int) local21.aDouble8, (int) local21.aDouble3, (int) local21.aDouble6, 60, local21, local21.anInt4821, -1L, false);
}
}
}
} }

3
client/src/main/java/rt4/Static202.java
View file

@ -6,9 +6,6 @@ import org.openrs2.deob.annotation.Pc;
public final class Static202 { public final class Static202 {
@OriginalMember(owner = "client!qg", name = "Y", descriptor = "[I")
public static final int[] cameraFrequency = new int[5];
@OriginalMember(owner = "client!qg", name = "a", descriptor = "([Lclient!na;[SI)V") @OriginalMember(owner = "client!qg", name = "a", descriptor = "([Lclient!na;[SI)V")
public static void method3656(@OriginalArg(0) JagString[] arg0, @OriginalArg(1) short[] arg1) { public static void method3656(@OriginalArg(0) JagString[] arg0, @OriginalArg(1) short[] arg1) {
Static54.method1307(arg1, arg0.length - 1, arg0, 0); Static54.method1307(arg1, arg0.length - 1, arg0, 0);

56
client/src/main/java/rt4/Static203.java
View file

@ -1,56 +0,0 @@
package rt4;
import java.awt.Container;
import java.awt.Insets;
import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc;
public final class Static203 {
@OriginalMember(owner = "client!qh", name = "a", descriptor = "(Z)V")
public static void method3662() {
@Pc(8) Container local8;
if (GameShell.fullScreenFrame != null) {
local8 = GameShell.fullScreenFrame;
} else if (GameShell.frame == null) {
local8 = GameShell.signLink.applet;
} else {
local8 = GameShell.frame;
}
GameShell.frameWidth = local8.getSize().width;
GameShell.frameHeight = local8.getSize().height;
@Pc(35) Insets local35;
if (local8 == GameShell.frame) {
local35 = GameShell.frame.getInsets();
GameShell.frameHeight -= local35.bottom + local35.top;
GameShell.frameWidth -= local35.right + local35.left;
}
if (DisplayMode.getWindowMode() >= 2) {
GameShell.canvasWidth = GameShell.frameWidth;
GameShell.leftMargin = 0;
GameShell.topMargin = 0;
GameShell.canvasHeight = GameShell.frameHeight;
} else {
GameShell.topMargin = 0;
GameShell.leftMargin = (GameShell.frameWidth - 765) / 2;
GameShell.canvasHeight = 503;
GameShell.canvasWidth = 765;
}
if (GlRenderer.enabled) {
GlRenderer.setCanvasSize(GameShell.canvasWidth, GameShell.canvasHeight);
}
GameShell.canvas.setSize(GameShell.canvasWidth, GameShell.canvasHeight);
if (local8 == GameShell.frame) {
local35 = GameShell.frame.getInsets();
GameShell.canvas.setLocation(local35.left + GameShell.leftMargin, GameShell.topMargin + local35.top);
} else {
GameShell.canvas.setLocation(GameShell.leftMargin, GameShell.topMargin);
}
if (InterfaceList.topLevelInterface != -1) {
Static210.method3712(true);
}
Static139.method2704();
}
}

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

@ -2,19 +2,9 @@ package rt4;
import org.openrs2.deob.annotation.OriginalArg; import org.openrs2.deob.annotation.OriginalArg;
import org.openrs2.deob.annotation.OriginalMember; import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc;
public final class Static210 { public final class Static210 {
@OriginalMember(owner = "client!rb", name = "a", descriptor = "(I)V")
public static void method3711() {
for (@Pc(7) int local7 = 0; local7 < 104; local7++) {
for (@Pc(14) int local14 = 0; local14 < 104; local14++) {
Static31.anIntArrayArray6[local7][local14] = 0;
}
}
}
@OriginalMember(owner = "client!rb", name = "a", descriptor = "(ZB)V") @OriginalMember(owner = "client!rb", name = "a", descriptor = "(ZB)V")
public static void method3712(@OriginalArg(0) boolean arg0) { public static void method3712(@OriginalArg(0) boolean arg0) {
Static234.method4017(GameShell.canvasHeight, arg0, InterfaceList.topLevelInterface, GameShell.canvasWidth); Static234.method4017(GameShell.canvasHeight, arg0, InterfaceList.topLevelInterface, GameShell.canvasWidth);

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

@ -4,35 +4,10 @@ import org.openrs2.deob.annotation.OriginalMember;
public final class Static211 { public final class Static211 {
@OriginalMember(owner = "client!he", name = "db", descriptor = "Lclient!na;")
public static final JagString aClass100_517 = JagString.parse("");
@OriginalMember(owner = "client!rc", name = "R", descriptor = "Z") @OriginalMember(owner = "client!rc", name = "R", descriptor = "Z")
private static boolean aBoolean74; private static boolean aBoolean74;
@OriginalMember(owner = "client!rc", name = "p", descriptor = "I") @OriginalMember(owner = "client!rc", name = "p", descriptor = "I")
public static int anInt1142 = 0; public static int anInt1142 = 0;
@OriginalMember(owner = "client!rc", name = "C", descriptor = "Z")
public static boolean aBoolean72 = false;
@OriginalMember(owner = "client!rc", name = "G", descriptor = "Lclient!na;")
public static final JagString aClass100_230 = JagString.parse("");
@OriginalMember(owner = "client!rc", name = "M", descriptor = "Z")
public static boolean aBoolean73 = false;
@OriginalMember(owner = "client!rc", name = "d", descriptor = "(I)V")
public static void method930() {
if (client.musicChannel != null) {
client.musicChannel.quit();
}
if (client.soundChannel != null) {
client.soundChannel.quit();
}
AudioChannel.init(Preferences.stereo);
client.musicChannel = AudioChannel.create(22050, GameShell.signLink, GameShell.canvas, 0);
client.musicChannel.setStream(client.musicStream);
client.soundChannel = AudioChannel.create(2048, GameShell.signLink, GameShell.canvas, 1);
client.soundChannel.setStream(client.soundStream);
}
} }

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

@ -57,7 +57,7 @@ public final class Static220 {
@OriginalMember(owner = "client!rm", name = "a", descriptor = "(III)V") @OriginalMember(owner = "client!rm", name = "a", descriptor = "(III)V")
public static void method3801() { public static void method3801() {
for (@Pc(1) int local1 = 0; local1 < Static126.anInt3114; local1++) { for (@Pc(1) int local1 = 0; local1 < SceneGraph.anInt3114; local1++) {
for (@Pc(6) int local6 = 0; local6 < SceneGraph.mapSizeX; local6++) { for (@Pc(6) int local6 = 0; local6 < SceneGraph.mapSizeX; local6++) {
for (@Pc(11) int local11 = 0; local11 < SceneGraph.mapSizeZ; local11++) { for (@Pc(11) int local11 = 0; local11 < SceneGraph.mapSizeZ; local11++) {
@Pc(22) Tile local22 = SceneGraph.tiles[local1][local6][local11]; @Pc(22) Tile local22 = SceneGraph.tiles[local1][local6][local11];

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

@ -8,6 +8,10 @@ public final class Static221 {
@OriginalMember(owner = "client!s", name = "a", descriptor = "[I") @OriginalMember(owner = "client!s", name = "a", descriptor = "[I")
public static int[] tt; public static int[] tt;
@OriginalMember(owner = "client!nd", name = "y", descriptor = "Lclient!mm;")
public static SoftwareSprite aClass3_Sub2_Sub1_Sub1_3;
@OriginalMember(owner = "client!hh", name = "r", descriptor = "[I")
public static int[] anIntArray235;
@OriginalMember(owner = "client!s", name = "b", descriptor = "(III)V") @OriginalMember(owner = "client!s", name = "b", descriptor = "(III)V")
public static void method3392(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) { public static void method3392(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) {
@ -29,7 +33,7 @@ public final class Static221 {
@Pc(65) int local65 = SoftwareRaster.pixels[local24++ + arg0]; @Pc(65) int local65 = SoftwareRaster.pixels[local24++ + arg0];
@Pc(70) int local70 = Static216.anIntArray188[local20++]; @Pc(70) int local70 = Static216.anIntArray188[local20++];
if (local70 == 0) { if (local70 == 0) {
Static167.aClass3_Sub2_Sub1_Sub1_3.pixels[local26++] = local65; aClass3_Sub2_Sub1_Sub1_3.pixels[local26++] = local65;
} else { } else {
@Pc(76) int local76 = local70 + 18; @Pc(76) int local76 = local70 + 18;
if (local76 > 255) { if (local76 > 255) {
@ -39,19 +43,19 @@ public final class Static221 {
if (local89 > 255) { if (local89 > 255) {
local89 = 255; local89 = 255;
} }
local70 = Static96.anIntArray235[local70]; local70 = anIntArray235[local70];
Static167.aClass3_Sub2_Sub1_Sub1_3.pixels[local26++] = (local89 * (local65 & 0xFF00FF) + (local70 & 0xFF00FF) * local76 & 0xFF00FF00) + ((local70 & 0xFF00) * local76 + ((local65 & 0xFF00) * local89) & 0xFF0000) >> 8; aClass3_Sub2_Sub1_Sub1_3.pixels[local26++] = (local89 * (local65 & 0xFF00FF) + (local70 & 0xFF00FF) * local76 & 0xFF00FF00) + ((local70 & 0xFF00) * local76 + ((local65 & 0xFF00) * local89) & 0xFF0000) >> 8;
} }
} }
for (local55 = 0; local55 < local43; local55++) { for (local55 = 0; local55 < local43; local55++) {
Static167.aClass3_Sub2_Sub1_Sub1_3.pixels[local26++] = SoftwareRaster.pixels[arg0 + local24++]; aClass3_Sub2_Sub1_Sub1_3.pixels[local26++] = SoftwareRaster.pixels[arg0 + local24++];
} }
local24 += SoftwareRaster.width - 128; local24 += SoftwareRaster.width - 128;
} }
if (GlRenderer.enabled) { if (GlRenderer.enabled) {
GlRaster.method1178(Static167.aClass3_Sub2_Sub1_Sub1_3.pixels, arg0, arg1, Static167.aClass3_Sub2_Sub1_Sub1_3.width, Static167.aClass3_Sub2_Sub1_Sub1_3.height); GlRaster.method1178(aClass3_Sub2_Sub1_Sub1_3.pixels, arg0, arg1, aClass3_Sub2_Sub1_Sub1_3.width, aClass3_Sub2_Sub1_Sub1_3.height);
} else { } else {
Static167.aClass3_Sub2_Sub1_Sub1_3.method1415(arg0, arg1); aClass3_Sub2_Sub1_Sub1_3.method1415(arg0, arg1);
} }
} }

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

@ -70,7 +70,7 @@ public final class Static226 {
local43 = 0; local43 = 0;
} }
if (anInt3953 == 1) { if (anInt3953 == 1) {
if (Static155.anInt3751 == Static277.anInt5850 && Static280.anInt5895 == Static60.anInt1892) { if (Static155.anInt3751 == Mouse.anInt5850 && Static280.anInt5895 == Static60.anInt1892) {
Static13.anInt436 = MiniMenu.size * 15 + (Static40.aBoolean298 ? 26 : 22); Static13.anInt436 = MiniMenu.size * 15 + (Static40.aBoolean298 ? 26 : 22);
anInt3953 = 0; anInt3953 = 0;
Static229.anInt5138 = local43; Static229.anInt5138 = local43;
@ -87,7 +87,7 @@ public final class Static226 {
Static40.aBoolean108 = true; Static40.aBoolean108 = true;
} else { } else {
Static280.anInt5895 = Mouse.clickY; Static280.anInt5895 = Mouse.clickY;
Static277.anInt5850 = Mouse.clickX; Mouse.anInt5850 = Mouse.clickX;
anInt3953 = 1; anInt3953 = 1;
} }
} }

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

@ -11,6 +11,10 @@ public final class Static228 {
@OriginalMember(owner = "client!sh", name = "e", descriptor = "Lclient!na;") @OriginalMember(owner = "client!sh", name = "e", descriptor = "Lclient!na;")
public static final JagString aClass100_967 = JagString.parse(""); public static final JagString aClass100_967 = JagString.parse("");
@OriginalMember(owner = "client!wi", name = "X", descriptor = "[[B")
public static final byte[][] aByteArrayArray16 = new byte[1000][];
@OriginalMember(owner = "client!bb", name = "t", descriptor = "[[B")
public static final byte[][] aByteArrayArray2 = new byte[250][];
@OriginalMember(owner = "client!sh", name = "f", descriptor = "I") @OriginalMember(owner = "client!sh", name = "f", descriptor = "I")
public static int anInt5103 = -1; public static int anInt5103 = -1;
@ -25,12 +29,12 @@ public final class Static228 {
public static synchronized byte[] allocate(@OriginalArg(1) int arg0) { public static synchronized byte[] allocate(@OriginalArg(1) int arg0) {
@Pc(22) byte[] local22; @Pc(22) byte[] local22;
if (arg0 == 100 && Static115.anInt2937 > 0) { if (arg0 == 100 && Static115.anInt2937 > 0) {
local22 = Static277.aByteArrayArray16[--Static115.anInt2937]; local22 = aByteArrayArray16[--Static115.anInt2937];
Static277.aByteArrayArray16[Static115.anInt2937] = null; aByteArrayArray16[Static115.anInt2937] = null;
return local22; return local22;
} else if (arg0 == 5000 && Static251.anInt5459 > 0) { } else if (arg0 == 5000 && Static251.anInt5459 > 0) {
local22 = Static12.aByteArrayArray2[--Static251.anInt5459]; local22 = aByteArrayArray2[--Static251.anInt5459];
Static12.aByteArrayArray2[Static251.anInt5459] = null; aByteArrayArray2[Static251.anInt5459] = null;
return local22; return local22;
} else if (arg0 == 30000 && Static224.anInt5064 > 0) { } else if (arg0 == 30000 && Static224.anInt5064 > 0) {
local22 = aByteArrayArray6[--Static224.anInt5064]; local22 = aByteArrayArray6[--Static224.anInt5064];

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

@ -1,6 +1,5 @@
package rt4; package rt4;
import org.openrs2.deob.annotation.OriginalArg;
import org.openrs2.deob.annotation.OriginalMember; import org.openrs2.deob.annotation.OriginalMember;
public final class Static229 { public final class Static229 {
@ -8,15 +7,4 @@ public final class Static229 {
@OriginalMember(owner = "client!si", name = "ab", descriptor = "I") @OriginalMember(owner = "client!si", name = "ab", descriptor = "I")
public static int anInt5138; public static int anInt5138;
@OriginalMember(owner = "client!si", name = "gb", descriptor = "Lclient!na;")
public static final JagString aClass100_974 = JagString.parse("<br>(X");
@OriginalMember(owner = "client!si", name = "a", descriptor = "(IZ)V")
public static void method3935(@OriginalArg(0) int arg0) {
FogManager.method3060(FogManager.anInt3923, ((float) arg0 * 0.1F + 0.7F) * 1.1523438F, 0.69921875F, 0.69921875F);
FogManager.method3063(-50.0F, -60.0F, -50.0F);
FogManager.method3062(FogManager.anInt3922, 0);
FogManager.method3058();
}
} }

125
client/src/main/java/rt4/Static231.java
View file

@ -15,131 +15,6 @@ public final class Static231 {
@OriginalMember(owner = "client!sk", name = "lb", descriptor = "Z") @OriginalMember(owner = "client!sk", name = "lb", descriptor = "Z")
public static boolean aBoolean252 = false; public static boolean aBoolean252 = false;
@OriginalMember(owner = "client!sk", name = "a", descriptor = "(IIIIBIII)V")
public static void method3981(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5, @OriginalArg(7) int arg6) {
@Pc(7) int local7 = 0;
@Pc(12) int local12 = arg0 - arg3;
@Pc(14) int local14 = 0;
@Pc(16) int local16 = arg6;
@Pc(20) int local20 = arg6 * arg6;
@Pc(25) int local25 = arg6 - arg3;
@Pc(29) int local29 = arg0 * arg0;
@Pc(33) int local33 = local20 << 1;
@Pc(37) int local37 = local25 * local25;
@Pc(41) int local41 = local12 * local12;
@Pc(45) int local45 = local29 << 1;
@Pc(49) int local49 = local37 << 1;
@Pc(53) int local53 = local41 << 1;
@Pc(57) int local57 = local25 << 1;
@Pc(61) int local61 = arg6 << 1;
@Pc(70) int local70 = local33 + local29 * (1 - local61);
@Pc(79) int local79 = local20 - (local61 - 1) * local45;
@Pc(88) int local88 = local49 + local41 * (1 - local57);
@Pc(96) int local96 = local37 - local53 * (local57 - 1);
@Pc(100) int local100 = local20 << 2;
@Pc(104) int local104 = local29 << 2;
@Pc(108) int local108 = local37 << 2;
@Pc(112) int local112 = local33 * 3;
@Pc(118) int local118 = (local61 - 3) * local45;
@Pc(130) int local130 = local41 << 2;
@Pc(134) int local134 = local49 * 3;
@Pc(140) int local140 = (local57 - 3) * local53;
@Pc(146) int local146 = (arg6 - 1) * local104;
@Pc(148) int local148 = local108;
@Pc(150) int local150 = local100;
@Pc(156) int local156 = (local25 - 1) * local130;
@Pc(174) int local174;
@Pc(183) int local183;
@Pc(192) int local192;
@Pc(201) int local201;
if (arg4 >= TextureOp29.anInt5773 && TextureOp29.anInt2869 >= arg4) {
@Pc(166) int[] local166 = Static71.anIntArrayArray10[arg4];
local174 = Static78.method1690(TextureOp29.anInt5063, arg5 - arg0, TextureOp29.anInt4164);
local183 = Static78.method1690(TextureOp29.anInt5063, arg5 + arg0, TextureOp29.anInt4164);
local192 = Static78.method1690(TextureOp29.anInt5063, arg5 - local12, TextureOp29.anInt4164);
local201 = Static78.method1690(TextureOp29.anInt5063, arg5 + local12, TextureOp29.anInt4164);
Static131.method2576(local166, local174, local192, arg2);
Static131.method2576(local166, local192, local201, arg1);
Static131.method2576(local166, local201, local183, arg2);
}
while (local16 > 0) {
if (local70 < 0) {
while (local70 < 0) {
local70 += local112;
local112 += local100;
local7++;
local79 += local150;
local150 += local100;
}
}
@Pc(255) boolean local255 = local16 <= local25;
if (local79 < 0) {
local79 += local150;
local70 += local112;
local7++;
local150 += local100;
local112 += local100;
}
if (local255) {
if (local88 < 0) {
while (local88 < 0) {
local14++;
local96 += local148;
local148 += local108;
local88 += local134;
local134 += local108;
}
}
if (local96 < 0) {
local14++;
local96 += local148;
local88 += local134;
local148 += local108;
local134 += local108;
}
local88 += -local156;
local156 -= local130;
local96 += -local140;
local140 -= local130;
}
local79 += -local118;
local70 += -local146;
local146 -= local104;
local118 -= local104;
local16--;
local183 = arg4 + local16;
local174 = arg4 - local16;
if (TextureOp29.anInt5773 <= local183 && TextureOp29.anInt2869 >= local174) {
local192 = Static78.method1690(TextureOp29.anInt5063, arg5 + local7, TextureOp29.anInt4164);
local201 = Static78.method1690(TextureOp29.anInt5063, arg5 - local7, TextureOp29.anInt4164);
if (local255) {
@Pc(404) int local404 = Static78.method1690(TextureOp29.anInt5063, arg5 + local14, TextureOp29.anInt4164);
@Pc(412) int local412 = Static78.method1690(TextureOp29.anInt5063, arg5 - local14, TextureOp29.anInt4164);
@Pc(420) int[] local420;
if (TextureOp29.anInt5773 <= local174) {
local420 = Static71.anIntArrayArray10[local174];
Static131.method2576(local420, local201, local412, arg2);
Static131.method2576(local420, local412, local404, arg1);
Static131.method2576(local420, local404, local192, arg2);
}
if (local183 <= TextureOp29.anInt2869) {
local420 = Static71.anIntArrayArray10[local183];
Static131.method2576(local420, local201, local412, arg2);
Static131.method2576(local420, local412, local404, arg1);
Static131.method2576(local420, local404, local192, arg2);
}
} else {
if (TextureOp29.anInt5773 <= local174) {
Static131.method2576(Static71.anIntArrayArray10[local174], local201, local192, arg2);
}
if (TextureOp29.anInt2869 >= local183) {
Static131.method2576(Static71.anIntArrayArray10[local183], local201, local192, arg2);
}
}
}
}
}
@OriginalMember(owner = "client!sk", name = "a", descriptor = "(IIIIII)V") @OriginalMember(owner = "client!sk", name = "a", descriptor = "(IIIIII)V")
public static void method3982(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4) { public static void method3982(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4) {
@Pc(15) int local15 = arg4 - arg2; @Pc(15) int local15 = arg4 - arg2;

3
client/src/main/java/rt4/Static232.java
View file

@ -6,9 +6,6 @@ import org.openrs2.deob.annotation.Pc;
public final class Static232 { public final class Static232 {
@OriginalMember(owner = "client!sm", name = "e", descriptor = "[[[B")
public static byte[][][] aByteArrayArrayArray13;
@OriginalMember(owner = "client!sm", name = "a", descriptor = "(IIIIIIIIIII)V") @OriginalMember(owner = "client!sm", name = "a", descriptor = "(IIIIIIIIIII)V")
public static void method3991(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(8) int arg5, @OriginalArg(9) int arg6, @OriginalArg(10) int arg7) { public static void method3991(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(8) int arg5, @OriginalArg(9) int arg6, @OriginalArg(10) int arg7) {
@Pc(9) int local9 = arg2 - arg4; @Pc(9) int local9 = arg2 - arg4;

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

@ -42,11 +42,11 @@ public final class Static233 {
@Pc(19) byte local19; @Pc(19) byte local19;
@Pc(21) byte[][] local21; @Pc(21) byte[][] local21;
if (GlRenderer.enabled && arg0) { if (GlRenderer.enabled && arg0) {
local21 = Static19.underWaterLocationsMapFilesBuffer; local21 = LoginManager.underWaterLocationsMapFilesBuffer;
local19 = 1; local19 = 1;
} else { } else {
local19 = 4; local19 = 4;
local21 = Static156.locationMapFilesBuffer; local21 = LoginManager.locationMapFilesBuffer;
} }
for (@Pc(29) int local29 = 0; local29 < local19; local29++) { for (@Pc(29) int local29 = 0; local29 < local19; local29++) {
client.audioLoop(); client.audioLoop();
@ -60,8 +60,8 @@ public final class Static233 {
@Pc(83) int local83 = local56 >> 14 & 0x3FF; @Pc(83) int local83 = local56 >> 14 & 0x3FF;
@Pc(89) int local89 = local56 >> 3 & 0x7FF; @Pc(89) int local89 = local56 >> 3 & 0x7FF;
@Pc(99) int local99 = local89 / 8 + (local83 / 8 << 8); @Pc(99) int local99 = local89 / 8 + (local83 / 8 << 8);
for (@Pc(101) int local101 = 0; local101 < Static238.regionBitPacked.length; local101++) { for (@Pc(101) int local101 = 0; local101 < LoginManager.regionBitPacked.length; local101++) {
if (Static238.regionBitPacked[local101] == local99 && local21[local101] != null) { if (LoginManager.regionBitPacked[local101] == local99 && local21[local101] != null) {
Static217.method3771(PathFinder.collisionMaps, local29, local21[local101], local67, local77, local36 * 8, local43 * 8, arg0, (local83 & 0x7) * 8, (local89 & 0x7) * 8); Static217.method3771(PathFinder.collisionMaps, local29, local21[local101], local67, local77, local36 * 8, local43 * 8, arg0, (local83 & 0x7) * 8, (local89 & 0x7) * 8);
break; break;
} }

3
client/src/main/java/rt4/Static235.java
View file

@ -4,9 +4,6 @@ import org.openrs2.deob.annotation.OriginalMember;
public final class Static235 { public final class Static235 {
@OriginalMember(owner = "client!tb", name = "X", descriptor = "Lclient!se;")
public static MapElementList mapElementList;
@OriginalMember(owner = "client!tb", name = "Q", descriptor = "I") @OriginalMember(owner = "client!tb", name = "Q", descriptor = "I")
public static int anInt5276 = 0; public static int anInt5276 = 0;

3
client/src/main/java/rt4/Static238.java
View file

@ -4,9 +4,6 @@ import org.openrs2.deob.annotation.OriginalMember;
public final class Static238 { public final class Static238 {
@OriginalMember(owner = "client!te", name = "H", descriptor = "[I")
public static int[] regionBitPacked;
@OriginalMember(owner = "client!te", name = "B", descriptor = "[I") @OriginalMember(owner = "client!te", name = "B", descriptor = "[I")
public static final int[] anIntArray469 = new int[] { 0, -1, 0, 1 }; public static final int[] anIntArray469 = new int[] { 0, -1, 0, 1 };

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

@ -20,8 +20,4 @@ public final class Static24 {
return local8; return local8;
} }
@OriginalMember(owner = "client!bn", name = "d", descriptor = "(II)Z")
public static boolean isDigit(@OriginalArg(1) int arg0) {
return arg0 >= 48 && arg0 <= 57;
}
} }

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

@ -6,9 +6,6 @@ import org.openrs2.deob.annotation.Pc;
public final class Static245 { public final class Static245 {
@OriginalMember(owner = "client!tm", name = "g", descriptor = "I")
public static int anInt5375;
@OriginalMember(owner = "client!tm", name = "a", descriptor = "(III[Lclient!mj;IB[BIIIZ)V") @OriginalMember(owner = "client!tm", name = "a", descriptor = "(III[Lclient!mj;IB[BIIIZ)V")
public static void method4228(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) CollisionMap[] arg3, @OriginalArg(4) int arg4, @OriginalArg(6) byte[] arg5, @OriginalArg(7) int arg6, @OriginalArg(8) int arg7, @OriginalArg(9) int arg8, @OriginalArg(10) boolean arg9) { public static void method4228(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) CollisionMap[] arg3, @OriginalArg(4) int arg4, @OriginalArg(6) byte[] arg5, @OriginalArg(7) int arg6, @OriginalArg(8) int arg7, @OriginalArg(9) int arg8, @OriginalArg(10) boolean arg9) {
@Pc(17) int local17; @Pc(17) int local17;
@ -34,9 +31,9 @@ public final class Static245 {
for (local103 = 0; local103 < 64; local103++) { for (local103 = 0; local103 < 64; local103++) {
for (local108 = 0; local108 < 64; local108++) { for (local108 = 0; local108 < 64; local108++) {
if (arg6 == local17 && arg8 <= local103 && arg8 + 8 > local103 && arg7 <= local108 && local108 < arg7 + 8) { if (arg6 == local17 && arg8 <= local103 && arg8 + 8 > local103 && arg7 <= local108 && local108 < arg7 + 8) {
Static278.readTile(0, 0, arg9, local96, Static202.method3659(arg0, local103 & 0x7, local108 & 0x7) + arg4, Static214.method4360(arg0, local108 & 0x7, local103 & 0x7) + arg1, arg0, arg2); SceneGraph.readTile(0, 0, arg9, local96, Static202.method3659(arg0, local103 & 0x7, local108 & 0x7) + arg4, Static214.method4360(arg0, local108 & 0x7, local103 & 0x7) + arg1, arg0, arg2);
} else { } else {
Static278.readTile(0, 0, arg9, local96, -1, -1, 0, 0); SceneGraph.readTile(0, 0, arg9, local96, -1, -1, 0, 0);
} }
} }
} }
@ -83,7 +80,7 @@ public final class Static245 {
} }
while (local237 > local232) { while (local237 > local232) {
while (local417 < local255) { while (local417 < local255) {
Static232.aByteArrayArrayArray13[arg2][local232][local417] = 0; SceneGraph.aByteArrayArrayArray13[arg2][local232][local417] = 0;
local417++; local417++;
} }
local232++; local232++;
@ -100,7 +97,7 @@ public final class Static245 {
local316 = arg1 + Static214.method4360(arg0, local266 & 0x7, local255 & 0x7); local316 = arg1 + Static214.method4360(arg0, local266 & 0x7, local255 & 0x7);
@Pc(328) int local328 = Static202.method3659(arg0, local255 & 0x7, local266 & 0x7) + arg4; @Pc(328) int local328 = Static202.method3659(arg0, local255 & 0x7, local266 & 0x7) + arg4;
if (local316 >= 0 && local316 < 104 && local328 >= 0 && local328 < 104) { if (local316 >= 0 && local316 < 104 && local328 >= 0 && local328 < 104) {
Static232.aByteArrayArrayArray13[arg2][local316][local328] = local246; SceneGraph.aByteArrayArrayArray13[arg2][local316][local328] = local246;
} }
} }
} }
@ -162,7 +159,7 @@ public final class Static245 {
local108 = arg4 + 7; local108 = arg4 + 7;
for (local497 = arg1; local497 < local103; local497++) { for (local497 = arg1; local497 < local103; local497++) {
for (local232 = arg4; local232 < local108; local232++) { for (local232 = arg4; local232 < local108; local232++) {
Static232.aByteArrayArrayArray13[arg2][local497][local232] = 0; SceneGraph.aByteArrayArrayArray13[arg2][local497][local232] = 0;
} }
} }
} }

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

@ -1,28 +1,10 @@
package rt4; package rt4;
import org.openrs2.deob.annotation.OriginalMember; import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc;
public final class Static246 { public final class Static246 {
@OriginalMember(owner = "client!u", name = "i", descriptor = "I") @OriginalMember(owner = "client!u", name = "i", descriptor = "I")
public static int anInt5393; public static int anInt5393;
@OriginalMember(owner = "client!u", name = "a", descriptor = "(Z)V")
public static void method4239() {
for (@Pc(9) SpotAnimNode local9 = (SpotAnimNode) Static99.aClass69_64.head(); local9 != null; local9 = (SpotAnimNode) Static99.aClass69_64.next()) {
@Pc(15) SpotAnim local15 = local9.aClass8_Sub2_1;
if (local15.anInt606 != Player.level || local15.aBoolean41) {
local9.unlink();
} else if (local15.anInt590 <= client.loop) {
local15.method558(Static178.anInt4247);
if (local15.aBoolean41) {
local9.unlink();
} else {
Static43.method1141(local15.anInt606, local15.anInt604, local15.anInt598, local15.anInt599, 60, local15, 0, -1L, false);
}
}
}
}
} }

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

@ -6,6 +6,16 @@ import org.openrs2.deob.annotation.Pc;
public final class Static247 { public final class Static247 {
@OriginalMember(owner = "client!ka", name = "t", descriptor = "[I")
public static final int[] anIntArray294 = new int[] { 0, 0, 2, 0, 0, 2, 1, 1, 0 };
@OriginalMember(owner = "client!uj", name = "A", descriptor = "[I")
public static final int[] anIntArray489 = new int[] { 2, 0, 0, 2, 0, 0, 0, 4, 4 };
@OriginalMember(owner = "client!gm", name = "gb", descriptor = "[I")
public static final int[] anIntArray211 = new int[] { 0, 4, 4, 8, 0, 0, 8, 0, 0 };
@OriginalMember(owner = "client!kd", name = "sb", descriptor = "[I")
public static final int[] anIntArray307 = new int[] { 1, 1, 0, 0, 0, 8, 0, 0, 8 };
@OriginalMember(owner = "client!hb", name = "t", descriptor = "[I")
public static final int[] anIntArray215 = new int[] { 160, 192, 80, 96, 0, 144, 80, 48, 160 };
@OriginalMember(owner = "client!bl", name = "X", descriptor = "I") @OriginalMember(owner = "client!bl", name = "X", descriptor = "I")
public static int anInt730 = -1; public static int anInt730 = -1;
@ -224,23 +234,23 @@ public final class Static247 {
local8.anInt670 = Static191.anIntArray386[var10]; local8.anInt670 = Static191.anIntArray386[var10];
} }
if (local616 != null) { if (local616 != null) {
if ((local616.anInt3049 & Static90.anIntArray215[var10]) == 0) { if ((local616.anInt3049 & anIntArray215[var10]) == 0) {
local8.anInt663 = 0; local8.anInt663 = 0;
} else if (local616.anInt3049 == 16) { } else if (local616.anInt3049 == 16) {
local8.anInt663 = 3; local8.anInt663 = 3;
local8.anInt665 = Static128.anIntArray294[var10]; local8.anInt665 = anIntArray294[var10];
local8.anInt667 = 3 - local8.anInt665; local8.anInt667 = 3 - local8.anInt665;
} else if (local616.anInt3049 == 32) { } else if (local616.anInt3049 == 32) {
local8.anInt663 = 6; local8.anInt663 = 6;
local8.anInt665 = Static254.anIntArray489[var10]; local8.anInt665 = anIntArray489[var10];
local8.anInt667 = 6 - local8.anInt665; local8.anInt667 = 6 - local8.anInt665;
} else if (local616.anInt3049 == 64) { } else if (local616.anInt3049 == 64) {
local8.anInt663 = 12; local8.anInt663 = 12;
local8.anInt665 = Static86.anIntArray211[var10]; local8.anInt665 = anIntArray211[var10];
local8.anInt667 = 12 - local8.anInt665; local8.anInt667 = 12 - local8.anInt665;
} else { } else {
local8.anInt663 = 9; local8.anInt663 = 9;
local8.anInt665 = Static131.anIntArray307[var10]; local8.anInt665 = anIntArray307[var10];
local8.anInt667 = 9 - local8.anInt665; local8.anInt667 = 9 - local8.anInt665;
} }
if ((local616.anInt3049 & local65) != 0 && !Static260.method3850(local27, local18, local21, local616.anInt3049)) { if ((local616.anInt3049 & local65) != 0 && !Static260.method3850(local27, local18, local21, local616.anInt3049)) {
@ -256,7 +266,7 @@ public final class Static247 {
local616.aClass8_6.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local616.anInt3048 - Static149.anInt3555, local616.anInt3051 - Static123.anInt3947, local616.anInt3044 - Static217.anInt4903, local616.key, local24, null); local616.aClass8_6.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local616.anInt3048 - Static149.anInt3555, local616.anInt3051 - Static123.anInt3947, local616.anInt3044 - Static217.anInt4903, local616.key, local24, null);
} }
} }
if (local619 != null && !Static276.method4611(local27, local18, local21, local619.primary.getMaxY())) { if (local619 != null && !method4611(local27, local18, local21, local619.primary.getMaxY())) {
if (GlRenderer.enabled) { if (GlRenderer.enabled) {
GlRenderer.method4159(local33 - 0.5F); GlRenderer.method4159(local33 - 0.5F);
} }
@ -573,7 +583,7 @@ public final class Static247 {
} }
if (local8.anInt670 != 0) { if (local8.anInt670 != 0) {
@Pc(2109) WallDecor local2109 = local8.wallDecor; @Pc(2109) WallDecor local2109 = local8.wallDecor;
if (local2109 != null && !Static276.method4611(local27, local18, local21, local2109.primary.getMaxY())) { if (local2109 != null && !method4611(local27, local18, local21, local2109.primary.getMaxY())) {
if ((local2109.anInt1395 & local8.anInt670) != 0) { if ((local2109.anInt1395 & local8.anInt670) != 0) {
if (GlRenderer.enabled) { if (GlRenderer.enabled) {
LightingManager.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21); LightingManager.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21);
@ -624,7 +634,7 @@ public final class Static247 {
} }
} }
@Pc(2388) Tile local2388; @Pc(2388) Tile local2388;
if (local24 < Static126.anInt3114 - 1) { if (local24 < SceneGraph.anInt3114 - 1) {
local2388 = SceneGraph.tiles[local24 + 1][local18][local21]; local2388 = SceneGraph.tiles[local24 + 1][local18][local21];
if (local2388 != null && local2388.aBoolean46) { if (local2388 != null && local2388.aBoolean46) {
Static7.aClass69_32.addTail(local2388); Static7.aClass69_32.addTail(local2388);
@ -681,4 +691,14 @@ public final class Static247 {
return arg0 & 0xFF; return arg0 & 0xFF;
} }
@OriginalMember(owner = "client!wh", name = "a", descriptor = "(IIII)Z")
public static boolean method4611(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) {
if (Static9.method187(arg0, arg1, arg2)) {
@Pc(10) int local10 = arg1 << 7;
@Pc(14) int local14 = arg2 << 7;
return SceneGraph.method4394(local10 + 1, SceneGraph.tileHeights[arg0][arg1][arg2] + arg3, local14 + 1) && SceneGraph.method4394(local10 + 128 - 1, SceneGraph.tileHeights[arg0][arg1 + 1][arg2] + arg3, local14 + 1) && SceneGraph.method4394(local10 + 128 - 1, SceneGraph.tileHeights[arg0][arg1 + 1][arg2 + 1] + arg3, local14 + 128 - 1) && SceneGraph.method4394(local10 + 1, SceneGraph.tileHeights[arg0][arg1][arg2 + 1] + arg3, local14 + 128 - 1);
} else {
return false;
}
}
} }

31
client/src/main/java/rt4/Static248.java
View file

@ -7,9 +7,6 @@ import org.openrs2.deob.annotation.Pc;
public final class Static248 { public final class Static248 {
@OriginalMember(owner = "client!uc", name = "f", descriptor = "I")
public static int anInt4232;
@OriginalMember(owner = "client!uc", name = "a", descriptor = "I") @OriginalMember(owner = "client!uc", name = "a", descriptor = "I")
public static int anInt4229 = 2; public static int anInt4229 = 2;
@ -24,13 +21,13 @@ public final class Static248 {
@Pc(32) int local32; @Pc(32) int local32;
@Pc(37) int local37; @Pc(37) int local37;
@Pc(183) int local183; @Pc(183) int local183;
for (@Pc(23) int local23 = Static235.anInt5276; local23 < Static126.anInt3114; local23++) { for (@Pc(23) int local23 = Static235.anInt5276; local23 < SceneGraph.anInt3114; local23++) {
@Pc(30) Tile[][] local30 = SceneGraph.tiles[local23]; @Pc(30) Tile[][] local30 = SceneGraph.tiles[local23];
for (local32 = Static31.anInt987; local32 < Static2.anInt15; local32++) { for (local32 = Static31.anInt987; local32 < Static2.anInt15; local32++) {
for (local37 = Static80.anInt4698; local37 < Static215.anInt4866; local37++) { for (local37 = Static80.anInt4698; local37 < Static215.anInt4866; local37++) {
@Pc(46) Tile local46 = local30[local32][local37]; @Pc(46) Tile local46 = local30[local32][local37];
if (local46 != null) { if (local46 != null) {
if (Static48.aBooleanArrayArray1[local32 + Static277.tileVisibilityDistance - Static167.anInt4069][local37 + Static277.tileVisibilityDistance - Static193.anInt4539] && (arg3 == null || local23 < arg4 || arg3[local23][local32][local37] != arg5)) { if (Static48.aBooleanArrayArray1[local32 + Static123.tileVisibilityDistance - Static167.anInt4069][local37 + Static123.tileVisibilityDistance - Static193.anInt4539] && (arg3 == null || local23 < arg4 || arg3[local23][local32][local37] != arg5)) {
local46.aBoolean45 = true; local46.aBoolean45 = true;
local46.aBoolean46 = true; local46.aBoolean46 = true;
if (local46.sceneryLen > 0) { if (local46.sceneryLen > 0) {
@ -86,8 +83,8 @@ public final class Static248 {
UnderwaterMaterialRenderer.method4609(); UnderwaterMaterialRenderer.method4609();
Static152.anInt3604 = -1; Static152.anInt3604 = -1;
Static247.anInt730 = -1; Static247.anInt730 = -1;
for (local32 = 0; local32 < Static182.aClass3_Sub14ArrayArray2[0].length; local32++) { for (local32 = 0; local32 < SceneGraph.underwaterHdTiles[0].length; local32++) {
@Pc(285) GlTile local285 = Static182.aClass3_Sub14ArrayArray2[0][local32]; @Pc(285) GlTile local285 = SceneGraph.underwaterHdTiles[0][local32];
@Pc(294) float local294 = 251.5F - (local285.blend ? 1.0F : 0.5F); @Pc(294) float local294 = 251.5F - (local285.blend ? 1.0F : 0.5F);
if (local285.underwaterColor != Static152.anInt3604) { if (local285.underwaterColor != Static152.anInt3604) {
Static152.anInt3604 = local285.underwaterColor; Static152.anInt3604 = local285.underwaterColor;
@ -100,12 +97,12 @@ public final class Static248 {
} else { } else {
local32 = Static235.anInt5276; local32 = Static235.anInt5276;
while (true) { while (true) {
if (local32 >= Static126.anInt3114) { if (local32 >= SceneGraph.anInt3114) {
LightingManager.method2402(Static167.anInt4069, Static193.anInt4539, SceneGraph.tiles); LightingManager.method2402(Static167.anInt4069, Static193.anInt4539, SceneGraph.tiles);
break; break;
} }
for (local37 = 0; local37 < Static182.aClass3_Sub14ArrayArray2[local32].length; local37++) { for (local37 = 0; local37 < SceneGraph.underwaterHdTiles[local32].length; local37++) {
@Pc(336) GlTile local336 = Static182.aClass3_Sub14ArrayArray2[local32][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); @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) { if (local336.texture != -1 && Rasteriser.textureProvider.getMaterialType(local336.texture) == MaterialManager.WATER && Preferences.highWaterDetail) {
WaterMaterialRenderer.method619(local336.underwaterColor); WaterMaterialRenderer.method619(local336.underwaterColor);
@ -114,7 +111,7 @@ public final class Static248 {
} }
if (local32 == 0 && Preferences.sceneryShadowsType > 0) { if (local32 == 0 && Preferences.sceneryShadowsType > 0) {
GlRenderer.method4159(101.5F); GlRenderer.method4159(101.5F);
Static242.method4198(Static167.anInt4069, Static193.anInt4539, Static277.tileVisibilityDistance, arg1, Static48.aBooleanArrayArray1, SceneGraph.tileHeights[0]); Static242.method4198(Static167.anInt4069, Static193.anInt4539, Static123.tileVisibilityDistance, arg1, Static48.aBooleanArrayArray1, SceneGraph.tileHeights[0]);
} }
local32++; local32++;
} }
@ -128,13 +125,13 @@ public final class Static248 {
@Pc(406) Tile[][] local406; @Pc(406) Tile[][] local406;
@Pc(415) int local415; @Pc(415) int local415;
@Pc(428) int local428; @Pc(428) int local428;
for (local399 = Static235.anInt5276; local399 < Static126.anInt3114; local399++) { for (local399 = Static235.anInt5276; local399 < SceneGraph.anInt3114; local399++) {
local406 = SceneGraph.tiles[local399]; local406 = SceneGraph.tiles[local399];
for (local37 = -Static277.tileVisibilityDistance; local37 <= 0; local37++) { for (local37 = -Static123.tileVisibilityDistance; local37 <= 0; local37++) {
local415 = Static167.anInt4069 + local37; local415 = Static167.anInt4069 + local37;
local183 = Static167.anInt4069 - local37; local183 = Static167.anInt4069 - local37;
if (local415 >= Static31.anInt987 || local183 < Static2.anInt15) { if (local415 >= Static31.anInt987 || local183 < Static2.anInt15) {
for (local428 = -Static277.tileVisibilityDistance; local428 <= 0; local428++) { for (local428 = -Static123.tileVisibilityDistance; local428 <= 0; local428++) {
local434 = Static193.anInt4539 + local428; local434 = Static193.anInt4539 + local428;
local438 = Static193.anInt4539 - local428; local438 = Static193.anInt4539 - local428;
if (local415 >= Static31.anInt987) { if (local415 >= Static31.anInt987) {
@ -175,13 +172,13 @@ public final class Static248 {
} }
} }
} }
for (local399 = Static235.anInt5276; local399 < Static126.anInt3114; local399++) { for (local399 = Static235.anInt5276; local399 < SceneGraph.anInt3114; local399++) {
local406 = SceneGraph.tiles[local399]; local406 = SceneGraph.tiles[local399];
for (local37 = -Static277.tileVisibilityDistance; local37 <= 0; local37++) { for (local37 = -Static123.tileVisibilityDistance; local37 <= 0; local37++) {
local415 = Static167.anInt4069 + local37; local415 = Static167.anInt4069 + local37;
local183 = Static167.anInt4069 - local37; local183 = Static167.anInt4069 - local37;
if (local415 >= Static31.anInt987 || local183 < Static2.anInt15) { if (local415 >= Static31.anInt987 || local183 < Static2.anInt15) {
for (local428 = -Static277.tileVisibilityDistance; local428 <= 0; local428++) { for (local428 = -Static123.tileVisibilityDistance; local428 <= 0; local428++) {
local434 = Static193.anInt4539 + local428; local434 = Static193.anInt4539 + local428;
local438 = Static193.anInt4539 - local428; local438 = Static193.anInt4539 - local428;
if (local415 >= Static31.anInt987) { if (local415 >= Static31.anInt987) {

21
client/src/main/java/rt4/Static249.java
View file

@ -1,21 +0,0 @@
package rt4;
import org.openrs2.deob.annotation.OriginalArg;
import org.openrs2.deob.annotation.OriginalMember;
public final class Static249 {
@OriginalMember(owner = "client!ud", name = "Q", descriptor = "Lclient!na;")
public static final JagString aClass100_1039 = JagString.parse(" x ");
@OriginalMember(owner = "client!ud", name = "a", descriptor = "(ILclient!be;)Z")
public static boolean method4265(@OriginalArg(1) Component arg0) {
if (arg0.anInt453 == 205) {
Static267.anInt5775 = 250;
return true;
} else {
return false;
}
}
}

31
client/src/main/java/rt4/Static250.java
View file

@ -1,7 +1,6 @@
package rt4; package rt4;
import org.openrs2.deob.annotation.OriginalMember; import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc;
public final class Static250 { public final class Static250 {
@ -17,34 +16,4 @@ public final class Static250 {
@OriginalMember(owner = "client!uf", name = "t", descriptor = "I") @OriginalMember(owner = "client!uf", name = "t", descriptor = "I")
public static int anInt5444 = 0; public static int anInt5444 = 0;
@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;
if (Camera.cameraX - playerX < -500 || Camera.cameraX - playerX > 500 || Camera.cameraZ - playerZ < -500 || Camera.cameraZ - playerZ > 500) {
Camera.cameraX = playerX;
Camera.cameraZ = playerZ;
}
if (Camera.cameraZ != playerZ) {
Camera.cameraZ += (playerZ - Camera.cameraZ) / 16;
}
if (Camera.cameraX != playerX) {
Camera.cameraX += (playerX - Camera.cameraX) / 16;
}
if (Preferences.aBoolean63) {
for (@Pc(93) int local93 = 0; local93 < InterfaceList.keyQueueSize; local93++) {
@Pc(104) int code = InterfaceList.keyCodes[local93];
if (code == Keyboard.KEY_UP) {
Camera.pitchTarget += 47;
} else if (code == Keyboard.KEY_DOWN) {
Camera.pitchTarget -= 17;
} else if (code == Keyboard.KEY_LEFT) {
Camera.yawTarget -= 65;
} else if (code == Keyboard.KEY_RIGHT) {
Camera.yawTarget += 191;
}
}
Camera.clampCameraAngle();
}
}
} }

3
client/src/main/java/rt4/Static251.java
View file

@ -5,9 +5,6 @@ import org.openrs2.deob.annotation.OriginalMember;
public final class Static251 { public final class Static251 {
@OriginalMember(owner = "client!ug", name = "h", descriptor = "I")
public static int anInt5449;
@OriginalMember(owner = "client!ug", name = "b", descriptor = "[F") @OriginalMember(owner = "client!ug", name = "b", descriptor = "[F")
public static final float[] aFloatArray28 = new float[4]; public static final float[] aFloatArray28 = new float[4];

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

@ -13,8 +13,8 @@ public final class Static252 {
if (Static236.method4047() != 2) { if (Static236.method4047() != 2) {
return; return;
} }
@Pc(27) byte local27 = (byte) (Static136.anInt3325 - 4 & 0xFF); @Pc(27) byte local27 = (byte) (Static253.anInt3325 - 4 & 0xFF);
@Pc(31) int local31 = Static136.anInt3325 % 104; @Pc(31) int local31 = Static253.anInt3325 % 104;
@Pc(33) int local33; @Pc(33) int local33;
@Pc(40) int local40; @Pc(40) int local40;
for (local33 = 0; local33 < 4; local33++) { for (local33 = 0; local33 < 4; local33++) {

375
client/src/main/java/rt4/Static253.java
View file

@ -8,21 +8,25 @@ public final class Static253 {
@OriginalMember(owner = "client!bi", name = "jb", descriptor = "Z") @OriginalMember(owner = "client!bi", name = "jb", descriptor = "Z")
public static boolean aBoolean43 = true; public static boolean aBoolean43 = true;
@OriginalMember(owner = "client!wi", name = "bb", descriptor = "I")
public static int anInt5854 = 0;
@OriginalMember(owner = "client!kk", name = "j", descriptor = "I")
public static int anInt3325 = 0;
@OriginalMember(owner = "client!ui", name = "a", descriptor = "(IIZIII)V") @OriginalMember(owner = "client!ui", name = "a", descriptor = "(IIZIII)V")
public static void method4326(@OriginalArg(1) int arg0, @OriginalArg(2) boolean arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4) { public static void method4326(@OriginalArg(1) int arg0, @OriginalArg(2) boolean arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4) {
Static136.anInt3325++; anInt3325++;
Static210.method3711(); method3711();
if (!arg1) { if (!arg1) {
Static38.method964(true); method964(true);
Static173.method3240(true); method3240(true);
Static38.method964(false); method964(false);
} }
Static173.method3240(false); method3240(false);
if (!arg1) { if (!arg1) {
Static195.method3532(); method3532();
} }
Static246.method4239(); method4239();
if (GlRenderer.enabled) { if (GlRenderer.enabled) {
Static115.method2314(arg3, arg4, arg0, arg2, true); Static115.method2314(arg3, arg4, arg0, arg2, true);
arg2 = Static115.anInt983; arg2 = Static115.anInt983;
@ -38,8 +42,8 @@ public final class Static253 {
if (local59 < Static234.anInt5245 / 256) { if (local59 < Static234.anInt5245 / 256) {
local59 = Static234.anInt5245 / 256; local59 = Static234.anInt5245 / 256;
} }
if (Static176.customCameraActive[4] && Static276.cameraAmplitude[4] + 128 > local59) { if (Static176.customCameraActive[4] && Camera.cameraAmplitude[4] + 128 > local59) {
local59 = Static276.cameraAmplitude[4] + 128; local59 = Camera.cameraAmplitude[4] + 128;
} }
Static18.method555(Camera.cameraX, arg0, SceneGraph.getTileHeight(Player.level, PlayerList.self.xFine, PlayerList.self.zFine) - 50, 600 - -(local59 * 3), local57, Camera.cameraZ, local59); Static18.method555(Camera.cameraX, arg0, SceneGraph.getTileHeight(Player.level, PlayerList.self.xFine, PlayerList.self.zFine) - 50, 600 - -(local59 * 3), local57, Camera.cameraZ, local59);
} }
@ -52,7 +56,7 @@ public final class Static253 {
@Pc(171) int local171; @Pc(171) int local171;
for (local127 = 0; local127 < 5; local127++) { for (local127 = 0; local127 < 5; local127++) {
if (Static176.customCameraActive[local127]) { if (Static176.customCameraActive[local127]) {
local171 = (int) ((double) -Camera.cameraJitter[local127] + (double) (Camera.cameraJitter[local127] * 2 + 1) * Math.random() + Math.sin((double) Static31.anIntArray76[local127] * ((double) Static202.cameraFrequency[local127] / 100.0D)) * (double) Static276.cameraAmplitude[local127]); local171 = (int) ((double) -Camera.cameraJitter[local127] + (double) (Camera.cameraJitter[local127] * 2 + 1) * Math.random() + Math.sin((double) Static31.anIntArray76[local127] * ((double) Camera.cameraFrequency[local127] / 100.0D)) * (double) Camera.cameraAmplitude[local127]);
if (local127 == 3) { if (local127 == 3) {
Camera.cameraYaw = local171 + Camera.cameraYaw & 0x7FF; Camera.cameraYaw = local171 + Camera.cameraYaw & 0x7FF;
} }
@ -104,7 +108,7 @@ public final class Static253 {
Static34.anInt1053 = (local361 - local344) * (Static60.anInt1892 - arg4) / arg0 + local344; Static34.anInt1053 = (local361 - local344) * (Static60.anInt1892 - arg4) / arg0 + local344;
} }
client.audioLoop(); client.audioLoop();
@Pc(387) byte local387 = Static236.method4047() == 2 ? (byte) Static136.anInt3325 : 1; @Pc(387) byte local387 = Static236.method4047() == 2 ? (byte) anInt3325 : 1;
if (GlRenderer.enabled) { if (GlRenderer.enabled) {
GlRenderer.restoreLighting(); GlRenderer.restoreLighting();
GlRenderer.setDepthTestEnabled(true); GlRenderer.setDepthTestEnabled(true);
@ -159,7 +163,7 @@ public final class Static253 {
@OriginalMember(owner = "client!lc", name = "a", descriptor = "(IIIIIII)V") @OriginalMember(owner = "client!lc", name = "a", descriptor = "(IIIIIII)V")
public static void method2726(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5) { public static void method2726(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5) {
Static277.anInt5854 = 0; anInt5854 = 0;
@Pc(5) int local5; @Pc(5) int local5;
@Pc(642) int local642; @Pc(642) int local642;
@Pc(74) int local74; @Pc(74) int local74;
@ -250,16 +254,16 @@ public final class Static253 {
} }
if (local17.chatMessage != null && (local5 >= PlayerList.size || Chat.publicFilter == 0 || Chat.publicFilter == 3 || Chat.publicFilter == 1 && FriendsList.contains(((Player) local17).username))) { if (local17.chatMessage != null && (local5 >= PlayerList.size || Chat.publicFilter == 0 || Chat.publicFilter == 3 || Chat.publicFilter == 1 && FriendsList.contains(((Player) local17).username))) {
Static180.method3326(arg4 >> 1, arg3, local17, arg5, local17.method2691(), arg1 >> 1); Static180.method3326(arg4 >> 1, arg3, local17, arg5, local17.method2691(), arg1 >> 1);
if (Static65.anInt1951 > -1 && Static277.anInt5854 < Static191.anInt4506) { if (Static65.anInt1951 > -1 && anInt5854 < Static191.anInt4506) {
Static191.anIntArray389[Static277.anInt5854] = Fonts.b12Full.getStringWidth(local17.chatMessage) / 2; Static191.anIntArray389[anInt5854] = Fonts.b12Full.getStringWidth(local17.chatMessage) / 2;
Static191.anIntArray387[Static277.anInt5854] = Fonts.b12Full.lineHeight; Static191.anIntArray387[anInt5854] = Fonts.b12Full.lineHeight;
Static191.anIntArray385[Static277.anInt5854] = Static65.anInt1951; Static191.anIntArray385[anInt5854] = Static65.anInt1951;
Static191.anIntArray392[Static277.anInt5854] = Static16.anInt548; Static191.anIntArray392[anInt5854] = Static16.anInt548;
Static191.anIntArray390[Static277.anInt5854] = local17.chatColor; Static191.anIntArray390[anInt5854] = local17.chatColor;
Static191.anIntArray391[Static277.anInt5854] = local17.chatEffect; Static191.anIntArray391[anInt5854] = local17.chatEffect;
Static191.anIntArray384[Static277.anInt5854] = local17.chatLoops; Static191.anIntArray384[anInt5854] = local17.chatLoops;
Static191.aClass100Array132[Static277.anInt5854] = local17.chatMessage; Static191.aClass100Array132[anInt5854] = local17.chatMessage;
Static277.anInt5854++; anInt5854++;
} }
} }
if (local17.hitpointsBarVisibleUntil > client.loop) { if (local17.hitpointsBarVisibleUntil > client.loop) {
@ -340,7 +344,7 @@ public final class Static253 {
} }
} }
} }
for (local5 = 0; local5 < Static277.anInt5854; local5++) { for (local5 = 0; local5 < anInt5854; local5++) {
local74 = Static191.anIntArray392[local5]; local74 = Static191.anIntArray392[local5];
@Pc(859) int local859 = Static191.anIntArray385[local5]; @Pc(859) int local859 = Static191.anIntArray385[local5];
local310 = Static191.anIntArray387[local5]; local310 = Static191.anIntArray387[local5];
@ -364,13 +368,13 @@ public final class Static253 {
local639 = Static16.anIntArray52[Static191.anIntArray390[local5]]; local639 = Static16.anIntArray52[Static191.anIntArray390[local5]];
} }
if (Static191.anIntArray390[local5] == 6) { if (Static191.anIntArray390[local5] == 6) {
local639 = Static136.anInt3325 % 20 >= 10 ? 16776960 : 16711680; local639 = anInt3325 % 20 >= 10 ? 16776960 : 16711680;
} }
if (Static191.anIntArray390[local5] == 7) { if (Static191.anIntArray390[local5] == 7) {
local639 = Static136.anInt3325 % 20 < 10 ? 255 : 65535; local639 = anInt3325 % 20 < 10 ? 255 : 65535;
} }
if (Static191.anIntArray390[local5] == 8) { if (Static191.anIntArray390[local5] == 8) {
local639 = Static136.anInt3325 % 20 >= 10 ? 8454016 : 45056; local639 = anInt3325 % 20 >= 10 ? 8454016 : 45056;
} }
if (Static191.anIntArray390[local5] == 9) { if (Static191.anIntArray390[local5] == 9) {
local642 = 150 - Static191.anIntArray384[local5]; local642 = 150 - Static191.anIntArray384[local5];
@ -406,13 +410,13 @@ public final class Static253 {
Fonts.b12Full.renderCenter(local962, Static65.anInt1951 + arg2, arg0 + Static16.anInt548, local639, 0); Fonts.b12Full.renderCenter(local962, Static65.anInt1951 + arg2, arg0 + Static16.anInt548, local639, 0);
} }
if (Static191.anIntArray391[local5] == 1) { if (Static191.anIntArray391[local5] == 1) {
Fonts.b12Full.renderWave(local962, arg2 + Static65.anInt1951, Static16.anInt548 + arg0, local639, Static136.anInt3325); Fonts.b12Full.renderWave(local962, arg2 + Static65.anInt1951, Static16.anInt548 + arg0, local639, anInt3325);
} }
if (Static191.anIntArray391[local5] == 2) { if (Static191.anIntArray391[local5] == 2) {
Fonts.b12Full.renderWave2(local962, arg2 + Static65.anInt1951, arg0 - -Static16.anInt548, local639, Static136.anInt3325); Fonts.b12Full.renderWave2(local962, arg2 + Static65.anInt1951, arg0 - -Static16.anInt548, local639, anInt3325);
} }
if (Static191.anIntArray391[local5] == 3) { if (Static191.anIntArray391[local5] == 3) {
Fonts.b12Full.renderShake(local962, arg2 + Static65.anInt1951, Static16.anInt548 + arg0, local639, Static136.anInt3325, 150 - Static191.anIntArray384[local5]); Fonts.b12Full.renderShake(local962, arg2 + Static65.anInt1951, Static16.anInt548 + arg0, local639, anInt3325, 150 - Static191.anIntArray384[local5]);
} }
if (Static191.anIntArray391[local5] == 4) { if (Static191.anIntArray391[local5] == 4) {
local642 = (150 - Static191.anIntArray384[local5]) * (Fonts.b12Full.getStringWidth(local962) + 100) / 150; local642 = (150 - Static191.anIntArray384[local5]) * (Fonts.b12Full.getStringWidth(local962) + 100) / 150;
@ -453,4 +457,315 @@ public final class Static253 {
} }
} }
} }
@OriginalMember(owner = "client!rb", name = "a", descriptor = "(I)V")
public static void method3711() {
for (@Pc(7) int local7 = 0; local7 < 104; local7++) {
for (@Pc(14) int local14 = 0; local14 < 104; local14++) {
Static31.anIntArrayArray6[local7][local14] = 0;
}
}
}
@OriginalMember(owner = "client!cn", name = "b", descriptor = "(ZI)V")
public static void method964(@OriginalArg(0) boolean arg0) {
@Pc(3) int local3 = PlayerList.size;
if (LoginManager.mapFlagX == PlayerList.self.xFine >> 7 && PlayerList.self.zFine >> 7 == LoginManager.mapFlagZ) {
LoginManager.mapFlagX = 0;
}
if (arg0) {
local3 = 1;
}
@Pc(28) int local28;
@Pc(39) Player local39;
@Pc(82) int local82;
@Pc(182) int local182;
@Pc(200) int local200;
@Pc(214) int local214;
@Pc(223) int local223;
@Pc(106) int local106;
for (local28 = 0; local28 < local3; local28++) {
if (arg0) {
local39 = PlayerList.self;
} else {
local39 = PlayerList.players[PlayerList.ids[local28]];
}
if (local39 != null && local39.method2682()) {
@Pc(55) int local55 = local39.getSize();
@Pc(77) int local77;
if (local55 == 1) {
if ((local39.xFine & 0x7F) == 64 && (local39.zFine & 0x7F) == 64) {
local77 = local39.xFine >> 7;
local82 = local39.zFine >> 7;
if (local77 >= 0 && local77 < 104 && local82 >= 0 && local82 < 104) {
local106 = Static31.anIntArrayArray6[local77][local82]++;
}
}
} else if (((local55 & 0x1) != 0 || (local39.xFine & 0x7F) == 0 && (local39.zFine & 0x7F) == 0) && ((local55 & 0x1) != 1 || (local39.xFine & 0x7F) == 64 && (local39.zFine & 0x7F) == 64)) {
local77 = local39.xFine - local55 * 64 >> 7;
local82 = local39.zFine - local55 * 64 >> 7;
local182 = local39.getSize() + local77;
if (local182 > 104) {
local182 = 104;
}
if (local77 < 0) {
local77 = 0;
}
local200 = local82 + local39.getSize();
if (local82 < 0) {
local82 = 0;
}
if (local200 > 104) {
local200 = 104;
}
for (local214 = local77; local214 < local182; local214++) {
for (local223 = local82; local223 < local200; local223++) {
local106 = Static31.anIntArrayArray6[local214][local223]++;
}
}
}
}
}
label220: for (local28 = 0; local28 < local3; local28++) {
@Pc(272) long local272;
if (arg0) {
local39 = PlayerList.self;
local272 = 8791798054912L;
} else {
local39 = PlayerList.players[PlayerList.ids[local28]];
local272 = (long) PlayerList.ids[local28] << 32;
}
if (local39 != null && local39.method2682()) {
local39.aBoolean98 = false;
if ((Preferences.manyIdleAnimations && PlayerList.size > 200 || PlayerList.size > 50) && !arg0 && local39.movementSeqId == local39.getBasType().idleAnimationId) {
local39.aBoolean98 = true;
}
local82 = local39.getSize();
if (local82 == 1) {
if ((local39.xFine & 0x7F) == 64 && (local39.zFine & 0x7F) == 64) {
local182 = local39.xFine >> 7;
local200 = local39.zFine >> 7;
if (local182 < 0 || local182 >= 104 || local200 < 0 || local200 >= 104) {
continue;
}
if (Static31.anIntArrayArray6[local182][local200] > 1) {
local106 = Static31.anIntArrayArray6[local182][local200]--;
continue;
}
}
} else if ((local82 & 0x1) == 0 && (local39.xFine & 0x7F) == 0 && (local39.zFine & 0x7F) == 0 || (local82 & 0x1) == 1 && (local39.xFine & 0x7F) == 64 && (local39.zFine & 0x7F) == 0) {
local182 = local39.xFine - local82 * 64 >> 7;
local214 = local82 + local182;
local200 = local39.zFine - local82 * 64 >> 7;
if (local214 > 104) {
local214 = 104;
}
if (local182 < 0) {
local182 = 0;
}
local223 = local82 + local200;
if (local200 < 0) {
local200 = 0;
}
@Pc(468) boolean local468 = true;
if (local223 > 104) {
local223 = 104;
}
@Pc(476) int local476;
@Pc(485) int local485;
for (local476 = local182; local476 < local214; local476++) {
for (local485 = local200; local485 < local223; local485++) {
if (Static31.anIntArrayArray6[local476][local485] <= 1) {
local468 = false;
break;
}
}
}
if (local468) {
local476 = local182;
while (true) {
if (local476 >= local214) {
continue label220;
}
for (local485 = local200; local485 < local223; local485++) {
local106 = Static31.anIntArrayArray6[local476][local485]--;
}
local476++;
}
}
}
if (local39.attachment == null || client.loop < local39.anInt3390 || local39.anInt3375 <= client.loop) {
local39.anInt3424 = SceneGraph.getTileHeight(Player.level, local39.xFine, local39.zFine);
Static43.method1141(Player.level, local39.xFine, local39.zFine, local39.anInt3424, (local82 - 1) * 64 + 60, local39, local39.anInt3381, local272, local39.aBoolean171);
} else {
local39.aBoolean98 = false;
local39.anInt3424 = SceneGraph.getTileHeight(Player.level, local39.xFine, local39.zFine);
Static184.method3387(Player.level, local39.xFine, local39.zFine, local39.anInt3424, local39, local39.anInt3381, local272, local39.atachmentX0, local39.attachmentZ0, local39.attachmentX1, local39.attachmentZ1);
}
}
}
}
@OriginalMember(owner = "client!nk", name = "c", descriptor = "(IZ)V")
public static void method3240(@OriginalArg(1) boolean arg0) {
@Pc(7) int local7;
@Pc(16) Npc local16;
@Pc(107) int local107;
@Pc(113) int local113;
@Pc(133) int local133;
@Pc(149) int local149;
@Pc(158) int local158;
@Pc(171) int local171;
for (local7 = 0; local7 < NpcList.size; local7++) {
local16 = NpcList.npcs[NpcList.ids[local7]];
if (local16 != null && local16.method2682() && local16.type.aBoolean182 == arg0 && local16.type.isMultiNpcValid()) {
@Pc(42) int local42 = local16.getSize();
@Pc(97) int local97;
if (local42 == 1) {
if ((local16.xFine & 0x7F) == 64 && (local16.zFine & 0x7F) == 64) {
local97 = local16.xFine >> 7;
local107 = local16.zFine >> 7;
if (local97 >= 0 && local97 < 104 && local107 >= 0 && local107 < 104) {
local171 = Static31.anIntArrayArray6[local97][local107]++;
}
}
} else if (((local42 & 0x1) != 0 || (local16.xFine & 0x7F) == 0 && (local16.zFine & 0x7F) == 0) && ((local42 & 0x1) != 1 || (local16.xFine & 0x7F) == 64 && (local16.zFine & 0x7F) == 64)) {
local97 = local16.xFine - local42 * 64 >> 7;
local107 = local16.zFine - local42 * 64 >> 7;
local113 = local16.getSize() + local97;
if (local97 < 0) {
local97 = 0;
}
if (local113 > 104) {
local113 = 104;
}
local133 = local107 + local16.getSize();
if (local107 < 0) {
local107 = 0;
}
if (local133 > 104) {
local133 = 104;
}
for (local149 = local97; local149 < local113; local149++) {
for (local158 = local107; local158 < local133; local158++) {
local171 = Static31.anIntArrayArray6[local149][local158]++;
}
}
}
}
}
label200: for (local7 = 0; local7 < NpcList.size; local7++) {
local16 = NpcList.npcs[NpcList.ids[local7]];
@Pc(262) long local262 = (long) NpcList.ids[local7] << 32 | 0x20000000L;
if (local16 != null && local16.method2682() && local16.type.aBoolean182 == arg0 && local16.type.isMultiNpcValid()) {
local107 = local16.getSize();
if (local107 == 1) {
if ((local16.xFine & 0x7F) == 64 && (local16.zFine & 0x7F) == 64) {
local113 = local16.xFine >> 7;
local133 = local16.zFine >> 7;
if (local113 < 0 || local113 >= 104 || local133 < 0 || local133 >= 104) {
continue;
}
if (Static31.anIntArrayArray6[local113][local133] > 1) {
local171 = Static31.anIntArrayArray6[local113][local133]--;
continue;
}
}
} else if ((local107 & 0x1) == 0 && (local16.xFine & 0x7F) == 0 && (local16.zFine & 0x7F) == 0 || (local107 & 0x1) == 1 && (local16.xFine & 0x7F) == 64 && (local16.zFine & 0x7F) == 64) {
local113 = local16.xFine - local107 * 64 >> 7;
local133 = local16.zFine - local107 * 64 >> 7;
local158 = local133 + local107;
if (local133 < 0) {
local133 = 0;
}
@Pc(368) boolean local368 = true;
local149 = local113 + local107;
if (local158 > 104) {
local158 = 104;
}
if (local113 < 0) {
local113 = 0;
}
if (local149 > 104) {
local149 = 104;
}
@Pc(396) int local396;
@Pc(401) int local401;
for (local396 = local113; local396 < local149; local396++) {
for (local401 = local133; local401 < local158; local401++) {
if (Static31.anIntArrayArray6[local396][local401] <= 1) {
local368 = false;
break;
}
}
}
if (local368) {
local396 = local113;
while (true) {
if (local396 >= local149) {
continue label200;
}
for (local401 = local133; local401 < local158; local401++) {
local171 = Static31.anIntArrayArray6[local396][local401]--;
}
local396++;
}
}
}
if (!local16.type.aBoolean183) {
local262 |= Long.MIN_VALUE;
}
local16.anInt3424 = SceneGraph.getTileHeight(Player.level, local16.xFine, local16.zFine);
Static43.method1141(Player.level, local16.xFine, local16.zFine, local16.anInt3424, local107 * 64 + 60 - 64, local16, local16.anInt3381, local262, local16.aBoolean171);
}
}
}
@OriginalMember(owner = "client!pk", name = "i", descriptor = "(I)V")
public static void method3532() {
for (@Pc(16) ProjAnimNode local16 = (ProjAnimNode) Static217.aClass69_116.head(); local16 != null; local16 = (ProjAnimNode) Static217.aClass69_116.next()) {
@Pc(21) ProjAnim local21 = local16.aClass8_Sub6_1;
if (Player.level != local21.anInt4810 || local21.anInt4800 < client.loop) {
local16.unlink();
} else if (client.loop >= local21.anInt4822) {
if (local21.anInt4819 > 0) {
@Pc(54) Npc local54 = NpcList.npcs[local21.anInt4819 - 1];
if (local54 != null && local54.xFine >= 0 && local54.xFine < 13312 && local54.zFine >= 0 && local54.zFine < 13312) {
local21.method3705(local54.zFine, client.loop, SceneGraph.getTileHeight(local21.anInt4810, local54.xFine, local54.zFine) - local21.anInt4805, local54.xFine);
}
}
if (local21.anInt4819 < 0) {
@Pc(102) int local102 = -local21.anInt4819 - 1;
@Pc(107) Player local107;
if (PlayerList.selfId == local102) {
local107 = PlayerList.self;
} else {
local107 = PlayerList.players[local102];
}
if (local107 != null && local107.xFine >= 0 && local107.xFine < 13312 && local107.zFine >= 0 && local107.zFine < 13312) {
local21.method3705(local107.zFine, client.loop, SceneGraph.getTileHeight(local21.anInt4810, local107.xFine, local107.zFine) - local21.anInt4805, local107.xFine);
}
}
local21.method3704(Static178.anInt4247);
Static43.method1141(Player.level, (int) local21.aDouble8, (int) local21.aDouble3, (int) local21.aDouble6, 60, local21, local21.anInt4821, -1L, false);
}
}
}
@OriginalMember(owner = "client!u", name = "a", descriptor = "(Z)V")
public static void method4239() {
for (@Pc(9) SpotAnimNode local9 = (SpotAnimNode) Static99.aClass69_64.head(); local9 != null; local9 = (SpotAnimNode) Static99.aClass69_64.next()) {
@Pc(15) SpotAnim local15 = local9.aClass8_Sub2_1;
if (local15.anInt606 != Player.level || local15.aBoolean41) {
local9.unlink();
} else if (local15.anInt590 <= client.loop) {
local15.method558(Static178.anInt4247);
if (local15.aBoolean41) {
local9.unlink();
} else {
Static43.method1141(local15.anInt606, local15.anInt604, local15.anInt598, local15.anInt599, 60, local15, 0, -1L, false);
}
}
}
}
} }

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

@ -9,12 +9,9 @@ public final class Static254 {
@OriginalMember(owner = "client!uj", name = "H", descriptor = "I") @OriginalMember(owner = "client!uj", name = "H", descriptor = "I")
public static int anInt5559; public static int anInt5559;
@OriginalMember(owner = "client!uj", name = "A", descriptor = "[I")
public static final int[] anIntArray489 = new int[] { 2, 0, 0, 2, 0, 0, 0, 4, 4 };
@OriginalMember(owner = "client!uj", name = "a", descriptor = "(BZII[[[Lclient!bj;I)Z") @OriginalMember(owner = "client!uj", name = "a", descriptor = "(BZII[[[Lclient!bj;I)Z")
public static boolean method4348(@OriginalArg(1) boolean arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) Tile[][][] arg3, @OriginalArg(5) int arg4) { public static boolean method4348(@OriginalArg(1) boolean arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) Tile[][][] arg3, @OriginalArg(5) int arg4) {
@Pc(14) byte local14 = arg0 ? 1 : (byte) (Static136.anInt3325 & 0xFF); @Pc(14) byte local14 = arg0 ? 1 : (byte) (Static253.anInt3325 & 0xFF);
if (local14 == Static266.aByteArrayArrayArray15[Player.level][arg1][arg2]) { if (local14 == Static266.aByteArrayArrayArray15[Player.level][arg1][arg2]) {
return false; return false;
} else if ((SceneGraph.tileFlags[Player.level][arg1][arg2] & 0x4) == 0) { } else if ((SceneGraph.tileFlags[Player.level][arg1][arg2] & 0x4) == 0) {
@ -46,18 +43,18 @@ public final class Static254 {
@Pc(358) int local358; @Pc(358) int local358;
if (local130 && arg3[local150][local108][local122] != null) { if (local130 && arg3[local150][local108][local122] != null) {
if (arg3[local150][local108][local122].wall != null) { if (arg3[local150][local108][local122].wall != null) {
local191 = Static104.method2251(local94); local191 = SceneGraph.method2251(local94);
if (arg3[local150][local108][local122].wall.anInt3049 == local191 || arg3[local150][local108][local122].wall.anInt3052 == local191) { if (arg3[local150][local108][local122].wall.anInt3049 == local191 || arg3[local150][local108][local122].wall.anInt3052 == local191) {
continue; continue;
} }
if (local102 != 0) { if (local102 != 0) {
local227 = Static104.method2251(local102); local227 = SceneGraph.method2251(local102);
if (local227 == arg3[local150][local108][local122].wall.anInt3049 || arg3[local150][local108][local122].wall.anInt3052 == local227) { if (local227 == arg3[local150][local108][local122].wall.anInt3049 || arg3[local150][local108][local122].wall.anInt3052 == local227) {
continue; continue;
} }
} }
if (local116 != 0) { if (local116 != 0) {
local227 = Static104.method2251(local116); local227 = SceneGraph.method2251(local116);
if (local227 == arg3[local150][local108][local122].wall.anInt3049 || local227 == arg3[local150][local108][local122].wall.anInt3052) { if (local227 == arg3[local150][local108][local122].wall.anInt3049 || local227 == arg3[local150][local108][local122].wall.anInt3052) {
continue; continue;
} }

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

@ -1,13 +1,5 @@
package rt4; package rt4;
import org.openrs2.deob.annotation.OriginalArg;
import org.openrs2.deob.annotation.OriginalMember;
public final class Static258 { public final class Static258 {
@OriginalMember(owner = "client!va", name = "a", descriptor = "(IB)Z")
public static boolean isLetter(@OriginalArg(0) int arg0) {
return arg0 >= 97 && arg0 <= 122 || arg0 >= 65 && arg0 <= 90;
}
} }

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

@ -1,10 +0,0 @@
package rt4;
import org.openrs2.deob.annotation.OriginalMember;
public final class Static259 {
@OriginalMember(owner = "client!vc", name = "V", descriptor = "[J")
public static final long[] aLongArray11 = new long[1000];
}

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

@ -14,18 +14,18 @@ public final class Static26 {
@OriginalMember(owner = "client!ca", name = "a", descriptor = "(ZI)V") @OriginalMember(owner = "client!ca", name = "a", descriptor = "(ZI)V")
public static void method743(@OriginalArg(0) boolean arg0) { public static void method743(@OriginalArg(0) boolean arg0) {
@Pc(13) int local13 = Static273.mapFilesBuffer.length; @Pc(13) int local13 = LoginManager.mapFilesBuffer.length;
@Pc(19) byte[][] local19; @Pc(19) byte[][] local19;
if (GlRenderer.enabled && arg0) { if (GlRenderer.enabled && arg0) {
local19 = Static19.underWaterLocationsMapFilesBuffer; local19 = LoginManager.underWaterLocationsMapFilesBuffer;
} else { } else {
local19 = Static156.locationMapFilesBuffer; local19 = LoginManager.locationMapFilesBuffer;
} }
for (@Pc(25) int local25 = 0; local25 < local13; local25++) { for (@Pc(25) int local25 = 0; local25 < local13; local25++) {
@Pc(32) byte[] local32 = local19[local25]; @Pc(32) byte[] local32 = local19[local25];
if (local32 != null) { if (local32 != null) {
@Pc(45) int local45 = (Static238.regionBitPacked[local25] >> 8) * 64 - Camera.originX; @Pc(45) int local45 = (LoginManager.regionBitPacked[local25] >> 8) * 64 - Camera.originX;
@Pc(56) int local56 = (Static238.regionBitPacked[local25] & 0xFF) * 64 - Camera.originZ; @Pc(56) int local56 = (LoginManager.regionBitPacked[local25] & 0xFF) * 64 - Camera.originZ;
client.audioLoop(); client.audioLoop();
Static124.method2437(local45, arg0, local32, local56, PathFinder.collisionMaps); Static124.method2437(local45, arg0, local32, local56, PathFinder.collisionMaps);
} }

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

@ -1,38 +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 Static262 {
@OriginalMember(owner = "client!vf", name = "g", descriptor = "[I")
public static final int[] anIntArray515 = new int[14];
@OriginalMember(owner = "client!vf", name = "a", descriptor = "(IIIILclient!th;Lclient!th;IIJ)V")
public static void method4508(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) Entity arg4, @OriginalArg(5) Entity arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7, @OriginalArg(8) long arg8) {
if (arg4 == null && arg5 == null) {
return;
}
@Pc(8) Wall local8 = new Wall();
local8.key = arg8;
local8.anInt3048 = arg1 * 128 + 64;
local8.anInt3044 = arg2 * 128 + 64;
local8.anInt3051 = arg3;
local8.primary = arg4;
local8.aClass8_6 = arg5;
local8.anInt3049 = arg6;
local8.anInt3052 = arg7;
for (@Pc(42) int local42 = arg0; local42 >= 0; local42--) {
if (SceneGraph.tiles[local42][arg1][arg2] == null) {
SceneGraph.tiles[local42][arg1][arg2] = new Tile(local42, arg1, arg2);
}
}
SceneGraph.tiles[arg0][arg1][arg2].wall = local8;
}
@OriginalMember(owner = "client!vf", name = "a", descriptor = "(IB)Lclient!na;")
public static JagString method4510(@OriginalArg(0) int arg0) {
return arg0 >= 999999999 ? Static220.aClass100_930 : JagString.parseInt(arg0);
}
}

3
client/src/main/java/rt4/Static263.java
View file

@ -15,9 +15,6 @@ public final class Static263 {
@OriginalMember(owner = "client!vg", name = "c", descriptor = "Z") @OriginalMember(owner = "client!vg", name = "c", descriptor = "Z")
public static boolean aBoolean299 = false; public static boolean aBoolean299 = false;
@OriginalMember(owner = "client!vg", name = "d", descriptor = "I")
public static int anInt5755 = 2;
@OriginalMember(owner = "client!vg", name = "a", descriptor = "(I[S)[S") @OriginalMember(owner = "client!vg", name = "a", descriptor = "(I[S)[S")
public static short[] method4511(@OriginalArg(1) short[] arg0) { public static short[] method4511(@OriginalArg(1) short[] arg0) {
if (arg0 == null) { if (arg0 == null) {

3
client/src/main/java/rt4/Static265.java
View file

@ -6,9 +6,6 @@ import org.openrs2.deob.annotation.Pc;
public final class Static265 { public final class Static265 {
@OriginalMember(owner = "client!vj", name = "d", descriptor = "I")
public static int anInt5765;
@OriginalMember(owner = "client!vj", name = "a", descriptor = "(III)J") @OriginalMember(owner = "client!vj", name = "a", descriptor = "(III)J")
public static long method4521(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) { public static long method4521(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
@Pc(7) Tile local7 = SceneGraph.tiles[arg0][arg1][arg2]; @Pc(7) Tile local7 = SceneGraph.tiles[arg0][arg1][arg2];

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

@ -35,7 +35,7 @@ public final class Static269 {
for (local14 = 0; local14 < local99; local14++) { for (local14 = 0; local14 < local99; local14++) {
for (local21 = 0; local21 < 64; local21++) { for (local21 = 0; local21 < 64; local21++) {
for (local117 = 0; local117 < 64; local117++) { for (local117 = 0; local117 < 64; local117++) {
Static278.readTile(arg2, arg5, arg1, local95, local117 + arg3, arg4 + local21, 0, local14); SceneGraph.readTile(arg2, arg5, arg1, local95, local117 + arg3, arg4 + local21, 0, local14);
} }
} }
} }
@ -79,7 +79,7 @@ public final class Static269 {
} }
while (local243 < local188) { while (local243 < local188) {
while (local190 < local194) { while (local190 < local194) {
Static232.aByteArrayArrayArray13[local117][local243][local190] = 0; SceneGraph.aByteArrayArrayArray13[local117][local243][local190] = 0;
local190++; local190++;
} }
local243++; local243++;
@ -91,7 +91,7 @@ public final class Static269 {
for (local194 = local243 + arg4; local194 < arg4 + local243 + 4; local194++) { for (local194 = local243 + arg4; local194 < arg4 + local243 + 4; local194++) {
for (@Pc(320) int local320 = arg3 + local188; local320 < arg3 + local188 + 4; local320++) { for (@Pc(320) int local320 = arg3 + local188; local320 < arg3 + local188 + 4; local320++) {
if (local194 >= 0 && local194 < 104 && local320 >= 0 && local320 < 104) { if (local194 >= 0 && local194 < 104 && local320 >= 0 && local320 < 104) {
Static232.aByteArrayArrayArray13[local117][local194][local320] = local305; SceneGraph.aByteArrayArrayArray13[local117][local194][local320] = local305;
} }
} }
} }
@ -124,7 +124,7 @@ public final class Static269 {
} }
while (local188 > local243) { while (local188 > local243) {
while (local190 < local194) { while (local190 < local194) {
Static232.aByteArrayArrayArray13[local117][local243][local190] = Static232.aByteArrayArrayArray13[local117 - 1][local243][local190]; SceneGraph.aByteArrayArrayArray13[local117][local243][local190] = SceneGraph.aByteArrayArrayArray13[local117 - 1][local243][local190];
local190++; local190++;
} }
local243++; local243++;
@ -190,7 +190,7 @@ public final class Static269 {
local243 = (arg4 >> 2) + local117; local243 = (arg4 >> 2) + local117;
local188 = local515 + (arg3 >> 2); local188 = local515 + (arg3 >> 2);
if (local243 >= 0 && local243 < 26 && local188 >= 0 && local188 < 26) { if (local243 >= 0 && local243 < 26 && local188 >= 0 && local188 < 26) {
Static232.aByteArrayArrayArray13[local21][local243][local188] = 0; SceneGraph.aByteArrayArrayArray13[local21][local243][local188] = 0;
} }
} }
} }
@ -208,7 +208,7 @@ public final class Static269 {
Static232.method3993(512); Static232.method3993(512);
Static132.method2608(); Static132.method2608();
} else { } else {
Static38.method960((byte) (Static136.anInt3325 - 4 & 0xFF)); Static38.method960((byte) (Static253.anInt3325 - 4 & 0xFF));
Static232.method3993(2); Static232.method3993(2);
} }
} }

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