diff --git a/client/src/main/java/rt4/Camera.java b/client/src/main/java/rt4/Camera.java index 00a5b4a..0cf6be0 100644 --- a/client/src/main/java/rt4/Camera.java +++ b/client/src/main/java/rt4/Camera.java @@ -69,6 +69,22 @@ public class Camera { @OriginalMember(owner = "client!gk", name = "d", descriptor = "F") public static float aFloat10; public static int ZOOM = 600; + @OriginalMember(owner = "client!il", name = "O", descriptor = "I") + public static int anInt4612; + @OriginalMember(owner = "client!eg", name = "a", descriptor = "I") + public static int anInt1744; + @OriginalMember(owner = "client!kf", name = "f", descriptor = "I") + public static int anInt5230; + @OriginalMember(owner = "client!ke", name = "U", descriptor = "I") + public static int anInt3291 = 0; + @OriginalMember(owner = "client!uc", name = "a", descriptor = "I") + public static int anInt4229 = 2; + @OriginalMember(owner = "client!ta", name = "B", descriptor = "I") + public static int anInt5245 = 0; + @OriginalMember(owner = "client!qk", name = "h", descriptor = "I") + public static int anInt4774 = 0; + @OriginalMember(owner = "client!sj", name = "H", descriptor = "I") + public static int anInt5161 = 0; public static double mod(double a, double b) { return ((a % b) + b) % b; @@ -109,10 +125,10 @@ public class Camera { if (local64 < 32768) { local64 = 32768; } - if (Static234.anInt5245 < local64) { - Static234.anInt5245 += (local64 - Static234.anInt5245) / 24; - } else if (local64 < Static234.anInt5245) { - Static234.anInt5245 += (local64 - Static234.anInt5245) / 80; + if (anInt5245 < local64) { + anInt5245 += (local64 - anInt5245) / 24; + } else if (local64 < anInt5245) { + anInt5245 += (local64 - anInt5245) / 80; } } @@ -121,43 +137,43 @@ public class Camera { @Pc(9) int local9 = anInt4232 * 128 + 64; @Pc(15) int local15 = anInt5375 * 128 + 64; @Pc(23) int local23 = SceneGraph.getTileHeight(Player.level, local15, local9) - Static231.anInt5203; - if (Static113.anInt4612 >= 100) { + if (anInt4612 >= 100) { renderX = anInt5375 * 128 + 64; renderZ = anInt4232 * 128 + 64; Static5.anInt40 = SceneGraph.getTileHeight(Player.level, renderX, renderZ) - Static231.anInt5203; } else { if (renderX < local15) { - renderX += Static233.anInt5225 + Static113.anInt4612 * (local15 - renderX) / 1000; + renderX += Static233.anInt5225 + anInt4612 * (local15 - renderX) / 1000; if (renderX > local15) { renderX = local15; } } if (Static5.anInt40 < local23) { - Static5.anInt40 += (local23 - Static5.anInt40) * Static113.anInt4612 / 1000 + Static233.anInt5225; + Static5.anInt40 += (local23 - Static5.anInt40) * anInt4612 / 1000 + Static233.anInt5225; if (Static5.anInt40 > local23) { Static5.anInt40 = local23; } } if (renderX > local15) { - renderX -= Static233.anInt5225 + (renderX - local15) * Static113.anInt4612 / 1000; + renderX -= Static233.anInt5225 + (renderX - local15) * anInt4612 / 1000; if (renderX < local15) { renderX = local15; } } if (renderZ < local9) { - renderZ += Static233.anInt5225 + Static113.anInt4612 * (local9 - renderZ) / 1000; + renderZ += Static233.anInt5225 + anInt4612 * (local9 - renderZ) / 1000; if (local9 < renderZ) { renderZ = local9; } } if (local23 < Static5.anInt40) { - Static5.anInt40 -= (Static5.anInt40 - local23) * Static113.anInt4612 / 1000 + Static233.anInt5225; + Static5.anInt40 -= (Static5.anInt40 - local23) * anInt4612 / 1000 + Static233.anInt5225; if (local23 > Static5.anInt40) { Static5.anInt40 = local23; } } if (renderZ > local9) { - renderZ -= Static233.anInt5225 + (renderZ - local9) * Static113.anInt4612 / 1000; + renderZ -= Static233.anInt5225 + (renderZ - local9) * anInt4612 / 1000; if (local9 > renderZ) { renderZ = local9; } @@ -165,7 +181,7 @@ public class Camera { } local9 = anInt5765 * 128 + 64; local15 = anInt5449 * 128 + 64; - local23 = SceneGraph.getTileHeight(Player.level, local15, local9) - Static260.anInt1744; + local23 = SceneGraph.getTileHeight(Player.level, local15, local9) - anInt1744; @Pc(236) int local236 = local23 - Static5.anInt40; @Pc(241) int local241 = local9 - renderZ; @Pc(246) int local246 = local15 - renderX; @@ -179,13 +195,13 @@ public class Camera { } @Pc(292) int local292 = (int) (-325.949D * Math.atan2((double) local246, (double) local241)) & 0x7FF; if (cameraPitch < local268) { - cameraPitch += Static133.anInt5230 + Static233.anInt5217 * (local268 - cameraPitch) / 1000; + cameraPitch += anInt5230 + Static233.anInt5217 * (local268 - cameraPitch) / 1000; if (cameraPitch > local268) { cameraPitch = local268; } } if (cameraPitch > local268) { - cameraPitch -= (cameraPitch - local268) * Static233.anInt5217 / 1000 + Static133.anInt5230; + cameraPitch -= (cameraPitch - local268) * Static233.anInt5217 / 1000 + anInt5230; if (cameraPitch < local268) { cameraPitch = local268; } @@ -198,11 +214,11 @@ public class Camera { local350 += 2048; } if (local350 > 0) { - cameraYaw += local350 * Static233.anInt5217 / 1000 + Static133.anInt5230; + cameraYaw += local350 * Static233.anInt5217 / 1000 + anInt5230; cameraYaw &= 0x7FF; } if (local350 < 0) { - cameraYaw -= Static233.anInt5217 * -local350 / 1000 + Static133.anInt5230; + cameraYaw -= Static233.anInt5217 * -local350 / 1000 + anInt5230; cameraYaw &= 0x7FF; } @Pc(404) int local404 = local292 - cameraYaw; @@ -283,15 +299,15 @@ public class Camera { @OriginalMember(owner = "client!vd", name = "a", descriptor = "(IIIIBI)V") public static void method3849(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(5) int arg4) { - Static133.anInt5230 = arg2; + anInt5230 = arg2; anInt5765 = arg1; Static233.anInt5217 = arg4; anInt5449 = arg3; - Static260.anInt1744 = arg0; + anInt1744 = arg0; if (Static233.anInt5217 >= 100) { @Pc(30) int local30 = anInt5449 * 128 + 64; @Pc(36) int local36 = anInt5765 * 128 + 64; - @Pc(44) int local44 = SceneGraph.getTileHeight(Player.level, local30, local36) - Static260.anInt1744; + @Pc(44) int local44 = SceneGraph.getTileHeight(Player.level, local30, local36) - anInt1744; @Pc(49) int local49 = local44 - Static5.anInt40; @Pc(54) int local54 = local30 - renderX; @Pc(59) int local59 = local36 - renderZ; @@ -310,12 +326,12 @@ public class Camera { @OriginalMember(owner = "client!lb", name = "a", descriptor = "(ZIIIBII)V") public static void method2722(@OriginalArg(0) boolean arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5) { - Static113.anInt4612 = arg3; + anInt4612 = arg3; Static231.anInt5203 = arg2; anInt5375 = arg5; Static233.anInt5225 = arg1; anInt4232 = arg4; - if (arg0 && Static113.anInt4612 >= 100) { + if (arg0 && anInt4612 >= 100) { renderX = anInt5375 * 128 + 64; renderZ = anInt4232 * 128 + 64; Static5.anInt40 = SceneGraph.getTileHeight(Player.level, renderX, renderZ) - Static231.anInt5203; @@ -328,7 +344,7 @@ public class Camera { for (@Pc(3) int local3 = 0; local3 < 5; local3++) { Static176.customCameraActive[local3] = false; } - Static133.anInt5230 = 0; + anInt5230 = 0; Static233.anInt5217 = 0; anInt3718 = -1; anInt1694 = -1; @@ -337,8 +353,8 @@ public class Camera { @OriginalMember(owner = "client!uf", name = "a", descriptor = "(B)V") public static void method4273() { - @Pc(14) int playerX = PlayerList.self.xFine + Static132.anInt3291; - @Pc(20) int playerZ = PlayerList.self.zFine + Static206.anInt4774; + @Pc(14) int playerX = PlayerList.self.xFine + anInt3291; + @Pc(20) int playerZ = PlayerList.self.zFine + anInt4774; if (cameraX - playerX < -500 || cameraX - playerX > 500 || cameraZ - playerZ < -500 || cameraZ - playerZ > 500) { cameraX = playerX; cameraZ = playerZ; diff --git a/client/src/main/java/rt4/ChangeLocRequest.java b/client/src/main/java/rt4/ChangeLocRequest.java index 5ffd54c..158615b 100644 --- a/client/src/main/java/rt4/ChangeLocRequest.java +++ b/client/src/main/java/rt4/ChangeLocRequest.java @@ -57,7 +57,7 @@ public final class ChangeLocRequest extends Node { if (local10.setLoops > 0) { local10.setLoops--; } - if (local10.setLoops == 0 && local10.x >= 1 && local10.z >= 1 && local10.x <= 102 && local10.z <= 102 && (local10.anInt929 < 0 || Static113.method3557(local10.anInt929, local10.anInt926))) { + if (local10.setLoops == 0 && local10.x >= 1 && local10.z >= 1 && local10.x <= 102 && local10.z <= 102 && (local10.anInt929 < 0 || method3557(local10.anInt929, local10.anInt926))) { Static79.method1698(local10.anInt929, local10.x, local10.level, local10.anInt922, local10.z, local10.anInt926, local10.layer); local10.setLoops = -1; if (local10.originalId == local10.anInt929 && local10.originalId == -1) { @@ -66,7 +66,7 @@ public final class ChangeLocRequest extends Node { local10.unlink(); } } - } else if (local10.originalId < 0 || Static113.method3557(local10.originalId, local10.originalShape)) { + } else if (local10.originalId < 0 || method3557(local10.originalId, local10.originalShape)) { Static79.method1698(local10.originalId, local10.x, local10.level, local10.originalAngle, local10.z, local10.originalShape, local10.layer); local10.unlink(); } @@ -138,4 +138,15 @@ public final class ChangeLocRequest extends Node { } } + @OriginalMember(owner = "client!il", name = "a", descriptor = "(BII)Z") + public static boolean method3557(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) { + if (arg1 == 11) { + arg1 = 10; + } + if (arg1 >= 5 && arg1 <= 8) { + arg1 = 4; + } + @Pc(30) LocType local30 = LocTypeList.get(arg0); + return local30.isReady(arg1); + } } diff --git a/client/src/main/java/rt4/Cheat.java b/client/src/main/java/rt4/Cheat.java index 4f9ae89..60f2469 100644 --- a/client/src/main/java/rt4/Cheat.java +++ b/client/src/main/java/rt4/Cheat.java @@ -127,7 +127,7 @@ public class Cheat { local29 = Runtime.getRuntime(); local38 = (int) ((local29.totalMemory() - local29.freeMemory()) / 1024L); Chat.add(null, 0, JagString.concatenate(new JagString[] { aClass100_893, JagString.parseInt(local38), DEBUG_MEM_UNIT})); - Static16.method501(); + Player.method501(); client.method2380(); for (local117 = 0; local117 < 10; local117++) { System.gc(); @@ -136,7 +136,7 @@ public class Cheat { Chat.add(null, 0, JagString.concatenate(new JagString[] {aClass100_1093, JagString.parseInt(local38), DEBUG_MEM_UNIT})); } if (arg0.equalsIgnoreCase(PCACHESIZE)) { - Chat.add(null, 0, JagString.concatenate(new JagString[] { aClass100_335, JagString.parseInt(Static198.method1029()) })); + Chat.add(null, 0, JagString.concatenate(new JagString[] { aClass100_335, JagString.parseInt(PlayerAppearance.method1029()) })); } if (GlRenderer.enabled && arg0.equalsIgnoreCase(CARDMEM)) { System.out.println("oncard_geometry:" + GlCleaner.onCardGeometry); @@ -144,7 +144,7 @@ public class Cheat { System.out.println("oncard_texture:" + GlCleaner.onCardTexture); } if (arg0.equalsIgnoreCase(CLIENTDROP)) { - Static175.method3279(); + Protocol.method3279(); } if (arg0.equalsIgnoreCase(CLIENTJS5DROP)) { client.js5NetQueue.quit(); @@ -231,4 +231,5 @@ public class Cheat { Protocol.outboundBuffer.p1(arg0.length() - 1); Protocol.outboundBuffer.pjstr(arg0.substring(2)); } + } diff --git a/client/src/main/java/rt4/Class106.java b/client/src/main/java/rt4/Class106.java index 434a503..511e742 100644 --- a/client/src/main/java/rt4/Class106.java +++ b/client/src/main/java/rt4/Class106.java @@ -41,7 +41,15 @@ public abstract class Class106 { this.method3847(); } - @OriginalMember(owner = "client!wf", name = "a", descriptor = "(IIII)V") + @OriginalMember(owner = "client!se", name = "a", descriptor = "(IIIIZ)I") + public static int method3891(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) { + @Pc(8) int local8 = arg3 & 0xF; + @Pc(29) int local29 = local8 >= 4 ? (local8 == 12 || local8 == 14 ? arg0 : arg1) : arg2; + @Pc(42) int local42 = local8 < 8 ? arg0 : arg2; + return ((local8 & 0x1) == 0 ? local42 : -local42) + ((local8 & 0x2) == 0 ? local29 : -local29); + } + + @OriginalMember(owner = "client!wf", name = "a", descriptor = "(IIII)V") protected final void method3841() { @Pc(8) int[] local8 = new int[64]; @Pc(11) int[] local11 = new int[64]; @@ -110,18 +118,18 @@ public abstract class Class106 { @Pc(304) int local304 = MonochromeImageCache.anIntArray1[local190]; @Pc(308) int local308 = local126 - 4096; @Pc(315) short local315 = this.aShortArray69[local227 + local236]; - @Pc(327) int local327 = Static225.method3891(local166, local126, local190, this.aShortArray69[local285 + local207]); - @Pc(340) int local340 = Static225.method3891(local174, local126, local190, this.aShortArray69[local178 + local285]); + @Pc(327) int local327 = method3891(local166, local126, local190, this.aShortArray69[local285 + local207]); + @Pc(340) int local340 = method3891(local174, local126, local190, this.aShortArray69[local178 + local285]); @Pc(351) int local351 = local327 + (local194 * (local340 - local327) >> 12); - @Pc(363) int local363 = Static225.method3891(local166, local126, local300, this.aShortArray69[local315 + local207]); - @Pc(375) int local375 = Static225.method3891(local174, local126, local300, this.aShortArray69[local178 + local315]); + @Pc(363) int local363 = method3891(local166, local126, local300, this.aShortArray69[local315 + local207]); + @Pc(375) int local375 = method3891(local174, local126, local300, this.aShortArray69[local178 + local315]); @Pc(386) int local386 = local363 + (local194 * (local375 - local363) >> 12); @Pc(397) int local397 = ((local386 - local351) * local304 >> 12) + local351; - @Pc(409) int local409 = Static225.method3891(local166, local308, local190, this.aShortArray69[local207 + local278]); - @Pc(421) int local421 = Static225.method3891(local174, local308, local190, this.aShortArray69[local178 + local278]); + @Pc(409) int local409 = method3891(local166, local308, local190, this.aShortArray69[local207 + local278]); + @Pc(421) int local421 = method3891(local174, local308, local190, this.aShortArray69[local178 + local278]); @Pc(432) int local432 = (local194 * (local421 - local409) >> 12) + local409; - @Pc(445) int local445 = Static225.method3891(local166, local308, local300, this.aShortArray69[local207 + local259]); - @Pc(457) int local457 = Static225.method3891(local174, local308, local300, this.aShortArray69[local178 + local259]); + @Pc(445) int local445 = method3891(local166, local308, local300, this.aShortArray69[local207 + local259]); + @Pc(457) int local457 = method3891(local174, local308, local300, this.aShortArray69[local178 + local259]); @Pc(468) int local468 = local445 + ((local457 - local445) * local194 >> 12); @Pc(480) int local480 = local432 + ((local468 - local432) * local304 >> 12); this.method3848(((local480 - local397) * local271 >> 12) + local397, local96); diff --git a/client/src/main/java/rt4/ClientProt.java b/client/src/main/java/rt4/ClientProt.java index 18a8bb1..ff3c50f 100644 --- a/client/src/main/java/rt4/ClientProt.java +++ b/client/src/main/java/rt4/ClientProt.java @@ -7,8 +7,12 @@ import org.openrs2.deob.annotation.Pc; import java.io.IOException; public class ClientProt { + @OriginalMember(owner = "client!e", name = "Dc", descriptor = "Lclient!na;") + public static final JagString aClass100_363 = JagString.parse("_labels"); @OriginalMember(owner = "client!wc", name = "g", descriptor = "I") public static int anInt5804 = 0; + @OriginalMember(owner = "client!nm", name = "U", descriptor = "I") + public static int mapFilesMissingCount = 0; @OriginalMember(owner = "client!vg", name = "a", descriptor = "(Lclient!na;IIBI)V") public static void method4512(@OriginalArg(0) JagString arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(4) int arg3) { @@ -124,9 +128,9 @@ public class ClientProt { InterfaceList.closeInterface(true, local18); } } - if (Static39.aClass13_10 != null) { - InterfaceList.redraw(Static39.aClass13_10); - Static39.aClass13_10 = null; + if (Static44.aClass13_10 != null) { + InterfaceList.redraw(Static44.aClass13_10); + Static44.aClass13_10 = null; } } @@ -166,14 +170,14 @@ public class ClientProt { @OriginalMember(owner = "client!gd", name = "c", descriptor = "(I)V") public static void rebuildMap() { ping(false); - Static175.mapFilesMissingCount = 0; + mapFilesMissingCount = 0; @Pc(12) boolean fileExists = true; @Pc(14) int id; for (id = 0; id < LoginManager.mapFilesBuffer.length; id++) { if (LoginManager.mapFileIds[id] != -1 && LoginManager.mapFilesBuffer[id] == null) { LoginManager.mapFilesBuffer[id] = client.js5Archive5.fetchFile(LoginManager.mapFileIds[id], 0); if (LoginManager.mapFilesBuffer[id] == null) { - Static175.mapFilesMissingCount++; + mapFilesMissingCount++; fileExists = false; } } @@ -181,7 +185,7 @@ public class ClientProt { LoginManager.locationMapFilesBuffer[id] = client.js5Archive5.fetchFile(LoginManager.locationsMapFileIds[id], LoginManager.regionsXteaKeys[id], 0); if (LoginManager.locationMapFilesBuffer[id] == null) { fileExists = false; - Static175.mapFilesMissingCount++; + mapFilesMissingCount++; } } @@ -190,13 +194,13 @@ public class ClientProt { LoginManager.underWaterMapFilesBuffer[id] = client.js5Archive5.fetchFile(LoginManager.underWaterMapFileIds[id], 0); if (LoginManager.underWaterMapFilesBuffer[id] == null) { fileExists = false; - Static175.mapFilesMissingCount++; + mapFilesMissingCount++; } } if (LoginManager.underWaterLocationsMapFileIds[id] != -1 && LoginManager.underWaterLocationsMapFilesBuffer[id] == null) { LoginManager.underWaterLocationsMapFilesBuffer[id] = client.js5Archive5.fetchFile(LoginManager.underWaterLocationsMapFileIds[id], 0); if (LoginManager.underWaterLocationsMapFilesBuffer[id] == null) { - Static175.mapFilesMissingCount++; + mapFilesMissingCount++; fileExists = false; } } @@ -205,20 +209,20 @@ public class ClientProt { if (LoginManager.npcSpawnsFileIds != null && LoginManager.npcSpawnsFilesBuffer[id] == null && LoginManager.npcSpawnsFileIds[id] != -1) { LoginManager.npcSpawnsFilesBuffer[id] = client.js5Archive5.fetchFile(LoginManager.npcSpawnsFileIds[id], LoginManager.regionsXteaKeys[id], 0); if (LoginManager.npcSpawnsFilesBuffer[id] == null) { - Static175.mapFilesMissingCount++; + mapFilesMissingCount++; fileExists = false; } } } if (LoginManager.mapElementList == null) { - if (LoginManager.map == null || !client.js5Archive23.isGroupNameValid(JagString.concatenate(new JagString[] { LoginManager.map.group, Static50.aClass100_363 }))) { + if (LoginManager.map == null || !client.js5Archive23.isGroupNameValid(JagString.concatenate(new JagString[] { LoginManager.map.group, aClass100_363 }))) { LoginManager.mapElementList = new MapElementList(0); - } else if (client.js5Archive23.isGroupReady(JagString.concatenate(new JagString[] { LoginManager.map.group, Static50.aClass100_363 }))) { - LoginManager.mapElementList = MapElementList.create(JagString.concatenate(new JagString[] { LoginManager.map.group, Static50.aClass100_363 }), client.js5Archive23); + } else if (client.js5Archive23.isGroupReady(JagString.concatenate(new JagString[] { LoginManager.map.group, aClass100_363 }))) { + LoginManager.mapElementList = MapElementList.create(JagString.concatenate(new JagString[] { LoginManager.map.group, aClass100_363 }), client.js5Archive23); } else { fileExists = false; - Static175.mapFilesMissingCount++; + mapFilesMissingCount++; } } @@ -236,7 +240,7 @@ public class ClientProt { if (local294 != null) { chunkZ = (LoginManager.regionBitPacked[id] & 0xFF) * 64 - Camera.originZ; chunkX = (LoginManager.regionBitPacked[id] >> 8) * 64 - Camera.originX; - if (Static230.dynamicMapRegion) { + if (LoginManager.dynamicMapRegion) { chunkZ = 10; chunkX = 10; } @@ -247,7 +251,7 @@ public class ClientProt { if (local294 != null) { chunkX = (LoginManager.regionBitPacked[id] >> 8) * 64 - Camera.originX; chunkZ = (LoginManager.regionBitPacked[id] & 0xFF) * 64 - Camera.originZ; - if (Static230.dynamicMapRegion) { + if (LoginManager.dynamicMapRegion) { chunkZ = 10; chunkX = 10; } @@ -289,10 +293,10 @@ public class ClientProt { } AreaSoundManager.clear(false); if (GlRenderer.enabled) { - Static242.shadowMapImage.clear(); + ShadowManager.shadowMapImage.clear(); for (i = 0; i < 13; i++) { for (chunkX = 0; chunkX < 13; chunkX++) { - Static242.shadows[i][chunkX].outputToSprite = true; + ShadowManager.shadows[i][chunkX].outputToSprite = true; } } } @@ -300,13 +304,13 @@ public class ClientProt { LightingManager.method2404(); } if (GlRenderer.enabled) { - Static75.setDefaultChunksAtmosphere(); + setDefaultChunksAtmosphere(); } client.audioLoop(); System.gc(); ping(true); SceneGraph.load(false); - if (!Static230.dynamicMapRegion) { + if (!LoginManager.dynamicMapRegion) { Static87.method1805(false); ping(true); if (GlRenderer.enabled) { @@ -314,12 +318,12 @@ public class ClientProt { chunkX = PlayerList.self.movementQueueZ[0] >> 3; Static73.setLightPosition(chunkX, i); } - Static26.method743(false); + LoginManager.method743(false); if (LoginManager.npcSpawnsFilesBuffer != null) { Static158.decodeNpcFiles(); } } - if (Static230.dynamicMapRegion) { + if (LoginManager.dynamicMapRegion) { Static89.method1835(false); ping(true); if (GlRenderer.enabled) { @@ -351,12 +355,12 @@ public class ClientProt { if (GlRenderer.enabled && hasUnderWaterMap) { SceneGraph.setUnderwater(true); SceneGraph.load(true); - if (!Static230.dynamicMapRegion) { + if (!LoginManager.dynamicMapRegion) { Static87.method1805(true); ping(true); - Static26.method743(true); + LoginManager.method743(true); } - if (Static230.dynamicMapRegion) { + if (LoginManager.dynamicMapRegion) { Static89.method1835(true); ping(true); Static233.method4002(true); @@ -371,7 +375,7 @@ public class ClientProt { if (GlRenderer.enabled) { for (chunkX = 0; chunkX < 13; chunkX++) { for (chunkZ = 0; chunkZ < 13; chunkZ++) { - Static242.shadows[chunkX][chunkZ].method4676(SceneGraph.tileHeights[0], chunkX * 8, chunkZ * 8); + ShadowManager.shadows[chunkX][chunkZ].method4676(SceneGraph.tileHeights[0], chunkX * 8, chunkZ * 8); } } } @@ -380,7 +384,7 @@ public class ClientProt { Static220.spawnGroundObject(chunkZ, chunkX); } } - Static269.method2218(); + ScriptRunner.method2218(); client.audioLoop(); ChangeLocRequest.flush(); client.method3768(); @@ -389,7 +393,7 @@ public class ClientProt { Protocol.outboundBuffer.p1isaac(20); Protocol.outboundBuffer.p4(1057001181); } - if (!Static230.dynamicMapRegion) { + if (!LoginManager.dynamicMapRegion) { @Pc(815) int local815 = (LoginManager.centralZoneZ + 6) / 8; @Pc(821) int local821 = (LoginManager.centralZoneZ - 6) / 8; chunkX = (LoginManager.centralZoneX - 6) / 8; @@ -463,16 +467,16 @@ public class ClientProt { local30 = Static81.anInt2225 + Static40.aClass13_1.width - Static40.aClass13_14.width; } local41 -= Static40.anInt4035; - if (local41 < Static228.anInt5103) { - local41 = Static228.anInt5103; + if (local41 < InterfaceList.anInt5103) { + local41 = InterfaceList.anInt5103; } - if (Static228.anInt5103 + Static40.aClass13_1.height < local41 - -Static40.aClass13_14.height) { - local41 = Static228.anInt5103 + Static40.aClass13_1.height - Static40.aClass13_14.height; + if (InterfaceList.anInt5103 + Static40.aClass13_1.height < local41 - -Static40.aClass13_14.height) { + local41 = InterfaceList.anInt5103 + Static40.aClass13_1.height - Static40.aClass13_14.height; } @Pc(109) int local109 = local41 - Static36.anInt660; @Pc(114) int local114 = local30 - Static36.anInt3075; @Pc(122) int local122 = local30 + Static40.aClass13_1.scrollX - Static81.anInt2225; - @Pc(130) int local130 = Static40.aClass13_1.scrollY + local41 - Static228.anInt5103; + @Pc(130) int local130 = Static40.aClass13_1.scrollY + local41 - InterfaceList.anInt5103; @Pc(133) int local133 = Static40.aClass13_14.dragDeadzone; if (Static40.anInt4851 > Static40.aClass13_14.dragDeadtime && (local133 < local114 || -local133 > local114 || local109 > local133 || local109 < -local133)) { Static40.aBoolean172 = true; @@ -491,17 +495,17 @@ public class ClientProt { if (Static40.aClass13_14.onDragRelease != null) { local176 = new HookRequest(); local176.mouseY = local130; - local176.target = Static56.aClass13_12; + local176.target = InterfaceList.aClass13_12; local176.mouseX = local122; local176.arguments = Static40.aClass13_14.onDragRelease; local176.source = Static40.aClass13_14; ScriptRunner.run(local176); } - if (Static56.aClass13_12 != null && Static36.method938(Static40.aClass13_14) != null) { + if (InterfaceList.aClass13_12 != null && Static36.method938(Static40.aClass13_14) != null) { Protocol.outboundBuffer.p1isaac(79); Protocol.outboundBuffer.mp4(Static40.aClass13_14.id); - Protocol.outboundBuffer.ip2(Static56.aClass13_12.createdComponentId); - Protocol.outboundBuffer.p4(Static56.aClass13_12.id); + Protocol.outboundBuffer.ip2(InterfaceList.aClass13_12.createdComponentId); + Protocol.outboundBuffer.p4(InterfaceList.aClass13_12.id); Protocol.outboundBuffer.ip2(Static40.aClass13_14.createdComponentId); } } else if ((VarpDomain.anInt2952 == 1 || MiniMenu.method4640(MiniMenu.size - 1)) && MiniMenu.size > 2) { @@ -522,4 +526,14 @@ public class ClientProt { Protocol.outboundBuffer.imp4(arg1); Protocol.outboundBuffer.ip2(arg0); } + + @OriginalMember(owner = "client!g", name = "b", descriptor = "(I)V") + public static void setDefaultChunksAtmosphere() { + @Pc(9) Environment local9 = new Environment(); + for (@Pc(18) int local18 = 0; local18 < 13; local18++) { + for (@Pc(25) int local25 = 0; local25 < 13; local25++) { + Static103.aClass92ArrayArray1[local18][local25] = local9; + } + } + } } diff --git a/client/src/main/java/rt4/ColorUtils.java b/client/src/main/java/rt4/ColorUtils.java index f62ffe3..2f5c99e 100644 --- a/client/src/main/java/rt4/ColorUtils.java +++ b/client/src/main/java/rt4/ColorUtils.java @@ -5,6 +5,9 @@ import org.openrs2.deob.annotation.OriginalMember; import org.openrs2.deob.annotation.Pc; public class ColorUtils { + @OriginalMember(owner = "client!ug", name = "b", descriptor = "[F") + public static final float[] aFloatArray28 = new float[4]; + @OriginalMember(owner = "client!ib", name = "a", descriptor = "(II)I") public static int rgbToHsl(@OriginalArg(1) int arg0) { @Pc(10) double local10 = (double) (arg0 >> 16 & 0xFF) / 256.0D; @@ -73,14 +76,14 @@ public class ColorUtils { @Pc(7) float local7 = FogManager.method3068() + FogManager.method3059(); @Pc(9) int local9 = FogManager.method3064(); @Pc(11) float local11 = 0.58823526F; - Static251.aFloatArray28[3] = 1.0F; + aFloatArray28[3] = 1.0F; @Pc(24) float local24 = (float) (local9 >> 16 & 0xFF) / 255.0F; @Pc(33) float local33 = (float) (local9 >> 8 & 0xFF) / 255.0F; - Static251.aFloatArray28[1] = local7 * (float) (arg0 >> 8 & 0xFF) / 255.0F * local33 * local11; - Static251.aFloatArray28[0] = local7 * local11 * local24 * ((float) (arg0 >> 16 & 0xFF) / 255.0F); + aFloatArray28[1] = local7 * (float) (arg0 >> 8 & 0xFF) / 255.0F * local33 * local11; + aFloatArray28[0] = local7 * local11 * local24 * ((float) (arg0 >> 16 & 0xFF) / 255.0F); @Pc(74) float local74 = (float) (local9 & 0xFF) / 255.0F; - Static251.aFloatArray28[2] = (float) (arg0 & 0xFF) / 255.0F * local74 * local11 * local7; - return Static251.aFloatArray28; + aFloatArray28[2] = (float) (arg0 & 0xFF) / 255.0F * local74 * local11 * local7; + return aFloatArray28; } @OriginalMember(owner = "client!gn", name = "a", descriptor = "(IZI)I") diff --git a/client/src/main/java/rt4/Component.java b/client/src/main/java/rt4/Component.java index 35b50b2..cc5c24f 100644 --- a/client/src/main/java/rt4/Component.java +++ b/client/src/main/java/rt4/Component.java @@ -1135,7 +1135,7 @@ public final class Component { this.dragRenderBehavior = buffer.g1() == 1; local567 = -1; this.targetVerb = buffer.gjstr(); - if (Static199.method3594(local175) != 0) { + if (ServerActiveProperties.method3594(local175) != 0) { local567 = buffer.g2(); this.anInt499 = buffer.g2(); if (local567 == 65535) { diff --git a/client/src/main/java/rt4/DateUtil.java b/client/src/main/java/rt4/DateUtil.java new file mode 100644 index 0000000..32971fb --- /dev/null +++ b/client/src/main/java/rt4/DateUtil.java @@ -0,0 +1,93 @@ +package rt4; + +import org.openrs2.deob.annotation.OriginalArg; +import org.openrs2.deob.annotation.OriginalMember; +import org.openrs2.deob.annotation.Pc; + +import java.util.Calendar; +import java.util.Date; +import java.util.TimeZone; + +public final class DateUtil { + + @OriginalMember(owner = "client!cl", name = "K", descriptor = "Ljava/util/Calendar;") + public static final Calendar calendar = Calendar.getInstance(TimeZone.getTimeZone("GMT")); + @OriginalMember(owner = "client!fn", name = "Z", descriptor = "Lclient!na;") + public static final JagString aClass100_461 = JagString.parse(")1 "); + @OriginalMember(owner = "client!wb", name = "a", descriptor = "Lclient!na;") + public static final JagString aClass100_1089 = JagString.parse(")2"); + @OriginalMember(owner = "client!dm", name = "j", descriptor = "Lclient!na;") + public static final JagString SPACE = JagString.parse(" "); + @OriginalMember(owner = "client!vh", name = "c", descriptor = "Lclient!na;") + public static final JagString COLON = JagString.parse(":"); + @OriginalMember(owner = "client!ee", name = "a", descriptor = "Lclient!na;") + public static final JagString TIMEZONE = JagString.parse(" GMT"); + + @OriginalMember(owner = "client!km", name = "tc", descriptor = "Lclient!na;") + private static final JagString DEC = JagString.parse("Dec"); + + @OriginalMember(owner = "client!km", name = "vc", descriptor = "Lclient!na;") + private static final JagString JUL = JagString.parse("Jul"); + + @OriginalMember(owner = "client!km", name = "xc", descriptor = "Lclient!na;") + private static final JagString MAY = JagString.parse("May"); + + @OriginalMember(owner = "client!km", name = "yc", descriptor = "Lclient!na;") + private static final JagString NOV = JagString.parse("Nov"); + + @OriginalMember(owner = "client!km", name = "zc", descriptor = "Lclient!na;") + private static final JagString MAR = JagString.parse("Mar"); + + @OriginalMember(owner = "client!km", name = "Gc", descriptor = "Lclient!na;") + private static final JagString JAN = JagString.parse("Jan"); + + @OriginalMember(owner = "client!km", name = "Hc", descriptor = "Lclient!na;") + private static final JagString FEB = JagString.parse("Feb"); + + @OriginalMember(owner = "client!km", name = "Tc", descriptor = "Lclient!na;") + private static final JagString APR = JagString.parse("Apr"); + + @OriginalMember(owner = "client!km", name = "Wc", descriptor = "Lclient!na;") + private static final JagString JUN = JagString.parse("Jun"); + + @OriginalMember(owner = "client!km", name = "Qc", descriptor = "Lclient!na;") + private static final JagString AUG = JagString.parse("Aug"); + + @OriginalMember(owner = "client!km", name = "cd", descriptor = "Lclient!na;") + private static final JagString SEP = JagString.parse("Sep"); + + @OriginalMember(owner = "client!km", name = "dd", descriptor = "Lclient!na;") + private static final JagString OCT = JagString.parse("Oct"); + + @OriginalMember(owner = "client!km", name = "Ac", descriptor = "[Lclient!na;") + public static final JagString[] MONTHS = new JagString[] {JAN, FEB, MAR, APR, MAY, JUN, JUL, AUG, SEP, OCT, NOV, DEC}; + @OriginalMember(owner = "client!rl", name = "T", descriptor = "Lclient!na;") + private static final JagString SAT = JagString.parse("Sat"); + @OriginalMember(owner = "client!rl", name = "U", descriptor = "Lclient!na;") + private static final JagString MON = JagString.parse("Mon"); + @OriginalMember(owner = "client!rl", name = "W", descriptor = "Lclient!na;") + private static final JagString FRI = JagString.parse("Fri"); + @OriginalMember(owner = "client!rl", name = "db", descriptor = "Lclient!na;") + private static final JagString SUN = JagString.parse("Sun"); + @OriginalMember(owner = "client!rl", name = "cb", descriptor = "Lclient!na;") + private static final JagString TUE = JagString.parse("Tue"); + @OriginalMember(owner = "client!rl", name = "ab", descriptor = "Lclient!na;") + private static final JagString WED = JagString.parse("Wed"); + @OriginalMember(owner = "client!rl", name = "bb", descriptor = "Lclient!na;") + private static final JagString THU = JagString.parse("Thu"); + @OriginalMember(owner = "client!rl", name = "Y", descriptor = "[Lclient!na;") + public static final JagString[] DAYS = new JagString[] {SUN, MON, TUE, WED, THU, FRI, SAT}; + + @OriginalMember(owner = "client!cj", name = "a", descriptor = "(JB)Lclient!na;") + public static JagString getDateString(@OriginalArg(0) long date) { + calendar.setTime(new Date(date)); + @Pc(13) int local13 = calendar.get(Calendar.DAY_OF_WEEK); + @Pc(17) int local17 = calendar.get(Calendar.DATE); + @Pc(21) int local21 = calendar.get(Calendar.MONTH); + @Pc(32) int local32 = calendar.get(Calendar.YEAR); + @Pc(36) int local36 = calendar.get(Calendar.HOUR_OF_DAY); + @Pc(40) int local40 = calendar.get(Calendar.MINUTE); + @Pc(44) int local44 = calendar.get(Calendar.SECOND); + return JagString.concatenate(new JagString[] { DAYS[local13 - 1], aClass100_461, JagString.parseInt(local17 / 10), JagString.parseInt(local17 % 10), aClass100_1089, MONTHS[local21], aClass100_1089, JagString.parseInt(local32), SPACE, JagString.parseInt(local36 / 10), JagString.parseInt(local36 % 10), COLON, JagString.parseInt(local40 / 10), JagString.parseInt(local40 % 10), COLON, JagString.parseInt(local44 / 10), JagString.parseInt(local44 % 10), TIMEZONE}); + } +} diff --git a/client/src/main/java/rt4/DeadClass.java b/client/src/main/java/rt4/DeadClass.java index 68fcda6..8602694 100644 --- a/client/src/main/java/rt4/DeadClass.java +++ b/client/src/main/java/rt4/DeadClass.java @@ -8,4 +8,10 @@ public final class DeadClass { @OriginalMember(owner = "client!ul", name = "I", descriptor = "Lclient!gn;") public static final LruHashTable cache = new LruHashTable(4); + + @OriginalMember(owner = "client!ck", name = "b", descriptor = "Lclient!na;") + private static final JagString aClass100_195 = JagString.parse("Discard"); + + @OriginalMember(owner = "client!rc", name = "R", descriptor = "Z") + private static boolean aBoolean74; } diff --git a/client/src/main/java/rt4/DisplayMode.java b/client/src/main/java/rt4/DisplayMode.java index 6451f14..eaea4d3 100644 --- a/client/src/main/java/rt4/DisplayMode.java +++ b/client/src/main/java/rt4/DisplayMode.java @@ -16,8 +16,10 @@ public final class DisplayMode { public static boolean aBoolean73 = false; @OriginalMember(owner = "client!jk", name = "y", descriptor = "Z") public static boolean aBoolean156 = false; + @OriginalMember(owner = "client!hi", name = "f", descriptor = "J") + public static long aLong89 = 0L; - @OriginalMember(owner = "client!od", name = "j", descriptor = "I") + @OriginalMember(owner = "client!od", name = "j", descriptor = "I") public int width; @OriginalMember(owner = "client!od", name = "k", descriptor = "I") @@ -47,7 +49,7 @@ public final class DisplayMode { @OriginalMember(owner = "client!th", name = "a", descriptor = "(ZIIII)V") public static void setWindowMode(@OriginalArg(0) boolean arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3) { - Static97.aLong89 = 0L; + aLong89 = 0L; @Pc(4) int mode = getWindowMode(); if (arg1 == 3 || mode == 3) { arg0 = true; @@ -85,7 +87,7 @@ public final class DisplayMode { GameShell.fullScreenFrame = null; } if (arg1 == 3 && GameShell.fullScreenFrame == null) { - GameShell.fullScreenFrame = Static169.method3176(0, arg5, arg4, GameShell.signLink); + GameShell.fullScreenFrame = method3176(0, arg5, arg4, GameShell.signLink); if (GameShell.fullScreenFrame != null) { Preferences.fullScreenHeight = arg5; Preferences.fullScreenWidth = arg4; @@ -202,7 +204,7 @@ public final class DisplayMode { GameShell.thread.setPriority(1); SoftwareRaster.frameBuffer = Static131.create(503, 765, GameShell.canvas); SoftwareModel.method4583(); - Static76.method1643(); + ParticleSystem.quit(); ((Js5GlTextureProvider) Rasteriser.textureProvider).method3248(20); if (Preferences.highDetailLighting) { if (Preferences.brightness == 1) { @@ -271,7 +273,7 @@ public final class DisplayMode { @Pc(122) DisplayMode local122 = aClass114Array1[local114]; local112[local114] = local122.height * local122.width; } - Static181.method3346(local112, aClass114Array1); + method3346(local112, aClass114Array1); } return aClass114Array1; } @@ -300,4 +302,74 @@ public final class DisplayMode { } return local45; } + + @OriginalMember(owner = "client!nf", name = "a", descriptor = "(IIIIILsignlink!ll;)Ljava/awt/Frame;") + public static Frame method3176(@OriginalArg(2) int arg0, @OriginalArg(3) int arg1, @OriginalArg(4) int arg2, @OriginalArg(5) SignLink arg3) { + if (!arg3.isFullScreenSupported()) { + return null; + } + @Pc(20) DisplayMode[] local20 = method3558(arg3); + if (local20 == null) { + return null; + } + @Pc(27) boolean local27 = false; + for (@Pc(29) int local29 = 0; local29 < local20.length; local29++) { + if (arg2 == local20[local29].width && arg1 == local20[local29].height && (!local27 || local20[local29].bitDepth > arg0)) { + arg0 = local20[local29].bitDepth; + local27 = true; + } + } + if (!local27) { + return null; + } + @Pc(90) PrivilegedRequest local90 = arg3.enterFullScreen(arg0, arg1, arg2); + while (local90.status == 0) { + ThreadUtils.sleep(10L); + } + @Pc(103) Frame local103 = (Frame) local90.result; + if (local103 == null) { + return null; + } else if (local90.status == 2) { + exitFullScreen(local103, arg3); + return null; + } else { + return local103; + } + } + + @OriginalMember(owner = "client!oi", name = "a", descriptor = "(I[I[Ljava/lang/Object;)V") + public static void method3346(@OriginalArg(1) int[] arg0, @OriginalArg(2) Object[] arg1) { + method1292(arg1, arg0.length - 1, arg0, 0); + } + + @OriginalMember(owner = "client!ec", name = "a", descriptor = "([Ljava/lang/Object;I[III)V") + public static void method1292(@OriginalArg(0) Object[] arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int[] arg2, @OriginalArg(4) int arg3) { + if (arg3 >= arg1) { + return; + } + @Pc(11) int local11 = (arg3 + arg1) / 2; + @Pc(15) int local15 = arg2[local11]; + @Pc(17) int local17 = arg3; + arg2[local11] = arg2[arg1]; + arg2[arg1] = local15; + @Pc(31) Object local31 = arg0[local11]; + arg0[local11] = arg0[arg1]; + arg0[arg1] = local31; + for (@Pc(43) int local43 = arg3; local43 < arg1; local43++) { + if ((local43 & 0x1) + local15 > arg2[local43]) { + @Pc(67) int local67 = arg2[local43]; + arg2[local43] = arg2[local17]; + arg2[local17] = local67; + @Pc(81) Object local81 = arg0[local43]; + arg0[local43] = arg0[local17]; + arg0[local17++] = local81; + } + } + arg2[arg1] = arg2[local17]; + arg2[local17] = local15; + arg0[arg1] = arg0[local17]; + arg0[local17] = local31; + method1292(arg0, local17 - 1, arg2, arg3); + method1292(arg0, arg1, arg2, local17 + 1); + } } diff --git a/client/src/main/java/rt4/EnumTypeList.java b/client/src/main/java/rt4/EnumTypeList.java index ba3d08f..b8f1c99 100644 --- a/client/src/main/java/rt4/EnumTypeList.java +++ b/client/src/main/java/rt4/EnumTypeList.java @@ -21,7 +21,7 @@ public class EnumTypeList { if (local10 != null) { return local10; } - @Pc(24) byte[] local24 = archive.fetchFile(Static97.method1959(arg0), Static103.method2236(arg0)); + @Pc(24) byte[] local24 = archive.fetchFile(getGroupId(arg0), getFileId(arg0)); local10 = new EnumType(); if (local24 != null) { local10.decode(new Buffer(local24)); @@ -29,4 +29,14 @@ public class EnumTypeList { types.put(local10, (long) arg0); return local10; } + + @OriginalMember(owner = "client!i", name = "e", descriptor = "(BI)I") + public static int getFileId(@OriginalArg(1) int arg0) { + return arg0 & 0xFF; + } + + @OriginalMember(owner = "client!hi", name = "a", descriptor = "(BI)I") + public static int getGroupId(@OriginalArg(1) int arg0) { + return arg0 >>> 8; + } } diff --git a/client/src/main/java/rt4/Find.java b/client/src/main/java/rt4/Find.java index c1b4b80..5a2c821 100644 --- a/client/src/main/java/rt4/Find.java +++ b/client/src/main/java/rt4/Find.java @@ -44,7 +44,7 @@ public class Find { for (@Pc(115) int local115 = 0; local115 < index; local115++) { local113[local115] = QuickChatPhraseTypeList.get(local22[local115]).getText(); } - Static202.method3656(local113, results); + method3656(local113, results); } @OriginalMember(owner = "client!me", name = "a", descriptor = "(ZLclient!na;I)V") @@ -77,6 +77,42 @@ public class Find { for (@Pc(119) int local119 = 0; local119 < index; local119++) { local117[local119] = ObjTypeList.get(local8[local119]).name; } - Static202.method3656(local117, results); + method3656(local117, results); + } + + @OriginalMember(owner = "client!qg", name = "a", descriptor = "([Lclient!na;[SI)V") + public static void method3656(@OriginalArg(0) JagString[] arg0, @OriginalArg(1) short[] arg1) { + method1307(arg1, arg0.length - 1, arg0, 0); + } + + @OriginalMember(owner = "client!ed", name = "a", descriptor = "([SI[Lclient!na;II)V") + public static void method1307(@OriginalArg(0) short[] arg0, @OriginalArg(1) int arg1, @OriginalArg(2) JagString[] arg2, @OriginalArg(4) int arg3) { + if (arg1 <= arg3) { + return; + } + @Pc(14) int local14 = arg3; + @Pc(21) int local21 = (arg3 + arg1) / 2; + @Pc(25) JagString local25 = arg2[local21]; + arg2[local21] = arg2[arg1]; + arg2[arg1] = local25; + @Pc(39) short local39 = arg0[local21]; + arg0[local21] = arg0[arg1]; + arg0[arg1] = local39; + for (@Pc(51) int local51 = arg3; local51 < arg1; local51++) { + if (local25 == null || arg2[local51] != null && arg2[local51].method3139(local25) < (local51 & 0x1)) { + @Pc(80) JagString local80 = arg2[local51]; + arg2[local51] = arg2[local14]; + arg2[local14] = local80; + @Pc(94) short local94 = arg0[local51]; + arg0[local51] = arg0[local14]; + arg0[local14++] = local94; + } + } + arg2[arg1] = arg2[local14]; + arg2[local14] = local25; + arg0[arg1] = arg0[local14]; + arg0[local14] = local39; + method1307(arg0, local14 - 1, arg2, arg3); + method1307(arg0, arg1, arg2, local14 + 1); } } diff --git a/client/src/main/java/rt4/GlModel.java b/client/src/main/java/rt4/GlModel.java index 84e6b45..8f40472 100644 --- a/client/src/main/java/rt4/GlModel.java +++ b/client/src/main/java/rt4/GlModel.java @@ -54,8 +54,10 @@ public final class GlModel extends Model { public static int anInt5300; @OriginalMember(owner = "client!td", name = "zb", descriptor = "F") public static float aFloat28; + @OriginalMember(owner = "client!lk", name = "V", descriptor = "I") + public static int anInt3582 = 0; - @OriginalMember(owner = "client!td", name = "t", descriptor = "[S") + @OriginalMember(owner = "client!td", name = "t", descriptor = "[S") private short[] aShortArray75; @OriginalMember(owner = "client!td", name = "v", descriptor = "[S") @@ -909,7 +911,18 @@ public final class GlModel extends Model { aClass8_Sub1_Sub1_6 = new GlModel(); } - @OriginalMember(owner = "client!td", name = "a", descriptor = "(ZZZ)Lclient!ak;") + @OriginalMember(owner = "client!vg", name = "a", descriptor = "(I[S)[S") + public static short[] method4511(@OriginalArg(1) short[] arg0) { + if (arg0 == null) { + return null; + } else { + @Pc(19) short[] local19 = new short[arg0.length]; + ArrayUtils.copy(arg0, 0, local19, 0, arg0.length); + return local19; + } + } + + @OriginalMember(owner = "client!td", name = "a", descriptor = "(ZZZ)Lclient!ak;") @Override public final Model method4560(@OriginalArg(0) boolean arg0, @OriginalArg(1) boolean arg1, @OriginalArg(2) boolean arg2) { return this.method4114(arg0, arg1, arg2, aClass8_Sub1_Sub1_4, aClass8_Sub1_Sub1_3); @@ -961,7 +974,7 @@ public final class GlModel extends Model { local161 = MathUtils.sin[arg0]; local163 = MathUtils.cos[arg0]; } - if (arg8 > 0L && Static39.aBoolean77 && local70 > 0) { + if (arg8 > 0L && ScriptRunner.aBoolean77 && local70 > 0) { @Pc(187) int local187; @Pc(191) int local191; if (local84 > 0) { @@ -980,7 +993,7 @@ public final class GlModel extends Model { local206 = local153 / local70; local210 = local132 / local53; } - if (Static150.anInt3582 >= local187 && Static150.anInt3582 <= local191 && Static34.anInt1053 >= local206 && Static34.anInt1053 <= local210) { + if (anInt3582 >= local187 && anInt3582 <= local191 && Static34.anInt1053 >= local206 && Static34.anInt1053 <= local210) { local187 = 999999; local191 = -999999; local206 = 999999; @@ -1033,9 +1046,9 @@ public final class GlModel extends Model { } } } - if (Static150.anInt3582 >= local187 && Static150.anInt3582 <= local191 && Static34.anInt1053 >= local206 && Static34.anInt1053 <= local210) { + if (anInt3582 >= local187 && anInt3582 <= local191 && Static34.anInt1053 >= local206 && Static34.anInt1053 <= local210) { if (this.aBoolean303) { - Model.aLongArray11[Static2.anInt7++] = arg8; + Model.aLongArray11[MiniMenu.anInt7++] = arg8; } else { if (anIntArray468.length < this.anInt5296) { anIntArray468 = new int[this.anInt5296]; @@ -1052,8 +1065,8 @@ public final class GlModel extends Model { @Pc(698) short local698 = this.aShortArray77[local362]; @Pc(703) short local703 = this.aShortArray82[local362]; @Pc(708) short local708 = this.aShortArray83[local362]; - if (this.method4118(Static150.anInt3582, Static34.anInt1053, anIntArray467[local698], anIntArray467[local703], anIntArray467[local708], anIntArray468[local698], anIntArray468[local703], anIntArray468[local708])) { - Model.aLongArray11[Static2.anInt7++] = arg8; + if (this.method4118(anInt3582, Static34.anInt1053, anIntArray467[local698], anIntArray467[local703], anIntArray467[local708], anIntArray468[local698], anIntArray468[local703], anIntArray468[local708])) { + Model.aLongArray11[MiniMenu.anInt7++] = arg8; break label118; } local362++; @@ -1288,17 +1301,17 @@ public final class GlModel extends Model { if (local237 != -1) { if (local40 == null) { this.aClass23_1 = new GlModel_Class23(); - local40 = this.aClass23_1.aShortArray8 = Static263.method4511(this.aShortArray76); - local44 = this.aClass23_1.aShortArray10 = Static263.method4511(this.aShortArray79); - local48 = this.aClass23_1.aShortArray9 = Static263.method4511(this.aShortArray85); - local52 = this.aClass23_1.aShortArray7 = Static263.method4511(this.aShortArray86); + local40 = this.aClass23_1.aShortArray8 = method4511(this.aShortArray76); + local44 = this.aClass23_1.aShortArray10 = method4511(this.aShortArray79); + local48 = this.aClass23_1.aShortArray9 = method4511(this.aShortArray85); + local52 = this.aClass23_1.aShortArray7 = method4511(this.aShortArray86); } if (local68 == null) { @Pc(325) GlModel_Class23 local325 = local2.aClass23_1 = new GlModel_Class23(); - local68 = local325.aShortArray8 = Static263.method4511(local24); - local72 = local325.aShortArray10 = Static263.method4511(local27); - local76 = local325.aShortArray9 = Static263.method4511(local30); - local80 = local325.aShortArray7 = Static263.method4511(local33); + local68 = local325.aShortArray8 = method4511(local24); + local72 = local325.aShortArray10 = method4511(local27); + local76 = local325.aShortArray9 = method4511(local30); + local80 = local325.aShortArray7 = method4511(local33); } @Pc(358) short local358 = this.aShortArray76[local175]; @Pc(363) short local363 = this.aShortArray79[local175]; @@ -2819,7 +2832,7 @@ public final class GlModel extends Model { if (arg2) { local3.aShortArray75 = this.aShortArray75; } else { - local3.aShortArray75 = Static263.method4511(this.aShortArray75); + local3.aShortArray75 = method4511(this.aShortArray75); } local3.aByteArray71 = this.aByteArray71; if (arg2 && arg3 && (arg6 && arg4 || Preferences.highDetailLighting)) { @@ -2833,10 +2846,10 @@ public final class GlModel extends Model { local3.aShortArray85 = this.aShortArray85; local3.aShortArray86 = this.aShortArray86; } else { - local3.aShortArray76 = Static263.method4511(this.aShortArray76); - local3.aShortArray79 = Static263.method4511(this.aShortArray79); - local3.aShortArray85 = Static263.method4511(this.aShortArray85); - local3.aShortArray86 = Static263.method4511(this.aShortArray86); + local3.aShortArray76 = method4511(this.aShortArray76); + local3.aShortArray79 = method4511(this.aShortArray79); + local3.aShortArray85 = method4511(this.aShortArray85); + local3.aShortArray86 = method4511(this.aShortArray86); } if (!Preferences.highDetailLighting) { local3.aClass127_2 = null; @@ -2854,15 +2867,15 @@ public final class GlModel extends Model { local3.aShortArray83 = this.aShortArray83; local3.aClass127_5 = this.aClass127_5; } else { - local3.aShortArray77 = Static263.method4511(this.aShortArray77); - local3.aShortArray82 = Static263.method4511(this.aShortArray82); - local3.aShortArray83 = Static263.method4511(this.aShortArray83); + local3.aShortArray77 = method4511(this.aShortArray77); + local3.aShortArray82 = method4511(this.aShortArray82); + local3.aShortArray83 = method4511(this.aShortArray83); local3.aClass127_5 = new GlBuffer(); } if (arg8) { local3.aShortArray80 = this.aShortArray80; } else { - local3.aShortArray80 = Static263.method4511(this.aShortArray80); + local3.aShortArray80 = method4511(this.aShortArray80); } local3.anIntArray464 = this.anIntArray464; local3.anIntArrayArray36 = this.anIntArrayArray36; diff --git a/client/src/main/java/rt4/InterfaceList.java b/client/src/main/java/rt4/InterfaceList.java index 49bed25..ace8763 100644 --- a/client/src/main/java/rt4/InterfaceList.java +++ b/client/src/main/java/rt4/InterfaceList.java @@ -25,6 +25,10 @@ public class InterfaceList { public static final int[] rectangleHeight = new int[100]; @OriginalMember(owner = "client!pa", name = "R", descriptor = "[Z") public static final boolean[] aBooleanArray100 = new boolean[100]; + @OriginalMember(owner = "client!ql", name = "h", descriptor = "Lclient!na;") + public static final JagString aClass100_903 = JagString.parse("Hidden)2"); + @OriginalMember(owner = "client!ja", name = "f", descriptor = "Lclient!ih;") + public static final LinkedList mediumPriorityRequests = new LinkedList(); @OriginalMember(owner = "client!bn", name = "V", descriptor = "I") public static int rectangles = 0; @OriginalMember(owner = "client!md", name = "W", descriptor = "I") @@ -49,6 +53,32 @@ public class InterfaceList { public static int miscTransmitAt = 0; @OriginalMember(owner = "client!je", name = "T", descriptor = "Lclient!sc;") public static HashTable openInterfaces = new HashTable(8); + @OriginalMember(owner = "client!wl", name = "h", descriptor = "Lclient!be;") + public static Component aClass13_26 = null; + @OriginalMember(owner = "client!jd", name = "i", descriptor = "Lclient!be;") + public static Component clickedInventoryComponent; + @OriginalMember(owner = "client!nf", name = "h", descriptor = "Lclient!be;") + public static Component mouseOverInventoryInterface; + @OriginalMember(owner = "client!qk", name = "f", descriptor = "I") + public static int clickedInventoryComponentY = 0; + @OriginalMember(owner = "client!ef", name = "r", descriptor = "Lclient!be;") + public static Component aClass13_12 = null; + @OriginalMember(owner = "client!bn", name = "O", descriptor = "I") + public static int anInt761; + @OriginalMember(owner = "client!bc", name = "X", descriptor = "I") + public static int anInt436; + @OriginalMember(owner = "client!si", name = "ab", descriptor = "I") + public static int anInt5138; + @OriginalMember(owner = "client!sh", name = "f", descriptor = "I") + public static int anInt5103 = -1; + @OriginalMember(owner = "client!gd", name = "j", descriptor = "I") + public static int clickedInventoryComponentCycle = 0; + @OriginalMember(owner = "client!lj", name = "w", descriptor = "I") + public static int clickedInventoryComponentX = 0; + @OriginalMember(owner = "client!og", name = "e", descriptor = "Lclient!be;") + public static Component aClass13_22; + @OriginalMember(owner = "client!ok", name = "b", descriptor = "I") + public static int anInt4271; @OriginalMember(owner = "client!ab", name = "a", descriptor = "(ZLclient!ve;Lclient!ve;Lclient!ve;Lclient!ve;)V") public static void init(@OriginalArg(1) Js5 arg0, @OriginalArg(2) Js5 arg1, @OriginalArg(3) Js5 arg2, @OriginalArg(4) Js5 arg3) { @@ -194,7 +224,7 @@ public class InterfaceList { if (!getServerActiveProperties(arg0).method503(arg1) && arg0.onOptionClick == null) { return null; } else if (arg0.ops == null || arg0.ops.length <= arg1 || arg0.ops[arg1] == null || arg0.ops[arg1].trim().length() == 0) { - return Static121.qaOpTest ? JagString.concatenate(new JagString[] { Static207.aClass100_903, JagString.parseInt(arg1) }) : null; + return Static121.qaOpTest ? JagString.concatenate(new JagString[] { aClass100_903, JagString.parseInt(arg1) }) : null; } else { return arg0.ops[arg1]; } @@ -259,8 +289,8 @@ public class InterfaceList { for (@Pc(3) int local3 = 0; local3 < arg4.length; local3++) { @Pc(19) Component local19 = arg4[local3]; if (local19 != null && local19.layer == arg0) { - Static150.method2801(arg3, arg2, local19, arg1); - Static111.method2291(local19, arg3, arg2); + method2801(arg3, arg2, local19, arg1); + method2291(local19, arg3, arg2); if (local19.scrollMaxH - local19.width < local19.scrollX) { local19.scrollX = local19.scrollMaxH - local19.width; } @@ -305,7 +335,7 @@ public class InterfaceList { if (arg0) { method2275(local16); } - Static132.method3214(local16); + method3214(local16); @Pc(32) Component local32 = getComponent(local9); if (local32 != null) { redraw(local32); @@ -313,15 +343,15 @@ public class InterfaceList { @Pc(41) int local41 = MiniMenu.size; @Pc(43) int local43; for (local43 = 0; local43 < local41; local43++) { - if (Static2.method5(MiniMenu.actions[local43])) { + if (method5(MiniMenu.actions[local43])) { MiniMenu.remove(local43); } } if (MiniMenu.size == 1) { Static40.aBoolean108 = false; - Static133.method4012(Static183.anInt4271, Static24.anInt761, Static229.anInt5138, Static13.anInt436); + method4012(anInt4271, anInt761, anInt5138, anInt436); } else { - Static133.method4012(Static183.anInt4271, Static24.anInt761, Static229.anInt5138, Static13.anInt436); + method4012(anInt4271, anInt761, anInt5138, anInt436); local43 = Fonts.b12Full.getStringWidth(LocalizedText.CHOOSE_OPTION); for (@Pc(75) int local75 = 0; local75 < MiniMenu.size; local75++) { @Pc(88) int local88 = Fonts.b12Full.getStringWidth(MiniMenu.getOp(local75)); @@ -329,11 +359,679 @@ public class InterfaceList { local43 = local88; } } - Static13.anInt436 = MiniMenu.size * 15 + (Static40.aBoolean298 ? 26 : 22); - Static24.anInt761 = local43 + 8; + anInt436 = MiniMenu.size * 15 + (Static40.aBoolean298 ? 26 : 22); + anInt761 = local43 + 8; } if (topLevelInterface != -1) { - Static54.runScripts(1, topLevelInterface); + runScripts(1, topLevelInterface); + } + } + + @OriginalMember(owner = "client!ii", name = "a", descriptor = "(Lclient!be;III)V") + public static void method2291(@OriginalArg(0) Component arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2) { + if (arg0.xMode == 0) { + arg0.y = arg0.baseY; + } else if (arg0.xMode == 1) { + arg0.y = (arg1 - arg0.height) / 2 + arg0.baseY; + } else if (arg0.xMode == 2) { + arg0.y = arg1 - arg0.height - arg0.baseY; + } else if (arg0.xMode == 3) { + arg0.y = arg0.baseY * arg1 >> 14; + } else if (arg0.xMode == 4) { + arg0.y = (arg1 * arg0.baseY >> 14) + (arg1 - arg0.height) / 2; + } else { + arg0.y = arg1 - (arg1 * arg0.baseY >> 14) - arg0.height; + } + if (arg0.yMode == 0) { + arg0.x = arg0.baseX; + } else if (arg0.yMode == 1) { + arg0.x = arg0.baseX + (arg2 - arg0.width) / 2; + } else if (arg0.yMode == 2) { + arg0.x = arg2 - arg0.baseX - arg0.width; + } else if (arg0.yMode == 3) { + arg0.x = arg0.baseX * arg2 >> 14; + } else if (arg0.yMode == 4) { + arg0.x = (arg0.baseX * arg2 >> 14) + (arg2 - arg0.width) / 2; + } else { + arg0.x = arg2 - (arg2 * arg0.baseX >> 14) - arg0.width; + } + if (!Static121.qaOpTest || getServerActiveProperties(arg0).events == 0 && arg0.type != 0) { + return; + } + if (arg0.y < 0) { + arg0.y = 0; + } else if (arg0.height + arg0.y > arg1) { + arg0.y = arg1 - arg0.height; + } + if (arg0.x < 0) { + arg0.x = 0; + } else if (arg2 < arg0.x + arg0.width) { + arg0.x = arg2 - arg0.width; + } + } + + @OriginalMember(owner = "client!fn", name = "a", descriptor = "(ILclient!be;)V") + public static void update(@OriginalArg(1) Component arg0) { + @Pc(7) Component local7 = method4668(arg0); + @Pc(19) int local19; + @Pc(17) int local17; + if (local7 == null) { + local17 = GameShell.canvasHeight; + local19 = GameShell.canvasWidth; + } else { + local17 = local7.height; + local19 = local7.width; + } + method2801(local17, local19, arg0, false); + method2291(arg0, local17, local19); + } + + @OriginalMember(owner = "client!lk", name = "a", descriptor = "(IIILclient!be;Z)V") + public static void method2801(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) Component arg2, @OriginalArg(4) boolean arg3) { + @Pc(4) int local4 = arg2.width; + @Pc(7) int local7 = arg2.height; + if (arg2.dynamicWidthValue == 0) { + arg2.width = arg2.baseWidth; + } else if (arg2.dynamicWidthValue == 1) { + arg2.width = arg1 - arg2.baseWidth; + } else if (arg2.dynamicWidthValue == 2) { + arg2.width = arg2.baseWidth * arg1 >> 14; + } else if (arg2.dynamicWidthValue == 3) { + if (arg2.type == 2) { + arg2.width = arg2.baseWidth * 32 + (arg2.baseWidth - 1) * arg2.anInt512; + } else if (arg2.type == 7) { + arg2.width = arg2.baseWidth * 115 + arg2.anInt512 * (arg2.baseWidth - 1); + } + } + if (arg2.dynamicHeightValue == 0) { + arg2.height = arg2.baseHeight; + } else if (arg2.dynamicHeightValue == 1) { + arg2.height = arg0 - arg2.baseHeight; + } else if (arg2.dynamicHeightValue == 2) { + arg2.height = arg0 * arg2.baseHeight >> 14; + } else if (arg2.dynamicHeightValue == 3) { + if (arg2.type == 2) { + arg2.height = (arg2.baseHeight - 1) * arg2.anInt516 + arg2.baseHeight * 32; + } else if (arg2.type == 7) { + arg2.height = arg2.baseHeight * 12 + (arg2.baseHeight - 1) * arg2.anInt516; + } + } + if (arg2.dynamicWidthValue == 4) { + arg2.width = arg2.aspectWidth * arg2.height / arg2.aspectHeight; + } + if (arg2.dynamicHeightValue == 4) { + arg2.height = arg2.aspectHeight * arg2.width / arg2.aspectWidth; + } + if (Static121.qaOpTest && (getServerActiveProperties(arg2).events != 0 || arg2.type == 0)) { + if (arg2.height < 5 && arg2.width < 5) { + arg2.height = 5; + arg2.width = 5; + } else { + if (arg2.width <= 0) { + arg2.width = 5; + } + if (arg2.height <= 0) { + arg2.height = 5; + } + } + } + if (arg2.clientCode == 1337) { + aClass13_26 = arg2; + } + if (arg3 && arg2.onResize != null && (local4 != arg2.width || arg2.height != local7)) { + @Pc(305) HookRequest local305 = new HookRequest(); + local305.arguments = arg2.onResize; + local305.source = arg2; + lowPriorityRequests.addTail(local305); + } + } + + @OriginalMember(owner = "client!wl", name = "a", descriptor = "(Lclient!be;I)Lclient!be;") + public static Component method4668(@OriginalArg(0) Component arg0) { + if (arg0.layer != -1) { + return getComponent(arg0.layer); + } + @Pc(28) int local28 = arg0.id >>> 16; + @Pc(33) HashTableIterator local33 = new HashTableIterator(openInterfaces); + for (@Pc(38) ComponentPointer local38 = (ComponentPointer) local33.method2701(); local38 != null; local38 = (ComponentPointer) local33.method2700()) { + if (local28 == local38.anInt5878) { + return getComponent((int) local38.key); + } + } + return null; + } + + @OriginalMember(owner = "client!kf", name = "a", descriptor = "(IIBII)V") + public static void method4012(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3) { + for (@Pc(12) int local12 = 0; local12 < rectangles; local12++) { + if (rectangleWidth[local12] + rectangleX[local12] > arg0 && arg1 + arg0 > rectangleX[local12] && arg2 < rectangleHeight[local12] + rectangleY[local12] && rectangleY[local12] < arg2 + arg3) { + aBooleanArray100[local12] = true; + } + } + } + + @OriginalMember(owner = "client!we", name = "b", descriptor = "(BI)V") + public static void method3214(@OriginalArg(1) int arg0) { + for (@Pc(11) Node local11 = properties.head(); local11 != null; local11 = properties.next()) { + if ((local11.key >> 48 & 0xFFFFL) == (long) arg0) { + local11.unlink(); + } + } + } + + @OriginalMember(owner = "client!ed", name = "a", descriptor = "(III)V") + public static void runScripts(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) { + if (load(arg1)) { + method7(components[arg1], arg0); + } + } + + @OriginalMember(owner = "client!aa", name = "a", descriptor = "([Lclient!be;ZI)V") + public static void method7(@OriginalArg(0) Component[] arg0, @OriginalArg(2) int arg1) { + for (@Pc(11) int local11 = 0; local11 < arg0.length; local11++) { + @Pc(23) Component local23 = arg0[local11]; + if (local23 != null) { + if (local23.type == 0) { + if (local23.createdComponents != null) { + method7(local23.createdComponents, arg1); + } + @Pc(49) ComponentPointer local49 = (ComponentPointer) openInterfaces.get((long) local23.id); + if (local49 != null) { + runScripts(arg1, local49.anInt5878); + } + } + @Pc(72) HookRequest local72; + if (arg1 == 0 && local23.onDialogAbort != null) { + local72 = new HookRequest(); + local72.arguments = local23.onDialogAbort; + local72.source = local23; + ScriptRunner.run(local72); + } + if (arg1 == 1 && local23.onWidgetsOpenClose != null) { + if (local23.createdComponentId >= 0) { + @Pc(103) Component local103 = getComponent(local23.id); + if (local103 == null || local103.createdComponents == null || local23.createdComponentId >= local103.createdComponents.length || local103.createdComponents[local23.createdComponentId] != local23) { + continue; + } + } + local72 = new HookRequest(); + local72.arguments = local23.onWidgetsOpenClose; + local72.source = local23; + ScriptRunner.run(local72); + } + } + } + } + + @OriginalMember(owner = "client!eg", name = "a", descriptor = "(IIIIIIII)V") + public static void method1320(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5, @OriginalArg(7) int arg6) { + if (load(arg4)) { + method946(components[arg4], -1, arg5, arg1, arg3, arg6, arg0, arg2); + } + } + + @OriginalMember(owner = "client!client", name = "a", descriptor = "([Lclient!be;IIIIIII)V") + public static void method946(@OriginalArg(0) Component[] arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7) { + for (@Pc(1) int local1 = 0; local1 < arg0.length; local1++) { + @Pc(9) Component component = arg0[local1]; + if (component != null && component.layer == arg1 && (!component.if3 || component.type == 0 || component.aBoolean25 || getServerActiveProperties(component).events != 0 || component == Static40.aClass13_1 || component.clientCode == 1338) && (!component.if3 || !Static36.method947(component))) { + @Pc(50) int local50 = component.x + arg6; + @Pc(55) int local55 = component.y + arg7; + @Pc(61) int local61; + @Pc(63) int local63; + @Pc(65) int local65; + @Pc(67) int local67; + if (component.type == 2) { + local61 = arg2; + local63 = arg3; + local65 = arg4; + local67 = arg5; + } else { + @Pc(73) int local73 = local50 + component.width; + @Pc(78) int local78 = local55 + component.height; + if (component.type == 9) { + local73++; + local78++; + } + local61 = local50 > arg2 ? local50 : arg2; + local63 = local55 > arg3 ? local55 : arg3; + local65 = local73 < arg4 ? local73 : arg4; + local67 = local78 < arg5 ? local78 : arg5; + } + if (component == Static40.aClass13_14) { + Static44.aBoolean83 = true; + Static36.anInt3075 = local50; + Static36.anInt660 = local55; + } + if (!component.if3 || local61 < local65 && local63 < local67) { + if (component.type == 0) { + if (!component.if3 && Static36.method947(component) && aClass13_22 != component) { + continue; + } + if (component.noClickThrough && Mouse.lastMouseX >= local61 && Mouse.lastMouseY >= local63 && Mouse.lastMouseX < local65 && Mouse.lastMouseY < local67) { + for (@Pc(164) HookRequest local164 = (HookRequest) lowPriorityRequests.head(); local164 != null; local164 = (HookRequest) lowPriorityRequests.next()) { + if (local164.aBoolean158) { + local164.unlink(); + local164.source.aBoolean19 = false; + } + } + if (Static40.anInt4851 == 0) { + Static40.aClass13_14 = null; + Static40.aClass13_1 = null; + } + Static36.anInt3337 = 0; + } + } + if (component.if3) { + @Pc(207) boolean local207; + if (Mouse.lastMouseX >= local61 && Mouse.lastMouseY >= local63 && Mouse.lastMouseX < local65 && Mouse.lastMouseY < local67) { + local207 = true; + } else { + local207 = false; + } + @Pc(212) boolean local212 = false; + if (Mouse.pressedButton == 1 && local207) { + local212 = true; + } + @Pc(221) boolean local221 = false; + if (Mouse.clickButton == 1 && Mouse.clickX >= local61 && Mouse.clickY >= local63 && Mouse.clickX < local65 && Mouse.clickY < local67) { + local221 = true; + } + @Pc(243) int i; + @Pc(322) int k; + if (component.aByteArray8 != null) { + for (i = 0; i < component.aByteArray8.length; i++) { + if (Keyboard.pressedKeys[component.aByteArray8[i]]) { + if (component.anIntArray49 == null || client.loop >= component.anIntArray49[i]) { + @Pc(279) byte local279 = component.aByteArray7[i]; + if (local279 == 0 || ((local279 & 0x2) == 0 || Keyboard.pressedKeys[Keyboard.KEY_ALT]) && ((local279 & 0x1) == 0 || Keyboard.pressedKeys[Keyboard.KEY_CTRL]) && ((local279 & 0x4) == 0 || Keyboard.pressedKeys[Keyboard.KEY_SHIFT])) { + ClientProt.method4512(JagString.EMPTY, -1, i + 1, component.id); + k = component.anIntArray46[i]; + if (component.anIntArray49 == null) { + component.anIntArray49 = new int[component.aByteArray8.length]; + } + if (k == 0) { + component.anIntArray49[i] = Integer.MAX_VALUE; + } else { + component.anIntArray49[i] = client.loop + k; + } + } + } + } else if (component.anIntArray49 != null) { + component.anIntArray49[i] = 0; + } + } + } + if (local221) { + Static40.method1015(Mouse.clickY - local55, Mouse.clickX - local50, component); + } + if (Static40.aClass13_14 != null && Static40.aClass13_14 != component && local207 && getServerActiveProperties(component).method509()) { + aClass13_12 = component; + } + if (component == Static40.aClass13_1) { + Static146.aBoolean174 = true; + Static81.anInt2225 = local50; + anInt5103 = local55; + } + if (component.aBoolean25 || component.clientCode != 0) { + @Pc(399) HookRequest request; + if (local207 && MouseWheel.wheelRotation != 0 && component.onScroll != null) { + request = new HookRequest(); + request.aBoolean158 = true; + request.source = component; + request.mouseY = MouseWheel.wheelRotation; + request.arguments = component.onScroll; + lowPriorityRequests.addTail(request); + } + if (Static40.aClass13_14 != null || clickedInventoryComponent != null || Static40.aBoolean108 || component.clientCode != 1400 && Static36.anInt3337 > 0) { + local221 = false; + local212 = false; + local207 = false; + } + @Pc(508) int skill; + if (component.clientCode != 0) { + if (component.clientCode == 1337) { + aClass13_26 = component; + redraw(component); + continue; + } + if (component.clientCode == 1338) { + if (local221) { + Static1.anInt5 = Mouse.clickX - local50; + MiniMenu.anInt2878 = Mouse.clickY - local55; + } + continue; + } + if (component.clientCode == 1400) { + WorldMap.component = component; + if (local221) { + if (Keyboard.pressedKeys[Keyboard.KEY_CTRL] && LoginManager.staffModLevel > 0) { + i = (int) ((double) (Mouse.clickX - local50 - component.width / 2) * 2.0D / (double) WorldMap.zoom); + skill = (int) ((double) (Mouse.clickY - local55 - component.height / 2) * 2.0D / (double) WorldMap.zoom); + k = WorldMap.anInt435 + i; + @Pc(516) int local516 = WorldMap.anInt919 + skill; + @Pc(520) int local520 = k + WorldMap.originX; + @Pc(528) int local528 = WorldMap.length + WorldMap.originZ - local516 - 1; + Cheat.teleport(local520, local528, 0); + ClientProt.closeWidget(); + continue; + } + Static36.anInt3337 = 1; + Static40.anInt5388 = Mouse.lastMouseX; + Static40.anInt4035 = Mouse.lastMouseY; + continue; + } + if (local212 && Static36.anInt3337 > 0) { + if (Static36.anInt3337 == 1 && (Static40.anInt5388 != Mouse.lastMouseX || Static40.anInt4035 != Mouse.lastMouseY)) { + Static36.anInt4620 = WorldMap.anInt435; + Static36.anInt1885 = WorldMap.anInt919; + Static36.anInt3337 = 2; + } + if (Static36.anInt3337 == 2) { + WorldMap.method1964(Static36.anInt4620 + (int) ((double) (Static40.anInt5388 - Mouse.lastMouseX) * 2.0D / (double) WorldMap.targetZoom)); + WorldMap.method4641(Static36.anInt1885 + (int) ((double) (Static40.anInt4035 - Mouse.lastMouseY) * 2.0D / (double) WorldMap.targetZoom)); + } + continue; + } + Static36.anInt3337 = 0; + continue; + } + if (component.clientCode == 1401) { + if (local212) { + WorldMap.method2387(component.width, Mouse.lastMouseY - local55, Mouse.lastMouseX - local50, component.height); + } + continue; + } + if (component.clientCode == 1402) { + if (!GlRenderer.enabled) { + redraw(component); + } + continue; + } + } + if (!component.aBoolean24 && local221) { + component.aBoolean24 = true; + if (component.onClickRepeat != null) { + request = new HookRequest(); + request.aBoolean158 = true; + request.source = component; + request.mouseX = Mouse.clickX - local50; + request.mouseY = Mouse.clickY - local55; + request.arguments = component.onClickRepeat; + lowPriorityRequests.addTail(request); + } + } + if (component.aBoolean24 && local212 && component.onDrag != null) { + request = new HookRequest(); + request.aBoolean158 = true; + request.source = component; + request.mouseX = Mouse.lastMouseX - local50; + request.mouseY = Mouse.lastMouseY - local55; + request.arguments = component.onDrag; + lowPriorityRequests.addTail(request); + } + if (component.aBoolean24 && !local212) { + component.aBoolean24 = false; + if (component.onRelease != null) { + request = new HookRequest(); + request.aBoolean158 = true; + request.source = component; + request.mouseX = Mouse.lastMouseX - local50; + request.mouseY = Mouse.lastMouseY - local55; + request.arguments = component.onRelease; + mediumPriorityRequests.addTail(request); + } + } + if (local212 && component.onHold != null) { + request = new HookRequest(); + request.aBoolean158 = true; + request.source = component; + request.mouseX = Mouse.lastMouseX - local50; + request.mouseY = Mouse.lastMouseY - local55; + request.arguments = component.onHold; + lowPriorityRequests.addTail(request); + } + if (!component.aBoolean19 && local207) { + component.aBoolean19 = true; + if (component.onMouseOver != null) { + request = new HookRequest(); + request.aBoolean158 = true; + request.source = component; + request.mouseX = Mouse.lastMouseX - local50; + request.mouseY = Mouse.lastMouseY - local55; + request.arguments = component.onMouseOver; + lowPriorityRequests.addTail(request); + } + } + if (component.aBoolean19 && local207 && component.onMouseRepeat != null) { + request = new HookRequest(); + request.aBoolean158 = true; + request.source = component; + request.mouseX = Mouse.lastMouseX - local50; + request.mouseY = Mouse.lastMouseY - local55; + request.arguments = component.onMouseRepeat; + lowPriorityRequests.addTail(request); + } + if (component.aBoolean19 && !local207) { + component.aBoolean19 = false; + if (component.onMouseLeave != null) { + request = new HookRequest(); + request.aBoolean158 = true; + request.source = component; + request.mouseX = Mouse.lastMouseX - local50; + request.mouseY = Mouse.lastMouseY - local55; + request.arguments = component.onMouseLeave; + mediumPriorityRequests.addTail(request); + } + } + if (component.onTimer != null) { + request = new HookRequest(); + request.source = component; + request.arguments = component.onTimer; + Static4.highPriorityRequests.addTail(request); + } + @Pc(966) HookRequest request2; + if (component.onVarcTransmit != null && VarcDomain.updatedVarcsWriterIndex > component.updatedVarcsReaderIndex) { + if (component.varcTriggers == null || VarcDomain.updatedVarcsWriterIndex - component.updatedVarcsReaderIndex > 32) { + request = new HookRequest(); + request.source = component; + request.arguments = component.onVarcTransmit; + lowPriorityRequests.addTail(request); + } else { + label563: for (i = component.updatedVarcsReaderIndex; i < VarcDomain.updatedVarcsWriterIndex; i++) { + skill = VarcDomain.updatedVarcs[i & 0x1F]; + for (k = 0; k < component.varcTriggers.length; k++) { + if (component.varcTriggers[k] == skill) { + request2 = new HookRequest(); + request2.source = component; + request2.arguments = component.onVarcTransmit; + lowPriorityRequests.addTail(request2); + break label563; + } + } + } + } + component.updatedVarcsReaderIndex = VarcDomain.updatedVarcsWriterIndex; + } + if (component.onVarcstrTransmit != null && VarcDomain.updatedVarcstrsWriterIndex > component.updatedVarcstrsReaderIndex) { + if (component.varcstrTriggers == null || VarcDomain.updatedVarcstrsWriterIndex - component.updatedVarcstrsReaderIndex > 32) { + request = new HookRequest(); + request.source = component; + request.arguments = component.onVarcstrTransmit; + lowPriorityRequests.addTail(request); + } else { + label539: for (i = component.updatedVarcstrsReaderIndex; i < VarcDomain.updatedVarcstrsWriterIndex; i++) { + skill = VarcDomain.updatedVarcstrs[i & 0x1F]; + for (k = 0; k < component.varcstrTriggers.length; k++) { + if (component.varcstrTriggers[k] == skill) { + request2 = new HookRequest(); + request2.source = component; + request2.arguments = component.onVarcstrTransmit; + lowPriorityRequests.addTail(request2); + break label539; + } + } + } + } + component.updatedVarcstrsReaderIndex = VarcDomain.updatedVarcstrsWriterIndex; + } + if (component.onVarpTransmit != null && VarpDomain.updatedVarpsWriterIndex > component.updatedVarpsReaderIndex) { + if (component.varpTriggers == null || VarpDomain.updatedVarpsWriterIndex - component.updatedVarpsReaderIndex > 32) { + request = new HookRequest(); + request.source = component; + request.arguments = component.onVarpTransmit; + lowPriorityRequests.addTail(request); + } else { + label515: for (i = component.updatedVarpsReaderIndex; i < VarpDomain.updatedVarpsWriterIndex; i++) { + skill = VarpDomain.updatedVarps[i & 0x1F]; + for (k = 0; k < component.varpTriggers.length; k++) { + if (component.varpTriggers[k] == skill) { + request2 = new HookRequest(); + request2.source = component; + request2.arguments = component.onVarpTransmit; + lowPriorityRequests.addTail(request2); + break label515; + } + } + } + } + component.updatedVarpsReaderIndex = VarpDomain.updatedVarpsWriterIndex; + } + if (component.onInvTransmit != null && Inv.updatedInventoriesWriterIndex > component.updatedInventoriesReaderIndex) { + if (component.inventoryTriggers == null || Inv.updatedInventoriesWriterIndex - component.updatedInventoriesReaderIndex > 32) { + request = new HookRequest(); + request.source = component; + request.arguments = component.onInvTransmit; + lowPriorityRequests.addTail(request); + } else { + outer: + for (i = component.updatedInventoriesReaderIndex; i < Inv.updatedInventoriesWriterIndex; i++) { + skill = Inv.updatedInventories[i & 0x1F]; + for (k = 0; k < component.inventoryTriggers.length; k++) { + if (component.inventoryTriggers[k] == skill) { + request2 = new HookRequest(); + request2.source = component; + request2.arguments = component.onInvTransmit; + lowPriorityRequests.addTail(request2); + break outer; + } + } + } + } + component.updatedInventoriesReaderIndex = Inv.updatedInventoriesWriterIndex; + } + if (component.onStatTransmit != null && PlayerSkillXpTable.updatedStatsWriterIndex > component.updatedStatsReaderIndex) { + if (component.statTriggers == null || PlayerSkillXpTable.updatedStatsWriterIndex - component.updatedStatsReaderIndex > 32) { + request = new HookRequest(); + request.source = component; + request.arguments = component.onStatTransmit; + lowPriorityRequests.addTail(request); + } else { + outer: + for (i = component.updatedStatsReaderIndex; i < PlayerSkillXpTable.updatedStatsWriterIndex; i++) { + skill = PlayerSkillXpTable.updatedStats[i & 0x1F]; + for (k = 0; k < component.statTriggers.length; k++) { + if (component.statTriggers[k] == skill) { + request2 = new HookRequest(); + request2.source = component; + request2.arguments = component.onStatTransmit; + lowPriorityRequests.addTail(request2); + break outer; + } + } + } + } + component.updatedStatsReaderIndex = PlayerSkillXpTable.updatedStatsWriterIndex; + } + if (Chat.transmitAt > component.lastTransmitTimer && component.onMsg != null) { + request = new HookRequest(); + request.source = component; + request.arguments = component.onMsg; + lowPriorityRequests.addTail(request); + } + if (FriendsList.transmitAt > component.lastTransmitTimer && component.onFriendTransmit != null) { + request = new HookRequest(); + request.source = component; + request.arguments = component.onFriendTransmit; + lowPriorityRequests.addTail(request); + } + if (ClanChat.transmitAt > component.lastTransmitTimer && component.onClanTransmit != null) { + request = new HookRequest(); + request.source = component; + request.arguments = component.onClanTransmit; + lowPriorityRequests.addTail(request); + } + if (StockMarketManager.transmitAt > component.lastTransmitTimer && component.onStockTransmit != null) { + request = new HookRequest(); + request.source = component; + request.arguments = component.onStockTransmit; + lowPriorityRequests.addTail(request); + } + if (miscTransmitAt > component.lastTransmitTimer && component.onMiscTransmit != null) { + request = new HookRequest(); + request.source = component; + request.arguments = component.onMiscTransmit; + lowPriorityRequests.addTail(request); + } + component.lastTransmitTimer = transmitTimer; + if (component.onKey != null) { + for (i = 0; i < keyQueueSize; i++) { + @Pc(1430) HookRequest local1430 = new HookRequest(); + local1430.source = component; + local1430.keyCode = keyCodes[i]; + local1430.keyChar = keyChars[i]; + local1430.arguments = component.onKey; + lowPriorityRequests.addTail(local1430); + } + } + if (Camera.aBoolean16 && component.onMinimapUnlock != null) { + request = new HookRequest(); + request.source = component; + request.arguments = component.onMinimapUnlock; + lowPriorityRequests.addTail(request); + } + } + } + if (!component.if3 && Static40.aClass13_14 == null && clickedInventoryComponent == null && !Static40.aBoolean108) { + if ((component.anInt470 >= 0 || component.anInt480 != 0) && Mouse.lastMouseX >= local61 && Mouse.lastMouseY >= local63 && Mouse.lastMouseX < local65 && Mouse.lastMouseY < local67) { + if (component.anInt470 >= 0) { + aClass13_22 = arg0[component.anInt470]; + } else { + aClass13_22 = component; + } + } + if (component.type == 8 && Mouse.lastMouseX >= local61 && Mouse.lastMouseY >= local63 && Mouse.lastMouseX < local65 && Mouse.lastMouseY < local67) { + Protocol.aClass13_11 = component; + } + if (component.scrollMaxV > component.height) { + Static36.method4049(Mouse.lastMouseY, component.height, component, Mouse.lastMouseX, local50 + component.width, local55, component.scrollMaxV); + } + } + if (component.type == 0) { + method946(arg0, component.id, local61, local63, local65, local67, local50 - component.scrollX, local55 - component.scrollY); + if (component.createdComponents != null) { + method946(component.createdComponents, component.id, local61, local63, local65, local67, local50 - component.scrollX, local55 - component.scrollY); + } + @Pc(1595) ComponentPointer local1595 = (ComponentPointer) openInterfaces.get((long) component.id); + if (local1595 != null) { + method1320(local50, local63, local55, local65, local1595.anInt5878, local61, local67); + } + } + } + } + } + } + + @OriginalMember(owner = "client!aa", name = "a", descriptor = "(SI)Z") + public static boolean method5(@OriginalArg(0) short arg0) { + if (arg0 == 47 || arg0 == 5 || arg0 == 43 || arg0 == 35 || arg0 == 58 || arg0 == 22 || arg0 == 40 || arg0 == 3) { + return true; + } else if (arg0 == 9 || arg0 == 12 || arg0 == 1006 || arg0 == 1003) { + return true; + } else if (arg0 == 25 || arg0 == 23 || arg0 == 48 || arg0 == 7 || arg0 == 13) { + return true; + } else { + return arg0 == 8 || arg0 == 32 || arg0 == 28 || arg0 == 59 || arg0 == 51 || arg0 == 41; } } } diff --git a/client/src/main/java/rt4/Inv.java b/client/src/main/java/rt4/Inv.java index c9b5283..87b065e 100644 --- a/client/src/main/java/rt4/Inv.java +++ b/client/src/main/java/rt4/Inv.java @@ -10,6 +10,14 @@ public final class Inv extends Node { @OriginalMember(owner = "client!cb", name = "I", descriptor = "[I") public static final int[] updatedInventories = new int[32]; + @OriginalMember(owner = "client!kl", name = "u", descriptor = "Lclient!na;") + public static final JagString aClass100_637 = JagString.parse(""); + @OriginalMember(owner = "client!ol", name = "Y", descriptor = "Lclient!na;") + public static final JagString aClass100_819 = JagString.parse(""); + @OriginalMember(owner = "client!ib", name = "g", descriptor = "Lclient!na;") + public static final JagString aClass100_559 = JagString.parse(""); + @OriginalMember(owner = "client!jj", name = "m", descriptor = "Lclient!na;") + public static final JagString aClass100_594 = JagString.parse("<)4col>"); @OriginalMember(owner = "client!ii", name = "c", descriptor = "I") public static int updatedInventoriesWriterIndex = 0; @OriginalMember(owner = "client!bj", name = "v", descriptor = "Lclient!sc;") @@ -255,11 +263,22 @@ public final class Inv extends Node { @OriginalMember(owner = "client!eb", name = "b", descriptor = "(II)Lclient!na;") public static JagString formatObjAmount(@OriginalArg(1) int arg0) { if (arg0 < 100000) { - return JagString.concatenate(new JagString[] { Static52.aClass100_559, JagString.parseInt(arg0), Static52.aClass100_594 }); + return JagString.concatenate(new JagString[] { aClass100_559, JagString.parseInt(arg0), aClass100_594 }); } else if (arg0 >= 10000000) { - return JagString.concatenate(new JagString[] { Static52.aClass100_819, JagString.parseInt(arg0 / 1000000), LocalizedText.MILLION, Static52.aClass100_594 }); + return JagString.concatenate(new JagString[] { aClass100_819, JagString.parseInt(arg0 / 1000000), LocalizedText.MILLION, aClass100_594 }); } else { - return JagString.concatenate(new JagString[] { Static52.aClass100_637, JagString.parseInt(arg0 / 1000), LocalizedText.THOUSAND, Static52.aClass100_594 }); + return JagString.concatenate(new JagString[] { aClass100_637, JagString.parseInt(arg0 / 1000), LocalizedText.THOUSAND, aClass100_594 }); + } + } + + @OriginalMember(owner = "client!bd", name = "a", descriptor = "(BI)V") + public static void method475(@OriginalArg(1) int arg0) { + @Pc(8) Inv local8 = (Inv) objectContainerCache.get((long) arg0); + if (local8 != null) { + for (@Pc(24) int local24 = 0; local24 < local8.objectIds.length; local24++) { + local8.objectIds[local24] = -1; + local8.anIntArray422[local24] = 0; + } } } } diff --git a/client/src/main/java/rt4/JagString.java b/client/src/main/java/rt4/JagString.java index 0258eaf..bc4963b 100644 --- a/client/src/main/java/rt4/JagString.java +++ b/client/src/main/java/rt4/JagString.java @@ -21,7 +21,27 @@ public final class JagString implements StringInterface { public static final JagString aClass100_853 = parse("null"); @OriginalMember(owner = "client!t", name = "C", descriptor = "Lclient!na;") public static final JagString aClass100_994 = parse(")3"); - @OriginalMember(owner = "client!na", name = "T", descriptor = "[B") + @OriginalMember(owner = "client!dm", name = "n", descriptor = "Lclient!na;") + public static final JagString PERCENT_SIGN = parse("(U"); + @OriginalMember(owner = "client!jh", name = "g", descriptor = "Lclient!na;") + public static final JagString aClass100_591 = parse("(Udns"); + @OriginalMember(owner = "client!tb", name = "P", descriptor = "Lclient!na;") + public static final JagString aClass100_1002 = parse("(U5"); + @OriginalMember(owner = "client!hh", name = "a", descriptor = "Lclient!na;") + public static final JagString aClass100_520 = parse("(U4"); + @OriginalMember(owner = "client!mj", name = "g", descriptor = "Lclient!na;") + public static final JagString aClass100_761 = parse("(U3"); + @OriginalMember(owner = "client!wh", name = "u", descriptor = "Lclient!na;") + public static final JagString aClass100_1097 = parse("(U2"); + @OriginalMember(owner = "client!bm", name = "p", descriptor = "Lclient!na;") + public static final JagString aClass100_133 = parse("(U1"); + @OriginalMember(owner = "client!vk", name = "a", descriptor = "[I") + public static final int[] anIntArray471 = new int[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 73, 74, 76, 78, 83, 84, 85, 86, 91, 92, 93, 94, 95, 97, 103, 104, 105, 106, 107, 108, 113, 114, 115, 116, 118, 119, 120, 121, 122, 123, 124, 125, 133, 134, 136, 138, 143, 144, 145, 146, 151, 152, 153, 154, 155, 157, 163, 164, 165, 166, 168, 169, 174, 175, 176, 177, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 97, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 157, 215, 216, 117, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 66, 66, 66, 66, 66, 66, 65, 75, 79, 79, 79, 79, 87, 87, 87, 87, 77, 96, 98, 98, 98, 98, 98, 250, 251, 109, 109, 109, 109, 117, 252, 167, 126, 126, 126, 126, 126, 126, 125, 135, 139, 139, 139, 139, 147, 147, 147, 147, 137, 156, 158, 158, 158, 158, 158, 253, 254, 170, 170, 170, 170, 178, 255, 178 }; + @OriginalMember(owner = "client!sh", name = "e", descriptor = "Lclient!na;") + public static final JagString aClass100_967 = parse(""); + @OriginalMember(owner = "client!li", name = "w", descriptor = "Lclient!sc;") + public static HashTable aClass133_13; + @OriginalMember(owner = "client!na", name = "T", descriptor = "[B") public byte[] chars; @OriginalMember(owner = "client!na", name = "lb", descriptor = "I") @@ -201,26 +221,26 @@ public final class JagString implements StringInterface { @OriginalMember(owner = "client!k", name = "a", descriptor = "(Lclient!be;Lclient!na;I)Lclient!na;") public static JagString method2465(@OriginalArg(0) Component arg0, @OriginalArg(1) JagString arg1) { - if (arg1.indexOf(Static127.PERCENT_SIGN) == -1) { + if (arg1.indexOf(PERCENT_SIGN) == -1) { return arg1; } while (true) { - @Pc(14) int local14 = arg1.indexOf(Static127.aClass100_133); + @Pc(14) int local14 = arg1.indexOf(aClass100_133); if (local14 == -1) { while (true) { - local14 = arg1.indexOf(Static127.aClass100_1097); + local14 = arg1.indexOf(aClass100_1097); if (local14 == -1) { while (true) { - local14 = arg1.indexOf(Static127.aClass100_761); + local14 = arg1.indexOf(aClass100_761); if (local14 == -1) { while (true) { - local14 = arg1.indexOf(Static127.aClass100_520); + local14 = arg1.indexOf(aClass100_520); if (local14 == -1) { while (true) { - local14 = arg1.indexOf(Static127.aClass100_1002); + local14 = arg1.indexOf(aClass100_1002); if (local14 == -1) { while (true) { - local14 = arg1.indexOf(Static127.aClass100_591); + local14 = arg1.indexOf(aClass100_591); if (local14 == -1) { return arg1; } @@ -235,22 +255,177 @@ public final class JagString implements StringInterface { arg1 = concatenate(new JagString[] { arg1.substring(local14, 0), local246, arg1.substring(local14 + 4) }); } } - arg1 = concatenate(new JagString[] { arg1.substring(local14, 0), StringUtils.method4510(Static127.method3212(4, arg0)), arg1.substring(local14 + 2) }); + arg1 = concatenate(new JagString[] { arg1.substring(local14, 0), StringUtils.method4510(method3212(4, arg0)), arg1.substring(local14 + 2) }); } } - arg1 = concatenate(new JagString[] { arg1.substring(local14, 0), StringUtils.method4510(Static127.method3212(3, arg0)), arg1.substring(local14 + 2) }); + arg1 = concatenate(new JagString[] { arg1.substring(local14, 0), StringUtils.method4510(method3212(3, arg0)), arg1.substring(local14 + 2) }); } } - arg1 = concatenate(new JagString[] { arg1.substring(local14, 0), StringUtils.method4510(Static127.method3212(2, arg0)), arg1.substring(local14 + 2) }); + arg1 = concatenate(new JagString[] { arg1.substring(local14, 0), StringUtils.method4510(method3212(2, arg0)), arg1.substring(local14 + 2) }); } } - arg1 = concatenate(new JagString[] { arg1.substring(local14, 0), StringUtils.method4510(Static127.method3212(1, arg0)), arg1.substring(local14 + 2) }); + arg1 = concatenate(new JagString[] { arg1.substring(local14, 0), StringUtils.method4510(method3212(1, arg0)), arg1.substring(local14 + 2) }); } } - arg1 = concatenate(new JagString[] { arg1.substring(local14, 0), StringUtils.method4510(Static127.method3212(0, arg0)), arg1.substring(local14 + 2) }); + arg1 = concatenate(new JagString[] { arg1.substring(local14, 0), StringUtils.method4510(method3212(0, arg0)), arg1.substring(local14 + 2) }); } } + @OriginalMember(owner = "client!we", name = "a", descriptor = "(BILclient!be;)I") + public static int method3212(@OriginalArg(1) int arg0, @OriginalArg(2) Component arg1) { + if (arg1.anIntArrayArray4 == null || arg0 >= arg1.anIntArrayArray4.length) { + return -2; + } + try { + @Pc(33) int[] local33 = arg1.anIntArrayArray4[arg0]; + @Pc(35) byte local35 = 0; + @Pc(37) int local37 = 0; + @Pc(39) int local39 = 0; + while (true) { + @Pc(41) int local41 = 0; + @Pc(46) int local46 = local33[local39++]; + @Pc(48) byte local48 = 0; + if (local46 == 0) { + return local37; + } + if (local46 == 15) { + local48 = 1; + } + if (local46 == 16) { + local48 = 2; + } + if (local46 == 1) { + local41 = PlayerSkillXpTable.boostedLevels[local33[local39++]]; + } + if (local46 == 17) { + local48 = 3; + } + if (local46 == 2) { + local41 = PlayerSkillXpTable.baseLevels[local33[local39++]]; + } + if (local46 == 3) { + local41 = PlayerSkillXpTable.experience[local33[local39++]]; + } + @Pc(124) int local124; + @Pc(135) Component local135; + @Pc(140) int local140; + @Pc(152) int local152; + if (local46 == 4) { + local124 = local33[local39++] << 16; + @Pc(131) int local131 = local124 + local33[local39++]; + local135 = InterfaceList.getComponent(local131); + local140 = local33[local39++]; + if (local140 != -1 && (!ObjTypeList.get(local140).members || LoginManager.mapMembers)) { + for (local152 = 0; local152 < local135.objTypes.length; local152++) { + if (local140 + 1 == local135.objTypes[local152]) { + local41 += local135.objCounts[local152]; + } + } + } + } + if (local46 == 5) { + local41 = VarpDomain.activeVarps[local33[local39++]]; + } + if (local46 == 6) { + local41 = PlayerSkillXpTable.xpLevelLookup[PlayerSkillXpTable.baseLevels[local33[local39++]] - 1]; + } + if (local46 == 7) { + local41 = VarpDomain.activeVarps[local33[local39++]] * 100 / 46875; + } + if (local46 == 8) { + local41 = PlayerList.self.combatLevel; + } + if (local46 == 9) { + for (local124 = 0; local124 < 25; local124++) { + if (Static182.aBooleanArray97[local124]) { + local41 += PlayerSkillXpTable.baseLevels[local124]; + } + } + } + if (local46 == 10) { + local124 = local33[local39++] << 16; + local124 += local33[local39++]; + local135 = InterfaceList.getComponent(local124); + local140 = local33[local39++]; + if (local140 != -1 && (!ObjTypeList.get(local140).members || LoginManager.mapMembers)) { + for (local152 = 0; local152 < local135.objTypes.length; local152++) { + if (local135.objTypes[local152] == local140 + 1) { + local41 = 999999999; + break; + } + } + } + } + if (local46 == 11) { + local41 = Player.runEnergy; + } + if (local46 == 12) { + local41 = Player.weight; + } + if (local46 == 13) { + local124 = VarpDomain.activeVarps[local33[local39++]]; + @Pc(353) int local353 = local33[local39++]; + local41 = (0x1 << local353 & local124) == 0 ? 0 : 1; + } + if (local46 == 14) { + local124 = local33[local39++]; + local41 = VarpDomain.getVarbit(local124); + } + if (local46 == 18) { + local41 = (PlayerList.self.xFine >> 7) + Camera.originX; + } + if (local46 == 19) { + local41 = (PlayerList.self.zFine >> 7) + Camera.originZ; + } + if (local46 == 20) { + local41 = local33[local39++]; + } + if (local48 == 0) { + if (local35 == 0) { + local37 += local41; + } + if (local35 == 1) { + local37 -= local41; + } + if (local35 == 2 && local41 != 0) { + local37 /= local41; + } + if (local35 == 3) { + local37 *= local41; + } + local35 = 0; + } else { + local35 = local48; + } + } + } catch (@Pc(464) Exception local464) { + return -1; + } + } + + @OriginalMember(owner = "client!nb", name = "a", descriptor = "(II)Lclient!na;") + public static JagString getNbsp() { + @Pc(21) JagString str = new JagString(); + str.length = 1; + str.chars = new byte[1]; + str.chars[0] = -96; // 0xA0 - NBSP + return str; + } + + @OriginalMember(owner = "client!sj", name = "a", descriptor = "(Ljava/lang/String;I)Lclient!na;") + public static JagString method3952(@OriginalArg(0) String arg0) { + @Pc(14) byte[] local14 = arg0.getBytes(StandardCharsets.ISO_8859_1); + @Pc(23) JagString local23 = new JagString(); + local23.chars = local14; + local23.length = 0; + for (@Pc(31) int local31 = 0; local31 < local14.length; local31++) { + if (local14[local31] != 0) { + local14[local23.length++] = local14[local31]; + } + } + return local23; + } + @OriginalMember(owner = "client!na", name = "a", descriptor = "(Z)Ljava/net/URL;") public final URL method3107() throws MalformedURLException { return new URL(new String(this.chars, 0, this.length)); @@ -527,10 +702,10 @@ public final class JagString implements StringInterface { } else { local17--; } - if (Static266.anIntArray471[local12] < Static266.anIntArray471[local14]) { + if (anIntArray471[local12] < anIntArray471[local14]) { return -1; } - if (Static266.anIntArray471[local14] < Static266.anIntArray471[local12]) { + if (anIntArray471[local14] < anIntArray471[local12]) { return 1; } } @@ -918,10 +1093,10 @@ public final class JagString implements StringInterface { @Pc(19) Class local19 = JagString.class; synchronized (local19) { @Pc(30) StringNode local30; - if (Static148.aClass133_13 == null) { - Static148.aClass133_13 = new HashTable(4096); + if (aClass133_13 == null) { + aClass133_13 = new HashTable(4096); } else { - for (local30 = (StringNode) Static148.aClass133_13.get(local9); local30 != null; local30 = (StringNode) Static148.aClass133_13.nextWithKey()) { + for (local30 = (StringNode) aClass133_13.get(local9); local30 != null; local30 = (StringNode) aClass133_13.nextWithKey()) { if (this.strEquals(local30.value)) { return local30.value; } @@ -930,7 +1105,7 @@ public final class JagString implements StringInterface { local30 = new StringNode(); local30.value = this; this.aBoolean193 = false; - Static148.aClass133_13.put(local30, local9); + aClass133_13.put(local30, local9); return this; } } @@ -959,7 +1134,7 @@ public final class JagString implements StringInterface { public final JagString fromParameters(@OriginalArg(1) Applet arg0) { @Pc(19) String local19 = new String(this.chars, 0, this.length); @Pc(23) String local23 = arg0.getParameter(local19); - return local23 == null ? null : Static230.method3952(local23); + return local23 == null ? null : method3952(local23); } @OriginalMember(owner = "client!na", name = "d", descriptor = "(Z)I") @@ -1024,7 +1199,7 @@ public final class JagString implements StringInterface { @OriginalMember(owner = "client!na", name = "k", descriptor = "(I)Lclient!na;") public final JagString method3159() { @Pc(9) JagString local9 = Base37.decode37(this.encode37()); - return local9 == null ? Static228.aClass100_967 : local9; + return local9 == null ? aClass100_967 : local9; } @OriginalMember(owner = "client!na", name = "a", descriptor = "(Z[BIII)I") diff --git a/client/src/main/java/rt4/Static101.java b/client/src/main/java/rt4/LangUtils.java similarity index 60% rename from client/src/main/java/rt4/Static101.java rename to client/src/main/java/rt4/LangUtils.java index fda8514..bd87487 100644 --- a/client/src/main/java/rt4/Static101.java +++ b/client/src/main/java/rt4/LangUtils.java @@ -4,10 +4,8 @@ import org.openrs2.deob.annotation.OriginalArg; import org.openrs2.deob.annotation.OriginalMember; import org.openrs2.deob.annotation.Pc; -public final class Static101 { +public final class LangUtils { - @OriginalMember(owner = "client!hm", name = "T", descriptor = "Lclient!na;") - public static final JagString aClass100_538 = JagString.parse(" "); @OriginalMember(owner = "client!mc", name = "fb", descriptor = "Lclient!na;") private static final JagString LANG_PT = JagString.parse("pt"); @OriginalMember(owner = "client!mc", name = "mb", descriptor = "Lclient!na;") @@ -19,10 +17,7 @@ public final class Static101 { @OriginalMember(owner = "client!mc", name = "ob", descriptor = "[Lclient!na;") public static final JagString[] LANGUAGES = new JagString[] {LANG_EN, LANG_DE, LANG_FR, LANG_PT}; - @OriginalMember(owner = "client!hm", name = "ab", descriptor = "I") - public static int anInt2640 = 0; - - @OriginalMember(owner = "client!hm", name = "a", descriptor = "(Lclient!na;B)I") + @OriginalMember(owner = "client!hm", name = "a", descriptor = "(Lclient!na;B)I") public static int method2053(@OriginalArg(0) JagString arg0) { for (@Pc(12) int local12 = 0; local12 < LANGUAGES.length; local12++) { if (LANGUAGES[local12].equalsIgnoreCase(arg0)) { @@ -32,17 +27,4 @@ public final class Static101 { return -1; } - @OriginalMember(owner = "client!hm", name = "a", descriptor = "(IIIII)V") - public static void method2054(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3) { - @Pc(8) int local8; - if (arg0 <= arg2) { - for (local8 = arg0; local8 < arg2; local8++) { - Static71.anIntArrayArray10[local8][arg1] = arg3; - } - } else { - for (local8 = arg2; local8 < arg0; local8++) { - Static71.anIntArrayArray10[local8][arg1] = arg3; - } - } - } } diff --git a/client/src/main/java/rt4/Light.java b/client/src/main/java/rt4/Light.java index ce8fc75..a0912e3 100644 --- a/client/src/main/java/rt4/Light.java +++ b/client/src/main/java/rt4/Light.java @@ -100,7 +100,23 @@ public final class Light { @OriginalMember(owner = "client!gk", name = "b", descriptor = "(B)V") public static void method1771() { - anIntArray150 = Static206.method3679(0.4F); + anIntArray150 = method3679(0.4F); + } + + @OriginalMember(owner = "client!qk", name = "a", descriptor = "(ZIIIIFII)[I") + public static int[] method3679(@OriginalArg(5) float arg0) { + @Pc(11) int[] local11 = new int[2048]; + @Pc(15) TextureOp4 local15 = new TextureOp4(); + local15.anInt646 = 8; + local15.anInt642 = 4; + local15.anInt650 = 35; + local15.anInt641 = 8; + local15.anInt648 = (int) (arg0 * 4096.0F); + local15.aBoolean44 = true; + local15.method4630(); + Static10.method348(1, 2048); + local15.method584(0, local11); + return local11; } @OriginalMember(owner = "client!gi", name = "a", descriptor = "(BIIII)V") diff --git a/client/src/main/java/rt4/LightingManager.java b/client/src/main/java/rt4/LightingManager.java index 974cfcb..5eb9732 100644 --- a/client/src/main/java/rt4/LightingManager.java +++ b/client/src/main/java/rt4/LightingManager.java @@ -12,6 +12,16 @@ public class LightingManager { public static int lightCount = 0; @OriginalMember(owner = "client!jf", name = "a", descriptor = "[Lclient!gi;") public static Light[] lights; + @OriginalMember(owner = "client!rh", name = "d", descriptor = "I") + public static int anInt4866; + @OriginalMember(owner = "client!aa", name = "m", descriptor = "I") + public static int anInt15; + @OriginalMember(owner = "client!gf", name = "M", descriptor = "I") + public static int anInt4698; + @OriginalMember(owner = "client!ch", name = "w", descriptor = "I") + public static int anInt987; + @OriginalMember(owner = "client!id", name = "b", descriptor = "I") +public static int anInt2875 = -1; @OriginalMember(owner = "client!jf", name = "c", descriptor = "[I") private static int[] anIntArray283; @OriginalMember(owner = "client!jf", name = "d", descriptor = "I") @@ -377,22 +387,22 @@ public class LightingManager { @Pc(76) int local76 = 0; @Pc(84) int local84 = (local63.anInt2245 >> 7) - local63.anInt2236; @Pc(92) int local92 = (local63.anInt2245 >> 7) + local63.anInt2236; - if (local92 >= Static215.anInt4866) { - local92 = Static215.anInt4866 - 1; + if (local92 >= anInt4866) { + local92 = anInt4866 - 1; } - if (local84 < Static80.anInt4698) { - local76 = Static80.anInt4698 - local84; - local84 = Static80.anInt4698; + if (local84 < anInt4698) { + local76 = anInt4698 - local84; + local84 = anInt4698; } for (@Pc(112) int local112 = local84; local112 <= local92; local112++) { @Pc(121) short local121 = local63.aShortArray30[local76++]; @Pc(133) int local133 = (local63.anInt2240 >> 7) + (local121 >> 8) - local63.anInt2236; @Pc(141) int local141 = local133 + (local121 & 0xFF) - 1; - if (local133 < Static31.anInt987) { - local133 = Static31.anInt987; + if (local133 < anInt987) { + local133 = anInt987; } - if (local141 >= Static2.anInt15) { - local141 = Static2.anInt15 - 1; + if (local141 >= anInt15) { + local141 = anInt15 - 1; } for (@Pc(155) int local155 = local133; local155 <= local141; local155++) { @Pc(160) Tile local160 = null; @@ -445,4 +455,14 @@ public class LightingManager { } } } + + @OriginalMember(owner = "client!ch", name = "c", descriptor = "(I)V") + public static void method846() { + if (!SceneGraph.allLevelsAreVisible() && LoginManager.centralPlane != Player.level) { + LoginManager.method2463(Player.level, LoginManager.centralZoneZ, LoginManager.centralZoneX, PlayerList.self.movementQueueZ[0], false, PlayerList.self.movementQueueX[0]); + } else if (Player.level != anInt2875 && MiniMap.renderMap(Player.level)) { + anInt2875 = Player.level; + ScriptRunner.method2218(); + } + } } diff --git a/client/src/main/java/rt4/LiquidMaterialRenderer.java b/client/src/main/java/rt4/LiquidMaterialRenderer.java index 583e86d..62f6edb 100644 --- a/client/src/main/java/rt4/LiquidMaterialRenderer.java +++ b/client/src/main/java/rt4/LiquidMaterialRenderer.java @@ -87,9 +87,9 @@ public final class LiquidMaterialRenderer implements MaterialRenderer { local5.glCallList(this.anInt4831); local5.glActiveTexture(GL2.GL_TEXTURE1); local5.glMatrixMode(GL2.GL_TEXTURE); - local5.glTranslatef((float) Static253.anInt406, (float) Static253.anInt4675, (float) Static253.anInt5158); - local5.glRotatef(-((float) Static253.anInt1815 * 360.0F) / 2048.0F, 0.0F, 1.0F, 0.0F); - local5.glRotatef(-((float) Static253.anInt5559 * 360.0F) / 2048.0F, 1.0F, 0.0F, 0.0F); + local5.glTranslatef((float) MaterialManager.anInt406, (float) MaterialManager.anInt4675, (float) MaterialManager.anInt5158); + local5.glRotatef(-((float) MaterialManager.anInt1815 * 360.0F) / 2048.0F, 0.0F, 1.0F, 0.0F); + local5.glRotatef(-((float) MaterialManager.anInt5559 * 360.0F) / 2048.0F, 1.0F, 0.0F, 0.0F); local5.glRotatef(-180.0F, 1.0F, 0.0F, 0.0F); local5.glMatrixMode(GL2.GL_MODELVIEW); if (!Static151.allows3DTextureMapping) { diff --git a/client/src/main/java/rt4/Loc.java b/client/src/main/java/rt4/Loc.java index d1ae596..3c0d62b 100644 --- a/client/src/main/java/rt4/Loc.java +++ b/client/src/main/java/rt4/Loc.java @@ -186,7 +186,7 @@ public final class Loc extends Entity { local158 = SceneGraph.tileHeights[arg7 + 1]; } @Pc(215) Loc_Class139 local215 = arg0.method3428(arg2, local80, local120, arg4, local148, local158, false, null, true, local88); - Static242.method4207(local215.aClass36_Sub1_3, local80 - arg3, local122, local88 - arg1); + ShadowManager.method4207(local215.aClass36_Sub1_3, local80 - arg3, local122, local88 - arg1); } @OriginalMember(owner = "client!dc", name = "a", descriptor = "(IIIII)V") @@ -211,7 +211,7 @@ public final class Loc extends Entity { @OriginalMember(owner = "client!dc", name = "c", descriptor = "(I)V") public final void method1046() { if (this.aClass36_Sub1_2 != null) { - Static242.method4207(this.aClass36_Sub1_2, this.anInt1296, this.anInt1294, this.anInt1319); + ShadowManager.method4207(this.aClass36_Sub1_2, this.anInt1296, this.anInt1294, this.anInt1319); } this.anInt1321 = -1; this.anInt1322 = -1; @@ -338,7 +338,7 @@ public final class Loc extends Entity { local314 = SceneGraph.tileHeights[this.anInt1303 + 1]; } if (GlRenderer.enabled && local256) { - Static242.method4207(this.aClass36_Sub1_2, this.anInt1296, this.anInt1294, this.anInt1319); + ShadowManager.method4207(this.aClass36_Sub1_2, this.anInt1296, this.anInt1294, this.anInt1319); } @Pc(356) boolean local356 = this.aClass36_Sub1_2 == null; @Pc(389) Loc_Class139 local389; @@ -360,11 +360,11 @@ public final class Loc extends Entity { local429 = local293 - (local439[local178][local192] + local439[local185][local192] + local439[local185][local201] + local439[local178][local201] >> 2); } @Pc(471) SoftwareIndexedSprite local471 = local389.aClass36_Sub1_3; - if (this.aBoolean81 && Static242.method4209(local471, local302, local429, local311)) { + if (this.aBoolean81 && ShadowManager.method4209(local471, local302, local429, local311)) { this.aBoolean81 = false; } if (!this.aBoolean81) { - Static242.method4211(local471, local302, local429, local311); + ShadowManager.method4211(local471, local302, local429, local311); this.aClass36_Sub1_2 = local471; this.anInt1319 = local311; if (local356) { diff --git a/client/src/main/java/rt4/LoginManager.java b/client/src/main/java/rt4/LoginManager.java index 4b0276b..7944838 100644 --- a/client/src/main/java/rt4/LoginManager.java +++ b/client/src/main/java/rt4/LoginManager.java @@ -26,6 +26,10 @@ public class LoginManager { public static final JagString aClass100_772 = JagString.parse("um"); @OriginalMember(owner = "client!gm", name = "W", descriptor = "Lclient!na;") public static final JagString UNDERSCORE = JagString.parse("_"); + @OriginalMember(owner = "client!hk", name = "W", descriptor = "Lclient!ih;") + public static final LinkedList aClass69_64 = new LinkedList(); + @OriginalMember(owner = "client!gd", name = "h", descriptor = "[I") + public static final int[] anIntArray204 = new int[] { 16, 32, 64, 128 }; @OriginalMember(owner = "client!rl", name = "X", descriptor = "I") public static int anInt4937 = 0; @OriginalMember(owner = "client!sd", name = "X", descriptor = "Z") @@ -104,6 +108,10 @@ public class LoginManager { public static int mapFlagX = 0; @OriginalMember(owner = "client!gk", name = "h", descriptor = "I") public static int mapFlagZ = 0; + @OriginalMember(owner = "client!qf", name = "M", descriptor = "I") + public static int anInt1862 = 0; + @OriginalMember(owner = "client!sj", name = "u", descriptor = "Z") + public static boolean dynamicMapRegion = false; @OriginalMember(owner = "client!dm", name = "d", descriptor = "(I)V") public static void clear() { @@ -613,13 +621,13 @@ public class LoginManager { MidiPlayer.jingle = false; MusicPlayer.groupId = -1; AreaSoundManager.clear(true); - Static230.dynamicMapRegion = false; + dynamicMapRegion = false; Camera.originZ = 0; centralZoneX = 0; centralZoneZ = 0; Camera.originX = 0; - for (local19 = 0; local19 < Static143.hintMapMarkers.length; local19++) { - Static143.hintMapMarkers[local19] = null; + for (local19 = 0; local19 < MiniMap.hintMapMarkers.length; local19++) { + MiniMap.hintMapMarkers[local19] = null; } PlayerList.size = 0; NpcList.size = 0; @@ -770,8 +778,8 @@ public class LoginManager { if (GlRenderer.enabled && arg4 && (Math.abs(local86) > 104 || Math.abs(local81) > 104)) { Static103.setInstantFade(); } - Static107.anInt2875 = -1; - Static99.aClass69_64.clear(); + LightingManager.anInt2875 = -1; + aClass69_64.clear(); Static217.aClass69_116.clear(); } @@ -788,7 +796,7 @@ public class LoginManager { Player.rebootTimer = 0; Protocol.opcode4 = -1; Protocol.inboundBuffer.offset = 0; - Static201.anInt1862 = 0; + anInt1862 = 0; Protocol.opcode = -1; @Pc(35) int local35; for (local35 = 0; local35 < PlayerList.players.length; local35++) { @@ -809,4 +817,460 @@ public class LoginManager { } ClientProt.method1373(); } + + @OriginalMember(owner = "client!ca", name = "a", descriptor = "(ZI)V") + public static void method743(@OriginalArg(0) boolean arg0) { + @Pc(13) int local13 = mapFilesBuffer.length; + @Pc(19) byte[][] local19; + if (GlRenderer.enabled && arg0) { + local19 = underWaterLocationsMapFilesBuffer; + } else { + local19 = locationMapFilesBuffer; + } + for (@Pc(25) int local25 = 0; local25 < local13; local25++) { + @Pc(32) byte[] local32 = local19[local25]; + if (local32 != null) { + @Pc(45) int local45 = (regionBitPacked[local25] >> 8) * 64 - Camera.originX; + @Pc(56) int local56 = (regionBitPacked[local25] & 0xFF) * 64 - Camera.originZ; + client.audioLoop(); + method2437(local45, arg0, local32, local56, PathFinder.collisionMaps); + } + } + } + + @OriginalMember(owner = "client!jk", name = "a", descriptor = "(IZ[BII[Lclient!mj;)V") + public static void method2437(@OriginalArg(0) int arg0, @OriginalArg(1) boolean arg1, @OriginalArg(2) byte[] arg2, @OriginalArg(3) int arg3, @OriginalArg(5) CollisionMap[] arg4) { + @Pc(10) Buffer local10 = new Buffer(arg2); + @Pc(12) int local12 = -1; + while (true) { + @Pc(16) int local16 = local10.gVarSmart(); + if (local16 == 0) { + return; + } + local12 += local16; + @Pc(27) int local27 = 0; + while (true) { + @Pc(31) int local31 = local10.gsmarts(); + if (local31 == 0) { + break; + } + local27 += local31 - 1; + @Pc(46) int local46 = local27 & 0x3F; + @Pc(50) int local50 = local27 >> 12; + @Pc(56) int local56 = local27 >> 6 & 0x3F; + @Pc(60) int local60 = local10.g1(); + @Pc(64) int local64 = local60 >> 2; + @Pc(68) int local68 = local60 & 0x3; + @Pc(72) int local72 = arg0 + local56; + @Pc(76) int local76 = local46 + arg3; + if (local72 > 0 && local76 > 0 && local72 < 103 && local76 < 103) { + @Pc(90) CollisionMap local90 = null; + if (!arg1) { + @Pc(95) int local95 = local50; + if ((SceneGraph.tileFlags[1][local72][local76] & 0x2) == 2) { + local95 = local50 - 1; + } + if (local95 >= 0) { + local90 = arg4[local95]; + } + } + method3397(local50, !arg1, local50, arg1, local90, local12, local64, local72, local76, local68); + } + } + } + } + + @OriginalMember(owner = "client!p", name = "a", descriptor = "(IZIZLclient!mj;IIIBII)V") + public static void method3397(@OriginalArg(0) int arg0, @OriginalArg(1) boolean arg1, @OriginalArg(2) int arg2, @OriginalArg(3) boolean arg3, @OriginalArg(4) CollisionMap arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7, @OriginalArg(9) int arg8, @OriginalArg(10) int arg9) { + if (arg1 && !SceneGraph.allLevelsAreVisible() && (SceneGraph.tileFlags[0][arg7][arg8] & 0x2) == 0) { + if ((SceneGraph.tileFlags[arg2][arg7][arg8] & 0x10) != 0) { + return; + } + if (Static4.method22(arg8, arg7, arg2) != centralPlane) { + return; + } + } + if (arg2 < SceneGraph.firstVisibleLevel) { + SceneGraph.firstVisibleLevel = arg2; + } + @Pc(62) LocType local62 = LocTypeList.get(arg5); + if (GlRenderer.enabled && local62.aBoolean216) { + return; + } + @Pc(84) int local84; + @Pc(81) int local81; + if (arg9 == 1 || arg9 == 3) { + local81 = local62.width; + local84 = local62.length; + } else { + local84 = local62.width; + local81 = local62.length; + } + @Pc(103) int local103; + @Pc(112) int local112; + if (arg7 + local84 <= 104) { + local103 = arg7 + (local84 >> 1); + local112 = arg7 + (local84 + 1 >> 1); + } else { + local112 = arg7 + 1; + local103 = arg7; + } + @Pc(129) int local129; + @Pc(133) int local133; + if (local81 + arg8 > 104) { + local129 = arg8; + local133 = arg8 + 1; + } else { + local129 = (local81 >> 1) + arg8; + local133 = arg8 + (local81 + 1 >> 1); + } + @Pc(153) int[][] local153 = SceneGraph.tileHeights[arg0]; + @Pc(165) int local165 = (local84 << 6) + (arg7 << 7); + @Pc(173) int local173 = (local81 << 6) + (arg8 << 7); + @Pc(199) int local199 = local153[local103][local133] + local153[local112][local129] + local153[local103][local129] + local153[local112][local133] >> 2; + @Pc(201) int local201 = 0; + @Pc(213) int[][] local213; + if (GlRenderer.enabled && arg0 != 0) { + local213 = SceneGraph.tileHeights[0]; + local201 = local199 - (local213[local112][local133] + local213[local112][local129] + local213[local103][local129] + local213[local103][local133] >> 2); + } + local213 = null; + @Pc(261) long local261 = (long) (arg7 | 0x40000000 | arg8 << 7 | arg6 << 14 | arg9 << 20); + if (arg3) { + local213 = SceneGraph.surfaceTileHeights[0]; + } else if (arg0 < 3) { + local213 = SceneGraph.tileHeights[arg0 + 1]; + } + if (local62.anInt4429 == 0 || arg3) { + local261 |= Long.MIN_VALUE; + } + if (local62.anInt4438 == 1) { + local261 |= 0x400000L; + } + if (local62.aBoolean213) { + local261 |= 0x80000000L; + } + if (local62.hasAreaSound()) { + AreaSoundManager.add(arg8, local62, arg9, null, arg7, arg2, null); + } + @Pc(330) boolean local330 = local62.aBoolean212 & !arg3; + local261 |= (long) arg5 << 32; + @Pc(387) Entity local387; + @Pc(403) Loc_Class139 local403; + if (arg6 == 22) { + if (Preferences.showGroundDecorations || local62.anInt4429 != 0 || local62.anInt4435 == 1 || local62.aBoolean206) { + if (local62.anInt4430 == -1 && local62.multiLocs == null && !local62.aBoolean214) { + local403 = local62.method3428(arg9, local165, local153, 22, local199, local213, arg1, null, local330, local173); + if (GlRenderer.enabled && local330) { + ShadowManager.method4211(local403.aClass36_Sub1_3, local165, local201, local173); + } + local387 = local403.aClass8_10; + } else { + local387 = new Loc(arg5, 22, arg9, arg0, arg7, arg8, local62.anInt4430, local62.aBoolean209, null); + } + SceneGraph.setGroundDecor(arg2, arg7, arg8, local199, local387, local261, local62.aBoolean211); + if (local62.anInt4435 == 1 && arg4 != null) { + arg4.flagGroundDecor(arg7, arg8); + } + } + } else if (arg6 == 10 || arg6 == 11) { + if (local62.anInt4430 == -1 && local62.multiLocs == null && !local62.aBoolean214) { + local403 = local62.method3428(arg6 == 11 ? arg9 + 4 : arg9, local165, local153, 10, local199, local213, arg1, null, local330, local173); + if (GlRenderer.enabled && local330) { + ShadowManager.method4211(local403.aClass36_Sub1_3, local165, local201, local173); + } + local387 = local403.aClass8_10; + } else { + local387 = new Loc(arg5, 10, arg6 == 11 ? arg9 + 4 : arg9, arg0, arg7, arg8, local62.anInt4430, local62.aBoolean209, null); + } + if (local387 != null) { + @Pc(531) boolean local531 = Static5.method35(arg2, arg7, arg8, local199, local84, local81, local387, local261); + if (local62.aBoolean215 && local531 && arg1) { + @Pc(541) int local541 = 15; + if (local387 instanceof Model) { + local541 = ((Model) local387).method4566() / 4; + if (local541 > 30) { + local541 = 30; + } + } + for (@Pc(560) int local560 = 0; local560 <= local84; local560++) { + for (@Pc(565) int local565 = 0; local565 <= local81; local565++) { + if (SceneGraph.aByteArrayArrayArray9[arg2][arg7 + local560][local565 + arg8] < local541) { + SceneGraph.aByteArrayArrayArray9[arg2][arg7 + local560][arg8 + local565] = (byte) local541; + } + } + } + } + } + if (local62.anInt4435 != 0 && arg4 != null) { + arg4.flagScenery(arg7, local62.aBoolean207, arg8, local84, local81); + } + } else if (arg6 >= 12) { + if (local62.anInt4430 == -1 && local62.multiLocs == null && !local62.aBoolean214) { + local403 = local62.method3428(arg9, local165, local153, arg6, local199, local213, arg1, null, local330, local173); + if (GlRenderer.enabled && local330) { + ShadowManager.method4211(local403.aClass36_Sub1_3, local165, local201, local173); + } + local387 = local403.aClass8_10; + } else { + local387 = new Loc(arg5, arg6, arg9, arg0, arg7, arg8, local62.anInt4430, local62.aBoolean209, null); + } + Static5.method35(arg2, arg7, arg8, local199, 1, 1, local387, local261); + if (arg1 && arg6 >= 12 && arg6 <= 17 && arg6 != 13 && arg2 > 0) { + SceneGraph.anIntArrayArrayArray6[arg2][arg7][arg8] |= 0x4; + } + if (local62.anInt4435 != 0 && arg4 != null) { + arg4.flagScenery(arg7, local62.aBoolean207, arg8, local84, local81); + } + } else if (arg6 == 0) { + if (local62.anInt4430 == -1 && local62.multiLocs == null && !local62.aBoolean214) { + local403 = local62.method3428(arg9, local165, local153, 0, local199, local213, arg1, null, local330, local173); + if (GlRenderer.enabled && local330) { + ShadowManager.method4211(local403.aClass36_Sub1_3, local165, local201, local173); + } + local387 = local403.aClass8_10; + } else { + local387 = new Loc(arg5, 0, arg9, arg0, arg7, arg8, local62.anInt4430, local62.aBoolean209, null); + } + SceneGraph.setWall(arg2, arg7, arg8, local199, local387, null, Static267.anIntArray517[arg9], 0, local261); + if (arg1) { + if (arg9 == 0) { + if (local62.aBoolean215) { + SceneGraph.aByteArrayArrayArray9[arg2][arg7][arg8] = 50; + SceneGraph.aByteArrayArrayArray9[arg2][arg7][arg8 + 1] = 50; + } + if (local62.aBoolean220) { + SceneGraph.anIntArrayArrayArray6[arg2][arg7][arg8] |= 0x1; + } + } else if (arg9 == 1) { + if (local62.aBoolean215) { + SceneGraph.aByteArrayArrayArray9[arg2][arg7][arg8 + 1] = 50; + SceneGraph.aByteArrayArrayArray9[arg2][arg7 + 1][arg8 + 1] = 50; + } + if (local62.aBoolean220) { + SceneGraph.anIntArrayArrayArray6[arg2][arg7][arg8 + 1] |= 0x2; + } + } else if (arg9 == 2) { + if (local62.aBoolean215) { + SceneGraph.aByteArrayArrayArray9[arg2][arg7 + 1][arg8] = 50; + SceneGraph.aByteArrayArrayArray9[arg2][arg7 + 1][arg8 + 1] = 50; + } + if (local62.aBoolean220) { + SceneGraph.anIntArrayArrayArray6[arg2][arg7 + 1][arg8] |= 0x1; + } + } else if (arg9 == 3) { + if (local62.aBoolean215) { + SceneGraph.aByteArrayArrayArray9[arg2][arg7][arg8] = 50; + SceneGraph.aByteArrayArrayArray9[arg2][arg7 + 1][arg8] = 50; + } + if (local62.aBoolean220) { + SceneGraph.anIntArrayArrayArray6[arg2][arg7][arg8] |= 0x2; + } + } + } + if (local62.anInt4435 != 0 && arg4 != null) { + arg4.flagWall(arg9, arg6, local62.aBoolean207, arg8, arg7); + } + if (local62.wallDecorOffsetScale != 16) { + Static18.method559(arg2, arg7, arg8, local62.wallDecorOffsetScale); + } + } else if (arg6 == 1) { + if (local62.anInt4430 == -1 && local62.multiLocs == null && !local62.aBoolean214) { + local403 = local62.method3428(arg9, local165, local153, 1, local199, local213, arg1, null, local330, local173); + if (GlRenderer.enabled && local330) { + ShadowManager.method4211(local403.aClass36_Sub1_3, local165, local201, local173); + } + local387 = local403.aClass8_10; + } else { + local387 = new Loc(arg5, 1, arg9, arg0, arg7, arg8, local62.anInt4430, local62.aBoolean209, null); + } + SceneGraph.setWall(arg2, arg7, arg8, local199, local387, null, anIntArray204[arg9], 0, local261); + if (local62.aBoolean215 && arg1) { + if (arg9 == 0) { + SceneGraph.aByteArrayArrayArray9[arg2][arg7][arg8 + 1] = 50; + } else if (arg9 == 1) { + SceneGraph.aByteArrayArrayArray9[arg2][arg7 + 1][arg8 + 1] = 50; + } else if (arg9 == 2) { + SceneGraph.aByteArrayArrayArray9[arg2][arg7 + 1][arg8] = 50; + } else if (arg9 == 3) { + SceneGraph.aByteArrayArrayArray9[arg2][arg7][arg8] = 50; + } + } + if (local62.anInt4435 != 0 && arg4 != null) { + arg4.flagWall(arg9, arg6, local62.aBoolean207, arg8, arg7); + } + } else { + @Pc(1226) int local1226; + if (arg6 == 2) { + local1226 = arg9 + 1 & 0x3; + @Pc(1269) Entity local1269; + @Pc(1254) Entity local1254; + if (local62.anInt4430 == -1 && local62.multiLocs == null && !local62.aBoolean214) { + @Pc(1287) Loc_Class139 local1287 = local62.method3428(arg9 + 4, local165, local153, 2, local199, local213, arg1, null, local330, local173); + if (GlRenderer.enabled && local330) { + ShadowManager.method4211(local1287.aClass36_Sub1_3, local165, local201, local173); + } + local1254 = local1287.aClass8_10; + local1287 = local62.method3428(local1226, local165, local153, 2, local199, local213, arg1, null, local330, local173); + if (GlRenderer.enabled && local330) { + ShadowManager.method4211(local1287.aClass36_Sub1_3, local165, local201, local173); + } + local1269 = local1287.aClass8_10; + } else { + local1254 = new Loc(arg5, 2, arg9 + 4, arg0, arg7, arg8, local62.anInt4430, local62.aBoolean209, null); + local1269 = new Loc(arg5, 2, local1226, arg0, arg7, arg8, local62.anInt4430, local62.aBoolean209, null); + } + SceneGraph.setWall(arg2, arg7, arg8, local199, local1254, local1269, Static267.anIntArray517[arg9], Static267.anIntArray517[local1226], local261); + if (local62.aBoolean220 && arg1) { + if (arg9 == 0) { + SceneGraph.anIntArrayArrayArray6[arg2][arg7][arg8] |= 0x1; + SceneGraph.anIntArrayArrayArray6[arg2][arg7][arg8 + 1] |= 0x2; + } else if (arg9 == 1) { + SceneGraph.anIntArrayArrayArray6[arg2][arg7][arg8 + 1] |= 0x2; + SceneGraph.anIntArrayArrayArray6[arg2][arg7 + 1][arg8] |= 0x1; + } else if (arg9 == 2) { + SceneGraph.anIntArrayArrayArray6[arg2][arg7 + 1][arg8] |= 0x1; + SceneGraph.anIntArrayArrayArray6[arg2][arg7][arg8] |= 0x2; + } else if (arg9 == 3) { + SceneGraph.anIntArrayArrayArray6[arg2][arg7][arg8] |= 0x2; + SceneGraph.anIntArrayArrayArray6[arg2][arg7][arg8] |= 0x1; + } + } + if (local62.anInt4435 != 0 && arg4 != null) { + arg4.flagWall(arg9, arg6, local62.aBoolean207, arg8, arg7); + } + if (local62.wallDecorOffsetScale != 16) { + Static18.method559(arg2, arg7, arg8, local62.wallDecorOffsetScale); + } + } else if (arg6 == 3) { + if (local62.anInt4430 == -1 && local62.multiLocs == null && !local62.aBoolean214) { + local403 = local62.method3428(arg9, local165, local153, 3, local199, local213, arg1, null, local330, local173); + if (GlRenderer.enabled && local330) { + ShadowManager.method4211(local403.aClass36_Sub1_3, local165, local201, local173); + } + local387 = local403.aClass8_10; + } else { + local387 = new Loc(arg5, 3, arg9, arg0, arg7, arg8, local62.anInt4430, local62.aBoolean209, null); + } + SceneGraph.setWall(arg2, arg7, arg8, local199, local387, null, anIntArray204[arg9], 0, local261); + if (local62.aBoolean215 && arg1) { + if (arg9 == 0) { + SceneGraph.aByteArrayArrayArray9[arg2][arg7][arg8 + 1] = 50; + } else if (arg9 == 1) { + SceneGraph.aByteArrayArrayArray9[arg2][arg7 + 1][arg8 + 1] = 50; + } else if (arg9 == 2) { + SceneGraph.aByteArrayArrayArray9[arg2][arg7 + 1][arg8] = 50; + } else if (arg9 == 3) { + SceneGraph.aByteArrayArrayArray9[arg2][arg7][arg8] = 50; + } + } + if (local62.anInt4435 != 0 && arg4 != null) { + arg4.flagWall(arg9, arg6, local62.aBoolean207, arg8, arg7); + } + } else if (arg6 == 9) { + if (local62.anInt4430 == -1 && local62.multiLocs == null && !local62.aBoolean214) { + local403 = local62.method3428(arg9, local165, local153, arg6, local199, local213, arg1, null, local330, local173); + if (GlRenderer.enabled && local330) { + ShadowManager.method4211(local403.aClass36_Sub1_3, local165, local201, local173); + } + local387 = local403.aClass8_10; + } else { + local387 = new Loc(arg5, arg6, arg9, arg0, arg7, arg8, local62.anInt4430, local62.aBoolean209, null); + } + Static5.method35(arg2, arg7, arg8, local199, 1, 1, local387, local261); + if (local62.anInt4435 != 0 && arg4 != null) { + arg4.flagScenery(arg7, local62.aBoolean207, arg8, local84, local81); + } + if (local62.wallDecorOffsetScale != 16) { + Static18.method559(arg2, arg7, arg8, local62.wallDecorOffsetScale); + } + } else if (arg6 == 4) { + if (local62.anInt4430 == -1 && local62.multiLocs == null && !local62.aBoolean214) { + local403 = local62.method3428(arg9, local165, local153, 4, local199, local213, arg1, null, local330, local173); + if (GlRenderer.enabled && local330) { + ShadowManager.method4211(local403.aClass36_Sub1_3, local165, local201, local173); + } + local387 = local403.aClass8_10; + } else { + local387 = new Loc(arg5, 4, arg9, arg0, arg7, arg8, local62.anInt4430, local62.aBoolean209, null); + } + Static185.method1880(arg2, arg7, arg8, local199, local387, null, Static267.anIntArray517[arg9], 0, 0, 0, local261); + } else { + @Pc(1889) long local1889; + @Pc(1934) Entity local1934; + @Pc(1950) Loc_Class139 local1950; + if (arg6 == 5) { + local1226 = 16; + local1889 = SceneGraph.getWallKey(arg2, arg7, arg8); + if (local1889 != 0L) { + local1226 = LocTypeList.get(Integer.MAX_VALUE & (int) (local1889 >>> 32)).wallDecorOffsetScale; + } + if (local62.anInt4430 == -1 && local62.multiLocs == null && !local62.aBoolean214) { + local1950 = local62.method3428(arg9, local165, local153, 4, local199, local213, arg1, null, local330, local173); + if (GlRenderer.enabled && local330) { + ShadowManager.method4211(local1950.aClass36_Sub1_3, local165 - Static34.anIntArray80[arg9] * 8, local201, local173 - SceneGraph.anIntArray469[arg9] * 8); + } + local1934 = local1950.aClass8_10; + } else { + local1934 = new Loc(arg5, 4, arg9, arg0, arg7, arg8, local62.anInt4430, local62.aBoolean209, null); + } + Static185.method1880(arg2, arg7, arg8, local199, local1934, null, Static267.anIntArray517[arg9], 0, local1226 * Static34.anIntArray80[arg9], SceneGraph.anIntArray469[arg9] * local1226, local261); + } else if (arg6 == 6) { + local1226 = 8; + local1889 = SceneGraph.getWallKey(arg2, arg7, arg8); + if (local1889 != 0L) { + local1226 = LocTypeList.get(Integer.MAX_VALUE & (int) (local1889 >>> 32)).wallDecorOffsetScale / 2; + } + if (local62.anInt4430 == -1 && local62.multiLocs == null && !local62.aBoolean214) { + local1950 = local62.method3428(arg9 + 4, local165, local153, 4, local199, local213, arg1, null, local330, local173); + if (GlRenderer.enabled && local330) { + ShadowManager.method4211(local1950.aClass36_Sub1_3, local165 - Static114.anIntArray565[arg9] * 8, local201, local173 - SceneGraph.anIntArray154[arg9] * 8); + } + local1934 = local1950.aClass8_10; + } else { + local1934 = new Loc(arg5, 4, arg9 + 4, arg0, arg7, arg8, local62.anInt4430, local62.aBoolean209, null); + } + Static185.method1880(arg2, arg7, arg8, local199, local1934, null, 256, arg9, local1226 * Static114.anIntArray565[arg9], local1226 * SceneGraph.anIntArray154[arg9], local261); + } else if (arg6 == 7) { + @Pc(2137) int local2137 = arg9 + 2 & 0x3; + if (local62.anInt4430 == -1 && local62.multiLocs == null && !local62.aBoolean214) { + @Pc(2183) Loc_Class139 local2183 = local62.method3428(local2137 + 4, local165, local153, 4, local199, local213, arg1, null, local330, local173); + if (GlRenderer.enabled && local330) { + ShadowManager.method4211(local2183.aClass36_Sub1_3, local165, local201, local173); + } + local387 = local2183.aClass8_10; + } else { + local387 = new Loc(arg5, 4, local2137 + 4, arg0, arg7, arg8, local62.anInt4430, local62.aBoolean209, null); + } + Static185.method1880(arg2, arg7, arg8, local199, local387, null, 256, local2137, 0, 0, local261); + } else if (arg6 == 8) { + local1226 = 8; + local1889 = SceneGraph.getWallKey(arg2, arg7, arg8); + if (local1889 != 0L) { + local1226 = LocTypeList.get(Integer.MAX_VALUE & (int) (local1889 >>> 32)).wallDecorOffsetScale / 2; + } + @Pc(2244) int local2244 = arg9 + 2 & 0x3; + @Pc(2289) Entity local2289; + if (local62.anInt4430 == -1 && local62.multiLocs == null && !local62.aBoolean214) { + @Pc(2297) int local2297 = SceneGraph.anIntArray154[arg9] * 8; + @Pc(2303) int local2303 = Static114.anIntArray565[arg9] * 8; + @Pc(2319) Loc_Class139 local2319 = local62.method3428(arg9 + 4, local165, local153, 4, local199, local213, arg1, null, local330, local173); + if (GlRenderer.enabled && local330) { + ShadowManager.method4211(local2319.aClass36_Sub1_3, local165 - local2303, local201, local173 - local2297); + } + local1934 = local2319.aClass8_10; + local2319 = local62.method3428(local2244 + 4, local165, local153, 4, local199, local213, arg1, null, local330, local173); + if (GlRenderer.enabled && local330) { + ShadowManager.method4211(local2319.aClass36_Sub1_3, local165 - local2303, local201, local173 - local2297); + } + local2289 = local2319.aClass8_10; + } else { + local1934 = new Loc(arg5, 4, arg9 + 4, arg0, arg7, arg8, local62.anInt4430, local62.aBoolean209, null); + local2289 = new Loc(arg5, 4, local2244 + 4, arg0, arg7, arg8, local62.anInt4430, local62.aBoolean209, null); + } + Static185.method1880(arg2, arg7, arg8, local199, local1934, local2289, 256, arg9, local1226 * Static114.anIntArray565[arg9], SceneGraph.anIntArray154[arg9] * local1226, local261); + } + } + } + } } diff --git a/client/src/main/java/rt4/MapList.java b/client/src/main/java/rt4/MapList.java index 56ac9b6..234adaf 100644 --- a/client/src/main/java/rt4/MapList.java +++ b/client/src/main/java/rt4/MapList.java @@ -7,6 +7,8 @@ import org.openrs2.deob.annotation.Pc; public class MapList { @OriginalMember(owner = "client!sh", name = "a", descriptor = "Lclient!ih;") public static final LinkedList aClass69_120 = new LinkedList(); + @OriginalMember(owner = "client!ed", name = "D", descriptor = "Lclient!na;") + public static final JagString aClass100_374 = JagString.parse("details"); @OriginalMember(owner = "client!je", name = "W", descriptor = "Lclient!ve;") public static Js5 archive; @OriginalMember(owner = "client!th", name = "p", descriptor = "[Lclient!mm;") @@ -20,7 +22,7 @@ public class MapList { sprites = arg0; aBooleanArray130 = new boolean[sprites.length]; aClass69_120.clear(); - @Pc(25) int local25 = archive.getGroupId(Static54.aClass100_374); + @Pc(25) int local25 = archive.getGroupId(aClass100_374); @Pc(30) int[] local30 = archive.getFileIds(local25); for (@Pc(32) int local32 = 0; local32 < local30.length; local32++) { aClass69_120.addTail(Map.create(new Buffer(archive.fetchFile(local25, local30[local32])))); diff --git a/client/src/main/java/rt4/MaterialManager.java b/client/src/main/java/rt4/MaterialManager.java index 26d230f..e1183e1 100644 --- a/client/src/main/java/rt4/MaterialManager.java +++ b/client/src/main/java/rt4/MaterialManager.java @@ -15,6 +15,16 @@ public class MaterialManager { public static MaterialRenderer[] renderers; @OriginalMember(owner = "client!mh", name = "eb", descriptor = "I") public static int currentArg = 0; + @OriginalMember(owner = "client!sj", name = "D", descriptor = "I") + public static int anInt5158; + @OriginalMember(owner = "client!ej", name = "X", descriptor = "I") + public static int anInt1815; + @OriginalMember(owner = "client!uj", name = "H", descriptor = "I") + public static int anInt5559; + @OriginalMember(owner = "client!bb", name = "M", descriptor = "I") + public static int anInt406; + @OriginalMember(owner = "client!qc", name = "cb", descriptor = "I") + public static int anInt4675; @OriginalMember(owner = "client!cb", name = "b", descriptor = "(III)V") public static void setMaterial(@OriginalArg(1) int arg, @OriginalArg(2) int type) { @@ -72,4 +82,13 @@ public class MaterialManager { renderers[5] = new WaterfallMaterialRenderer(); renderers[6] = new UnlitMaterialRenderer(); } + + @OriginalMember(owner = "client!ld", name = "a", descriptor = "(IIIIZI)V") + public static void method2731(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(5) int arg4) { + anInt5158 = arg1; + anInt1815 = arg4; + anInt5559 = arg0; + anInt406 = arg3; + anInt4675 = arg2; + } } diff --git a/client/src/main/java/rt4/MidiPlayer.java b/client/src/main/java/rt4/MidiPlayer.java index de503e7..969d049 100644 --- a/client/src/main/java/rt4/MidiPlayer.java +++ b/client/src/main/java/rt4/MidiPlayer.java @@ -155,4 +155,13 @@ public class MidiPlayer { state = 1; songArchive = null; } + + @OriginalMember(owner = "client!sj", name = "c", descriptor = "(II)V") + public static void method3956(@OriginalArg(0) int arg0) { + if (state == 0) { + stream.setVolume(arg0); + } else { + volume = arg0; + } + } } diff --git a/client/src/main/java/rt4/MiniMap.java b/client/src/main/java/rt4/MiniMap.java index 3d25611..e8fdc4a 100644 --- a/client/src/main/java/rt4/MiniMap.java +++ b/client/src/main/java/rt4/MiniMap.java @@ -15,6 +15,10 @@ public class MiniMap { public static final int[] locX = new int[1000]; @OriginalMember(owner = "client!he", name = "eb", descriptor = "[I") public static final int[] locZ = new int[1000]; + @OriginalMember(owner = "client!ld", name = "b", descriptor = "[Lclient!nc;") + public static final MapMarker[] hintMapMarkers = new MapMarker[4]; + @OriginalMember(owner = "client!ld", name = "d", descriptor = "Lclient!na;") + public static final JagString aClass100_668 = JagString.parse("Hidden)2use"); @OriginalMember(owner = "client!ef", name = "j", descriptor = "Lclient!mm;") public static SoftwareSprite softwareSprite; @OriginalMember(owner = "client!ha", name = "i", descriptor = "Lclient!qf;") @@ -33,6 +37,12 @@ public class MiniMap { public static int anInt4262 = 1; @OriginalMember(owner = "client!gi", name = "H", descriptor = "I") public static int anInt2252 = 0; + @OriginalMember(owner = "client!nf", name = "i", descriptor = "I") + public static int anInt4075 = -1; + @OriginalMember(owner = "client!se", name = "h", descriptor = "I") + public static int anInt5073 = -1; + @OriginalMember(owner = "client!sd", name = "R", descriptor = "I") + public static int anInt5062; @OriginalMember(owner = "client!ma", name = "a", descriptor = "([IIIIII)V") public static void renderTile(@OriginalArg(0) int[] pixels, @OriginalArg(1) int index, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4) { @@ -356,7 +366,7 @@ public class MiniMap { } } } - @Pc(756) MapMarker[] local756 = Static143.hintMapMarkers; + @Pc(756) MapMarker[] local756 = hintMapMarkers; for (local181 = 0; local181 < local756.length; local181++) { @Pc(770) MapMarker local770 = local756[local181]; if (local770 != null && local770.type != 0 && client.loop % 20 < 10) { @@ -365,20 +375,20 @@ public class MiniMap { if (local804 != null) { local231 = local804.xFine / 32 - PlayerList.self.xFine / 32; local200 = local804.zFine / 32 - PlayerList.self.zFine / 32; - Static97.method1960(local770.anInt4048, arg1, arg2, local231, local200, arg3); + method1960(local770.anInt4048, arg1, arg2, local231, local200, arg3); } } if (local770.type == 2) { local154 = (local770.targetX - Camera.originX) * 4 + 2 - PlayerList.self.xFine / 32; local231 = (-Camera.originZ + local770.anInt4046) * 4 + 2 - PlayerList.self.zFine / 32; - Static97.method1960(local770.anInt4048, arg1, arg2, local154, local231, arg3); + method1960(local770.anInt4048, arg1, arg2, local154, local231, arg3); } if (local770.type == 10 && local770.actorTargetId >= 0 && PlayerList.players.length > local770.actorTargetId) { @Pc(905) Player local905 = PlayerList.players[local770.actorTargetId]; if (local905 != null) { local200 = local905.zFine / 32 - PlayerList.self.zFine / 32; local231 = local905.xFine / 32 - PlayerList.self.xFine / 32; - Static97.method1960(local770.anInt4048, arg1, arg2, local231, local200, arg3); + method1960(local770.anInt4048, arg1, arg2, local231, local200, arg3); } } } @@ -427,4 +437,44 @@ public class MiniMap { ((SoftwareSprite) arg1).method312(arg0.width / 2 + arg5 + local81 - arg1.anInt1860 / 2, -(arg1.anInt1866 / 2) + arg0.height / 2 + arg4 + -local92, arg0.anIntArray37, arg0.anIntArray45); } } + + @OriginalMember(owner = "client!hi", name = "a", descriptor = "(IIIIILclient!be;Z)V") + public static void method1960(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) Component arg5) { + @Pc(13) int local13 = arg3 * arg3 + arg4 * arg4; + if (local13 > 360000) { + return; + } + @Pc(30) int local30 = Math.min(arg5.width / 2, arg5.height / 2); + if (local30 * local30 >= local13) { + method1446(arg5, Sprites.mapmarkhints[arg0], arg4, arg3, arg1, arg2); + return; + } + local30 -= 10; + @Pc(58) int local58 = anInt1814 + (int)Camera.yawTarget & 0x7FF; + @Pc(62) int local62 = MathUtils.cos[local58]; + @Pc(66) int local66 = MathUtils.sin[local58]; + @Pc(74) int local74 = local66 * 256 / (anInt4130 + 256); + @Pc(82) int local82 = local62 * 256 / (anInt4130 + 256); + @Pc(93) int local93 = arg4 * local74 + local82 * arg3 >> 16; + @Pc(104) int local104 = arg4 * local82 - local74 * arg3 >> 16; + @Pc(110) double local110 = Math.atan2((double) local93, (double) local104); + @Pc(117) int local117 = (int) (Math.sin(local110) * (double) local30); + @Pc(124) int local124 = (int) (Math.cos(local110) * (double) local30); + if (GlRenderer.enabled) { + ((GlSprite) Sprites.hintMapEdge[arg0]).method1428((arg5.width / 2 + arg2 + local117) * 16, (arg5.height / 2 + arg1 - local124) * 16, (int) (local110 * 10430.378D)); + } else { + ((SoftwareSprite) Sprites.hintMapEdge[arg0]).method306(local117 + arg5.width / 2 + arg2 - 10, arg5.height / 2 + -10 + arg1 + -local124, local110); + } + } + + @OriginalMember(owner = "client!hi", name = "a", descriptor = "(Lclient!be;B)Lclient!na;") + public static JagString getTargetVerb(@OriginalArg(0) Component arg0) { + if (InterfaceList.getServerActiveProperties(arg0).getTargetMask() == 0) { + return null; + } else if (arg0.targetVerb == null || arg0.targetVerb.trim().length() == 0) { + return Static121.qaOpTest ? aClass100_668 : null; + } else { + return arg0.targetVerb; + } + } } diff --git a/client/src/main/java/rt4/MiniMenu.java b/client/src/main/java/rt4/MiniMenu.java index 37fe078..eb5bad1 100644 --- a/client/src/main/java/rt4/MiniMenu.java +++ b/client/src/main/java/rt4/MiniMenu.java @@ -117,6 +117,10 @@ public class MiniMenu { public static JagString walkText; @OriginalMember(owner = "client!jl", name = "v", descriptor = "I") public static int anInt3096 = 0; + @OriginalMember(owner = "client!aa", name = "a", descriptor = "I") + public static int anInt7 = 0; + @OriginalMember(owner = "client!cl", name = "Y", descriptor = "I") + public static int anInt1092 = -1; @OriginalMember(owner = "client!va", name = "a", descriptor = "(IZILclient!be;)V") public static void addComponentEntries(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) Component component) { @@ -125,7 +129,7 @@ public class MiniMenu { } @Pc(47) JagString local47; if (component.anInt530 == 2 && !Static241.aBoolean302) { - local47 = Static97.getTargetVerb(component); + local47 = MiniMap.getTargetVerb(component); if (local47 != null) { add(-1, 0L, JagString.concatenate(new JagString[] {COLOR_GREEN, component.aClass100_85 }), -1, (short) 32, local47, component.id); } @@ -139,7 +143,7 @@ public class MiniMenu { if (component.anInt530 == 5) { add(-1, 0L, JagString.EMPTY, 0, (short) 51, component.aClass100_89, component.id); } - if (component.anInt530 == 6 && Static39.aClass13_10 == null) { + if (component.anInt530 == 6 && Static44.aClass13_10 == null) { add(-1, 0L, JagString.EMPTY, -1, (short) 41, component.aClass100_89, component.id); } @Pc(173) int local173; @@ -155,13 +159,13 @@ public class MiniMenu { local195 += component.anIntArray41[local171]; } if (arg1 >= local195 && local202 <= arg0 && local195 + 32 > arg1 && local202 + 32 > arg0) { - Static169.mouseOverInventoryInterface = component; + InterfaceList.mouseOverInventoryInterface = component; Static18.clickedInventoryIndex = local171; if (component.objTypes[local171] > 0) { @Pc(267) ServerActiveProperties local267 = InterfaceList.getServerActiveProperties(component); @Pc(276) ObjType local276 = ObjTypeList.get(component.objTypes[local171] - 1); if (anInt5014 == 1 && local267.isObjOpsEnabled()) { - if (Static224.anInt5062 != component.id || Static185.anInt4370 != local171) { + if (MiniMap.anInt5062 != component.id || Static185.anInt4370 != local171) { add(-1, (long) local276.id, JagString.concatenate(new JagString[] { aClass100_203, aClass100_947, local276.name}), local171, (short) 40, LocalizedText.USE, component.id); } } else if (Static241.aBoolean302 && local267.isObjOpsEnabled()) { @@ -189,7 +193,7 @@ public class MiniMenu { } } if (local267.method507()) { - add(Static169.anInt4075, (long) local276.id, JagString.concatenate(new JagString[] { aClass100_32, local276.name}), local171, (short) 22, LocalizedText.USE, component.id); + add(MiniMap.anInt4075, (long) local276.id, JagString.concatenate(new JagString[] { aClass100_32, local276.name}), local171, (short) 22, LocalizedText.USE, component.id); } if (local267.isObjOpsEnabled() && local296 != null) { for (local309 = 2; local309 >= 0; local309--) { @@ -235,7 +239,7 @@ public class MiniMenu { } } } - add(Static225.anInt5073, (long) local276.id, JagString.concatenate(new JagString[] { aClass100_32, local276.name}), local171, (short) 1006, LocalizedText.EXAMINE, component.id); + add(MiniMap.anInt5073, (long) local276.id, JagString.concatenate(new JagString[] { aClass100_32, local276.name}), local171, (short) 1006, LocalizedText.EXAMINE, component.id); } } } @@ -253,7 +257,7 @@ public class MiniMenu { add(getOpCursor(local171, component), (long) (local171 + 1), component.optionBase, component.createdComponentId, (short) 1003, local765, component.id); } } - local47 = Static97.getTargetVerb(component); + local47 = MiniMap.getTargetVerb(component); if (local47 != null) { add(-1, 0L, component.optionBase, component.createdComponentId, (short) 32, local47, component.id); } @@ -278,7 +282,7 @@ public class MiniMenu { } ops[size] = arg5; opBases[size] = arg2; - cursors[size] = cursor == -1 ? Static35.anInt1092 : cursor; + cursors[size] = cursor == -1 ? anInt1092 : cursor; actions[size] = arg4; keys[size] = arg1; intArgs1[size] = arg3; @@ -378,7 +382,7 @@ public class MiniMenu { Protocol.outboundBuffer.p2(Static185.anInt4370); Protocol.outboundBuffer.ip4(local19); Protocol.outboundBuffer.ip2(local15); - Protocol.outboundBuffer.ip4(Static224.anInt5062); + Protocol.outboundBuffer.ip4(MiniMap.anInt5062); Protocol.outboundBuffer.ip2add(anInt4997); Protocol.outboundBuffer.ip2add(local36); anInt2043 = 0; @@ -572,10 +576,10 @@ public class MiniMenu { Protocol.outboundBuffer.ip2(local36); } } - if (local23 == 41 && Static39.aClass13_10 == null) { + if (local23 == 41 && Static44.aClass13_10 == null) { ClientProt.method10(local15, local19); - Static39.aClass13_10 = InterfaceList.method1418(local19, local15); - InterfaceList.redraw(Static39.aClass13_10); + Static44.aClass13_10 = InterfaceList.method1418(local19, local15); + InterfaceList.redraw(Static44.aClass13_10); } if (local23 == 49) { PathFinder.findPathToLoc(local31, local19, local15); @@ -599,7 +603,7 @@ public class MiniMenu { Protocol.outboundBuffer.p2(anInt4997); Protocol.outboundBuffer.ip2(local19 + Camera.originZ); Protocol.outboundBuffer.p2(Static185.anInt4370); - Protocol.outboundBuffer.mp4(Static224.anInt5062); + Protocol.outboundBuffer.mp4(MiniMap.anInt5062); Protocol.outboundBuffer.p2add((int) (local31 >>> 32) & Integer.MAX_VALUE); } if (local23 == 37) { @@ -659,11 +663,11 @@ public class MiniMenu { if (local23 == 32) { local693 = InterfaceList.method1418(local19, local15); if (local693 != null) { - Static53.method1294(); + method1294(); @Pc(1493) ServerActiveProperties local1493 = InterfaceList.getServerActiveProperties(local693); Static247.method4246(local19, local15, local1493.getTargetMask(), local1493.anInt540, local693.anInt499, local693.anInt484); anInt5014 = 0; - aClass100_545 = Static97.getTargetVerb(local693); + aClass100_545 = MiniMap.getTargetVerb(local693); if (aClass100_545 == null) { aClass100_545 = aClass100_1042; } @@ -771,7 +775,7 @@ public class MiniMenu { Cross.y = Mouse.clickY; Cross.x = Mouse.clickX; Protocol.outboundBuffer.p1isaac(115); - Protocol.outboundBuffer.mp4(Static224.anInt5062); + Protocol.outboundBuffer.mp4(MiniMap.anInt5062); Protocol.outboundBuffer.ip2(Static185.anInt4370); Protocol.outboundBuffer.ip2(local36); Protocol.outboundBuffer.ip2add(anInt4997); @@ -802,7 +806,7 @@ public class MiniMenu { Protocol.outboundBuffer.ip2(anInt4997); Protocol.outboundBuffer.ip2(local36); Protocol.outboundBuffer.ip2add(Camera.originZ + local19); - Protocol.outboundBuffer.mp4(Static224.anInt5062); + Protocol.outboundBuffer.mp4(MiniMap.anInt5062); } if (local23 == 1004) { Cross.milliseconds = 0; @@ -847,7 +851,7 @@ public class MiniMenu { Protocol.outboundBuffer.ip2add(local36); Protocol.outboundBuffer.p2(anInt4997); Protocol.outboundBuffer.p2(Static185.anInt4370); - Protocol.outboundBuffer.mp4(Static224.anInt5062); + Protocol.outboundBuffer.mp4(MiniMap.anInt5062); } } if (local23 == 7) { @@ -907,9 +911,9 @@ public class MiniMenu { } } if (local23 == 22) { - Static53.method1294(); + method1294(); local693 = InterfaceList.getComponent(local19); - Static224.anInt5062 = local19; + MiniMap.anInt5062 = local19; Static185.anInt4370 = local15; anInt5014 = 1; anInt4997 = local36; @@ -982,7 +986,7 @@ public class MiniMenu { } if (local23 == 36) { if (local36 == 0) { - Static187.anInt4422 = 1; + Protocol.anInt4422 = 1; method3556(Player.level, local15, local19); } else if (LoginManager.staffModLevel > 0 && Keyboard.pressedKeys[Keyboard.KEY_CTRL] && Keyboard.pressedKeys[Keyboard.KEY_SHIFT]) { Cheat.teleport(local15 + Camera.originX, Camera.originZ - -local19, Player.level); @@ -1036,10 +1040,10 @@ public class MiniMenu { } if (anInt5014 != 0) { anInt5014 = 0; - InterfaceList.redraw(InterfaceList.getComponent(Static224.anInt5062)); + InterfaceList.redraw(InterfaceList.getComponent(MiniMap.anInt5062)); } if (Static241.aBoolean302) { - Static53.method1294(); + method1294(); } if (pressedInventoryComponent != null && anInt2043 == 0) { InterfaceList.redraw(pressedInventoryComponent); @@ -1082,7 +1086,7 @@ public class MiniMenu { if (Static241.aBoolean302 && (anInt4999 & 0x40) != 0) { @Pc(61) Component local61 = InterfaceList.method1418(anInt2512, anInt506); if (local61 == null) { - Static53.method1294(); + method1294(); } else { add(anInt5393, 0L, aClass100_961, local33, (short) 11, aClass100_545, x); } @@ -1094,7 +1098,7 @@ public class MiniMenu { } } @Pc(112) long local112 = -1L; - for (local15 = 0; local15 < Static2.anInt7; local15++) { + for (local15 = 0; local15 < anInt7; local15++) { @Pc(121) long local121 = Model.aLongArray11[local15]; x = (int) local121 & 0x7F; @Pc(133) int local133 = (int) local121 >> 29 & 0x3; @@ -1112,7 +1116,7 @@ public class MiniMenu { continue; } if (anInt5014 == 1) { - add(Static169.anInt4075, local121, JagString.concatenate(new JagString[] {aClass100_203, aClass100_164, local172.name}), x, (short) 14, LocalizedText.USE, z); + add(MiniMap.anInt4075, local121, JagString.concatenate(new JagString[] {aClass100_203, aClass100_164, local172.name}), x, (short) 14, LocalizedText.USE, z); } else if (Static241.aBoolean302) { @Pc(363) ParamType local363 = Static121.anInt3039 == -1 ? null : ParamTypeList.get(Static121.anInt3039); if ((anInt4999 & 0x4) != 0 && (local363 == null || local172.getParam(local363.defaultInt, Static121.anInt3039) != local363.defaultInt)) { @@ -1153,7 +1157,7 @@ public class MiniMenu { } } } - add(Static225.anInt5073, (long) local172.id, JagString.concatenate(new JagString[] { aClass100_1008, local172.name}), x, (short) 1004, LocalizedText.EXAMINE, z); + add(MiniMap.anInt5073, (long) local172.id, JagString.concatenate(new JagString[] { aClass100_1008, local172.name}), x, (short) 1004, LocalizedText.EXAMINE, z); } } @Pc(514) int local514; @@ -1217,7 +1221,7 @@ public class MiniMenu { local240 = node.value.type; @Pc(951) ObjType local951 = ObjTypeList.get(local240); if (anInt5014 == 1) { - add(Static169.anInt4075, (long) local240, JagString.concatenate(new JagString[] { aClass100_203, aClass100_947, local951.name }), x, (short) 33, LocalizedText.USE, z); + add(MiniMap.anInt4075, (long) local240, JagString.concatenate(new JagString[] { aClass100_203, aClass100_947, local951.name }), x, (short) 33, LocalizedText.USE, z); } else if (Static241.aBoolean302) { @Pc(1142) ParamType local1142 = Static121.anInt3039 == -1 ? null : ParamTypeList.get(Static121.anInt3039); if ((anInt4999 & 0x1) != 0 && (local1142 == null || local951.getParam(local1142.defaultInt, Static121.anInt3039) != local1142.defaultInt)) { @@ -1256,7 +1260,7 @@ public class MiniMenu { add(local1041, (long) local240, JagString.concatenate(new JagString[] { aClass100_32, local951.name}), x, local1025, local997[local514], z); } } - add(Static225.anInt5073, (long) local240, JagString.concatenate(new JagString[] { aClass100_32, local951.name}), x, (short) 1002, LocalizedText.EXAMINE, z); + add(MiniMap.anInt5073, (long) local240, JagString.concatenate(new JagString[] { aClass100_32, local951.name}), x, (short) 1002, LocalizedText.EXAMINE, z); } } } @@ -1312,7 +1316,7 @@ public class MiniMenu { local35 = JagString.concatenate(new JagString[] { local35, getCombatLevelColor(arg0.combatLevel, PlayerList.self.combatLevel), OPEN_PARENTHESIS, local47, JagString.parseInt(arg0.combatLevel), CLOSE_PARENTHESIS}); } if (anInt5014 == 1) { - add(Static169.anInt4075, (long) arg2, JagString.concatenate(new JagString[] {aClass100_203, aClass100_407, local35 }), arg1, (short) 26, LocalizedText.USE, arg3); + add(MiniMap.anInt4075, (long) arg2, JagString.concatenate(new JagString[] {aClass100_203, aClass100_407, local35 }), arg1, (short) 26, LocalizedText.USE, arg3); } else if (Static241.aBoolean302) { @Pc(378) ParamType local378 = Static121.anInt3039 == -1 ? null : ParamTypeList.get(Static121.anInt3039); if ((anInt4999 & 0x2) != 0 && (local378 == null || arg0.getParam(Static121.anInt3039, local378.defaultInt) != local378.defaultInt)) { @@ -1384,7 +1388,7 @@ public class MiniMenu { } } } - add(Static225.anInt5073, (long) arg2, JagString.concatenate(new JagString[] {aClass100_965, local35 }), arg1, (short) 1007, LocalizedText.EXAMINE, arg3); + add(MiniMap.anInt5073, (long) arg2, JagString.concatenate(new JagString[] {aClass100_965, local35 }), arg1, (short) 1007, LocalizedText.EXAMINE, arg3); } } @@ -1419,7 +1423,7 @@ public class MiniMenu { } @Pc(275) int local275; if (anInt5014 == 1) { - add(Static169.anInt4075, (long) arg0, JagString.concatenate(new JagString[] {aClass100_203, aClass100_561, string }), arg3, (short) 1, LocalizedText.USE, arg1); + add(MiniMap.anInt4075, (long) arg0, JagString.concatenate(new JagString[] {aClass100_203, aClass100_561, string }), arg3, (short) 1, LocalizedText.USE, arg1); } else if (!Static241.aBoolean302) { for (local275 = 7; local275 >= 0; local275--) { if (Player.options[local275] != null) { @@ -1490,10 +1494,27 @@ public class MiniMenu { @OriginalMember(owner = "client!ud", name = "a", descriptor = "(ILclient!be;)Z") public static boolean method4265(@OriginalArg(1) Component arg0) { if (arg0.clientCode == 205) { - Static267.anInt5775 = 250; + Protocol.anInt5775 = 250; return true; } else { return false; } } + + @OriginalMember(owner = "client!ec", name = "a", descriptor = "(B)V") + public static void method1294() { + if (!Static241.aBoolean302) { + return; + } + @Pc(19) Component local19 = InterfaceList.method1418(anInt2512, anInt506); + if (local19 != null && local19.onUseWith != null) { + @Pc(29) HookRequest local29 = new HookRequest(); + local29.arguments = local19.onUseWith; + local29.source = local19; + ScriptRunner.run(local29); + } + Static241.aBoolean302 = false; + anInt1092 = -1; + InterfaceList.redraw(local19); + } } diff --git a/client/src/main/java/rt4/Mouse.java b/client/src/main/java/rt4/Mouse.java index 2b91718..f8be6dc 100644 --- a/client/src/main/java/rt4/Mouse.java +++ b/client/src/main/java/rt4/Mouse.java @@ -50,6 +50,8 @@ public final class Mouse implements MouseListener, MouseMotionListener, FocusLis public static volatile int anInt4973 = 0; @OriginalMember(owner = "client!wi", name = "W", descriptor = "I") public static int anInt5850 = 0; + @OriginalMember(owner = "client!ok", name = "f", descriptor = "J") + public static long prevClickTime = 0L; public int mouseWheelX; public int mouseWheelY; diff --git a/client/src/main/java/rt4/Npc.java b/client/src/main/java/rt4/Npc.java index 41a4018..18e548e 100644 --- a/client/src/main/java/rt4/Npc.java +++ b/client/src/main/java/rt4/Npc.java @@ -90,14 +90,14 @@ public final class Npc extends PathingEntity { model.translate(0, -this.spotAnimY, 0); if (spotAnimType.aBoolean100) { - if (Static101.anInt2640 != 0) { - model.rotateX(Static101.anInt2640); + if (PathingEntity.anInt2640 != 0) { + model.rotateX(PathingEntity.anInt2640); } if (PathingEntity.anInt2680 != 0) { model.rotateZ(PathingEntity.anInt2680); } - if (Static62.anInt1938 != 0) { - model.translate(0, Static62.anInt1938, 0); + if (PathingEntity.anInt1938 != 0) { + model.translate(0, PathingEntity.anInt1938, 0); } } } diff --git a/client/src/main/java/rt4/NpcType.java b/client/src/main/java/rt4/NpcType.java index 8047ca2..39579c4 100644 --- a/client/src/main/java/rt4/NpcType.java +++ b/client/src/main/java/rt4/NpcType.java @@ -76,8 +76,10 @@ public final class NpcType { @OriginalMember(owner = "client!me", name = "r", descriptor = "S") public short aShort23 = 0; + @OriginalMember(owner = "client!vk", name = "d", descriptor = "Lclient!na;") + public static final JagString aClass100_1010 = JagString.parse("null"); @OriginalMember(owner = "client!me", name = "L", descriptor = "Lclient!na;") - public JagString name = Static266.aClass100_1010; + public JagString name = aClass100_1010; @OriginalMember(owner = "client!me", name = "x", descriptor = "I") public int combatLevel = -1; diff --git a/client/src/main/java/rt4/ObjType.java b/client/src/main/java/rt4/ObjType.java index cdd5742..d65c7ad 100644 --- a/client/src/main/java/rt4/ObjType.java +++ b/client/src/main/java/rt4/ObjType.java @@ -59,8 +59,10 @@ public final class ObjType { @OriginalMember(owner = "client!h", name = "T", descriptor = "I") public int team = 0; + @OriginalMember(owner = "client!gd", name = "b", descriptor = "Lclient!na;") + public static final JagString aClass100_464 = JagString.parse("null"); @OriginalMember(owner = "client!h", name = "E", descriptor = "Lclient!na;") - public JagString name = Static78.aClass100_464; + public JagString name = aClass100_464; @OriginalMember(owner = "client!h", name = "J", descriptor = "I") private int manWearZOff = 0; diff --git a/client/src/main/java/rt4/ParticleSystem.java b/client/src/main/java/rt4/ParticleSystem.java index 3e75e08..61df4f1 100644 --- a/client/src/main/java/rt4/ParticleSystem.java +++ b/client/src/main/java/rt4/ParticleSystem.java @@ -1,7 +1,11 @@ package rt4; +import com.jogamp.opengl.GL2; import org.openrs2.deob.annotation.OriginalClass; import org.openrs2.deob.annotation.OriginalMember; +import org.openrs2.deob.annotation.Pc; + +import java.nio.FloatBuffer; @OriginalClass("client!ga") public final class ParticleSystem extends ParticleNode { @@ -11,7 +15,30 @@ public final class ParticleSystem extends ParticleNode { new Buffer(131056); } - @OriginalMember(owner = "client!ga", name = "d", descriptor = "()V") + @OriginalMember(owner = "client!ga", name = "a", descriptor = "()V") + public static void load() { + @Pc(1) GL2 gl = GlRenderer.gl; + if (gl.isExtensionAvailable("GL_ARB_point_parameters")) { + @Pc(20) float[] coefficients = new float[] { 1.0F, 0.0F, 5.0E-4F }; + gl.glPointParameterfv(GL2.GL_POINT_DISTANCE_ATTENUATION, coefficients, 0); + @Pc(28) FloatBuffer buffer = FloatBuffer.allocate(1); + gl.glGetFloatv(GL2.GL_POINT_SIZE_MAX, buffer); + @Pc(36) float pointSizeMax = buffer.get(0); + if (pointSizeMax > 1024.0F) { + pointSizeMax = 1024.0F; + } + gl.glPointParameterf(GL2.GL_POINT_SIZE_MIN, 1.0F); + gl.glPointParameterf(GL2.GL_POINT_SIZE_MAX, pointSizeMax); + } + if (gl.isExtensionAvailable("GL_ARB_point_sprite")) { + } + } + + @OriginalMember(owner = "client!ga", name = "b", descriptor = "()V") + public static void quit() { + } + + @OriginalMember(owner = "client!ga", name = "d", descriptor = "()V") public final void method1646() { } } diff --git a/client/src/main/java/rt4/PathingEntity.java b/client/src/main/java/rt4/PathingEntity.java index ff26609..b8e8fb6 100644 --- a/client/src/main/java/rt4/PathingEntity.java +++ b/client/src/main/java/rt4/PathingEntity.java @@ -14,6 +14,10 @@ public abstract class PathingEntity extends Entity { public static final BasType aClass20_1 = new BasType(); @OriginalMember(owner = "client!hn", name = "Y", descriptor = "I") public static int anInt2680 = 0; + @OriginalMember(owner = "client!hm", name = "ab", descriptor = "I") + public static int anInt2640 = 0; + @OriginalMember(owner = "client!f", name = "V", descriptor = "I") + public static int anInt1938 = 0; @OriginalMember(owner = "client!fe", name = "A", descriptor = "I") public int spotAnimStart; @@ -357,8 +361,8 @@ public abstract class PathingEntity extends Entity { @OriginalMember(owner = "client!fe", name = "a", descriptor = "(BLclient!ak;I)V") protected final void method2685(@OriginalArg(1) Model arg0, @OriginalArg(2) int arg1) { anInt2680 = 0; - Static101.anInt2640 = 0; - Static62.anInt1938 = 0; + anInt2640 = 0; + anInt1938 = 0; @Pc(21) BasType local21 = this.getBasType(); @Pc(24) int local24 = local21.anInt1059; @Pc(27) int local27 = local21.anInt1050; @@ -391,21 +395,21 @@ public abstract class PathingEntity extends Entity { @Pc(231) int local231 = local224 > local201 ? local201 : local224; @Pc(238) int local238 = local224 > local134 ? local134 : local224; @Pc(245) int local245 = local201 <= local87 ? local201 : local87; - Static101.anInt2640 = (int) (Math.atan2((double) (local212 - local231), (double) local27) * 325.95D) & 0x7FF; - if (Static101.anInt2640 != 0) { - arg0.rotateX(Static101.anInt2640); + anInt2640 = (int) (Math.atan2((double) (local212 - local231), (double) local27) * 325.95D) & 0x7FF; + if (anInt2640 != 0) { + arg0.rotateX(anInt2640); } anInt2680 = (int) (Math.atan2((double) (local245 - local238), (double) local24) * 325.95D) & 0x7FF; if (anInt2680 != 0) { arg0.rotateZ(anInt2680); } - Static62.anInt1938 = local224 + local87; - if (local201 + local134 < Static62.anInt1938) { - Static62.anInt1938 = local201 + local134; + anInt1938 = local224 + local87; + if (local201 + local134 < anInt1938) { + anInt1938 = local201 + local134; } - Static62.anInt1938 = (Static62.anInt1938 >> 1) - this.anInt3424; - if (Static62.anInt1938 != 0) { - arg0.translate(0, Static62.anInt1938, 0); + anInt1938 = (anInt1938 >> 1) - this.anInt3424; + if (anInt1938 != 0) { + arg0.translate(0, anInt1938, 0); } } diff --git a/client/src/main/java/rt4/Player.java b/client/src/main/java/rt4/Player.java index b7bf659..83634d5 100644 --- a/client/src/main/java/rt4/Player.java +++ b/client/src/main/java/rt4/Player.java @@ -36,6 +36,8 @@ public final class Player extends PathingEntity { public static PrivilegedRequest lastLogAddress; @OriginalMember(owner = "client!ib", name = "l", descriptor = "I") public static int anInt2863 = 0; + @OriginalMember(owner = "client!ea", name = "r", descriptor = "[[B") + public static byte[][] aByteArrayArray8; @OriginalMember(owner = "client!e", name = "Bc", descriptor = "Lclient!hh;") public PlayerAppearance appearance; @@ -195,6 +197,101 @@ public final class Player extends PathingEntity { } } + @OriginalMember(owner = "client!rg", name = "a", descriptor = "(Lclient!e;I)V") + public static void method4359(@OriginalArg(0) Player arg0) { + @Pc(12) AreaSound local12 = (AreaSound) AreaSoundManager.playerSounds.get(arg0.username.encode37()); + if (local12 == null) { + AreaSoundManager.add(arg0.movementQueueZ[0], null, 0, null, arg0.movementQueueX[0], level, arg0); + } else { + local12.update(); + } + } + + @OriginalMember(owner = "client!bf", name = "c", descriptor = "(I)V") + public static void method501() { + if (!GlRenderer.enabled || Static231.aBoolean252) { + return; + } + @Pc(14) Tile[][][] local14 = SceneGraph.tiles; + for (@Pc(22) int local22 = 0; local22 < local14.length; local22++) { + @Pc(30) Tile[][] local30 = local14[local22]; + for (@Pc(32) int local32 = 0; local32 < local30.length; local32++) { + for (@Pc(42) int local42 = 0; local42 < local30[local32].length; local42++) { + @Pc(54) Tile local54 = local30[local32][local42]; + if (local54 != null) { + @Pc(71) GlModel local71; + if (local54.groundDecor != null && local54.groundDecor.entity instanceof GlModel) { + local71 = (GlModel) local54.groundDecor.entity; + if ((local54.groundDecor.key & Long.MIN_VALUE) == 0L) { + local71.method4111(false, true, true, false, true, true); + } else { + local71.method4111(true, true, true, true, true, true); + } + } + if (local54.wallDecor != null) { + if (local54.wallDecor.primary instanceof GlModel) { + local71 = (GlModel) local54.wallDecor.primary; + if ((local54.wallDecor.key & Long.MIN_VALUE) == 0L) { + local71.method4111(false, true, true, false, true, true); + } else { + local71.method4111(true, true, true, true, true, true); + } + } + if (local54.wallDecor.secondary instanceof GlModel) { + local71 = (GlModel) local54.wallDecor.secondary; + if ((Long.MIN_VALUE & local54.wallDecor.key) == 0L) { + local71.method4111(false, true, true, false, true, true); + } else { + local71.method4111(true, true, true, true, true, true); + } + } + } + if (local54.wall != null) { + if (local54.wall.primary instanceof GlModel) { + local71 = (GlModel) local54.wall.primary; + if ((local54.wall.key & Long.MIN_VALUE) == 0L) { + local71.method4111(false, true, true, false, true, true); + } else { + local71.method4111(true, true, true, true, true, true); + } + } + if (local54.wall.secondary instanceof GlModel) { + local71 = (GlModel) local54.wall.secondary; + if ((Long.MIN_VALUE & local54.wall.key) == 0L) { + local71.method4111(false, true, true, false, true, true); + } else { + local71.method4111(true, true, true, true, true, true); + } + } + } + for (@Pc(270) int local270 = 0; local270 < local54.sceneryLen; local270++) { + if (local54.scenery[local270].entity instanceof GlModel) { + @Pc(293) GlModel local293 = (GlModel) local54.scenery[local270].entity; + if ((Long.MIN_VALUE & local54.scenery[local270].key) == 0L) { + local293.method4111(false, true, true, false, true, true); + } else { + local293.method4111(true, true, true, true, true, true); + } + } + } + } + } + } + } + Static231.aBoolean252 = true; + } + + @OriginalMember(owner = "client!ja", name = "a", descriptor = "(IIIIB)V") + public static void method2310(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) { + if (Cross.type == 1) { + Sprites.crosses[Cross.milliseconds / 100].render(Cross.x - 8, Cross.y + -8); + } + if (Cross.type == 2) { + Sprites.crosses[Cross.milliseconds / 100 + 4].render(Cross.x - 8, Cross.y + -8); + } + setTutorialIsland(); + } + @OriginalMember(owner = "client!e", name = "c", descriptor = "(B)I") @Override public final int getSize() { @@ -289,7 +386,7 @@ public final class Player extends PathingEntity { this.anInt1654 = arg0.g2(); this.anInt1670 = arg0.g2(); if (this.soundRadius != local134 || this.anInt1648 != local175 || this.anInt1658 != local309 || local312 != this.anInt1654 || this.anInt1670 != local315) { - Static214.method4359(this); + method4359(this); } } if (this.appearance == null) { @@ -315,20 +412,20 @@ public final class Player extends PathingEntity { @Pc(25) SeqType local25 = this.seqId != -1 && this.anInt3420 == 0 ? SeqTypeList.get(this.seqId) : null; @Pc(54) SeqType local54 = this.movementSeqId == -1 || this.aBoolean98 || this.movementSeqId == this.getBasType().idleAnimationId && local25 != null ? null : SeqTypeList.get(this.movementSeqId); @Pc(76) Model local76 = this.appearance.method1954(this.aClass147Array3, this.anInt3373, local54, local25, this.anInt3396, this.anInt3388, this.anInt3360, this.anInt3425, this.anInt3407); - @Pc(79) int local79 = Static198.method1029(); + @Pc(79) int local79 = PlayerAppearance.method1029(); if (GlRenderer.enabled && GameShell.maxMemory < 96 && local79 > 50) { - Static16.method501(); + method501(); } @Pc(102) int local102; if (client.modeWhat != 0 && local79 < 50) { local102 = 50 - local79; while (anInt2863 < local102) { - Static51.aByteArrayArray8[anInt2863] = new byte[102400]; + aByteArrayArray8[anInt2863] = new byte[102400]; anInt2863++; } while (anInt2863 > local102) { anInt2863--; - Static51.aByteArrayArray8[anInt2863] = null; + aByteArrayArray8[anInt2863] = null; } } if (local76 == null) { @@ -351,8 +448,8 @@ public final class Player extends PathingEntity { } } if (PlayerList.self == this) { - for (local102 = Static143.hintMapMarkers.length - 1; local102 >= 0; local102--) { - @Pc(245) MapMarker local245 = Static143.hintMapMarkers[local102]; + for (local102 = MiniMap.hintMapMarkers.length - 1; local102 >= 0; local102--) { + @Pc(245) MapMarker local245 = MiniMap.hintMapMarkers[local102]; if (local245 != null && local245.playerModelId != -1) { @Pc(291) int local291; @Pc(302) int local302; @@ -389,14 +486,14 @@ public final class Player extends PathingEntity { if (local184 != null) { local184.translate(0, -this.spotAnimY, 0); if (local471.aBoolean100) { - if (Static101.anInt2640 != 0) { - local184.rotateX(Static101.anInt2640); + if (PathingEntity.anInt2640 != 0) { + local184.rotateX(PathingEntity.anInt2640); } if (PathingEntity.anInt2680 != 0) { local184.rotateZ(PathingEntity.anInt2680); } - if (Static62.anInt1938 != 0) { - local184.translate(0, Static62.anInt1938, 0); + if (PathingEntity.anInt1938 != 0) { + local184.translate(0, PathingEntity.anInt1938, 0); } } } diff --git a/client/src/main/java/rt4/PlayerAppearance.java b/client/src/main/java/rt4/PlayerAppearance.java index 192ed8e..10ee134 100644 --- a/client/src/main/java/rt4/PlayerAppearance.java +++ b/client/src/main/java/rt4/PlayerAppearance.java @@ -44,6 +44,8 @@ public final class PlayerAppearance { public static final AnimFrameset[] aClass3_Sub2_Sub7Array8 = new AnimFrameset[14]; @OriginalMember(owner = "client!vf", name = "g", descriptor = "[I") public static final int[] anIntArray515 = new int[14]; + @OriginalMember(owner = "client!kf", name = "d", descriptor = "[Lclient!cl;") + public static final AnimFrameset[] aClass3_Sub2_Sub7Array7 = new AnimFrameset[14]; @OriginalMember(owner = "client!cj", name = "e", descriptor = "[[S") public static short[][] aShortArrayArray2; @OriginalMember(owner = "client!nj", name = "m", descriptor = "[[S") @@ -88,6 +90,17 @@ public final class PlayerAppearance { aClass99_21.method3103(); } + @OriginalMember(owner = "client!sj", name = "c", descriptor = "(I)V") + public static void method3947() { + aClass99_33.clear(); + aClass99_21.clear(); + } + + @OriginalMember(owner = "client!q", name = "a", descriptor = "(B)I") + public static int method1029() { + return aClass99_33.method3100(); + } + @OriginalMember(owner = "client!hh", name = "a", descriptor = "(IIIILclient!tk;III)Lclient!ak;") public final Model method1946(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) SeqType arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6) { @Pc(24) long local24 = (long) arg2 | (long) (arg6 << 16) | (long) arg1 << 32; @@ -388,17 +401,17 @@ public final class PlayerAppearance { anIntArray515[local353] = local858.anIntArray474[local374]; Static73.anIntArray183[local353] = arg0[local353].anInt5404; local979 = local858.frames[local367]; - Static133.aClass3_Sub2_Sub7Array7[local353] = SeqTypeList.getAnimFrameset(local979 >>> 16); + aClass3_Sub2_Sub7Array7[local353] = SeqTypeList.getAnimFrameset(local979 >>> 16); @Pc(991) int local991 = local979 & 0xFFFF; anIntArray187[local353] = local991; - if (Static133.aClass3_Sub2_Sub7Array7[local353] != null) { - local836 |= Static133.aClass3_Sub2_Sub7Array7[local353].isColorTransformed(local991); - local827 |= Static133.aClass3_Sub2_Sub7Array7[local353].isAlphaTransformed(local991); + if (aClass3_Sub2_Sub7Array7[local353] != null) { + local836 |= aClass3_Sub2_Sub7Array7[local353].isColorTransformed(local991); + local827 |= aClass3_Sub2_Sub7Array7[local353].isAlphaTransformed(local991); } } else { anIntArray515[local353] = 0; Static73.anIntArray183[local353] = 0; - Static133.aClass3_Sub2_Sub7Array7[local353] = null; + aClass3_Sub2_Sub7Array7[local353] = null; anIntArray187[local353] = -1; } } @@ -474,7 +487,7 @@ public final class PlayerAppearance { local598 = 1; while (local481 < local346) { if (aClass3_Sub2_Sub7Array8[local481] != null) { - local1284.method4565(aClass3_Sub2_Sub7Array8[local481], Static241.anIntArray520[local481], Static133.aClass3_Sub2_Sub7Array7[local481], anIntArray187[local481], Static73.anIntArray183[local481] - 1, anIntArray515[local481], local598, aClass144Array2[local481].aBoolean278, this.anIntArrayArray19[local481]); + local1284.method4565(aClass3_Sub2_Sub7Array8[local481], Static241.anIntArray520[local481], aClass3_Sub2_Sub7Array7[local481], anIntArray187[local481], Static73.anIntArray183[local481] - 1, anIntArray515[local481], local598, aClass144Array2[local481].aBoolean278, this.anIntArrayArray19[local481]); } local481++; local598 <<= 0x1; @@ -488,7 +501,7 @@ public final class PlayerAppearance { } for (local481 = 0; local481 < local346; local481++) { aClass3_Sub2_Sub7Array8[local481] = null; - Static133.aClass3_Sub2_Sub7Array7[local481] = null; + aClass3_Sub2_Sub7Array7[local481] = null; aClass144Array2[local481] = null; } return local1284; diff --git a/client/src/main/java/rt4/PlayerList.java b/client/src/main/java/rt4/PlayerList.java index 3a832f9..ddb266c 100644 --- a/client/src/main/java/rt4/PlayerList.java +++ b/client/src/main/java/rt4/PlayerList.java @@ -1,6 +1,7 @@ package rt4; import org.openrs2.deob.annotation.OriginalMember; +import org.openrs2.deob.annotation.Pc; public class PlayerList { @OriginalMember(owner = "client!ja", name = "l", descriptor = "[Lclient!wa;") @@ -21,4 +22,20 @@ public class PlayerList { public static JagString[] playerNames; @OriginalMember(owner = "client!vg", name = "a", descriptor = "[Lclient!na;") public static JagString[] playerNames2; + + @OriginalMember(owner = "client!fk", name = "b", descriptor = "(I)V") + public static void method1444() { + for (@Pc(7) int local7 = -1; local7 < size; local7++) { + @Pc(21) int local21; + if (local7 == -1) { + local21 = 2047; + } else { + local21 = ids[local7]; + } + @Pc(31) Player local31 = players[local21]; + if (local31 != null) { + NpcList.method4514(local31.getSize(), local31); + } + } + } } diff --git a/client/src/main/java/rt4/Protocol.java b/client/src/main/java/rt4/Protocol.java index e893fdf..cac03ac 100644 --- a/client/src/main/java/rt4/Protocol.java +++ b/client/src/main/java/rt4/Protocol.java @@ -28,6 +28,36 @@ public class Protocol { public static final JagString CLAN = JagString.parse(":clan:"); @OriginalMember(owner = "client!ij", name = "a", descriptor = "Lclient!na;") public static final JagString DUELFRIEND = JagString.parse(":duelfriend:"); + @OriginalMember(owner = "client!km", name = "Sc", descriptor = "Lclient!na;") + public static final JagString TRADE = JagString.parse(":trade:"); + @OriginalMember(owner = "client!pb", name = "x", descriptor = "[[[I") + public static final int[][][] anIntArrayArrayArray18 = new int[4][13][13]; + @OriginalMember(owner = "client!fc", name = "f", descriptor = "Lclient!na;") + public static final JagString IMG0 = JagString.parse(""); + @OriginalMember(owner = "client!en", name = "h", descriptor = "Lclient!na;") + public static final JagString CHALREQ = JagString.parse(":chalreq:"); + @OriginalMember(owner = "client!ef", name = "f", descriptor = "Lclient!na;") + public static final JagString DUELSTAKE = JagString.parse(":duelstake:"); + @OriginalMember(owner = "client!wd", name = "e", descriptor = "Lclient!na;") + public static final JagString aClass100_989 = JagString.parse("cookieprefix"); + @OriginalMember(owner = "client!u", name = "g", descriptor = "Lclient!na;") + public static final JagString aClass100_1029 = JagString.parse("cookiehost"); + @OriginalMember(owner = "client!lc", name = "m", descriptor = "Lclient!na;") + public static final JagString aClass100_667 = JagString.parse("settings="); + @OriginalMember(owner = "client!wh", name = "n", descriptor = "Lclient!na;") + public static final JagString aClass100_1095 = JagString.parse("; version=1; path=)4; domain="); + @OriginalMember(owner = "client!tm", name = "d", descriptor = "Lclient!na;") + public static final JagString aClass100_1018 = JagString.parse("; Expires=Thu)1 01)2Jan)21970 00:00:00 GMT; Max)2Age=0"); + @OriginalMember(owner = "client!vg", name = "h", descriptor = "Lclient!na;") + public static final JagString aClass100_1082 = JagString.parse("; Expires="); + @OriginalMember(owner = "client!s", name = "g", descriptor = "Lclient!na;") + public static final JagString aClass100_821 = JagString.parse("document)3cookie=(R"); + @OriginalMember(owner = "client!sc", name = "f", descriptor = "Lclient!na;") + public static final JagString aClass100_946 = JagString.parse("(R"); + @OriginalMember(owner = "client!fb", name = "i", descriptor = "Lclient!na;") + public static final JagString aClass100_431 = JagString.parse("; Max)2Age="); + @OriginalMember(owner = "client!ch", name = "z", descriptor = "[I") + public static final int[] anIntArray76 = new int[5]; @OriginalMember(owner = "client!jk", name = "B", descriptor = "Lclient!ma;") public static BufferedSocket socket; @OriginalMember(owner = "client!fl", name = "C", descriptor = "Lsignlink!im;") @@ -54,6 +84,26 @@ public class Protocol { public static int opcode2 = 0; @OriginalMember(owner = "client!bj", name = "r", descriptor = "I") public static int anInt659 = 2; + @OriginalMember(owner = "client!dg", name = "h", descriptor = "Lclient!be;") + public static Component aClass13_11; + @OriginalMember(owner = "client!ld", name = "i", descriptor = "I") + public static int anInt3486 = 0; + @OriginalMember(owner = "client!kf", name = "l", descriptor = "I") + public static int anInt5235 = 0; + @OriginalMember(owner = "client!pm", name = "ab", descriptor = "Z") + public static boolean aBoolean228 = true; + @OriginalMember(owner = "client!vl", name = "k", descriptor = "I") + public static int anInt5775 = 0; + @OriginalMember(owner = "client!t", name = "l", descriptor = "Lclient!ma;") + public static BufferedSocket aClass95_4; + @OriginalMember(owner = "client!od", name = "i", descriptor = "I") + public static int anInt4247 = 0; + @OriginalMember(owner = "client!bf", name = "G", descriptor = "I") + public static int anInt551 = 0; + @OriginalMember(owner = "client!pb", name = "ab", descriptor = "I") + public static int anInt4422 = 0; + @OriginalMember(owner = "client!fe", name = "R", descriptor = "Z") + public static boolean prevFocus = true; @OriginalMember(owner = "client!g", name = "b", descriptor = "(B)V") public static void readLocationPacket() { @@ -121,7 +171,7 @@ public class Protocol { local23 = local23 * 128 + 64; local19 = local19 * 128 + 64; @Pc(427) SpotAnim local427 = new SpotAnim(local27, Player.level, local23, local19, SceneGraph.getTileHeight(Player.level, local23, local19) - local31, local39, client.loop); - Static99.aClass69_64.addTail(new SpotAnimNode(local427)); + LoginManager.aClass69_64.addTail(new SpotAnimNode(local427)); } } else if (opcode == ServerProt.LOCATION_PACKET_179) { int local15 = inboundBuffer.g1add(); @@ -339,7 +389,7 @@ public class Protocol { @OriginalMember(owner = "client!g", name = "a", descriptor = "(IZ)V") public static void readRebuildPacket(@OriginalArg(1) boolean arg0) { - Static230.dynamicMapRegion = arg0; + LoginManager.dynamicMapRegion = arg0; @Pc(13) int local13; @Pc(20) int local20; @Pc(26) int local26; @@ -349,7 +399,7 @@ public class Protocol { @Pc(138) int local138; @Pc(151) int local151; @Pc(169) int local169; - if (!Static230.dynamicMapRegion) { + if (!LoginManager.dynamicMapRegion) { local13 = inboundBuffer.g2add(); local20 = (length - inboundBuffer.offset) / 16; LoginManager.regionsXteaKeys = new int[local20][4]; @@ -411,9 +461,9 @@ public class Protocol { for (local391 = 0; local391 < 13; local391++) { local138 = inboundBuffer.gBits(1); if (local138 == 1) { - Static187.anIntArrayArrayArray18[local60][local64][local391] = inboundBuffer.gBits(26); + anIntArrayArrayArray18[local60][local64][local391] = inboundBuffer.gBits(26); } else { - Static187.anIntArrayArrayArray18[local60][local64][local391] = -1; + anIntArrayArrayArray18[local60][local64][local391] = -1; } } } @@ -442,7 +492,7 @@ public class Protocol { for (local391 = 0; local391 < 4; local391++) { for (local138 = 0; local138 < 13; local138++) { for (local151 = 0; local151 < 13; local151++) { - local169 = Static187.anIntArrayArrayArray18[local391][local138][local151]; + local169 = anIntArrayArrayArray18[local391][local138][local151]; if (local169 != -1) { @Pc(555) int local555 = local169 >> 14 & 0x3FF; @Pc(561) int local561 = local169 >> 3 & 0x7FF; @@ -509,7 +559,7 @@ public class Protocol { local106 = phrase.id; message = phrase.type.decodeMessage(chatBuffer); } else { - message = Font.escape(Static65.formatChatMessage(chatBuffer).encodeMessage()); + message = Font.escape(formatChatMessage(chatBuffer).encodeMessage()); } player.chatMessage = message.trim(); player.chatEffect = int1 & 0xFF; @@ -518,7 +568,7 @@ public class Protocol { if (int2 == 2) { Chat.add(local106, local35 ? 17 : 1, message, null, JagString.concatenate(new JagString[] { Static44.IMG1, player.getName() })); } else if (int2 == 1) { - Chat.add(local106, local35 ? 17 : 1, message, null, JagString.concatenate(new JagString[] { Static65.IMG0, player.getName() })); + Chat.add(local106, local35 ? 17 : 1, message, null, JagString.concatenate(new JagString[] { IMG0, player.getName() })); } else { Chat.add(local106, local35 ? 17 : 2, message, null, player.getName()); } @@ -872,7 +922,7 @@ public class Protocol { opcode4 = opcode3; opcode3 = opcode2; opcode2 = opcode; - Static201.anInt1862 = 0; + LoginManager.anInt1862 = 0; if (opcode == ServerProt.VARP_SMALL) { int id = inboundBuffer.g2add(); @@ -901,7 +951,7 @@ public class Protocol { } else if (opcode == ServerProt.MESSAGE_GAME) { @Pc(245) JagString message = inboundBuffer.gjstr(); if (message.endsWith(TRADEREQ)) { - JagString name = message.substring(message.indexOf(Static264.COLON), 0); + JagString name = message.substring(message.indexOf(DateUtil.COLON), 0); long name37 = name.encode37(); boolean ignored = false; for (int i = 0; i < IgnoreList.size; i++) { @@ -913,8 +963,8 @@ public class Protocol { if (!ignored && Player.inTutorialIsland == 0) { Chat.add(name, 4, LocalizedText.TRADEREQ); } - } else if (message.endsWith(Static61.CHALREQ)) { - JagString name = message.substring(message.indexOf(Static264.COLON), 0); + } else if (message.endsWith(CHALREQ)) { + JagString name = message.substring(message.indexOf(DateUtil.COLON), 0); long name37 = name.encode37(); boolean ignored = false; for (int i = 0; i < IgnoreList.size; i++) { @@ -924,11 +974,11 @@ public class Protocol { } } if (!ignored && Player.inTutorialIsland == 0) { - JagString local506 = message.substring(message.length() - 9, message.indexOf(Static264.COLON) + 1); + JagString local506 = message.substring(message.length() - 9, message.indexOf(DateUtil.COLON) + 1); Chat.add(name, 8, local506); } } else if (message.endsWith(Static191.ASSISTREQ)) { - JagString name = message.substring(message.indexOf(Static264.COLON), 0); + JagString name = message.substring(message.indexOf(DateUtil.COLON), 0); long name37 = name.encode37(); boolean ignored = false; for (int i = 0; i < IgnoreList.size; i++) { @@ -943,8 +993,8 @@ public class Protocol { } else if (message.endsWith(CLAN)) { JagString name = message.substring(message.indexOf(CLAN), 0); Chat.add(JagString.EMPTY, 11, name); - } else if (message.endsWith(Static138.TRADE)) { - JagString name = message.substring(message.indexOf(Static138.TRADE), 0); + } else if (message.endsWith(TRADE)) { + JagString name = message.substring(message.indexOf(TRADE), 0); if (Player.inTutorialIsland == 0) { Chat.add(JagString.EMPTY, 12, name); } @@ -953,8 +1003,8 @@ public class Protocol { if (Player.inTutorialIsland == 0) { Chat.add(JagString.EMPTY, 13, name); } - } else if (message.endsWith(Static56.DUELSTAKE)) { - JagString name = message.substring(message.indexOf(Static264.COLON), 0); + } else if (message.endsWith(DUELSTAKE)) { + JagString name = message.substring(message.indexOf(DateUtil.COLON), 0); long name37 = name.encode37(); boolean ignored = false; for (int i = 0; i < IgnoreList.size; i++) { @@ -967,7 +1017,7 @@ public class Protocol { Chat.add(name, 14, JagString.EMPTY); } } else if (message.endsWith(DUELFRIEND)) { - JagString name = message.substring(message.indexOf(Static264.COLON), 0); + JagString name = message.substring(message.indexOf(DateUtil.COLON), 0); long name37 = name.encode37(); boolean ignored = false; for (int local277 = 0; local277 < IgnoreList.size; local277++) { @@ -980,7 +1030,7 @@ public class Protocol { Chat.add(name, 15, JagString.EMPTY); } } else if (message.endsWith(Static217.aClass100_916)) { - JagString name = message.substring(message.indexOf(Static264.COLON), 0); + JagString name = message.substring(message.indexOf(DateUtil.COLON), 0); long name37 = name.encode37(); boolean ignored = false; for (int i = 0; i < IgnoreList.size; i++) { @@ -993,7 +1043,7 @@ public class Protocol { Chat.add(name, 16, JagString.EMPTY); } } else if (message.endsWith(Static164.aClass100_770)) { - JagString name = message.substring(message.indexOf(Static264.COLON), 0); + JagString name = message.substring(message.indexOf(DateUtil.COLON), 0); long name37 = name.encode37(); boolean ignored = false; for (int i = 0; i < IgnoreList.size; i++) { @@ -1003,7 +1053,7 @@ public class Protocol { } } if (!ignored && Player.inTutorialIsland == 0) { - JagString local506 = message.substring(message.length() - 9, message.indexOf(Static264.COLON) + 1); + JagString local506 = message.substring(message.length() - 9, message.indexOf(DateUtil.COLON) + 1); Chat.add(name, 21, local506); } } else { @@ -1080,7 +1130,7 @@ public class Protocol { if (rights == 2 || rights == 3) { Chat.add(quickchatId, 20, message, Base37.decode37(clan37).toTitleCase(), JagString.concatenate(new JagString[] { Static44.IMG1, Base37.decode37(name37).toTitleCase() })); } else if (rights == 1) { - Chat.add(quickchatId, 20, message, Base37.decode37(clan37).toTitleCase(), JagString.concatenate(new JagString[] { Static65.IMG0, Base37.decode37(name37).toTitleCase() })); + Chat.add(quickchatId, 20, message, Base37.decode37(clan37).toTitleCase(), JagString.concatenate(new JagString[] { IMG0, Base37.decode37(name37).toTitleCase() })); } else { Chat.add(quickchatId, 20, message, Base37.decode37(clan37).toTitleCase(), Base37.decode37(name37).toTitleCase()); } @@ -1366,7 +1416,7 @@ public class Protocol { posZ = posZ * 128 + 64; posX = posX * 128 + 64; @Pc(2241) SpotAnim spotAnim = new SpotAnim(gfxId, plane, posX, posZ, SceneGraph.getTileHeight(plane, posX, posZ) - height, delay, client.loop); - Static99.aClass69_64.addTail(new SpotAnimNode(spotAnim)); + LoginManager.aClass69_64.addTail(new SpotAnimNode(spotAnim)); } } opcode = -1; @@ -1408,9 +1458,9 @@ public class Protocol { if (pointer != null) { InterfaceList.closeInterface(true, pointer); } - if (Static39.aClass13_10 != null) { - InterfaceList.redraw(Static39.aClass13_10); - Static39.aClass13_10 = null; + if (Static44.aClass13_10 != null) { + InterfaceList.redraw(Static44.aClass13_10); + Static44.aClass13_10 = null; } opcode = -1; return true; @@ -1631,7 +1681,7 @@ public class Protocol { if (rights == 2) { Chat.add(chatId, 18, message, null, JagString.concatenate(new JagString[] { Static44.IMG1, Base37.decode37(name).toTitleCase() })); } else if (rights == 1) { - Chat.add(chatId, 18, message, null, JagString.concatenate(new JagString[] { Static65.IMG0, Base37.decode37(name).toTitleCase() })); + Chat.add(chatId, 18, message, null, JagString.concatenate(new JagString[] { IMG0, Base37.decode37(name).toTitleCase() })); } else { Chat.add(chatId, 18, message, null, Base37.decode37(name).toTitleCase()); } @@ -1662,7 +1712,7 @@ public class Protocol { InterfaceList.method531(component, true); } if (InterfaceList.topLevelInterface != -1) { - Static54.runScripts(1, InterfaceList.topLevelInterface); + InterfaceList.runScripts(1, InterfaceList.topLevelInterface); } opcode = -1; return true; @@ -1678,7 +1728,7 @@ public class Protocol { Camera.cameraJitter[cameraId] = jitter; Camera.cameraAmplitude[cameraId] = amplitude; Camera.cameraFrequency[cameraId] = frequency; - Static31.anIntArray76[cameraId] = shake4; + anIntArray76[cameraId] = shake4; opcode = -1; return true; } else if (opcode == ServerProt.IF_SETCOLOUR) { @@ -1714,7 +1764,7 @@ public class Protocol { return true; } else if (opcode == ServerProt.GAME_FRAME_UNK) { if (InterfaceList.topLevelInterface != -1) { - Static54.runScripts(0, InterfaceList.topLevelInterface); + InterfaceList.runScripts(0, InterfaceList.topLevelInterface); } opcode = -1; return true; @@ -1730,7 +1780,7 @@ public class Protocol { int seqId = inboundBuffer.g2(); @Pc(3766) Npc npc = NpcList.npcs[npcId]; if (npc != null) { - Static223.animateNpc(value, seqId, npc); + animateNpc(value, seqId, npc); } opcode = -1; return true; @@ -1742,7 +1792,7 @@ public class Protocol { return true; } else if (opcode == ServerProt.MESSAGE_PRIVATE_ECHO) { long name37 = inboundBuffer.g8(); - JagString message = Font.escape(Static65.formatChatMessage(inboundBuffer).encodeMessage()); + JagString message = Font.escape(formatChatMessage(inboundBuffer).encodeMessage()); Chat.add(Base37.decode37(name37).toTitleCase(), 6, message); opcode = -1; return true; @@ -1754,9 +1804,9 @@ public class Protocol { inboundBuffer.gBytesIsaac(data, length); JagString url = JagString.decodeString(data, length, 0); if (GameShell.frame == null && (SignLink.anInt5928 == 3 || !SignLink.osName.startsWith("win") || client.haveIe6)) { - Static169.openUrl(url, true); + ScriptRunner.openUrl(url, true); } else { - Static175.url = url; + ScriptRunner.url = url; Static164.newTab = true; Static33.openUrlRequest = GameShell.signLink.openUrl(new String(url.method3148(), StandardCharsets.ISO_8859_1)); } @@ -1844,7 +1894,7 @@ public class Protocol { if (mapMarker.playerModelId == 65535) { mapMarker.playerModelId = -1; } - Static143.hintMapMarkers[slot] = mapMarker; + MiniMap.hintMapMarkers[slot] = mapMarker; } opcode = -1; return true; @@ -1921,11 +1971,11 @@ public class Protocol { if (!ignored && Player.inTutorialIsland == 0) { Chat.recentMessages[Chat.messageCounter] = messageId; Chat.messageCounter = (Chat.messageCounter + 1) % 100; - @Pc(4518) JagString message = Font.escape(Static65.formatChatMessage(inboundBuffer).encodeMessage()); + @Pc(4518) JagString message = Font.escape(formatChatMessage(inboundBuffer).encodeMessage()); if (rights == 2 || rights == 3) { Chat.add(JagString.concatenate(new JagString[] { Static44.IMG1, Base37.decode37(name37).toTitleCase() }), 7, message); } else if (rights == 1) { - Chat.add(JagString.concatenate(new JagString[] { Static65.IMG0, Base37.decode37(name37).toTitleCase() }), 7, message); + Chat.add(JagString.concatenate(new JagString[] { IMG0, Base37.decode37(name37).toTitleCase() }), 7, message); } else { Chat.add(Base37.decode37(name37).toTitleCase(), 3, message); } @@ -1967,11 +2017,11 @@ public class Protocol { if (!ignored && Player.inTutorialIsland == 0) { Chat.recentMessages[Chat.messageCounter] = local4626; Chat.messageCounter = (Chat.messageCounter + 1) % 100; - JagString message = Font.escape(Static65.formatChatMessage(inboundBuffer).encodeMessage()); + JagString message = Font.escape(formatChatMessage(inboundBuffer).encodeMessage()); if (rights == 2 || rights == 3) { Static73.method1598(message, JagString.concatenate(new JagString[] { Static44.IMG1, Base37.decode37(name37).toTitleCase() }), Base37.decode37(chat37).toTitleCase()); } else if (rights == 1) { - Static73.method1598(message, JagString.concatenate(new JagString[] { Static65.IMG0, Base37.decode37(name37).toTitleCase() }), Base37.decode37(chat37).toTitleCase()); + Static73.method1598(message, JagString.concatenate(new JagString[] { IMG0, Base37.decode37(name37).toTitleCase() }), Base37.decode37(chat37).toTitleCase()); } else { Static73.method1598(message, Base37.decode37(name37).toTitleCase(), Base37.decode37(chat37).toTitleCase()); } @@ -2238,7 +2288,7 @@ public class Protocol { component.objCounts[i] = 0; } } - Static14.method475(containerId); + Inv.method475(containerId); int total = inboundBuffer.g2(); for (int slot = 0; slot < total; slot++) { int amount = inboundBuffer.g1sub(); @@ -2260,7 +2310,7 @@ public class Protocol { opcode = -1; return true; } else if (opcode == ServerProt.SET_SETTINGS_STRING) { - Static230.method3954(inboundBuffer.gjstr()); + method3954(inboundBuffer.gjstr()); opcode = -1; return true; } else if (opcode == ServerProt.UPDATE_CURRENT_LOCATION) { @@ -2298,7 +2348,7 @@ public class Protocol { return readPacketInternal(); } catch (@Pc(14) IOException ex) { ex.printStackTrace(); - Static175.method3279(); + method3279(); return true; } catch (@Pc(19) Exception ex) { ex.printStackTrace(); @@ -2315,8 +2365,8 @@ public class Protocol { @OriginalMember(owner = "client!gg", name = "a", descriptor = "(Z)V") public static void method1756() { // todo: consolidate/rename static classes - if (Static267.anInt5775 > 0) { - Static267.anInt5775--; + if (anInt5775 > 0) { + anInt5775--; } if (Player.rebootTimer > 1) { Player.rebootTimer--; @@ -2324,7 +2374,7 @@ public class Protocol { } if (LoginManager.aBoolean247) { LoginManager.aBoolean247 = false; - Static175.method3279(); + method3279(); return; } for (@Pc(34) int i = 0; i < 100 && readPacket(); i++) { @@ -2419,7 +2469,7 @@ public class Protocol { } } if (Mouse.clickButton != 0) { - @Pc(411) long loops = (Mouse.clickTime - Static183.prevClickTime) / 50L; + @Pc(411) long loops = (Mouse.clickTime - Mouse.prevClickTime) / 50L; type = Mouse.clickY; if (type < 0) { type = 0; @@ -2430,7 +2480,7 @@ public class Protocol { loops = 32767L; } i = Mouse.clickX; - Static183.prevClickTime = Mouse.clickTime; + Mouse.prevClickTime = Mouse.clickTime; @Pc(437) byte button = 0; if (i < 0) { i = 0; @@ -2445,34 +2495,34 @@ public class Protocol { outboundBuffer.ip2add(button << 15 | x); outboundBuffer.mp4(i | type << 16); } - if (Static16.anInt551 > 0) { - Static16.anInt551--; + if (anInt551 > 0) { + anInt551--; } if (Preferences.aBoolean63) { for (i = 0; i < InterfaceList.keyQueueSize; i++) { offset = InterfaceList.keyCodes[i]; if (offset == 98 || offset == 99 || offset == 96 || offset == 97) { - Static197.aBoolean228 = true; + aBoolean228 = true; break; } } } else if (Keyboard.pressedKeys[Keyboard.KEY_LEFT] || Keyboard.pressedKeys[Keyboard.KEY_RIGHT] || Keyboard.pressedKeys[Keyboard.KEY_UP] || Keyboard.pressedKeys[Keyboard.KEY_DOWN]) { - Static197.aBoolean228 = true; + aBoolean228 = true; } - if (Static197.aBoolean228 && Static16.anInt551 <= 0) { - Static16.anInt551 = 20; - Static197.aBoolean228 = false; + if (aBoolean228 && anInt551 <= 0) { + anInt551 = 20; + aBoolean228 = false; outboundBuffer.p1isaac(21); outboundBuffer.p2add((int)Camera.pitchTarget); outboundBuffer.ip2((int)Camera.yawTarget); } - if (GameShell.focus && !Static67.prevFocus) { - Static67.prevFocus = true; + if (GameShell.focus && !prevFocus) { + prevFocus = true; outboundBuffer.p1isaac(22); outboundBuffer.p1(1); } - if (!GameShell.focus && Static67.prevFocus) { - Static67.prevFocus = false; + if (!GameShell.focus && prevFocus) { + prevFocus = false; outboundBuffer.p1isaac(22); outboundBuffer.p1(0); } @@ -2481,19 +2531,19 @@ public class Protocol { outboundBuffer.p4(Preferences.toInt()); Preferences.sentToServer = true; } - Static31.method846(); + LightingManager.method846(); if (client.gameState != 30) { return; } ChangeLocRequest.loop(); AttachLocRequest.loop(); SoundPlayer.loop(); - Static201.anInt1862++; - if (Static201.anInt1862 > 750) { - Static175.method3279(); + LoginManager.anInt1862++; + if (LoginManager.anInt1862 > 750) { + method3279(); return; } - Static71.method1444(); + PlayerList.method1444(); NpcList.method2274(); OverheadChat.loop(); if (WorldMap.component != null) { @@ -2625,7 +2675,7 @@ public class Protocol { Cross.type = 0; } } - Static178.anInt4247++; + anInt4247++; if (MiniMenu.pressedInventoryComponent != null) { MiniMenu.anInt2043++; if (MiniMenu.anInt2043 >= 15) { @@ -2635,17 +2685,17 @@ public class Protocol { } @Pc(1361) Component component; - if (Static118.clickedInventoryComponent != null) { - InterfaceList.redraw(Static118.clickedInventoryComponent); - if (Static149.clickedInventoryComponentX + 5 < Mouse.lastMouseX || Mouse.lastMouseX < Static149.clickedInventoryComponentX - 5 || Static206.clickedInventoryComponentY + 5 < Mouse.lastMouseY || Static206.clickedInventoryComponentY - 5 > Mouse.lastMouseY) { + if (InterfaceList.clickedInventoryComponent != null) { + InterfaceList.redraw(InterfaceList.clickedInventoryComponent); + if (InterfaceList.clickedInventoryComponentX + 5 < Mouse.lastMouseX || Mouse.lastMouseX < InterfaceList.clickedInventoryComponentX - 5 || InterfaceList.clickedInventoryComponentY + 5 < Mouse.lastMouseY || InterfaceList.clickedInventoryComponentY - 5 > Mouse.lastMouseY) { Static123.draggingClickedInventoryObject = true; } - Static78.clickedInventoryComponentCycle++; + InterfaceList.clickedInventoryComponentCycle++; if (Mouse.pressedButton == 0) { - if (Static123.draggingClickedInventoryObject && Static78.clickedInventoryComponentCycle >= 5) { - if (Static118.clickedInventoryComponent == Static169.mouseOverInventoryInterface && Static4.mouseOverInventoryObjectIndex != Static18.clickedInventoryIndex) { - component = Static118.clickedInventoryComponent; + if (Static123.draggingClickedInventoryObject && InterfaceList.clickedInventoryComponentCycle >= 5) { + if (InterfaceList.clickedInventoryComponent == InterfaceList.mouseOverInventoryInterface && Static4.mouseOverInventoryObjectIndex != Static18.clickedInventoryIndex) { + component = InterfaceList.clickedInventoryComponent; @Pc(1363) byte inserting = 0; if (VarpDomain.inserting == 1 && component.clientCode == 206) { @@ -2680,7 +2730,7 @@ public class Protocol { } outboundBuffer.p1isaac(231); outboundBuffer.p2(Static4.mouseOverInventoryObjectIndex); - outboundBuffer.ip4(Static118.clickedInventoryComponent.id); + outboundBuffer.ip4(InterfaceList.clickedInventoryComponent.id); outboundBuffer.p2add(Static18.clickedInventoryIndex); outboundBuffer.p1sub(inserting); } @@ -2691,17 +2741,17 @@ public class Protocol { } Mouse.clickButton = 0; MiniMenu.anInt2043 = 10; - Static118.clickedInventoryComponent = null; + InterfaceList.clickedInventoryComponent = null; } } Static146.aBoolean174 = false; - Static56.aClass13_12 = null; + InterfaceList.aClass13_12 = null; Static44.aBoolean83 = false; InterfaceList.keyQueueSize = 0; - component = Static180.aClass13_22; - Static180.aClass13_22 = null; - @Pc(1508) Component local1508 = Static43.aClass13_11; - Static43.aClass13_11 = null; + component = InterfaceList.aClass13_22; + InterfaceList.aClass13_22 = null; + @Pc(1508) Component local1508 = aClass13_11; + aClass13_11 = null; while (Keyboard.nextKey() && InterfaceList.keyQueueSize < 128) { InterfaceList.keyCodes[InterfaceList.keyQueueSize] = Keyboard.keyCode; InterfaceList.keyChars[InterfaceList.keyQueueSize] = Keyboard.keyChar; @@ -2709,7 +2759,7 @@ public class Protocol { } WorldMap.component = null; if (InterfaceList.topLevelInterface != -1) { - Static57.method1320(0, 0, 0, GameShell.canvasWidth, InterfaceList.topLevelInterface, 0, GameShell.canvasHeight); + InterfaceList.method1320(0, 0, 0, GameShell.canvasWidth, InterfaceList.topLevelInterface, 0, GameShell.canvasHeight); } InterfaceList.transmitTimer++; while (true) { @@ -2721,7 +2771,7 @@ public class Protocol { if (priorityRequest == null) { while (true) { do { - priorityRequest = (HookRequest) Static115.mediumPriorityRequests.removeHead(); + priorityRequest = (HookRequest) InterfaceList.mediumPriorityRequests.removeHead(); if (priorityRequest == null) { while (true) { do { @@ -2747,7 +2797,7 @@ public class Protocol { if (MiniMenu.anInt1742 != -1) { Cheat.teleport(Camera.originX + MiniMenu.anInt1742, Camera.originZ - -MiniMenu.anInt2954, Player.level); } - Static187.anInt4422 = 0; + anInt4422 = 0; MiniMenu.anInt3096 = 0; } else if (MiniMenu.anInt3096 == 2) { if (MiniMenu.anInt1742 != -1) { @@ -2762,7 +2812,7 @@ public class Protocol { Cross.x = Mouse.clickX; } MiniMenu.anInt3096 = 0; - } else if (Static187.anInt4422 == 2) { + } else if (anInt4422 == 2) { if (MiniMenu.anInt1742 != -1) { outboundBuffer.p1isaac(179); outboundBuffer.p2(Camera.originZ + MiniMenu.anInt2954); @@ -2772,8 +2822,8 @@ public class Protocol { Cross.x = Mouse.clickX; Cross.y = Mouse.clickY; } - Static187.anInt4422 = 0; - } else if (MiniMenu.anInt1742 != -1 && MiniMenu.anInt3096 == 0 && Static187.anInt4422 == 0) { + anInt4422 = 0; + } else if (MiniMenu.anInt1742 != -1 && MiniMenu.anInt3096 == 0 && anInt4422 == 0) { @Pc(1871) boolean local1871 = PathFinder.findPath(PlayerList.self.movementQueueZ[0], 0, 0, true, 0, MiniMenu.anInt1742, 0, 0, 0, MiniMenu.anInt2954, PlayerList.self.movementQueueX[0]); if (local1871) { Cross.y = Mouse.clickY; @@ -2784,30 +2834,30 @@ public class Protocol { } MiniMenu.anInt1742 = -1; Static7.method843(); - if (Static180.aClass13_22 != component) { + if (InterfaceList.aClass13_22 != component) { if (component != null) { InterfaceList.redraw(component); } - if (Static180.aClass13_22 != null) { - InterfaceList.redraw(Static180.aClass13_22); + if (InterfaceList.aClass13_22 != null) { + InterfaceList.redraw(InterfaceList.aClass13_22); } } - if (local1508 != Static43.aClass13_11 && Static191.anInt4504 == Static133.anInt5235) { + if (local1508 != aClass13_11 && Static191.anInt4504 == anInt5235) { if (local1508 != null) { InterfaceList.redraw(local1508); } - if (Static43.aClass13_11 != null) { - InterfaceList.redraw(Static43.aClass13_11); + if (aClass13_11 != null) { + InterfaceList.redraw(aClass13_11); } } - if (Static43.aClass13_11 == null) { - if (Static133.anInt5235 > 0) { - Static133.anInt5235--; + if (aClass13_11 == null) { + if (anInt5235 > 0) { + anInt5235--; } - } else if (Static133.anInt5235 < Static191.anInt4504) { - Static133.anInt5235++; - if (Static191.anInt4504 == Static133.anInt5235) { - InterfaceList.redraw(Static43.aClass13_11); + } else if (anInt5235 < Static191.anInt4504) { + anInt5235++; + if (Static191.anInt4504 == anInt5235) { + InterfaceList.redraw(aClass13_11); } } if (Camera.cameraType == 1) { @@ -2818,37 +2868,37 @@ public class Protocol { Camera.updateLoginScreenCamera(); } for (y = 0; y < 5; y++) { - @Pc(2001) int local2001 = Static31.anIntArray76[y]++; + @Pc(2001) int local2001 = anIntArray76[y]++; } y = Mouse.getIdleLoops(); x = Keyboard.getIdleLoops(); if (y > 15000 && x > 15000) { - Static267.anInt5775 = 250; + anInt5775 = 250; Mouse.setIdleLoops(14500); outboundBuffer.p1isaac(245); } if (Static33.openUrlRequest != null && Static33.openUrlRequest.status == 1) { if (Static33.openUrlRequest.result != null) { - Static169.openUrl(Static175.url, Static164.newTab); + ScriptRunner.openUrl(ScriptRunner.url, Static164.newTab); } - Static175.url = null; + ScriptRunner.url = null; Static33.openUrlRequest = null; Static164.newTab = false; } Static131.anInt3251++; MiniMap.anInt2252++; - Static143.anInt3486++; - if (Static143.anInt3486 > 500) { - Static143.anInt3486 = 0; + anInt3486++; + if (anInt3486 > 500) { + anInt3486 = 0; modelId = (int) (Math.random() * 8.0D); if ((modelId & 0x4) == 4) { - Static230.anInt5161 += Static220.anInt4941; + Camera.anInt5161 += Static220.anInt4941; } if ((modelId & 0x2) == 2) { - Static206.anInt4774 += anInt659; + Camera.anInt4774 += anInt659; } if ((modelId & 0x1) == 1) { - Static132.anInt3291 += Static248.anInt4229; + Camera.anInt3291 += Camera.anInt4229; } } if (MiniMap.anInt2252 > 500) { @@ -2861,8 +2911,8 @@ public class Protocol { MiniMap.anInt4130 += MiniMap.anInt4262; } } - if (Static132.anInt3291 < -50) { - Static248.anInt4229 = 2; + if (Camera.anInt3291 < -50) { + Camera.anInt4229 = 2; } if (MiniMap.anInt1814 < -60) { MiniMap.anInt5755 = 2; @@ -2870,19 +2920,19 @@ public class Protocol { if (MiniMap.anInt4130 < -20) { MiniMap.anInt4262 = 1; } - if (Static206.anInt4774 < -55) { + if (Camera.anInt4774 < -55) { anInt659 = 2; } - if (Static206.anInt4774 > 55) { + if (Camera.anInt4774 > 55) { anInt659 = -2; } - if (Static230.anInt5161 < -40) { + if (Camera.anInt5161 < -40) { Static220.anInt4941 = 1; } - if (Static132.anInt3291 > 50) { - Static248.anInt4229 = -2; + if (Camera.anInt3291 > 50) { + Camera.anInt4229 = -2; } - if (Static230.anInt5161 > 40) { + if (Camera.anInt5161 > 40) { Static220.anInt4941 = -1; } if (MiniMap.anInt4130 > 10) { @@ -2905,7 +2955,7 @@ public class Protocol { outboundBuffer.offset = 0; } } catch (@Pc(2266) IOException local2266) { - Static175.method3279(); + method3279(); } return; } @@ -2974,7 +3024,7 @@ public class Protocol { if (local43 == 65535) { local43 = -1; } - Static223.animateNpc(local47, local43, npc); + animateNpc(local47, local43, npc); } boolean hasFaceEntity = (local18 & 0x4) != 0; @@ -3047,7 +3097,7 @@ public class Protocol { local334[i1] = inboundBuffer.g1sub(); local337[i1] = inboundBuffer.g2(); } - Static159.method3037(local337, npc, local334, local331); + method3037(local337, npc, local334, local331); } boolean hasFaceLocation = (local18 & 0x200) != 0; @@ -3226,4 +3276,172 @@ public class Protocol { } buffer.offset += 24; } + + @OriginalMember(owner = "client!nm", name = "a", descriptor = "(Z)V") + public static void method3279() { + if (anInt5775 > 0) { + LoginManager.processLogout(); + } else { + aClass95_4 = socket; + socket = null; + client.setGameState(40); + } + } + + @OriginalMember(owner = "client!fc", name = "a", descriptor = "(Lclient!wa;I)Lclient!na;") + public static JagString formatChatMessage(@OriginalArg(0) Buffer arg0) { + return method4350(arg0); + } + + @OriginalMember(owner = "client!uj", name = "a", descriptor = "(Lclient!wa;II)Lclient!na;") + public static JagString method4350(@OriginalArg(0) Buffer arg0) { + try { + @Pc(7) int local7 = arg0.gsmarts(); + if (local7 > 32767) { + local7 = 32767; + } + @Pc(15) byte[] local15 = new byte[local7]; + arg0.offset += WordPack.codec.method1552(0, local7, local15, arg0.data, arg0.offset); + return JagString.decodeString(local15, local7, 0); + } catch (@Pc(47) Exception local47) { + return WordPack.CABBAGE; + } + } + + @OriginalMember(owner = "client!mi", name = "a", descriptor = "([IBLclient!km;[I[I)V") + public static void method3037(@OriginalArg(0) int[] arg0, @OriginalArg(2) Npc arg1, @OriginalArg(3) int[] arg2, @OriginalArg(4) int[] arg3) { + for (@Pc(3) int local3 = 0; local3 < arg3.length; local3++) { + @Pc(15) int local15 = arg3[local3]; + @Pc(19) int local19 = arg0[local3]; + @Pc(23) int local23 = arg2[local3]; + for (@Pc(25) int local25 = 0; local19 != 0 && arg1.aClass147Array3.length > local25; local25++) { + if ((local19 & 0x1) != 0) { + if (local15 == -1) { + arg1.aClass147Array3[local25] = null; + } else { + @Pc(60) SeqType local60 = SeqTypeList.get(local15); + @Pc(65) Npc_Class147 local65 = arg1.aClass147Array3[local25]; + @Pc(68) int local68 = local60.anInt5347; + if (local65 != null) { + if (local15 == local65.anInt5396) { + if (local68 == 0) { + local65 = arg1.aClass147Array3[local25] = null; + } else if (local68 == 1) { + local65.anInt5399 = 0; + local65.anInt5400 = 0; + local65.anInt5398 = 1; + local65.anInt5404 = 0; + local65.anInt5408 = local23; + SoundPlayer.playSeqSound(arg1.zFine, local60, arg1.xFine, false, 0); + } else if (local68 == 2) { + local65.anInt5400 = 0; + } + } else if (local60.forcedPriority >= SeqTypeList.get(local65.anInt5396).forcedPriority) { + local65 = arg1.aClass147Array3[local25] = null; + } + } + if (local65 == null) { + local65 = arg1.aClass147Array3[local25] = new Npc_Class147(); + local65.anInt5398 = 1; + local65.anInt5404 = 0; + local65.anInt5408 = local23; + local65.anInt5396 = local15; + local65.anInt5400 = 0; + local65.anInt5399 = 0; + SoundPlayer.playSeqSound(arg1.zFine, local60, arg1.xFine, false, 0); + } + } + } + local19 >>>= 0x1; + } + } + } + + @OriginalMember(owner = "client!sc", name = "a", descriptor = "(IIILclient!km;)V") + public static void animateNpc(@OriginalArg(0) int arg0, @OriginalArg(1) int animationId, @OriginalArg(3) Npc npc) { + if (npc.seqId == animationId && animationId != -1) { + @Pc(10) SeqType seqType = SeqTypeList.get(animationId); + @Pc(13) int local13 = seqType.anInt5347; + if (local13 == 1) { + npc.anInt3373 = 1; + npc.anInt3425 = 0; + npc.anInt3360 = 0; + npc.anInt3371 = 0; + npc.anInt3420 = arg0; + SoundPlayer.playSeqSound(npc.zFine, seqType, npc.xFine, false, npc.anInt3425); + } + if (local13 == 2) { + npc.anInt3371 = 0; + } + } else if (animationId == -1 || npc.seqId == -1 || SeqTypeList.get(animationId).forcedPriority >= SeqTypeList.get(npc.seqId).forcedPriority) { + npc.anInt3360 = 0; + npc.seqId = animationId; + npc.anInt3373 = 1; + npc.anInt3371 = 0; + npc.anInt3420 = arg0; + npc.anInt3405 = npc.movementQueueSize; + npc.anInt3425 = 0; + if (npc.seqId != -1) { + SoundPlayer.playSeqSound(npc.zFine, SeqTypeList.get(npc.seqId), npc.xFine, false, npc.anInt3425); + } + } + } + + @OriginalMember(owner = "client!sj", name = "a", descriptor = "(ILclient!na;)V") + public static void method3954(@OriginalArg(1) JagString arg0) { + client.settings = arg0; + if (GameShell.signLink.applet == null) { + return; + } + try { + @Pc(17) JagString local17 = aClass100_989.fromParameters(GameShell.signLink.applet); + @Pc(23) JagString local23 = aClass100_1029.fromParameters(GameShell.signLink.applet); + @Pc(48) JagString local48 = JagString.concatenate(new JagString[] { local17, aClass100_667, arg0, aClass100_1095, local23 }); + if (arg0.length() == 0) { + local48 = JagString.concatenate(new JagString[] { local48, aClass100_1018 }); + } else { + local48 = JagString.concatenate(new JagString[] { local48, aClass100_1082, DateUtil.getDateString(MonotonicClock.currentTimeMillis() + 94608000000L), aClass100_431, method2929(94608000L) }); + } + JagString.concatenate(new JagString[] { aClass100_821, local48, aClass100_946 }).method3134(GameShell.signLink.applet); + } catch (@Pc(124) Throwable local124) { + } + } + + @OriginalMember(owner = "client!md", name = "a", descriptor = "(JB)Lclient!na;") + public static JagString method2929(@OriginalArg(0) long arg0) { + return method1376(arg0); + } + + @OriginalMember(owner = "client!ej", name = "a", descriptor = "(IZIJ)Lclient!na;") + public static JagString method1376(@OriginalArg(3) long arg0) { + @Pc(35) long local35 = arg0 / (long) 10; + @Pc(37) int local37 = 1; + while (local35 != 0L) { + local37++; + local35 /= 10; + } + @Pc(51) int local51 = local37; + if (arg0 < 0L) { + local51 = local37 + 1; + } + @Pc(61) byte[] local61 = new byte[local51]; + if (arg0 < 0L) { + local61[0] = 45; + } + for (@Pc(79) int local79 = 0; local79 < local37; local79++) { + @Pc(92) int local92 = (int) (arg0 % (long) 10); + arg0 /= 10; + if (local92 < 0) { + local92 = -local92; + } + if (local92 > 9) { + local92 += 39; + } + local61[local51 - local79 - 1] = (byte) (local92 + 48); + } + @Pc(126) JagString local126 = new JagString(); + local126.chars = local61; + local126.length = local51; + return local126; + } } diff --git a/client/src/main/java/rt4/ReflectionCheck.java b/client/src/main/java/rt4/ReflectionCheck.java index 660d2da..d45dd13 100644 --- a/client/src/main/java/rt4/ReflectionCheck.java +++ b/client/src/main/java/rt4/ReflectionCheck.java @@ -182,7 +182,7 @@ public final class ReflectionCheck extends Node { } local17.anIntArray139[local59] = local71; local17.anIntArray137[local59] = local95; - local17.aClass212Array2[local59] = arg0.getDeclaredField(local104, Static6.method85(local93)); + local17.aClass212Array2[local59] = arg0.getDeclaredField(local104, method85(local93)); } else if (local71 == 3 || local71 == 4) { local93 = new String(arg1.gjstr().method3148()); local104 = new String(arg1.gjstr().method3148()); @@ -203,9 +203,9 @@ public final class ReflectionCheck extends Node { local17.anIntArray139[local59] = local71; @Pc(234) Class[] local234 = new Class[local95]; for (local210 = 0; local210 < local95; local210++) { - local234[local210] = Static6.method85(local171[local210]); + local234[local210] = method85(local171[local210]); } - local17.aClass212Array1[local59] = arg0.getDeclaredMethod(Static6.method85(local93), local234, local104); + local17.aClass212Array1[local59] = arg0.getDeclaredMethod(method85(local93), local234, local104); local17.aByteArrayArrayArray6[local59] = local193; } } catch (@Pc(269) ClassNotFoundException local269) { @@ -227,4 +227,27 @@ public final class ReflectionCheck extends Node { public static void method4625() { aClass69_113 = new LinkedList(); } + + @OriginalMember(owner = "client!ag", name = "a", descriptor = "(ILjava/lang/String;)Ljava/lang/Class;") + public static Class method85(@OriginalArg(1) String arg0) throws ClassNotFoundException { + if (arg0.equals("B")) { + return Byte.TYPE; + } else if (arg0.equals("I")) { + return Integer.TYPE; + } else if (arg0.equals("S")) { + return Short.TYPE; + } else if (arg0.equals("J")) { + return Long.TYPE; + } else if (arg0.equals("Z")) { + return Boolean.TYPE; + } else if (arg0.equals("F")) { + return Float.TYPE; + } else if (arg0.equals("D")) { + return Double.TYPE; + } else if (arg0.equals("C")) { + return Character.TYPE; + } else { + return Class.forName(arg0); + } + } } diff --git a/client/src/main/java/rt4/Resampler.java b/client/src/main/java/rt4/Resampler.java index 5d1560c..2a96629 100644 --- a/client/src/main/java/rt4/Resampler.java +++ b/client/src/main/java/rt4/Resampler.java @@ -20,7 +20,7 @@ public final class Resampler { @OriginalMember(owner = "client!vj", name = "", descriptor = "(II)V") public Resampler(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) { if (arg1 != arg0) { - @Pc(12) int local12 = Static180.method3330(arg1, arg0); + @Pc(12) int local12 = method3330(arg1, arg0); @Pc(16) int local16 = arg1 / local12; this.anInt5769 = local16; @Pc(23) int local23 = arg0 / local12; @@ -52,6 +52,20 @@ public final class Resampler { } } + @OriginalMember(owner = "client!og", name = "a", descriptor = "(III)I") + public static int method3330(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) { + if (arg0 > 22050) { + arg1 = arg0; + arg0 = 22050; + } + while (arg0 != 0) { + @Pc(21) int local21 = arg1 % arg0; + arg1 = arg0; + arg0 = local21; + } + return arg1; + } + @OriginalMember(owner = "client!vj", name = "a", descriptor = "([BB)[B") public final byte[] method4520(@OriginalArg(0) byte[] arg0) { if (this.anIntArrayArray40 != null) { diff --git a/client/src/main/java/rt4/SceneGraph.java b/client/src/main/java/rt4/SceneGraph.java index bf31edf..b764b24 100644 --- a/client/src/main/java/rt4/SceneGraph.java +++ b/client/src/main/java/rt4/SceneGraph.java @@ -9,6 +9,10 @@ public class SceneGraph { public static final byte[][][] tileFlags = new byte[4][104][104]; @OriginalMember(owner = "client!mi", name = "Y", descriptor = "[[[Lclient!ih;") public static final LinkedList[][][] objStacks = new LinkedList[4][104][104]; + @OriginalMember(owner = "client!te", name = "B", descriptor = "[I") + public static final int[] anIntArray469 = new int[] { 0, -1, 0, 1 }; + @OriginalMember(owner = "client!fb", name = "q", descriptor = "[I") + public static final int[] anIntArray154 = new int[] { -1, -1, 1, 1 }; @OriginalMember(owner = "client!kc", name = "o", descriptor = "[[[Lclient!bj;") public static Tile[][][] tiles; @@ -838,7 +842,7 @@ public class SceneGraph { overlay -= rowLightness[local234]; } if (local209 >= 0 && local202 > 0) { - local142[local168][local209] = Static54.method1309(overlay / local202, local178 / local202, local173 * 256 / local200); + local142[local168][local209] = method1309(overlay / local202, local178 / local202, local173 * 256 / local200); } } } @@ -889,7 +893,7 @@ public class SceneGraph { if (overlay == 0) { setTile(local152, local168, local173, 0, 0, -1, local200, local202, local209, local349, ColorUtils.multiplyLightnessSafe(local267, local234), ColorUtils.multiplyLightnessSafe(local273, local234), ColorUtils.multiplyLightnessSafe(local326, local234), ColorUtils.multiplyLightnessSafe(local332, local234), 0, 0, 0, 0, local254, 0); if (GlRenderer.enabled && local152 > 0 && local234 != -1 && FluTypeList.get(local178 - 1).aBoolean198) { - Static242.method4197(0, 0, true, false, local168, local173, local200 - tileHeights[0][local168][local173], -tileHeights[0][local168 + 1][local173] + local202, local209 - tileHeights[0][local168 + 1][local173 + 1], local349 - tileHeights[0][local168][local173 + 1]); + ShadowManager.method4197(0, 0, true, false, local168, local173, local200 - tileHeights[0][local168][local173], -tileHeights[0][local168 + 1][local173] + local202, local209 - tileHeights[0][local168 + 1][local173 + 1], local349 - tileHeights[0][local168][local173 + 1]); } if (GlRenderer.enabled && !underwater && anIntArrayArray11 != null && local152 == 0) { for (local322 = local168 - 1; local322 <= local168 + 1; local322++) { @@ -970,7 +974,7 @@ public class SceneGraph { } setTile(local152, local168, local173, local322, local1242, texture, local200, local202, local209, local349, ColorUtils.multiplyLightnessSafe(local267, local234), ColorUtils.multiplyLightnessSafe(local273, local234), ColorUtils.multiplyLightnessSafe(local326, local234), ColorUtils.multiplyLightnessSafe(local332, local234), ColorUtils.multiplyLightnessGrayscale(local1301, local267), ColorUtils.multiplyLightnessGrayscale(local1301, local273), ColorUtils.multiplyLightnessGrayscale(local1301, local326), ColorUtils.multiplyLightnessGrayscale(local1301, local332), local254, local1353); if (GlRenderer.enabled && local152 > 0) { - Static242.method4197(local322, local1242, local1301 == -2 || !local1248.aBoolean311, local234 == -1 || !FluTypeList.get(local178 - 1).aBoolean198, local168, local173, local200 - tileHeights[0][local168][local173], local202 - tileHeights[0][local168 + 1][local173], local209 - tileHeights[0][local168 + 1][local173 + 1], -tileHeights[0][local168][local173 + 1] + local349); + ShadowManager.method4197(local322, local1242, local1301 == -2 || !local1248.aBoolean311, local234 == -1 || !FluTypeList.get(local178 - 1).aBoolean198, local168, local173, local200 - tileHeights[0][local168][local173], local202 - tileHeights[0][local168 + 1][local173], local209 - tileHeights[0][local168 + 1][local173 + 1], -tileHeights[0][local168][local173 + 1] + local349); } } } @@ -1029,7 +1033,7 @@ public class SceneGraph { for (local152 = 0; local152 < 104; local152++) { for (local2204 = 0; local2204 < 104; local2204++) { if ((tileFlags[1][local152][local2204] & 0x2) == 2) { - Static224.method3884(local152, local2204); + method3884(local152, local2204); } } } @@ -1214,4 +1218,256 @@ public class SceneGraph { } } } + + @OriginalMember(owner = "client!ib", name = "a", descriptor = "(IIIIIIIILclient!th;IZJ)Z") + public static boolean method2256(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7, @OriginalArg(8) Entity arg8, @OriginalArg(9) int arg9, @OriginalArg(10) boolean arg10, @OriginalArg(11) long arg11) { + @Pc(6) boolean local6 = tileHeights == underwaterTileHeights; + @Pc(8) int local8 = 0; + @Pc(17) int local17; + for (@Pc(10) int local10 = arg1; local10 < arg1 + arg3; local10++) { + for (local17 = arg2; local17 < arg2 + arg4; local17++) { + if (local10 < 0 || local17 < 0 || local10 >= width || local17 >= length) { + return false; + } + @Pc(42) Tile local42 = tiles[arg0][local10][local17]; + if (local42 != null && local42.sceneryLen >= 5) { + return false; + } + } + } + @Pc(58) Scenery local58 = new Scenery(); + local58.key = arg11; + local58.level = arg0; + local58.anInt1699 = arg5; + local58.anInt1703 = arg6; + local58.anInt1706 = arg7; + local58.entity = arg8; + local58.anInt1714 = arg9; + local58.xMin = arg1; + local58.zMin = arg2; + local58.xMax = arg1 + arg3 - 1; + local58.zMax = arg2 + arg4 - 1; + @Pc(108) int local108; + for (local17 = arg1; local17 < arg1 + arg3; local17++) { + for (local108 = arg2; local108 < arg2 + arg4; local108++) { + @Pc(115) int local115 = 0; + if (local17 > arg1) { + local115++; + } + if (local17 < arg1 + arg3 - 1) { + local115 += 4; + } + if (local108 > arg2) { + local115 += 8; + } + if (local108 < arg2 + arg4 - 1) { + local115 += 2; + } + for (@Pc(141) int local141 = arg0; local141 >= 0; local141--) { + if (tiles[local141][local17][local108] == null) { + tiles[local141][local17][local108] = new Tile(local141, local17, local108); + } + } + @Pc(174) Tile local174 = tiles[arg0][local17][local108]; + local174.scenery[local174.sceneryLen] = local58; + local174.interiorFlags[local174.sceneryLen] = local115; + local174.allInteriorFlags |= local115; + local174.sceneryLen++; + if (local6 && anIntArrayArray11[local17][local108] != 0) { + local8 = anIntArrayArray11[local17][local108]; + } + } + } + if (local6 && local8 != 0) { + for (local17 = arg1; local17 < arg1 + arg3; local17++) { + for (local108 = arg2; local108 < arg2 + arg4; local108++) { + if (anIntArrayArray11[local17][local108] == 0) { + anIntArrayArray11[local17][local108] = local8; + } + } + } + } + if (arg10) { + scenery[sceneryLen++] = local58; + } + return true; + } + + @OriginalMember(owner = "client!dg", name = "a", descriptor = "(IIIIILclient!th;IJZ)Z") + public static boolean method1141(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) Entity arg5, @OriginalArg(6) int arg6, @OriginalArg(7) long arg7, @OriginalArg(8) boolean arg8) { + if (arg5 == null) { + return true; + } + @Pc(7) int local7 = arg1 - arg4; + @Pc(11) int local11 = arg2 - arg4; + @Pc(15) int local15 = arg1 + arg4; + @Pc(19) int local19 = arg2 + arg4; + if (arg8) { + if (arg6 > 640 && arg6 < 1408) { + local19 += 128; + } + if (arg6 > 1152 && arg6 < 1920) { + local15 += 128; + } + if (arg6 > 1664 || arg6 < 384) { + local11 -= 128; + } + if (arg6 > 128 && arg6 < 896) { + local7 -= 128; + } + } + local7 /= 128; + local11 /= 128; + local15 /= 128; + local19 /= 128; + return method2256(arg0, local7, local11, local15 + 1 - local7, local19 - local11 + 1, arg1, arg2, arg3, arg5, arg6, true, arg7); + } + + @OriginalMember(owner = "client!dg", name = "a", descriptor = "(IIIIIILclient!mj;)V") + public static void method1144(@OriginalArg(1) int z, @OriginalArg(2) int x, @OriginalArg(3) int level, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) CollisionMap collision) { + @Pc(9) long key = 0L; + if (arg3 == 0) { + key = getWallKey(level, x, z); + } else if (arg3 == 1) { + key = getWallDecorKey(level, x, z); + } else if (arg3 == 2) { + key = getSceneryKey(level, x, z); + } else if (arg3 == 3) { + key = getGroundDecorKey(level, x, z); + } + @Pc(57) int shape = (int) key >> 14 & 0x1F; + @Pc(70) int id = (int) (key >>> 32) & Integer.MAX_VALUE; + @Pc(74) LocType type = LocTypeList.get(id); + if (type.hasAreaSound()) { + AreaSoundManager.remove(x, type, z, level); + } + @Pc(92) int angle = (int) key >> 20 & 0x3; + if (key == 0L) { + return; + } + @Pc(100) Entity local100 = null; + @Pc(102) Entity local102 = null; + if (arg3 == 0) { + @Pc(110) Wall wall = removeWall(level, x, z); + if (wall != null) { + local100 = wall.primary; + local102 = wall.secondary; + } + if (type.anInt4435 != 0) { + collision.unflagWall(angle, type.aBoolean207, z, shape, x); + } + } else if (arg3 == 1) { + @Pc(233) WallDecor wallDecor = removeWallDecor(level, x, z); + if (wallDecor != null) { + local100 = wallDecor.primary; + local102 = wallDecor.secondary; + } + } else if (arg3 == 2) { + @Pc(148) Scenery scenery = removeScenery(level, x, z); + if (scenery != null) { + local100 = scenery.entity; + } + if (type.anInt4435 != 0 && type.width + x < 104 && type.width + z < 104 && x + type.length < 104 && z + type.length < 104) { + collision.unflagScenery(x, type.width, type.aBoolean207, angle, type.length, z); + } + } else if (arg3 == 3) { + @Pc(211) GroundDecor groundDecor = removeGroundDecor(level, x, z); + if (groundDecor != null) { + local100 = groundDecor.entity; + } + if (type.anInt4435 == 1) { + collision.unflagGroundDecor(z, x); + } + } + if (!GlRenderer.enabled || !type.aBoolean212) { + return; + } + if (shape == 2) { + if (local100 instanceof Loc) { + ((Loc) local100).method1046(); + } else { + Loc.method181(type, 0, angle + 4, 0, shape, x, z, arg4); + } + if (local102 instanceof Loc) { + ((Loc) local102).method1046(); + } else { + Loc.method181(type, 0, angle + 1 & 0x3, 0, shape, x, z, arg4); + } + } else if (shape == 5) { + if (local100 instanceof Loc) { + ((Loc) local100).method1046(); + } else { + Loc.method181(type, anIntArray469[angle] * 8, angle, Static34.anIntArray80[angle] * 8, 4, x, z, arg4); + } + } else if (shape == 6) { + if (local100 instanceof Loc) { + ((Loc) local100).method1046(); + } else { + Loc.method181(type, anIntArray154[angle] * 8, angle + 4, Static114.anIntArray565[angle] * 8, 4, x, z, arg4); + } + } else if (shape == 7) { + if (local100 instanceof Loc) { + ((Loc) local100).method1046(); + } else { + Loc.method181(type, 0, (angle + 2 & 0x3) + 4, 0, 4, x, z, arg4); + } + } else if (shape == 8) { + if (local100 instanceof Loc) { + ((Loc) local100).method1046(); + } else { + Loc.method181(type, anIntArray154[angle] * 8, angle + 4, Static114.anIntArray565[angle] * 8, 4, x, z, arg4); + } + if (local102 instanceof Loc) { + ((Loc) local102).method1046(); + } else { + Loc.method181(type, anIntArray154[angle] * 8, (angle + 2 & 0x3) + 4, Static114.anIntArray565[angle] * 8, 4, x, z, arg4); + } + } else if (shape == 11) { + if (local100 instanceof Loc) { + ((Loc) local100).method1046(); + } else { + Loc.method181(type, 0, angle + 4, 0, 10, x, z, arg4); + } + } else if (local100 instanceof Loc) { + ((Loc) local100).method1046(); + } else { + Loc.method181(type, 0, angle, 0, shape, x, z, arg4); + } + } + + @OriginalMember(owner = "client!ed", name = "a", descriptor = "(IIII)I") + public static int method1309(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2) { + if (arg0 > 243) { + arg1 >>= 0x4; + } else if (arg0 > 217) { + arg1 >>= 0x3; + } else if (arg0 > 192) { + arg1 >>= 0x2; + } else if (arg0 > 179) { + arg1 >>= 0x1; + } + return (arg0 >> 1) + (arg1 >> 5 << 7) + (arg2 >> 2 << 10); + } + + @OriginalMember(owner = "client!sd", name = "c", descriptor = "(II)V") + public static void method3884(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) { + @Pc(7) Tile local7 = tiles[0][arg0][arg1]; + for (@Pc(9) int local9 = 0; local9 < 3; local9++) { + @Pc(30) Tile local30 = tiles[local9][arg0][arg1] = tiles[local9 + 1][arg0][arg1]; + if (local30 != null) { + local30.anInt672--; + for (@Pc(40) int local40 = 0; local40 < local30.sceneryLen; local40++) { + @Pc(49) Scenery local49 = local30.scenery[local40]; + if ((local49.key >> 29 & 0x3L) == 2L && local49.xMin == arg0 && local49.zMin == arg1) { + local49.level--; + } + } + } + } + if (tiles[0][arg0][arg1] == null) { + tiles[0][arg0][arg1] = new Tile(0, arg0, arg1); + } + tiles[0][arg0][arg1].aClass3_Sub5_1 = local7; + tiles[3][arg0][arg1] = null; + } } diff --git a/client/src/main/java/rt4/ScriptRunner.java b/client/src/main/java/rt4/ScriptRunner.java index f3d87b1..7543c2b 100644 --- a/client/src/main/java/rt4/ScriptRunner.java +++ b/client/src/main/java/rt4/ScriptRunner.java @@ -37,7 +37,31 @@ public final class ScriptRunner { public static final int[] anIntArray140 = new int[5]; @OriginalMember(owner = "client!oe", name = "i", descriptor = "[[I") public static final int[][] anIntArrayArray33 = new int[5][5000]; - @OriginalMember(owner = "client!jh", name = "n", descriptor = "Lclient!bd;") + @OriginalMember(owner = "client!rl", name = "eb", descriptor = "Lclient!na;") + public static final JagString aClass100_928 = JagString.parse("(U0a )2 in: "); + @OriginalMember(owner = "client!bf", name = "I", descriptor = "[I") + public static final int[] anIntArray52 = new int[] { 16776960, 16711680, 65280, 65535, 16711935, 16777215 }; + @OriginalMember(owner = "client!fe", name = "I", descriptor = "Lclient!na;") + public static final JagString aClass100_639 = JagString.parse(" "); + @OriginalMember(owner = "client!dc", name = "M", descriptor = "Lclient!na;") + public static final JagString aClass100_268 = JagString.parse(")4"); + @OriginalMember(owner = "client!he", name = "gb", descriptor = "Lclient!na;") + public static final JagString aClass100_518 = JagString.parse("www"); + @OriginalMember(owner = "client!e", name = "Tc", descriptor = "Lclient!na;") + public static final JagString aClass100_365 = JagString.parse("www)2wtqa"); + @OriginalMember(owner = "client!lk", name = "J", descriptor = "Lclient!na;") + public static final JagString aClass100_687 = JagString.parse(")4p="); + @OriginalMember(owner = "client!en", name = "x", descriptor = "Lclient!na;") + public static final JagString aClass100_424 = JagString.parse("http:)4)4"); + @OriginalMember(owner = "client!gf", name = "I", descriptor = "Lclient!na;") + public static final JagString aClass100_886 = JagString.parse(")3runescape)3com)4l="); + @OriginalMember(owner = "client!v", name = "a", descriptor = "Lclient!na;") + public static final JagString aClass100_98 = JagString.parse(")4a="); + @OriginalMember(owner = "client!ch", name = "C", descriptor = "[[I") + public static final int[][] anIntArrayArray6 = new int[104][104]; + @OriginalMember(owner = "client!n", name = "e", descriptor = "Lclient!na;") + public static final JagString aClass100_767 = JagString.parse(")2"); + @OriginalMember(owner = "client!jh", name = "n", descriptor = "Lclient!bd;") public static QuickChatPhrase activePhrase; @OriginalMember(owner = "client!wf", name = "j", descriptor = "Lclient!be;") public static Component staticActiveComponent1; @@ -49,6 +73,1226 @@ public final class ScriptRunner { public static int[] intLocals; @OriginalMember(owner = "client!km", name = "ad", descriptor = "I") public static int fp = 0; + @OriginalMember(owner = "client!od", name = "g", descriptor = "S") + public static short aShort25 = 256; + @OriginalMember(owner = "client!an", name = "db", descriptor = "S") + public static short aShort9 = 205; + @OriginalMember(owner = "client!mc", name = "tb", descriptor = "S") + public static short aShort22 = 1; + @OriginalMember(owner = "client!ac", name = "k", descriptor = "S") + public static short aShort1 = 32767; + @OriginalMember(owner = "client!nc", name = "n", descriptor = "I") + public static int anInt4055 = 0; + @OriginalMember(owner = "client!tm", name = "i", descriptor = "I") + public static int anInt5377 = 0; + @OriginalMember(owner = "client!bn", name = "eb", descriptor = "I") + public static int anInt773 = 0; + @OriginalMember(owner = "client!ah", name = "n", descriptor = "I") + public static int anInt983 = 0; + @OriginalMember(owner = "client!sc", name = "p", descriptor = "I") + public static int anInt5029 = 0; + @OriginalMember(owner = "client!kd", name = "yb", descriptor = "S") + public static short aShort21 = 32767; + @OriginalMember(owner = "client!ee", name = "f", descriptor = "S") + public static short aShort12 = 1; + @OriginalMember(owner = "client!kk", name = "j", descriptor = "I") + public static int anInt3325 = 0; + @OriginalMember(owner = "client!bi", name = "jb", descriptor = "Z") + public static boolean aBoolean43 = true; + @OriginalMember(owner = "client!wi", name = "bb", descriptor = "I") + public static int anInt5854 = 0; + @OriginalMember(owner = "client!wb", name = "c", descriptor = "I") + public static int anInt5794 = -1; + @OriginalMember(owner = "client!k", name = "m", descriptor = "Z") + public static boolean neverRemoveRoofs = false; + @OriginalMember(owner = "client!vk", name = "f", descriptor = "[[[B") + public static byte[][][] aByteArrayArrayArray15; + @OriginalMember(owner = "client!vg", name = "b", descriptor = "S") + public static short aShort30 = 256; + @OriginalMember(owner = "client!vg", name = "c", descriptor = "Z") + public static boolean aBoolean299 = false; + @OriginalMember(owner = "client!lj", name = "z", descriptor = "[I") + public static int[] anIntArray338 = new int[2]; + @OriginalMember(owner = "client!vl", name = "i", descriptor = "[I") + public static int[] anIntArray518 = new int[2]; + @OriginalMember(owner = "client!tk", name = "K", descriptor = "[I") + public static int[] anIntArray476 = new int[2]; + @OriginalMember(owner = "client!e", name = "xc", descriptor = "[I") + public static int[] anIntArray134 = new int[2]; + @OriginalMember(owner = "client!ge", name = "k", descriptor = "[I") + public static int[] anIntArray205 = new int[2]; + @OriginalMember(owner = "client!d", name = "db", descriptor = "Z") + public static boolean aBoolean77 = false; + @OriginalMember(owner = "client!nm", name = "W", descriptor = "Lclient!na;") + public static JagString url; + @OriginalMember(owner = "client!bf", name = "B", descriptor = "I") + public static int anInt548 = -1; + @OriginalMember(owner = "client!pb", name = "rb", descriptor = "S") + public static short aShort27 = 320; + @OriginalMember(owner = "client!fc", name = "a", descriptor = "I") + public static int anInt1951 = -1; + @OriginalMember(owner = "client!em", name = "w", descriptor = "I") + public static int anInt1892; + @OriginalMember(owner = "client!me", name = "nb", descriptor = "I") + public static int anInt3751; + + @OriginalMember(owner = "client!ja", name = "a", descriptor = "(IIIIIZ)V") + public static void method2314(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) boolean arg4) { + if (arg0 < 1) { + arg0 = 1; + } + if (arg2 < 1) { + arg2 = 1; + } + if (GlRenderer.enabled) { + @Pc(25) int local25 = arg2 - 334; + if (local25 < 0) { + local25 = 0; + } else if (local25 > 100) { + local25 = 100; + } + @Pc(51) int local51 = local25 * (aShort9 - aShort25) / 100 + aShort25; + if (aShort22 > local51) { + local51 = aShort22; + } else if (aShort1 < local51) { + local51 = aShort1; + } + @Pc(73) int local73 = local51 * arg2 * 512 / (arg0 * 334); + @Pc(115) int local115; + @Pc(122) int local122; + @Pc(86) short local86; + if (local73 < aShort12) { + local86 = aShort12; + local51 = arg0 * 334 * local86 / (arg2 * 512); + if (aShort1 < local51) { + local51 = aShort1; + local115 = arg2 * 512 * local51 / (local86 * 334); + local122 = (arg0 - local115) / 2; + if (arg4) { + GlRaster.method1177(); + GlRaster.method1186(arg3, arg1, local122, arg2, 0); + GlRaster.method1186(arg0 + arg3 - local122, arg1, local122, arg2, 0); + } + arg3 += local122; + arg0 -= local122 * 2; + } + } else if (aShort21 < local73) { + local86 = aShort21; + local51 = local86 * arg0 * 334 / (arg2 * 512); + if (aShort22 > local51) { + local51 = aShort22; + local115 = local86 * arg0 * 334 / (local51 * 512); + local122 = (arg2 - local115) / 2; + if (arg4) { + GlRaster.method1177(); + GlRaster.method1186(arg3, arg1, arg0, local122, 0); + GlRaster.method1186(arg3, arg1 + arg2 - local122, arg0, local122, 0); + } + arg2 -= local122 * 2; + arg1 += local122; + } + } + anInt5029 = local51 * arg2 / 334; + } + anInt4055 = (short) arg0; + anInt5377 = (short) arg2; + anInt773 = arg1; + anInt983 = arg3; + } + + @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) { + anInt3325++; + method3711(); + if (!arg1) { + method964(true); + method3240(true); + method964(false); + } + method3240(false); + if (!arg1) { + method3532(); + } + method4239(); + if (GlRenderer.enabled) { + method2314(arg3, arg4, arg0, arg2, true); + arg2 = anInt983; + arg4 = anInt773; + arg3 = anInt4055; + arg0 = anInt5377; + } + @Pc(59) int local59; + @Pc(57) int local57; + if (Camera.cameraType == 1) { + local57 = Camera.anInt5161 + (int)Camera.yawTarget & 0x7FF; + local59 = (int)Camera.pitchTarget; + if (local59 < Camera.anInt5245 / 256) { + local59 = Camera.anInt5245 / 256; + } + if (Static176.customCameraActive[4] && Camera.cameraAmplitude[4] + 128 > local59) { + local59 = Camera.cameraAmplitude[4] + 128; + } + Static18.method555(Camera.cameraX, arg0, SceneGraph.getTileHeight(Player.level, PlayerList.self.xFine, PlayerList.self.zFine) - 50, Camera.ZOOM - -(local59 * 3), local57, Camera.cameraZ, local59); + } + local57 = Static5.anInt40; + local59 = Camera.renderX; + @Pc(121) int local121 = Camera.renderZ; + @Pc(123) int local123 = Camera.cameraPitch; + @Pc(125) int local125 = Camera.cameraYaw; + @Pc(127) int local127; + @Pc(171) int local171; + for (local127 = 0; local127 < 5; local127++) { + if (Static176.customCameraActive[local127]) { + local171 = (int) ((double) -Camera.cameraJitter[local127] + (double) (Camera.cameraJitter[local127] * 2 + 1) * Math.random() + Math.sin((double) Protocol.anIntArray76[local127] * ((double) Camera.cameraFrequency[local127] / 100.0D)) * (double) Camera.cameraAmplitude[local127]); + if (local127 == 3) { + Camera.cameraYaw = local171 + Camera.cameraYaw & 0x7FF; + } + if (local127 == 4) { + Camera.cameraPitch += local171; + if (Camera.cameraPitch < 128) { + Camera.cameraPitch = 128; + } + if (Camera.cameraPitch > 383) { + Camera.cameraPitch = 383; + } + } + if (local127 == 2) { + Camera.renderZ += local171; + } + if (local127 == 1) { + Static5.anInt40 += local171; + } + if (local127 == 0) { + Camera.renderX += local171; + } + } + } + Static252.method4302(); + if (GlRenderer.enabled) { + GlRaster.setClip(arg2, arg4, arg2 + arg3, arg4 - -arg0); + @Pc(248) float local248 = (float) Camera.cameraPitch * 0.17578125F; + @Pc(253) float local253 = (float) Camera.cameraYaw * 0.17578125F; + if (Camera.cameraType == 3) { + local248 = Static146.aFloat15 * 360.0F / 6.2831855F; + local253 = Camera.aFloat10 * 360.0F / 6.2831855F; + } + GlRenderer.method4171(arg2, arg4, arg3, arg0, arg3 / 2 + arg2, arg4 - -(arg0 / 2), local248, local253, anInt5029, anInt5029); + } else { + SoftwareRaster.setClip(arg2, arg4, arg3 + arg2, arg0 + arg4); + Rasteriser.prepare(); + } + if (Static40.aBoolean108 || anInt3751 < arg2 || anInt3751 >= arg3 + arg2 || arg4 > anInt1892 || arg0 + arg4 <= anInt1892) { + aBoolean77 = false; + MiniMenu.anInt7 = 0; + } else { + aBoolean77 = true; + MiniMenu.anInt7 = 0; + local171 = Rasteriser.screenUpperX; + @Pc(344) int local344 = Rasteriser.screenLowerY; + local127 = Rasteriser.screenLowerX; + GlModel.anInt3582 = local127 + (local171 - local127) * (-arg2 + anInt3751) / arg3; + @Pc(361) int local361 = Rasteriser.screenUpperY; + Static34.anInt1053 = (local361 - local344) * (anInt1892 - arg4) / arg0 + local344; + } + client.audioLoop(); + @Pc(387) byte local387 = method4047() == 2 ? (byte) anInt3325 : 1; + if (GlRenderer.enabled) { + GlRenderer.restoreLighting(); + GlRenderer.setDepthTestEnabled(true); + GlRenderer.setFogEnabled(true); + if (client.gameState == 10) { + local171 = Static103.method2235(Protocol.anInt4247, Camera.renderZ >> 10, Preferences.brightness, Camera.renderX >> 10); + } else { + local171 = Static103.method2235(Protocol.anInt4247, PlayerList.self.movementQueueZ[0] >> 3, Preferences.brightness, PlayerList.self.movementQueueX[0] >> 3); + } + LightingManager.method2394(client.loop, !Preferences.flickeringEffectsOn); + GlRenderer.clearColorAndDepthBuffers(local171); + MaterialManager.method2731(Camera.cameraPitch, Camera.renderZ, Static5.anInt40, Camera.renderX, Camera.cameraYaw); + GlRenderer.anInt5323 = client.loop; + Static156.method2954(Camera.renderX, Static5.anInt40, Camera.renderZ, Camera.cameraPitch, Camera.cameraYaw, aByteArrayArrayArray15, anIntArray205, anIntArray338, anIntArray518, anIntArray134, anIntArray476, Player.level + 1, local387, PlayerList.self.xFine >> 7, PlayerList.self.zFine >> 7); + aBoolean299 = true; + LightingManager.method2390(); + MaterialManager.method2731(0, 0, 0, 0, 0); + client.audioLoop(); + method3858(); + method2726(arg4, arg3, arg2, anInt5029, arg0, anInt5029); + Static233.method4000(arg3, arg2, arg0, anInt5029, anInt5029, arg4); + } else { + SoftwareRaster.fillRect(arg2, arg4, arg3, arg0, 0); + Static156.method2954(Camera.renderX, Static5.anInt40, Camera.renderZ, Camera.cameraPitch, Camera.cameraYaw, aByteArrayArrayArray15, anIntArray205, anIntArray338, anIntArray518, anIntArray134, anIntArray476, Player.level + 1, local387, PlayerList.self.xFine >> 7, PlayerList.self.zFine >> 7); + client.audioLoop(); + method3858(); + method2726(arg4, arg3, arg2, 256, arg0, 256); + Static233.method4000(arg3, arg2, arg0, 256, 256, arg4); + } + ((Js5GlTextureProvider) Rasteriser.textureProvider).method3239(Protocol.anInt4247); + Player.method2310(arg3, arg4, arg0, arg2); + Camera.cameraPitch = local123; + Camera.renderZ = local121; + Static5.anInt40 = local57; + Camera.renderX = local59; + Camera.cameraYaw = local125; + if (aBoolean43 && client.js5NetQueue.method2328() == 0) { + aBoolean43 = false; + } + if (aBoolean43) { + if (GlRenderer.enabled) { + GlRaster.method1186(arg2, arg4, arg3, arg0, 0); + } else { + SoftwareRaster.fillRect(arg2, arg4, arg3, arg0, 0); + } + Static114.drawTextOnScreen(false, LocalizedText.LOADING); + } + if (!arg1 && !aBoolean43 && !Static40.aBoolean108 && arg2 <= anInt3751 && arg3 + arg2 > anInt3751 && arg4 <= anInt1892 && arg0 + arg4 > anInt1892) { + MiniMenu.addEntries(arg4, arg3, arg0, arg2, anInt1892, anInt3751); + } + } + + @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) { + anInt5854 = 0; + @Pc(5) int local5; + @Pc(642) int local642; + @Pc(74) int local74; + @Pc(265) int local265; + @Pc(310) int local310; + @Pc(359) int local359; + @Pc(639) int local639; + for (local5 = -1; local5 < PlayerList.size + NpcList.size; local5++) { + @Pc(17) PathingEntity local17; + if (local5 == -1) { + local17 = PlayerList.self; + } else if (PlayerList.size > local5) { + local17 = PlayerList.players[PlayerList.ids[local5]]; + } else { + local17 = NpcList.npcs[NpcList.ids[local5 - PlayerList.size]]; + } + if (local17 != null && local17.method2682()) { + @Pc(58) NpcType local58; + if (local17 instanceof Npc) { + local58 = ((Npc) local17).type; + if (local58.multiNpcs != null) { + local58 = local58.getMultiNpc(); + } + if (local58 == null) { + continue; + } + } + @Pc(161) int local161; + if (local5 >= PlayerList.size) { + local58 = ((Npc) local17).type; + if (local58.multiNpcs != null) { + local58 = local58.getMultiNpc(); + } + if (local58.prayerIcon >= 0 && Sprites.headiconPrayers.length > local58.prayerIcon) { + if (local58.anInt3730 == -1) { + local265 = local17.method2691() + 15; + } else { + local265 = local58.anInt3730 + 15; + } + method3326(arg4 >> 1, arg3, local17, arg5, local265, arg1 >> 1); + if (anInt1951 > -1) { + Sprites.headiconPrayers[local58.prayerIcon].render(arg2 + anInt1951 - 12, arg0 + -30 - -anInt548); + } + } + @Pc(308) MapMarker[] local308 = MiniMap.hintMapMarkers; + for (local310 = 0; local310 < local308.length; local310++) { + @Pc(322) MapMarker local322 = local308[local310]; + if (local322 != null && local322.type == 1 && local322.actorTargetId == NpcList.ids[local5 - PlayerList.size] && client.loop % 20 < 10) { + if (local58.anInt3730 == -1) { + local359 = local17.method2691() + 15; + } else { + local359 = local58.anInt3730 + 15; + } + method3326(arg4 >> 1, arg3, local17, arg5, local359, arg1 >> 1); + if (anInt1951 > -1) { + Sprites.headhints[local322.anInt4048].render(arg2 + anInt1951 - 12, anInt548 + -28 + arg0); + } + } + } + } else { + local74 = 30; + @Pc(77) Player local77 = (Player) local17; + if (local77.anInt1669 != -1 || local77.anInt1649 != -1) { + method3326(arg4 >> 1, arg3, local17, arg5, local17.method2691() + 15, arg1 >> 1); + if (anInt1951 > -1) { + if (local77.anInt1669 != -1) { + Sprites.headiconPks[local77.anInt1669].render(anInt1951 + arg2 - 12, arg0 + -30 + anInt548); + local74 += 25; + } + if (local77.anInt1649 != -1) { + Sprites.headiconPrayers[local77.anInt1649].render(arg2 + anInt1951 - 12, arg0 - (-anInt548 + local74)); + local74 += 25; + } + } + } + if (local5 >= 0) { + @Pc(159) MapMarker[] local159 = MiniMap.hintMapMarkers; + for (local161 = 0; local161 < local159.length; local161++) { + @Pc(173) MapMarker local173 = local159[local161]; + if (local173 != null && local173.type == 10 && PlayerList.ids[local5] == local173.actorTargetId) { + method3326(arg4 >> 1, arg3, local17, arg5, local17.method2691() + 15, arg1 >> 1); + if (anInt1951 > -1) { + Sprites.headhints[local173.anInt4048].render(arg2 + anInt1951 - 12, arg0 + (anInt548 - local74)); + } + } + } + } + } + if (local17.chatMessage != null && (local5 >= PlayerList.size || Chat.publicFilter == 0 || Chat.publicFilter == 3 || Chat.publicFilter == 1 && FriendsList.contains(((Player) local17).username))) { + method3326(arg4 >> 1, arg3, local17, arg5, local17.method2691(), arg1 >> 1); + if (anInt1951 > -1 && anInt5854 < Static191.anInt4506) { + Static191.anIntArray389[anInt5854] = Fonts.b12Full.getStringWidth(local17.chatMessage) / 2; + Static191.anIntArray387[anInt5854] = Fonts.b12Full.lineHeight; + Static191.anIntArray385[anInt5854] = anInt1951; + Static191.anIntArray392[anInt5854] = anInt548; + Static191.anIntArray390[anInt5854] = local17.chatColor; + Static191.anIntArray391[anInt5854] = local17.chatEffect; + Static191.anIntArray384[anInt5854] = local17.chatLoops; + Static191.aClass100Array132[anInt5854] = local17.chatMessage; + anInt5854++; + } + } + if (local17.hitpointsBarVisibleUntil > client.loop) { + @Pc(508) Sprite local508 = Sprites.hitbars[0]; + @Pc(512) Sprite local512 = Sprites.hitbars[1]; + if (local17 instanceof Npc) { + @Pc(518) Npc local518 = (Npc) local17; + @Pc(528) Sprite[] local528 = (Sprite[]) HitBarList.hitBars.get((long) local518.type.hitBarId); + if (local528 == null) { + local528 = SpriteLoader.loadAlphaSprites(local518.type.hitBarId, client.js5Archive8); + if (local528 != null) { + HitBarList.hitBars.put(local528, (long) local518.type.hitBarId); + } + } + if (local528 != null && local528.length == 2) { + local512 = local528[1]; + local508 = local528[0]; + } + @Pc(571) NpcType local571 = local518.type; + if (local571.anInt3730 == -1) { + local310 = local17.method2691(); + } else { + local310 = local571.anInt3730; + } + } else { + local310 = local17.method2691(); + } + method3326(arg4 >> 1, arg3, local17, arg5, local508.height + local310 + 10, arg1 >> 1); + if (anInt1951 > -1) { + local161 = anInt1951 + arg2 - (local508.width >> 1); + local359 = anInt548 + arg0 - 3; + local508.render(local161, local359); + local639 = local508.width * local17.hitpointsBar / 255; + local642 = local508.height; + if (GlRenderer.enabled) { + GlRaster.method1183(local161, local359, local161 + local639, local359 + local642); + } else { + SoftwareRaster.method2498(local161, local359, local161 + local639, local642 + local359); + } + local512.render(local161, local359); + if (GlRenderer.enabled) { + GlRaster.setClip(arg2, arg0, arg1 + arg2, arg0 - -arg4); + } else { + SoftwareRaster.setClip(arg2, arg0, arg1 + arg2, arg4 + arg0); + } + } + } + for (local74 = 0; local74 < 4; local74++) { + if (local17.anIntArray319[local74] > client.loop) { + if (local17 instanceof Npc) { + @Pc(725) Npc local725 = (Npc) local17; + @Pc(728) NpcType local728 = local725.type; + if (local728.anInt3730 == -1) { + local265 = local17.method2691() / 2; + } else { + local265 = local728.anInt3730 / 2; + } + } else { + local265 = local17.method2691() / 2; + } + method3326(arg4 >> 1, arg3, local17, arg5, local265, arg1 >> 1); + if (anInt1951 > -1) { + if (local74 == 1) { + anInt548 -= 20; + } + if (local74 == 2) { + anInt548 -= 10; + anInt1951 -= 15; + } + if (local74 == 3) { + anInt548 -= 10; + anInt1951 += 15; + } + Sprites.hitmarks[local17.anIntArray321[local74]].render(arg2 + anInt1951 - 12, arg0 + anInt548 - 12); + Fonts.p11Full.renderCenter(JagString.parseInt(local17.anIntArray322[local74]), anInt1951 + arg2 - 1, anInt548 + 3 + arg0, 16777215, 0); + } + } + } + } + } + for (local5 = 0; local5 < anInt5854; local5++) { + local74 = Static191.anIntArray392[local5]; + @Pc(859) int local859 = Static191.anIntArray385[local5]; + local310 = Static191.anIntArray387[local5]; + local265 = Static191.anIntArray389[local5]; + @Pc(869) boolean local869 = true; + while (local869) { + local869 = false; + for (local359 = 0; local359 < local5; local359++) { + if (Static191.anIntArray392[local359] - Static191.anIntArray387[local359] < local74 + 2 && local74 - local310 < Static191.anIntArray392[local359] - -2 && local859 - local265 < Static191.anIntArray385[local359] + Static191.anIntArray389[local359] && Static191.anIntArray385[local359] - Static191.anIntArray389[local359] < local265 + local859 && Static191.anIntArray392[local359] - Static191.anIntArray387[local359] < local74) { + local74 = Static191.anIntArray392[local359] - Static191.anIntArray387[local359]; + local869 = true; + } + } + } + anInt1951 = Static191.anIntArray385[local5]; + anInt548 = Static191.anIntArray392[local5] = local74; + @Pc(962) JagString local962 = Static191.aClass100Array132[local5]; + if (VarpDomain.anInt2157 == 0) { + local639 = 16776960; + if (Static191.anIntArray390[local5] < 6) { + local639 = anIntArray52[Static191.anIntArray390[local5]]; + } + if (Static191.anIntArray390[local5] == 6) { + local639 = anInt3325 % 20 >= 10 ? 16776960 : 16711680; + } + if (Static191.anIntArray390[local5] == 7) { + local639 = anInt3325 % 20 < 10 ? 255 : 65535; + } + if (Static191.anIntArray390[local5] == 8) { + local639 = anInt3325 % 20 >= 10 ? 8454016 : 45056; + } + if (Static191.anIntArray390[local5] == 9) { + local642 = 150 - Static191.anIntArray384[local5]; + if (local642 < 50) { + local639 = local642 * 1280 + 16711680; + } else if (local642 < 100) { + local639 = 16776960 + 16384000 - local642 * 327680; + } else if (local642 < 150) { + local639 = local642 * 5 + 65280 - 500; + } + } + if (Static191.anIntArray390[local5] == 10) { + local642 = 150 - Static191.anIntArray384[local5]; + if (local642 < 50) { + local639 = local642 * 5 + 16711680; + } else if (local642 < 100) { + local639 = 16711935 - (local642 - 50) * 327680; + } else if (local642 < 150) { + local639 = local642 * 327680 + 255 + 500 - local642 * 5 - 32768000; + } + } + if (Static191.anIntArray390[local5] == 11) { + local642 = 150 - Static191.anIntArray384[local5]; + if (local642 < 50) { + local639 = 16777215 - local642 * 327685; + } else if (local642 < 100) { + local639 = local642 * 327685 + 65280 - 16384250; + } else if (local642 < 150) { + local639 = 16777215 + 32768000 - local642 * 327680; + } + } + if (Static191.anIntArray391[local5] == 0) { + Fonts.b12Full.renderCenter(local962, anInt1951 + arg2, arg0 + anInt548, local639, 0); + } + if (Static191.anIntArray391[local5] == 1) { + Fonts.b12Full.renderWave(local962, arg2 + anInt1951, anInt548 + arg0, local639, anInt3325); + } + if (Static191.anIntArray391[local5] == 2) { + Fonts.b12Full.renderWave2(local962, arg2 + anInt1951, arg0 - -anInt548, local639, anInt3325); + } + if (Static191.anIntArray391[local5] == 3) { + Fonts.b12Full.renderShake(local962, arg2 + anInt1951, anInt548 + arg0, local639, anInt3325, 150 - Static191.anIntArray384[local5]); + } + if (Static191.anIntArray391[local5] == 4) { + local642 = (150 - Static191.anIntArray384[local5]) * (Fonts.b12Full.getStringWidth(local962) + 100) / 150; + if (GlRenderer.enabled) { + GlRaster.method1183(anInt1951 + arg2 - 50, arg0, anInt1951 + arg2 + 50, arg4 + arg0); + } else { + SoftwareRaster.method2498(arg2 + anInt1951 - 50, arg0, anInt1951 + arg2 + 50, arg4 + arg0); + } + Fonts.b12Full.renderLeft(local962, arg2 + anInt1951 + 50 - local642, arg0 + anInt548, local639, 0); + if (GlRenderer.enabled) { + GlRaster.setClip(arg2, arg0, arg1 + arg2, arg4 + arg0); + } else { + SoftwareRaster.setClip(arg2, arg0, arg2 + arg1, arg0 + arg4); + } + } + if (Static191.anIntArray391[local5] == 5) { + @Pc(1372) int local1372 = 0; + local642 = 150 - Static191.anIntArray384[local5]; + if (GlRenderer.enabled) { + GlRaster.method1183(arg2, anInt548 + arg0 - Fonts.b12Full.lineHeight - 1, arg1 + arg2, arg0 + anInt548 + 5); + } else { + SoftwareRaster.method2498(arg2, anInt548 + arg0 - Fonts.b12Full.lineHeight - 1, arg2 + arg1, anInt548 + arg0 + 5); + } + if (local642 < 25) { + local1372 = local642 - 25; + } else if (local642 > 125) { + local1372 = local642 - 125; + } + Fonts.b12Full.renderCenter(local962, anInt1951 + arg2, local1372 + arg0 + anInt548, local639, 0); + if (GlRenderer.enabled) { + GlRaster.setClip(arg2, arg0, arg2 + arg1, arg0 + arg4); + } else { + SoftwareRaster.setClip(arg2, arg0, arg2 + arg1, arg0 + arg4); + } + } + } else { + Fonts.b12Full.renderCenter(local962, arg2 + anInt1951, arg0 + anInt548, 16776960, 0); + } + } + } + + @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++) { + 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 = 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 = 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 (anIntArrayArray6[local182][local200] > 1) { + local106 = 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 (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 = anIntArrayArray6[local476][local485]--; + } + local476++; + } + } + } + if (local39.attachment == null || client.loop < local39.attachmentSetAt || local39.attachmentResetAt <= client.loop) { + local39.anInt3424 = SceneGraph.getTileHeight(Player.level, local39.xFine, local39.zFine); + SceneGraph.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); + 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 = 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 = 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 (anIntArrayArray6[local113][local133] > 1) { + local171 = 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 (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 = anIntArrayArray6[local396][local401]--; + } + local396++; + } + } + } + if (!local16.type.aBoolean183) { + local262 |= Long.MIN_VALUE; + } + local16.anInt3424 = SceneGraph.getTileHeight(Player.level, local16.xFine, local16.zFine); + SceneGraph.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(Protocol.anInt4247); + SceneGraph.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) LoginManager.aClass69_64.head(); local9 != null; local9 = (SpotAnimNode) LoginManager.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(Protocol.anInt4247); + if (local15.aBoolean41) { + local9.unlink(); + } else { + SceneGraph.method1141(local15.anInt606, local15.anInt604, local15.anInt598, local15.anInt599, 60, local15, 0, -1L, false); + } + } + } + } + + @OriginalMember(owner = "client!wa", name = "o", descriptor = "(I)V") + public static void method2218() { + @Pc(8) int local8 = method4047(); + if (local8 == 0) { + aByteArrayArrayArray15 = null; + method3993(0); + } else if (local8 == 1) { + method960((byte) 0); + method3993(512); + method2608(); + } else { + method960((byte) (anInt3325 - 4 & 0xFF)); + method3993(2); + } + } + + @OriginalMember(owner = "client!tc", name = "a", descriptor = "(B)I") + public static int method4047() { + if (neverRemoveRoofs) { + return 0; + } else if (SceneGraph.allLevelsAreVisible()) { + return Preferences.removeRoofsSelectively ? 2 : 1; + } else { + return 1; + } + } + + @OriginalMember(owner = "client!ok", name = "a", descriptor = "(IIB)Lclient!ce;") + public static SecondaryLinkedList method3333(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) { + @Pc(9) SecondaryLinkedList local9 = new SecondaryLinkedList(); + for (@Pc(14) Map local14 = (Map) MapList.aClass69_120.head(); local14 != null; local14 = (Map) MapList.aClass69_120.next()) { + if (local14.aBoolean50 && local14.method664(arg1, arg0)) { + local9.addTail(local14); + } + } + return local9; + } + + @OriginalMember(owner = "client!cn", name = "a", descriptor = "(BB)V") + public static void method960(@OriginalArg(0) byte arg0) { + if (aByteArrayArrayArray15 == null) { + aByteArrayArrayArray15 = new byte[4][104][104]; + } + for (@Pc(20) int local20 = 0; local20 < 4; local20++) { + for (@Pc(25) int local25 = 0; local25 < 104; local25++) { + for (@Pc(32) int local32 = 0; local32 < 104; local32++) { + aByteArrayArrayArray15[local20][local25][local32] = arg0; + } + } + } + } + + @OriginalMember(owner = "client!sm", name = "a", descriptor = "(II)V") + public static void method3993(@OriginalArg(0) int arg0) { + anIntArray338 = new int[arg0]; + anIntArray518 = new int[arg0]; + anIntArray476 = new int[arg0]; + anIntArray134 = new int[arg0]; + anIntArray205 = new int[arg0]; + } + + @OriginalMember(owner = "client!ke", name = "f", descriptor = "(B)V") + public static void method2608() { + @Pc(7) int local7 = 0; + for (@Pc(23) int local23 = 0; local23 < 104; local23++) { + for (@Pc(30) int local30 = 0; local30 < 104; local30++) { + if (method4348(true, local23, local30, SceneGraph.tiles, local7)) { + local7++; + } + if (local7 >= 512) { + return; + } + } + } + } + + @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) { + @Pc(14) byte local14 = arg0 ? 1 : (byte) (anInt3325 & 0xFF); + if (local14 == aByteArrayArrayArray15[Player.level][arg1][arg2]) { + return false; + } else if ((SceneGraph.tileFlags[Player.level][arg1][arg2] & 0x4) == 0) { + return false; + } else { + @Pc(47) int local47 = 0; + @Pc(49) byte local49 = 0; + PathFinder.queueX[0] = arg1; + @Pc(69) int local69 = local49 + 1; + PathFinder.queueZ[0] = arg2; + aByteArrayArrayArray15[Player.level][arg1][arg2] = local14; + while (local47 != local69) { + @Pc(94) int local94 = PathFinder.queueX[local47] >> 16 & 0xFF; + @Pc(102) int local102 = PathFinder.queueX[local47] >> 24 & 0xFF; + @Pc(108) int local108 = PathFinder.queueX[local47] & 0xFFFF; + @Pc(116) int local116 = PathFinder.queueZ[local47] >> 16 & 0xFF; + @Pc(122) int local122 = PathFinder.queueZ[local47] & 0xFFFF; + local47 = local47 + 1 & 0xFFF; + @Pc(130) boolean local130 = false; + @Pc(132) boolean local132 = false; + if ((SceneGraph.tileFlags[Player.level][local108][local122] & 0x4) == 0) { + local130 = true; + } + @Pc(150) int local150; + @Pc(191) int local191; + label238: for (local150 = Player.level + 1; local150 <= 3; local150++) { + if ((SceneGraph.tileFlags[local150][local108][local122] & 0x8) == 0) { + @Pc(227) int local227; + @Pc(358) int local358; + if (local130 && arg3[local150][local108][local122] != null) { + if (arg3[local150][local108][local122].wall != null) { + local191 = SceneGraph.method2251(local94); + if (arg3[local150][local108][local122].wall.anInt3049 == local191 || arg3[local150][local108][local122].wall.anInt3052 == local191) { + continue; + } + if (local102 != 0) { + local227 = SceneGraph.method2251(local102); + if (local227 == arg3[local150][local108][local122].wall.anInt3049 || arg3[local150][local108][local122].wall.anInt3052 == local227) { + continue; + } + } + if (local116 != 0) { + local227 = SceneGraph.method2251(local116); + if (local227 == arg3[local150][local108][local122].wall.anInt3049 || local227 == arg3[local150][local108][local122].wall.anInt3052) { + continue; + } + } + } + if (arg3[local150][local108][local122].scenery != null) { + for (local191 = 0; local191 < arg3[local150][local108][local122].sceneryLen; local191++) { + local227 = (int) (arg3[local150][local108][local122].scenery[local191].key >> 14 & 0x3FL); + if (local227 == 21) { + local227 = 19; + } + @Pc(352) int local352 = (int) (arg3[local150][local108][local122].scenery[local191].key >> 20 & 0x3L); + local358 = local227 | local352 << 6; + if (local358 == local94 || local102 != 0 && local358 == local102 || local116 != 0 && local116 == local358) { + continue label238; + } + } + } + } + local132 = true; + @Pc(395) Tile local395 = arg3[local150][local108][local122]; + if (local395 != null && local395.sceneryLen > 0) { + for (local227 = 0; local227 < local395.sceneryLen; local227++) { + @Pc(418) Scenery local418 = local395.scenery[local227]; + if (local418.xMax != local418.xMin || local418.zMax != local418.zMin) { + for (local358 = local418.xMin; local358 <= local418.xMax; local358++) { + for (@Pc(450) int local450 = local418.zMin; local450 <= local418.zMax; local450++) { + aByteArrayArrayArray15[local150][local358][local450] = local14; + } + } + } + } + } + aByteArrayArrayArray15[local150][local108][local122] = local14; + } + } + if (local132) { + if (SceneGraph.tileHeights[Player.level + 1][local108][local122] > anIntArray205[arg4]) { + anIntArray205[arg4] = SceneGraph.tileHeights[Player.level + 1][local108][local122]; + } + local150 = local108 << 7; + if (local150 < anIntArray338[arg4]) { + anIntArray338[arg4] = local150; + } else if (anIntArray518[arg4] < local150) { + anIntArray518[arg4] = local150; + } + local191 = local122 << 7; + if (anIntArray476[arg4] > local191) { + anIntArray476[arg4] = local191; + } else if (anIntArray134[arg4] < local191) { + anIntArray134[arg4] = local191; + } + } + if (!local130) { + if (local108 >= 1 && aByteArrayArrayArray15[Player.level][local108 - 1][local122] != local14) { + PathFinder.queueX[local69] = local108 - 1 | 0x120000 | 0xD3000000; + PathFinder.queueZ[local69] = local122 | 0x130000; + local69 = local69 + 1 & 0xFFF; + aByteArrayArrayArray15[Player.level][local108 - 1][local122] = local14; + } + local122++; + if (local122 < 104) { + if (local108 - 1 >= 0 && local14 != aByteArrayArrayArray15[Player.level][local108 - 1][local122] && (SceneGraph.tileFlags[Player.level][local108][local122] & 0x4) == 0 && (SceneGraph.tileFlags[Player.level][local108 - 1][local122 - 1] & 0x4) == 0) { + PathFinder.queueX[local69] = 0x52000000 | 0x120000 | local108 - 1; + PathFinder.queueZ[local69] = local122 | 0x130000; + aByteArrayArrayArray15[Player.level][local108 - 1][local122] = local14; + local69 = local69 + 1 & 0xFFF; + } + if (local14 != aByteArrayArrayArray15[Player.level][local108][local122]) { + PathFinder.queueX[local69] = local108 | 0x13000000 | 0x520000; + PathFinder.queueZ[local69] = local122 | 0x530000; + local69 = local69 + 1 & 0xFFF; + aByteArrayArrayArray15[Player.level][local108][local122] = local14; + } + if (local108 + 1 < 104 && aByteArrayArrayArray15[Player.level][local108 + 1][local122] != local14 && (SceneGraph.tileFlags[Player.level][local108][local122] & 0x4) == 0 && (SceneGraph.tileFlags[Player.level][local108 + 1][local122 - 1] & 0x4) == 0) { + PathFinder.queueX[local69] = 0x92000000 | 0x520000 | local108 + 1; + PathFinder.queueZ[local69] = local122 | 0x530000; + aByteArrayArrayArray15[Player.level][local108 + 1][local122] = local14; + local69 = local69 + 1 & 0xFFF; + } + } + local122--; + if (local108 + 1 < 104 && local14 != aByteArrayArrayArray15[Player.level][local108 + 1][local122]) { + PathFinder.queueX[local69] = local108 + 1 | 0x920000 | 0x53000000; + PathFinder.queueZ[local69] = local122 | 0x930000; + aByteArrayArrayArray15[Player.level][local108 + 1][local122] = local14; + local69 = local69 + 1 & 0xFFF; + } + local122--; + if (local122 >= 0) { + if (local108 - 1 >= 0 && aByteArrayArrayArray15[Player.level][local108 - 1][local122] != local14 && (SceneGraph.tileFlags[Player.level][local108][local122] & 0x4) == 0 && (SceneGraph.tileFlags[Player.level][local108 - 1][local122 + 1] & 0x4) == 0) { + PathFinder.queueX[local69] = local108 - 1 | 0xD20000 | 0x12000000; + PathFinder.queueZ[local69] = local122 | 0xD30000; + aByteArrayArrayArray15[Player.level][local108 - 1][local122] = local14; + local69 = local69 + 1 & 0xFFF; + } + if (local14 != aByteArrayArrayArray15[Player.level][local108][local122]) { + PathFinder.queueX[local69] = local108 | 0xD20000 | 0x93000000; + PathFinder.queueZ[local69] = local122 | 0xD30000; + local69 = local69 + 1 & 0xFFF; + aByteArrayArrayArray15[Player.level][local108][local122] = local14; + } + if (local108 + 1 < 104 && aByteArrayArrayArray15[Player.level][local108 + 1][local122] != local14 && (SceneGraph.tileFlags[Player.level][local108][local122] & 0x4) == 0 && (SceneGraph.tileFlags[Player.level][local108 + 1][local122 + 1] & 0x4) == 0) { + PathFinder.queueX[local69] = local108 + 1 | 0xD2000000 | 0x920000; + PathFinder.queueZ[local69] = local122 | 0x930000; + aByteArrayArrayArray15[Player.level][local108 + 1][local122] = local14; + local69 = local69 + 1 & 0xFFF; + } + } + } + } + if (anIntArray205[arg4] != -1000000) { + anIntArray205[arg4] += 10; + anIntArray338[arg4] -= 50; + anIntArray518[arg4] += 50; + anIntArray134[arg4] += 50; + anIntArray476[arg4] -= 50; + } + return true; + } + } + + @OriginalMember(owner = "client!nf", name = "a", descriptor = "(Lclient!na;BZ)V") + public static void openUrl(@OriginalArg(0) JagString arg0, @OriginalArg(2) boolean arg1) { + if (!arg1) { + try { + GameShell.instance.getAppletContext().showDocument(arg0.method3127(GameShell.instance.getCodeBase()), "_top"); + } catch (@Pc(22) Exception local22) { + } + return; + } + if (GlRenderer.enabled && GameShell.openWindowJavaScript) { + try { + BrowserControl.call(GameShell.signLink.applet, "openjs", new Object[] { arg0.method3127(GameShell.instance.getCodeBase()).toString() }); + return; + } catch (@Pc(48) Throwable local48) { + } + } + try { + GameShell.instance.getAppletContext().showDocument(arg0.method3127(GameShell.instance.getCodeBase()), "_blank"); + } catch (@Pc(59) Exception local59) { + } + } + + @OriginalMember(owner = "client!og", name = "a", descriptor = "(BIILclient!fe;III)V") + public static void method3326(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) PathingEntity arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5) { + method1026(arg5, arg1, arg2.zFine, arg4, arg0, arg2.xFine, arg3); + } + + @OriginalMember(owner = "client!q", name = "a", descriptor = "(IIIIIIBI)V") + public static void method1026(@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(7) int arg6) { + if (arg5 < 128 || arg2 < 128 || arg5 > 13056 || arg2 > 13056) { + anInt548 = -1; + anInt1951 = -1; + return; + } + @Pc(38) int local38 = SceneGraph.getTileHeight(Player.level, arg5, arg2) - arg3; + @Pc(42) int local42 = arg2 - Camera.renderZ; + @Pc(46) int local46 = local38 - Static5.anInt40; + @Pc(50) int local50 = arg5 - Camera.renderX; + @Pc(54) int local54 = MathUtils.sin[Camera.cameraPitch]; + @Pc(58) int local58 = MathUtils.cos[Camera.cameraPitch]; + @Pc(62) int local62 = MathUtils.sin[Camera.cameraYaw]; + @Pc(66) int local66 = MathUtils.cos[Camera.cameraYaw]; + @Pc(76) int local76 = local50 * local66 + local62 * local42 >> 16; + @Pc(87) int local87 = local42 * local66 - local62 * local50 >> 16; + @Pc(89) int local89 = local76; + @Pc(99) int local99 = local58 * local46 - local87 * local54 >> 16; + @Pc(113) int local113 = local87 * local58 + local46 * local54 >> 16; + if (local113 < 50) { + anInt548 = -1; + anInt1951 = -1; + } else if (GlRenderer.enabled) { + @Pc(150) int local150 = arg1 * 512 >> 8; + anInt1951 = local150 * local89 / local113 + arg0; + @Pc(164) int local164 = arg6 * 512 >> 8; + anInt548 = local164 * local99 / local113 + arg4; + } else { + anInt1951 = (local89 << 9) / local113 + arg0; + anInt548 = (local99 << 9) / local113 + arg4; + } + } + + @OriginalMember(owner = "client!ed", name = "b", descriptor = "(II)Lclient!ba;") + public static World getWorld(@OriginalArg(1) int arg0) { + return WorldList.loaded && arg0 >= WorldList.minId && arg0 <= WorldList.maxId ? WorldList.worlds[arg0 - WorldList.minId] : null; + } + + @OriginalMember(owner = "client!sc", name = "a", descriptor = "()V") + public static void method3858() { + for (@Pc(1) int local1 = 0; local1 < SceneGraph.sceneryLen; local1++) { + @Pc(8) Scenery local8 = SceneGraph.scenery[local1]; + SceneGraph.removeScenery(local8); + SceneGraph.scenery[local1] = null; + } + SceneGraph.sceneryLen = 0; + } + + @OriginalMember(owner = "client!be", name = "a", descriptor = "(Z)Lclient!na;") + public static JagString method479() { + @Pc(8) JagString local8 = aClass100_518; + @Pc(10) JagString local10 = JagString.EMPTY; + if (client.modeWhere != 0) { + local8 = aClass100_365; + } + if (client.settings != null) { + local10 = JagString.concatenate(new JagString[] { aClass100_687, client.settings}); + } + return JagString.concatenate(new JagString[] { aClass100_424, local8, aClass100_886, JagString.parseInt(client.language), aClass100_98, JagString.parseInt(client.affiliate), local10, aClass100_268 }); + } + + @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) { + return arg4 == null || SceneGraph.method2256(arg0, arg7, arg8, arg9 + 1 - arg7, arg10 - arg8 + 1, arg1, arg2, arg3, arg4, arg5, true, arg6); + } public static class Cs2Opcodes { // Component setters @@ -3092,7 +4336,7 @@ public final class ScriptRunner { str1 = WorldMap.labels.aClass100Array153[int1]; int2 = WorldMap.labels.method3894(int1); } - str1 = str1.method3140(Static67.aClass100_639, Static5.aClass100_10); + str1 = str1.method3140(aClass100_639, Static5.aClass100_10); stringStack[ssp++] = str1; intStack[isp++] = int2; continue; @@ -3106,7 +4350,7 @@ public final class ScriptRunner { str1 = WorldMap.labels.aClass100Array153[int1]; int2 = WorldMap.labels.method3894(int1); } - str1 = str1.method3140(Static67.aClass100_639, Static5.aClass100_10); + str1 = str1.method3140(aClass100_639, Static5.aClass100_10); stringStack[ssp++] = str1; intStack[isp++] = int2; continue; @@ -3123,7 +4367,7 @@ public final class ScriptRunner { ssp--; str1 = stringStack[ssp]; local7566 = false; - @Pc(7577) SecondaryLinkedList local7577 = Static183.method3333(int1 >> 14 & 0x3FFF, int1 & 0x3FFF); + @Pc(7577) SecondaryLinkedList local7577 = method3333(int1 >> 14 & 0x3FFF, int1 & 0x3FFF); for (@Pc(7582) Map local7582 = (Map) local7577.method795(); local7582 != null; local7582 = (Map) local7577.method797()) { if (local7582.group.equalsIgnoreCase(str1)) { local7566 = true; @@ -3300,7 +4544,7 @@ public final class ScriptRunner { DisplayMode.setWindowMode(false, Preferences.favoriteWorlds, -1, -1); } if (GameShell.frame == null) { - Static169.openUrl(Static15.method479(), false); + openUrl(method479(), false); } else { System.exit(0); } @@ -3330,14 +4574,14 @@ public final class ScriptRunner { local1552 = intStack[isp] == 1; ssp--; string = stringStack[ssp]; - @Pc(8356) JagString local8356 = JagString.concatenate(new JagString[] { Static15.method479(), string }); + @Pc(8356) JagString local8356 = JagString.concatenate(new JagString[] { method479(), string }); if (GameShell.frame != null || local1552 && SignLink.anInt5928 != 3 && SignLink.osName.startsWith("win") && !client.haveIe6) { Static164.newTab = local1552; - Static175.url = local8356; + url = local8356; Static33.openUrlRequest = GameShell.signLink.openUrl(new String(local8356.method3148(), StandardCharsets.ISO_8859_1)); continue; } - Static169.openUrl(local8356, local1552); + openUrl(local8356, local1552); continue; } if (opcode == 5422) { @@ -3393,13 +4637,13 @@ public final class ScriptRunner { } if (opcode == 5426) { isp--; - Static270.anInt5794 = intStack[isp]; + anInt5794 = intStack[isp]; continue; } if (opcode == 5427) { isp -= 2; - Static169.anInt4075 = intStack[isp]; - Static225.anInt5073 = intStack[isp + 1]; + MiniMap.anInt4075 = intStack[isp]; + MiniMap.anInt5073 = intStack[isp + 1]; continue; } } else if (opcode < 5600) { @@ -3586,7 +4830,7 @@ public final class ScriptRunner { Preferences.setAllVisibleLevels(intStack[isp] == 1); LocTypeList.clear(); Static145.method2742(); - Static269.method2218(); + method2218(); Preferences.write(GameShell.signLink); Preferences.sentToServer = false; continue; @@ -3594,7 +4838,7 @@ public final class ScriptRunner { if (opcode == 6003) { isp--; Preferences.removeRoofsSelectively = intStack[isp] == 1; - Static269.method2218(); + method2218(); Preferences.write(GameShell.signLink); Preferences.sentToServer = false; continue; @@ -3752,7 +4996,7 @@ public final class ScriptRunner { MidiPlayer.method4548(); MidiPlayer.jingle = false; } else { - Static230.method3956(int1); + MidiPlayer.method3956(int1); } Preferences.musicVolume = int1; } @@ -3776,8 +5020,8 @@ public final class ScriptRunner { } if (opcode == 6021) { isp--; - Static127.neverRemoveRoofs = intStack[isp] == 1; - Static269.method2218(); + neverRemoveRoofs = intStack[isp] == 1; + method2218(); continue; } if (opcode == 6023) { @@ -3912,66 +5156,66 @@ public final class ScriptRunner { } else if (opcode < 6300) { if (opcode == 6200) { isp -= 2; - Static115.aShort25 = (short) intStack[isp]; - if (Static115.aShort25 <= 0) { - Static115.aShort25 = 256; + aShort25 = (short) intStack[isp]; + if (aShort25 <= 0) { + aShort25 = 256; } - Static115.aShort9 = (short) intStack[isp + 1]; - if (Static115.aShort9 <= 0) { - Static115.aShort9 = 205; + aShort9 = (short) intStack[isp + 1]; + if (aShort9 <= 0) { + aShort9 = 205; } continue; } if (opcode == 6201) { isp -= 2; - Static263.aShort30 = (short) intStack[isp]; - if (Static263.aShort30 <= 0) { - Static263.aShort30 = 256; + aShort30 = (short) intStack[isp]; + if (aShort30 <= 0) { + aShort30 = 256; } - Static187.aShort27 = (short) intStack[isp + 1]; - if (Static187.aShort27 <= 0) { - Static187.aShort27 = 320; + aShort27 = (short) intStack[isp + 1]; + if (aShort27 <= 0) { + aShort27 = 320; } continue; } if (opcode == 6202) { isp -= 4; - Static115.aShort22 = (short) intStack[isp]; - if (Static115.aShort22 <= 0) { - Static115.aShort22 = 1; + aShort22 = (short) intStack[isp]; + if (aShort22 <= 0) { + aShort22 = 1; } - Static115.aShort1 = (short) intStack[isp + 1]; - if (Static115.aShort1 <= 0) { - Static115.aShort1 = 32767; - } else if (Static115.aShort22 > Static115.aShort1) { - Static115.aShort1 = Static115.aShort22; + aShort1 = (short) intStack[isp + 1]; + if (aShort1 <= 0) { + aShort1 = 32767; + } else if (aShort22 > aShort1) { + aShort1 = aShort22; } - Static115.aShort12 = (short) intStack[isp + 2]; - if (Static115.aShort12 <= 0) { - Static115.aShort12 = 1; + aShort12 = (short) intStack[isp + 2]; + if (aShort12 <= 0) { + aShort12 = 1; } - Static115.aShort21 = (short) intStack[isp + 3]; - if (Static115.aShort21 <= 0) { - Static115.aShort21 = 32767; - } else if (Static115.aShort21 < Static115.aShort12) { - Static115.aShort21 = Static115.aShort12; + aShort21 = (short) intStack[isp + 3]; + if (aShort21 <= 0) { + aShort21 = 32767; + } else if (aShort21 < aShort12) { + aShort21 = aShort12; } continue; } if (opcode == 6203) { - Static115.method2314(Static280.aClass13_26.width, 0, Static280.aClass13_26.height, 0, false); - intStack[isp++] = Static115.anInt4055; - intStack[isp++] = Static115.anInt5377; + method2314(InterfaceList.aClass13_26.width, 0, InterfaceList.aClass13_26.height, 0, false); + intStack[isp++] = anInt4055; + intStack[isp++] = anInt5377; continue; } if (opcode == 6204) { - intStack[isp++] = Static263.aShort30; - intStack[isp++] = Static187.aShort27; + intStack[isp++] = aShort30; + intStack[isp++] = aShort27; continue; } if (opcode == 6205) { - intStack[isp++] = Static115.aShort25; - intStack[isp++] = Static115.aShort9; + intStack[isp++] = aShort25; + intStack[isp++] = aShort9; continue; } } else if (opcode < 6400) { @@ -4101,7 +5345,7 @@ public final class ScriptRunner { if (opcode == 6506) { isp--; int1 = intStack[isp]; - @Pc(10440) World local10440 = Static54.getWorld(int1); + @Pc(10440) World local10440 = getWorld(int1); if (local10440 == null) { intStack[isp++] = -1; stringStack[ssp++] = EMPTY_STRING; @@ -4124,7 +5368,7 @@ public final class ScriptRunner { int1 = intStack[isp]; local7566 = intStack[isp + 3] == 1; local1552 = intStack[isp + 1] == 1; - Static228.sortWorldList(int2, local1552, int1, local7566); + WorldList.sortWorldList(int2, local1552, int1, local7566); continue; } } else if (opcode < 6700) { @@ -4202,7 +5446,7 @@ public final class ScriptRunner { local652 = aCalendar2.get(Calendar.DATE); c = aCalendar2.get(Calendar.MONTH); local1087 = aCalendar2.get(Calendar.YEAR); - stringStack[ssp++] = JagString.concatenate(new JagString[] { JagString.parseInt(local652), Static163.aClass100_767, Static34.aClass100Array40[c], Static163.aClass100_767, JagString.parseInt(local1087) }); + stringStack[ssp++] = JagString.concatenate(new JagString[] { JagString.parseInt(local652), aClass100_767, Static34.aClass100Array40[c], aClass100_767, JagString.parseInt(local1087) }); continue; } if (opcode == Cs2Opcodes.strForGender) { @@ -4403,7 +5647,7 @@ public final class ScriptRunner { component.xMode = (byte) int2; component.yMode = (byte) int3; InterfaceList.redraw(component); - Static74.update(component); + InterfaceList.update(component); if (component.createdComponentId == -1) { DelayedStateChange.method4675(component.id); } @@ -4430,7 +5674,7 @@ public final class ScriptRunner { } component.dynamicWidthValue = (byte) int3; InterfaceList.redraw(component); - Static74.update(component); + InterfaceList.update(component); if (component.type == 0) { InterfaceList.method531(component, false); } @@ -4453,7 +5697,7 @@ public final class ScriptRunner { component.aspectWidth = intStack[isp]; component.aspectHeight = intStack[isp + 1]; InterfaceList.redraw(component); - Static74.update(component); + InterfaceList.update(component); if (component.type == 0) { InterfaceList.method531(component, false); } @@ -4477,7 +5721,7 @@ public final class ScriptRunner { TracingException.report("CS2 - scr:" + script.key + " op:" + op, ex); } else { @Pc(14385) JagString str = Static87.allocate(30); - str.method3113(Static219.aClass100_928).method3113(script.name); + str.method3113(aClass100_928).method3113(script.name); for (cycles = fp - 1; cycles >= 0; cycles--) { str.method3113(aClass100_253).method3113(callStack[cycles].script.name); } diff --git a/client/src/main/java/rt4/ServerActiveProperties.java b/client/src/main/java/rt4/ServerActiveProperties.java index eae27a8..1bf0da0 100644 --- a/client/src/main/java/rt4/ServerActiveProperties.java +++ b/client/src/main/java/rt4/ServerActiveProperties.java @@ -19,7 +19,12 @@ public final class ServerActiveProperties extends Node { this.events = arg0; } - @OriginalMember(owner = "client!bf", name = "a", descriptor = "(IB)Z") + @OriginalMember(owner = "client!qc", name = "a", descriptor = "(BI)I") + public static int method3594(@OriginalArg(1) int arg0) { + return arg0 >> 11 & 0x7F; + } + + @OriginalMember(owner = "client!bf", name = "a", descriptor = "(IB)Z") public final boolean method503(@OriginalArg(0) int arg0) { return (this.events >> arg0 + 1 & 0x1) != 0; } @@ -66,6 +71,6 @@ public final class ServerActiveProperties extends Node { @OriginalMember(owner = "client!bf", name = "i", descriptor = "(I)I") public final int getTargetMask() { - return Static199.method3594(this.events); + return method3594(this.events); } } diff --git a/client/src/main/java/rt4/Static242.java b/client/src/main/java/rt4/ShadowManager.java similarity index 99% rename from client/src/main/java/rt4/Static242.java rename to client/src/main/java/rt4/ShadowManager.java index 409eaf2..b640b63 100644 --- a/client/src/main/java/rt4/Static242.java +++ b/client/src/main/java/rt4/ShadowManager.java @@ -5,7 +5,7 @@ import org.openrs2.deob.annotation.OriginalArg; import org.openrs2.deob.annotation.OriginalMember; import org.openrs2.deob.annotation.Pc; -public final class Static242 { +public final class ShadowManager { @OriginalMember(owner = "client!tj", name = "a", descriptor = "Lclient!ek;") public static SoftwareIndexedSprite shadowMapImage; diff --git a/client/src/main/java/rt4/SoftwareModel.java b/client/src/main/java/rt4/SoftwareModel.java index e835222..ac27f1a 100644 --- a/client/src/main/java/rt4/SoftwareModel.java +++ b/client/src/main/java/rt4/SoftwareModel.java @@ -559,7 +559,38 @@ public final class SoftwareModel extends Model { return (arg0 & 0xFF80) + arg1; } - @OriginalMember(owner = "client!w", name = "e", descriptor = "(I)V") + @OriginalMember(owner = "client!nj", name = "a", descriptor = "(IIZ[I[I)V") + public static void method3223(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int[] arg2, @OriginalArg(4) int[] arg3) { + if (arg0 >= arg1) { + return; + } + @Pc(22) int local22 = (arg1 + arg0) / 2; + @Pc(24) int local24 = arg0; + @Pc(28) int local28 = arg2[local22]; + arg2[local22] = arg2[arg1]; + arg2[arg1] = local28; + @Pc(42) int local42 = arg3[local22]; + arg3[local22] = arg3[arg1]; + arg3[arg1] = local42; + for (@Pc(54) int local54 = arg0; local54 < arg1; local54++) { + if (arg2[local54] > (local54 & 0x1) + local28) { + @Pc(79) int local79 = arg2[local54]; + arg2[local54] = arg2[local24]; + arg2[local24] = local79; + @Pc(93) int local93 = arg3[local54]; + arg3[local54] = arg3[local24]; + arg3[local24++] = local93; + } + } + arg2[arg1] = arg2[local24]; + arg2[local24] = local28; + arg3[arg1] = arg3[local24]; + arg3[local24] = local42; + method3223(arg0, local24 - 1, arg2, arg3); + method3223(local24 + 1, arg1, arg2, arg3); + } + + @OriginalMember(owner = "client!w", name = "e", descriptor = "(I)V") private void method4579(@OriginalArg(0) int arg0) { if (aBooleanArray132[arg0]) { this.method4587(arg0); @@ -802,7 +833,7 @@ public final class SoftwareModel extends Model { @Pc(223) int local223; @Pc(208) int local208; @Pc(227) int local227; - if (arg8 > 0L && Static39.aBoolean77 && local53 > 0) { + if (arg8 > 0L && ScriptRunner.aBoolean77 && local53 > 0) { if (local71 > 0) { local204 = local91 / local38; local208 = local78 / local53; @@ -817,7 +848,7 @@ public final class SoftwareModel extends Model { local223 = local146 / local53; local227 = local123 / local38; } - if (Static150.anInt3582 >= local204 && Static150.anInt3582 <= local208 && Static34.anInt1053 >= local223 && Static34.anInt1053 <= local227) { + if (GlModel.anInt3582 >= local204 && GlModel.anInt3582 <= local208 && Static34.anInt1053 >= local223 && Static34.anInt1053 <= local227) { local204 = 999999; local208 = -999999; local223 = 999999; @@ -860,9 +891,9 @@ public final class SoftwareModel extends Model { } } } - if (Static150.anInt3582 >= local204 && Static150.anInt3582 <= local208 && Static34.anInt1053 >= local223 && Static34.anInt1053 <= local227) { + if (GlModel.anInt3582 >= local204 && GlModel.anInt3582 <= local208 && Static34.anInt1053 >= local223 && Static34.anInt1053 <= local227) { if (this.aBoolean303) { - Model.aLongArray11[Static2.anInt7++] = arg8; + Model.aLongArray11[MiniMenu.anInt7++] = arg8; } else { local190 = true; } @@ -1627,8 +1658,8 @@ public final class SoftwareModel extends Model { } } } else { - if (arg1 && this.method4589(Static150.anInt3582 + Rasteriser.centerX, Static34.anInt1053 + Rasteriser.centerY, anIntArray551[local51], anIntArray551[local56], anIntArray551[local61], local65, local69, local73)) { - Model.aLongArray11[Static2.anInt7++] = arg2; + if (arg1 && this.method4589(GlModel.anInt3582 + Rasteriser.centerX, Static34.anInt1053 + Rasteriser.centerY, anIntArray551[local51], anIntArray551[local56], anIntArray551[local61], local65, local69, local73)) { + Model.aLongArray11[MiniMenu.anInt7++] = arg2; arg1 = false; } if ((local65 - local69) * (anIntArray551[local61] - anIntArray551[local56]) - (anIntArray551[local51] - anIntArray551[local56]) * (local73 - local69) > 0) { @@ -1662,7 +1693,7 @@ public final class SoftwareModel extends Model { } } if (aBoolean307) { - Static172.method3223(0, local5 - 1, anIntArray550, anIntArray549); + method3223(0, local5 - 1, anIntArray550, anIntArray549); if (this.aByteArray73 == null) { for (local11 = 0; local11 < local5; local11++) { this.method4579(anIntArray549[local11]); diff --git a/client/src/main/java/rt4/Static1.java b/client/src/main/java/rt4/Static1.java index 300f743..7bf9e63 100644 --- a/client/src/main/java/rt4/Static1.java +++ b/client/src/main/java/rt4/Static1.java @@ -10,7 +10,11 @@ public final class Static1 { public static final boolean[][] aBooleanArrayArray4 = new boolean[][] { { true, true, true }, { false, false }, { false, true }, { true, false }, { false, true, true }, { true, false, true }, { false, true, false }, { true, false, false } }; @OriginalMember(owner = "client!kc", name = "s", descriptor = "[I") public static final int[] anIntArray300 = new int[] { 1, 1, 1, 1, 4, 1, 1, 5, 6, 1, 5, 0, 7, 0, 4, 1, 7, 2, 1, 1, 6, 1, 1, 3, 6, 1, 7, 0, 0, 6, 7, 0, 1, 7, 6, 1, 1, 1, 5, 4, 3, 2, 1, 1, 0, 4, 1, 5 }; - @OriginalMember(owner = "client!a", name = "h", descriptor = "I") + @OriginalMember(owner = "client!sh", name = "i", descriptor = "[[I") + public static final int[][] anIntArrayArray35 = new int[][] { { 0, 128, 0, 0, 128, 0, 128, 128 }, { 0, 128, 0, 0, 128, 0 }, { 0, 0, 64, 128, 0, 128 }, { 128, 128, 64, 128, 128, 0 }, { 0, 0, 128, 0, 128, 128, 64, 128 }, { 0, 128, 0, 0, 128, 0, 64, 128 }, { 64, 128, 0, 128, 0, 0, 64, 0 }, { 0, 0, 64, 0, 0, 64 }, { 128, 0, 128, 128, 0, 128, 0, 64, 64, 0 }, { 0, 128, 0, 0, 32, 64, 64, 96, 128, 128 }, { 0, 0, 128, 0, 128, 128, 64, 96, 32, 64 }, { 0, 0, 128, 0, 96, 32, 32, 32 } }; + @OriginalMember(owner = "client!gf", name = "S", descriptor = "[I") + public static final int[] anIntArray419 = new int[] { 0, 2, 2, 2, 1, 1, 2, 2, 1, 3, 1, 1 }; + @OriginalMember(owner = "client!a", name = "h", descriptor = "I") public static int anInt5; @OriginalMember(owner = "client!a", name = "e", descriptor = "Lclient!na;") @@ -18,6 +22,12 @@ public final class Static1 { @OriginalMember(owner = "client!a", name = "i", descriptor = "I") public static int anInt6 = 0; + @OriginalMember(owner = "client!ig", name = "b", descriptor = "I") + public static int anInt2882; + @OriginalMember(owner = "client!ig", name = "f", descriptor = "I") + public static int anInt2884; + @OriginalMember(owner = "client!hc", name = "P", descriptor = "I") + public static int anInt2428; @OriginalMember(owner = "client!a", name = "a", descriptor = "([[F[[F[[II[[F[[B[[II[[B[[B[[B[[[B)[Lclient!hg;") public static GlTile[] method2(@OriginalArg(0) float[][] arg0, @OriginalArg(1) float[][] arg1, @OriginalArg(2) int[][] arg2, @OriginalArg(3) int arg3, @OriginalArg(4) float[][] arg4, @OriginalArg(5) byte[][] arg5, @OriginalArg(6) int[][] arg6, @OriginalArg(8) byte[][] arg7, @OriginalArg(9) byte[][] arg8, @OriginalArg(10) byte[][] arg9, @OriginalArg(11) byte[][][] arg10) { @@ -57,11 +67,11 @@ public final class Static1 { } @Pc(61) GlTile local61 = method4212(local10, local50); @Pc(67) byte local67 = arg7[local12][local17]; - @Pc(71) int[] local71 = Static228.anIntArrayArray35[local67]; + @Pc(71) int[] local71 = anIntArrayArray35[local67]; local61.anInt2482 += local71.length / 2; local61.anInt2484++; if (local50.aBoolean310 && local30 != 0) { - local61.anInt2482 += Static80.anIntArray419[local67]; + local61.anInt2482 += anIntArray419[local67]; } } if ((arg8[local12][local17] & 0xFF) != 0 || local38 != 0 && arg7[local12][local17] == 0) { @@ -264,11 +274,11 @@ public final class Static1 { @Pc(1261) GlTile local1261 = method4212(local10, local1250); @Pc(1267) byte local1267 = arg7[local12][local17]; @Pc(1273) byte local1273 = arg5[local12][local17]; - local168 = Static19.method588(local1250.texture, local1250.anInt5899, arg6[local12][local17]); - local143 = Static19.method588(local1250.texture, local1250.anInt5899, arg6[local12 + 1][local17]); - local163 = Static19.method588(local1250.texture, local1250.anInt5899, arg6[local12 + 1][local17 + 1]); - local153 = Static19.method588(local1250.texture, local1250.anInt5899, arg6[local12][local17 + 1]); - Static58.method1324(local168, arg2, arg1, local12, arg0, local143, local1273, local30, local163, local38 != 0 && local1250.aBoolean310, local1267, local17, arg4, local153, local1261); + local168 = method588(local1250.texture, local1250.anInt5899, arg6[local12][local17]); + local143 = method588(local1250.texture, local1250.anInt5899, arg6[local12 + 1][local17]); + local163 = method588(local1250.texture, local1250.anInt5899, arg6[local12 + 1][local17 + 1]); + local153 = method588(local1250.texture, local1250.anInt5899, arg6[local12][local17 + 1]); + method1324(local168, arg2, arg1, local12, arg0, local143, local1273, local30, local163, local38 != 0 && local1250.aBoolean310, local1267, local17, arg4, local153, local1261); } if ((arg8[local12][local17] & 0xFF) != 0 || local127 != 0 && arg7[local12][local17] == 0) { @Pc(1382) int[] local1382 = new int[8]; @@ -462,10 +472,10 @@ public final class Static1 { @Pc(2318) boolean[] local2318 = aBooleanArrayArray4[local2003 == local180 ? local143 : 0]; @Pc(2324) FloType local2324 = FloTypeList.method4395(local2003 - 1); @Pc(2329) GlTile local2329 = method4212(local10, local2324); - @Pc(2345) int local2345 = Static19.method588(local2324.texture, local2324.anInt5899, arg6[local12][local17]) << 8 | 0xFF; - @Pc(2365) int local2365 = Static19.method588(local2324.texture, local2324.anInt5899, arg6[local12 + 1][local17]) << 8 | 0xFF; - @Pc(2385) int local2385 = Static19.method588(local2324.texture, local2324.anInt5899, arg6[local12 + 1][local17 + 1]) << 8 | 0xFF; - @Pc(2403) int local2403 = Static19.method588(local2324.texture, local2324.anInt5899, arg6[local12][local17 + 1]) << 8 | 0xFF; + @Pc(2345) int local2345 = method588(local2324.texture, local2324.anInt5899, arg6[local12][local17]) << 8 | 0xFF; + @Pc(2365) int local2365 = method588(local2324.texture, local2324.anInt5899, arg6[local12 + 1][local17]) << 8 | 0xFF; + @Pc(2385) int local2385 = method588(local2324.texture, local2324.anInt5899, arg6[local12 + 1][local17 + 1]) << 8 | 0xFF; + @Pc(2403) int local2403 = method588(local2324.texture, local2324.anInt5899, arg6[local12][local17 + 1]) << 8 | 0xFF; @Pc(2422) boolean local2422 = local2003 != local202 && local1086[0] && local1068[1]; @Pc(2441) boolean local2441 = local2003 != local1035 && local1055[0] && local2318[1]; @Pc(2456) boolean local2456 = local214 != local2003 && local1068[0] && local1055[1]; @@ -474,32 +484,32 @@ public final class Static1 { @Pc(2489) int local2489 = local2463 + local1068.length - 2; @Pc(2496) int local2496 = local2489 + local1086.length - 2; @Pc(2503) int local2503 = local2496 + local2318.length - 2; - @Pc(2524) int local2524 = Static207.method3683(local2403, 0.0F, local2345, local2365, null, arg2, local12, arg4, local2385, 0, true, local2329, arg1, local17, 64, arg0, 64); + @Pc(2524) int local2524 = method3683(local2403, 0.0F, local2345, local2365, null, arg2, local12, arg4, local2385, 0, true, local2329, arg1, local17, 64, arg0, 64); @Pc(2527) int[] local2527 = new int[local2503]; @Pc(2529) byte local2529 = 0; - @Pc(2550) int local2550 = Static207.method3683(local2403, 0.0F, local2345, local2365, null, arg2, local12, arg4, local2385, 0, local2456, local2329, arg1, local17, 0, arg0, 128); - @Pc(2571) int local2571 = Static207.method3683(local2403, 0.0F, local2345, local2365, null, arg2, local12, arg4, local2385, 0, local2441, local2329, arg1, local17, 128, arg0, 128); - @Pc(2592) int local2592 = Static207.method3683(local2403, 0.0F, local2345, local2365, null, arg2, local12, arg4, local2385, 0, local2422, local2329, arg1, local17, 0, arg0, 0); - @Pc(2613) int local2613 = Static207.method3683(local2403, 0.0F, local2345, local2365, null, arg2, local12, arg4, local2385, 0, local2482, local2329, arg1, local17, 128, arg0, 0); + @Pc(2550) int local2550 = method3683(local2403, 0.0F, local2345, local2365, null, arg2, local12, arg4, local2385, 0, local2456, local2329, arg1, local17, 0, arg0, 128); + @Pc(2571) int local2571 = method3683(local2403, 0.0F, local2345, local2365, null, arg2, local12, arg4, local2385, 0, local2441, local2329, arg1, local17, 128, arg0, 128); + @Pc(2592) int local2592 = method3683(local2403, 0.0F, local2345, local2365, null, arg2, local12, arg4, local2385, 0, local2422, local2329, arg1, local17, 0, arg0, 0); + @Pc(2613) int local2613 = method3683(local2403, 0.0F, local2345, local2365, null, arg2, local12, arg4, local2385, 0, local2482, local2329, arg1, local17, 128, arg0, 0); @Pc(2616) int local2616 = local2529 + 1; local2527[0] = local2524; @Pc(2621) int local2621 = local2616 + 1; local2527[1] = local2571; if (local1055.length > 2) { local2621++; - local2527[2] = Static207.method3683(local2403, 0.0F, local2345, local2365, null, arg2, local12, arg4, local2385, 0, local1055[2], local2329, arg1, local17, 64, arg0, 128); + local2527[2] = method3683(local2403, 0.0F, local2345, local2365, null, arg2, local12, arg4, local2385, 0, local1055[2], local2329, arg1, local17, 64, arg0, 128); } local2527[local2621++] = local2550; if (local1068.length > 2) { - local2527[local2621++] = Static207.method3683(local2403, 0.0F, local2345, local2365, null, arg2, local12, arg4, local2385, 0, local1068[2], local2329, arg1, local17, 0, arg0, 64); + local2527[local2621++] = method3683(local2403, 0.0F, local2345, local2365, null, arg2, local12, arg4, local2385, 0, local1068[2], local2329, arg1, local17, 0, arg0, 64); } local2527[local2621++] = local2592; if (local1086.length > 2) { - local2527[local2621++] = Static207.method3683(local2403, 0.0F, local2345, local2365, null, arg2, local12, arg4, local2385, 0, local1086[2], local2329, arg1, local17, 64, arg0, 0); + local2527[local2621++] = method3683(local2403, 0.0F, local2345, local2365, null, arg2, local12, arg4, local2385, 0, local1086[2], local2329, arg1, local17, 64, arg0, 0); } local2527[local2621++] = local2613; if (local2318.length > 2) { - local2527[local2621++] = Static207.method3683(local2403, 0.0F, local2345, local2365, null, arg2, local12, arg4, local2385, 0, local2318[2], local2329, arg1, local17, 128, arg0, 64); + local2527[local2621++] = method3683(local2403, 0.0F, local2345, local2365, null, arg2, local12, arg4, local2385, 0, local2318[2], local2329, arg1, local17, 128, arg0, 64); } local2527[local2621++] = local2571; local2329.method1945(local30, local12, local17, local2527, null, true); @@ -540,7 +550,7 @@ public final class Static1 { if (WorldMap.aClass3_Sub2_Sub1_2 == null || arg2 != WorldMap.aClass3_Sub2_Sub1_2.width || WorldMap.aClass3_Sub2_Sub1_2.height != arg1) { @Pc(63) SoftwareSprite local63 = new SoftwareSprite(arg2, arg1); SoftwareRaster.setSize(local63.pixels, arg2, arg1); - Static214.method4364(arg2, 0, WorldMap.width, 0, 0, WorldMap.length, arg1, 0); + WorldMap.method4364(arg2, 0, WorldMap.width, 0, 0, WorldMap.length, arg1, 0); if (GlRenderer.enabled) { WorldMap.aClass3_Sub2_Sub1_2 = new GlSprite(local63); } else { @@ -553,9 +563,9 @@ public final class Static1 { } } WorldMap.aClass3_Sub2_Sub1_2.method1415(arg0, arg3); - @Pc(147) int local147 = arg1 * Static109.anInt2884 / WorldMap.length + arg3; + @Pc(147) int local147 = arg1 * anInt2884 / WorldMap.length + arg3; @Pc(153) int local153 = WorldMap.anInt1176 * arg1 / WorldMap.length; - @Pc(161) int local161 = arg0 + arg2 * Static109.anInt2882 / WorldMap.width; + @Pc(161) int local161 = arg0 + arg2 * anInt2882 / WorldMap.width; @Pc(167) int local167 = arg2 * WorldMap.anInt2387 / WorldMap.width; @Pc(169) int local169 = 16711680; if (client.game == 1) { @@ -568,14 +578,14 @@ public final class Static1 { SoftwareRaster.fillRectAlpha(local161, local147, local167, local153, local169, 128); SoftwareRaster.drawRect(local161, local147, local167, local153, local169); } - if (Static201.anInt1864 <= 0) { + if (WorldMap.anInt1864 <= 0) { return; } @Pc(225) int local225; - if (Static91.anInt2428 > 10) { - local225 = (20 - Static91.anInt2428) * 25; + if (anInt2428 > 10) { + local225 = (20 - anInt2428) * 25; } else { - local225 = Static91.anInt2428 * 25; + local225 = anInt2428 * 25; } for (@Pc(238) MapElement local238 = (MapElement) WorldMap.mapElements.head(); local238 != null; local238 = (MapElement) WorldMap.mapElements.next()) { if (local238.id == Static9.anInt172) { @@ -600,4 +610,229 @@ public final class Static1 { } return local38; } + + @OriginalMember(owner = "client!bi", name = "a", descriptor = "(IIBI)I") + public static int method588(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2) { + @Pc(19) int local19 = Rasteriser.palette[SoftwareModel.method4585(arg1, arg2)]; + if (arg0 > 0) { + @Pc(31) int local31 = Rasteriser.textureProvider.method3238(arg0 & 0xFFFF); + @Pc(49) int local49; + @Pc(73) int local73; + if (local31 != 0) { + if (arg2 < 0) { + local49 = 0; + } else if (arg2 > 127) { + local49 = 16777215; + } else { + local49 = arg2 * 131586; + } + if (local31 == 256) { + local19 = local49; + } else { + local73 = 256 - local31; + local19 = ((local49 & 0xFF00) * local31 + local73 * (local19 & 0xFF00) & 0xFF0000) + (local31 * (local49 & 0xFF00FF) + ((local19 & 0xFF00FF) * local73) & 0xFF00FF00) >> 8; + } + } + local49 = Rasteriser.textureProvider.method3229(arg0 & 0xFFFF); + if (local49 != 0) { + local49 += 256; + @Pc(125) int local125 = (local19 >> 16 & 0xFF) * local49; + if (local125 > 65535) { + local125 = 65535; + } + local73 = (local19 >> 8 & 0xFF) * local49; + if (local73 > 65535) { + local73 = 65535; + } + @Pc(150) int local150 = local49 * (local19 & 0xFF); + if (local150 > 65535) { + local150 = 65535; + } + local19 = (local150 >> 8) + (local73 & 0xFF00) + (local125 << 8 & 0xFF001F); + } + } + return local19; + } + + @OriginalMember(owner = "client!eh", name = "a", descriptor = "(I[[I[[FI[[FIBIIBZBI[[FILclient!hg;)V") + public static void method1324(@OriginalArg(0) int arg0, @OriginalArg(1) int[][] arg1, @OriginalArg(2) float[][] arg2, @OriginalArg(3) int arg3, @OriginalArg(4) float[][] arg4, @OriginalArg(5) int arg5, @OriginalArg(6) byte arg6, @OriginalArg(7) int arg7, @OriginalArg(8) int arg8, @OriginalArg(10) boolean arg9, @OriginalArg(11) byte arg10, @OriginalArg(12) int arg11, @OriginalArg(13) float[][] arg12, @OriginalArg(14) int arg13, @OriginalArg(15) GlTile arg14) { + @Pc(11) int local11 = (arg0 << 8) + 255; + @Pc(17) int local17 = (arg5 << 8) + 255; + @Pc(23) int local23 = (arg8 << 8) + 255; + @Pc(29) int local29 = (arg13 << 8) + 255; + @Pc(33) int[] local33 = anIntArrayArray35[arg10]; + @Pc(39) int[] local39 = new int[local33.length >> 1]; + @Pc(41) int local41; + for (local41 = 0; local41 < local39.length; local41++) { + local39[local41] = method3683(local29, 0.0F, local11, local17, null, arg1, arg3, arg12, local23, arg6, false, arg14, arg2, arg11, local33[local41 + local41], arg4, local33[local41 + local41 + 1]); + } + @Pc(87) int[] local87 = null; + if (arg9) { + @Pc(191) int local191; + if (arg10 == 1) { + local41 = method3683(local29, 0.0F, local11, local17, null, arg1, arg3, arg12, local23, arg6, true, arg14, arg2, arg11, 64, arg4, 128); + local191 = method3683(local29, 0.0F, local11, local17, null, arg1, arg3, arg12, local23, arg6, true, arg14, arg2, arg11, 128, arg4, 64); + local87 = new int[] { local191, local41, local39[2], local41, local39[0], local39[2] }; + } else if (arg10 == 2) { + local87 = new int[6]; + local41 = method3683(local29, 0.0F, local11, local17, null, arg1, arg3, arg12, local23, arg6, true, arg14, arg2, arg11, 128, arg4, 128); + local191 = method3683(local29, 0.0F, local11, local17, null, arg1, arg3, arg12, local23, arg6, true, arg14, arg2, arg11, 64, arg4, 0); + local87[2] = local41; + local87[0] = local39[0]; + local87[5] = local39[0]; + local87[3] = local41; + local87[1] = local191; + local87[4] = local39[1]; + } else if (arg10 == 3) { + local87 = new int[6]; + local41 = method3683(local29, 0.0F, local11, local17, null, arg1, arg3, arg12, local23, arg6, true, arg14, arg2, arg11, 0, arg4, 128); + local191 = method3683(local29, 0.0F, local11, local17, null, arg1, arg3, arg12, local23, arg6, true, arg14, arg2, arg11, 64, arg4, 0); + local87[4] = local191; + local87[1] = local39[1]; + local87[0] = local39[2]; + local87[3] = local41; + local87[2] = local41; + local87[5] = local39[2]; + } else if (arg10 == 4) { + local87 = new int[3]; + local41 = method3683(local29, 0.0F, local11, local17, null, arg1, arg3, arg12, local23, arg6, true, arg14, arg2, arg11, 0, arg4, 128); + local87[0] = local39[3]; + local87[2] = local39[0]; + local87[1] = local41; + } else if (arg10 == 5) { + local87 = new int[3]; + local41 = method3683(local29, 0.0F, local11, local17, null, arg1, arg3, arg12, local23, arg6, true, arg14, arg2, arg11, 128, arg4, 128); + local87[1] = local41; + local87[0] = local39[2]; + local87[2] = local39[3]; + } else if (arg10 == 6) { + local87 = new int[6]; + local41 = method3683(local29, 0.0F, local11, local17, null, arg1, arg3, arg12, local23, arg6, true, arg14, arg2, arg11, 128, arg4, 0); + local191 = method3683(local29, 0.0F, local11, local17, null, arg1, arg3, arg12, local23, arg6, true, arg14, arg2, arg11, 128, arg4, 128); + local87[1] = local41; + local87[0] = local39[3]; + local87[2] = local191; + local87[4] = local39[0]; + local87[3] = local191; + local87[5] = local39[3]; + } else if (arg10 == 7) { + local87 = new int[6]; + local41 = method3683(local29, 0.0F, local11, local17, null, arg1, arg3, arg12, local23, arg6, true, arg14, arg2, arg11, 0, arg4, 128); + local191 = method3683(local29, 0.0F, local11, local17, null, arg1, arg3, arg12, local23, arg6, true, arg14, arg2, arg11, 128, arg4, 0); + local87[3] = local41; + local87[2] = local41; + local87[0] = local39[1]; + local87[4] = local39[2]; + local87[1] = local191; + local87[5] = local39[1]; + } else if (arg10 == 8) { + local87 = new int[3]; + local41 = method3683(local29, 0.0F, local11, local17, null, arg1, arg3, arg12, local23, arg6, true, arg14, arg2, arg11, 0, arg4, 0); + local87[2] = local39[4]; + local87[0] = local39[3]; + local87[1] = local41; + } else if (arg10 == 9) { + local41 = method3683(local29, 0.0F, local11, local17, null, arg1, arg3, arg12, local23, arg6, true, arg14, arg2, arg11, 128, arg4, 64); + local191 = method3683(local29, 0.0F, local11, local17, null, arg1, arg3, arg12, local23, arg6, true, arg14, arg2, arg11, 96, arg4, 32); + @Pc(715) int local715 = method3683(local29, 0.0F, local11, local17, null, arg1, arg3, arg12, local23, arg6, true, arg14, arg2, arg11, 64, arg4, 0); + local87 = new int[] { local191, local41, local39[4], local191, local39[4], local39[3], local191, local39[3], local39[2], local191, local39[2], local39[1], local191, local39[1], local715 }; + } else if (arg10 == 10) { + local87 = new int[9]; + local41 = method3683(local29, 0.0F, local11, local17, null, arg1, arg3, arg12, local23, arg6, true, arg14, arg2, arg11, 0, arg4, 128); + local87[0] = local39[2]; + local87[8] = local39[0]; + local87[1] = local41; + local87[4] = local41; + local87[2] = local39[3]; + local87[7] = local41; + local87[3] = local39[3]; + local87[5] = local39[4]; + local87[6] = local39[4]; + } else if (arg10 == 11) { + local87 = new int[12]; + local41 = method3683(local29, 0.0F, local11, local17, null, arg1, arg3, arg12, local23, arg6, true, arg14, arg2, arg11, 0, arg4, 64); + local191 = method3683(local29, 0.0F, local11, local17, null, arg1, arg3, arg12, local23, arg6, true, arg14, arg2, arg11, 128, arg4, 64); + local87[5] = local41; + local87[1] = local41; + local87[8] = local41; + local87[0] = local39[3]; + local87[2] = local39[0]; + local87[11] = local191; + local87[6] = local39[2]; + local87[7] = local191; + local87[10] = local39[1]; + local87[3] = local39[3]; + local87[4] = local39[2]; + local87[9] = local39[2]; + } + } + arg14.method1945(arg7, arg3, arg11, local39, local87, false); + } + + @OriginalMember(owner = "client!ql", name = "a", descriptor = "(IFII[[I[[II[[FIBIZLclient!hg;[[FII[[FI)I") + public static int method3683(@OriginalArg(0) int arg0, @OriginalArg(1) float arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int[][] arg4, @OriginalArg(5) int[][] arg5, @OriginalArg(6) int arg6, @OriginalArg(7) float[][] arg7, @OriginalArg(8) int arg8, @OriginalArg(10) int arg9, @OriginalArg(11) boolean arg10, @OriginalArg(12) GlTile arg11, @OriginalArg(13) float[][] arg12, @OriginalArg(14) int arg13, @OriginalArg(15) int arg14, @OriginalArg(16) float[][] arg15, @OriginalArg(17) int arg16) { + @Pc(20) int local20; + if (arg9 == 1) { + local20 = arg14; + arg14 = arg16; + arg16 = 128 - local20; + } else if (arg9 == 2) { + arg16 = 128 - arg16; + arg14 = 128 - arg14; + } else if (arg9 == 3) { + local20 = arg14; + arg14 = 128 - arg16; + arg16 = local20; + } + @Pc(66) float local66; + @Pc(72) float local72; + @Pc(80) int local80; + @Pc(78) float local78; + if (arg14 == 0 && arg16 == 0) { + local66 = arg15[arg6][arg13]; + local72 = arg7[arg6][arg13]; + local78 = arg12[arg6][arg13]; + local80 = arg2; + } else if (arg14 == 128 && arg16 == 0) { + local80 = arg3; + local66 = arg15[arg6 + 1][arg13]; + local72 = arg7[arg6 + 1][arg13]; + local78 = arg12[arg6 + 1][arg13]; + } else if (arg14 == 128 && arg16 == 128) { + local72 = arg7[arg6 + 1][arg13 + 1]; + local78 = arg12[arg6 + 1][arg13 + 1]; + local66 = arg15[arg6 + 1][arg13 + 1]; + local80 = arg8; + } else if (arg14 == 0 && arg16 == 128) { + local72 = arg7[arg6][arg13 + 1]; + local66 = arg15[arg6][arg13 + 1]; + local78 = arg12[arg6][arg13 + 1]; + local80 = arg0; + } else { + local78 = arg12[arg6][arg13]; + local66 = arg15[arg6][arg13]; + @Pc(219) float local219 = (float) arg16 / 128.0F; + @Pc(224) float local224 = (float) arg14 / 128.0F; + @Pc(238) float local238 = local78 + (arg12[arg6 + 1][arg13] - local78) * local224; + @Pc(253) float local253 = local66 + (arg15[arg6 + 1][arg13] - local66) * local224; + @Pc(261) float local261 = arg12[arg6][arg13 + 1]; + @Pc(269) float local269 = arg15[arg6][arg13 + 1]; + @Pc(286) float local286 = local269 + (arg15[arg6 + 1][arg13 + 1] - local269) * local224; + local72 = arg7[arg6][arg13]; + local66 = local253 + local219 * (local286 - local253); + @Pc(309) float local309 = arg7[arg6][arg13 + 1]; + @Pc(326) float local326 = local261 + (arg12[arg6 + 1][arg13 + 1] - local261) * local224; + local78 = local238 + local219 * (local326 - local238); + @Pc(352) float local352 = local309 + (arg7[arg6 + 1][arg13 + 1] - local309) * local224; + @Pc(367) float local367 = local72 + (arg7[arg6 + 1][arg13] - local72) * local224; + local72 = local367 + (local352 - local367) * local219; + @Pc(382) int local382 = Static69.method1540(arg14, arg2, arg3); + @Pc(388) int local388 = Static69.method1540(arg14, arg0, arg8); + local80 = Static69.method1540(arg16, local382, local388); + } + @Pc(405) int local405 = arg16 + (arg13 << 7); + @Pc(413) int local413 = Static182.method3361(arg14, arg13, arg5, arg6, arg16); + @Pc(420) int local420 = (arg6 << 7) + arg14; + return arg11.method1941(local420, local413, local405, local78, local66, local72, arg10 ? local80 & 0xFFFFFF00 : local80, arg4 == null ? 0.0F : (float) (local413 - Static182.method3361(arg14, arg13, arg4, arg6, arg16)) / arg1); + } } diff --git a/client/src/main/java/rt4/Static10.java b/client/src/main/java/rt4/Static10.java index 54d681c..ea1b4cb 100644 --- a/client/src/main/java/rt4/Static10.java +++ b/client/src/main/java/rt4/Static10.java @@ -6,53 +6,62 @@ import org.openrs2.deob.annotation.Pc; public final class Static10 { + @OriginalMember(owner = "client!nj", name = "k", descriptor = "I") + public static int anInt4165; + @OriginalMember(owner = "client!pe", name = "r", descriptor = "I") + public static int anInt4457; + @OriginalMember(owner = "client!fb", name = "h", descriptor = "[I") + public static int[] anIntArray153; + @OriginalMember(owner = "client!lb", name = "z", descriptor = "I") + public static int anInt3473; + @OriginalMember(owner = "client!an", name = "c", descriptor = "(III)V") public static void method348(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) { - if (Static189.anInt4457 != arg1) { + if (anInt4457 != arg1) { Static173.anIntArray367 = new int[arg1]; for (@Pc(10) int local10 = 0; local10 < arg1; local10++) { Static173.anIntArray367[local10] = (local10 << 12) / arg1; } Static165.anInt4042 = arg1 == 64 ? 2048 : 4096; Static34.anInt1060 = arg1 - 1; - Static189.anInt4457 = arg1; + anInt4457 = arg1; } - if (Static172.anInt4165 == arg0) { + if (anInt4165 == arg0) { return; } - if (Static189.anInt4457 == arg0) { - Static64.anIntArray153 = Static173.anIntArray367; + if (anInt4457 == arg0) { + anIntArray153 = Static173.anIntArray367; } else { - Static64.anIntArray153 = new int[arg0]; + anIntArray153 = new int[arg0]; for (@Pc(61) int local61 = 0; local61 < arg0; local61++) { - Static64.anIntArray153[local61] = (local61 << 12) / arg0; + anIntArray153[local61] = (local61 << 12) / arg0; } } - Static172.anInt4165 = arg0; - Static141.anInt3473 = arg0 - 1; + anInt4165 = arg0; + anInt3473 = arg0 - 1; } @OriginalMember(owner = "client!an", name = "a", descriptor = "(IIIIIII)V") public static void method352(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5) { - @Pc(11) int local11 = Static78.method1690(TextureOp29.anInt2869, arg5, TextureOp29.anInt5773); - @Pc(17) int local17 = Static78.method1690(TextureOp29.anInt2869, arg0, TextureOp29.anInt5773); - @Pc(23) int local23 = Static78.method1690(TextureOp29.anInt5063, arg3, TextureOp29.anInt4164); - @Pc(29) int local29 = Static78.method1690(TextureOp29.anInt5063, arg2, TextureOp29.anInt4164); - @Pc(42) int local42 = Static78.method1690(TextureOp29.anInt2869, arg5 + arg1, TextureOp29.anInt5773); - @Pc(51) int local51 = Static78.method1690(TextureOp29.anInt2869, arg0 - arg1, TextureOp29.anInt5773); + @Pc(11) int local11 = Static231.method1690(TextureOp29.anInt2869, arg5, TextureOp29.anInt5773); + @Pc(17) int local17 = Static231.method1690(TextureOp29.anInt2869, arg0, TextureOp29.anInt5773); + @Pc(23) int local23 = Static231.method1690(TextureOp29.anInt5063, arg3, TextureOp29.anInt4164); + @Pc(29) int local29 = Static231.method1690(TextureOp29.anInt5063, arg2, TextureOp29.anInt4164); + @Pc(42) int local42 = Static231.method1690(TextureOp29.anInt2869, arg5 + arg1, TextureOp29.anInt5773); + @Pc(51) int local51 = Static231.method1690(TextureOp29.anInt2869, arg0 - arg1, TextureOp29.anInt5773); @Pc(53) int local53; for (local53 = local11; local53 < local42; local53++) { - Static131.method2576(Static71.anIntArrayArray10[local53], local23, local29, arg4); + TextureOp29SubOp4.method2576(TextureOp29SubOp4.anIntArrayArray10[local53], local23, local29, arg4); } for (local53 = local17; local53 > local51; local53--) { - Static131.method2576(Static71.anIntArrayArray10[local53], local23, local29, arg4); + TextureOp29SubOp4.method2576(TextureOp29SubOp4.anIntArrayArray10[local53], local23, local29, arg4); } - @Pc(95) int local95 = Static78.method1690(TextureOp29.anInt5063, arg1 + arg3, TextureOp29.anInt4164); - @Pc(104) int local104 = Static78.method1690(TextureOp29.anInt5063, arg2 - arg1, TextureOp29.anInt4164); + @Pc(95) int local95 = Static231.method1690(TextureOp29.anInt5063, arg1 + arg3, TextureOp29.anInt4164); + @Pc(104) int local104 = Static231.method1690(TextureOp29.anInt5063, arg2 - arg1, TextureOp29.anInt4164); for (local53 = local42; local53 <= local51; local53++) { - @Pc(117) int[] local117 = Static71.anIntArrayArray10[local53]; - Static131.method2576(local117, local23, local95, arg4); - Static131.method2576(local117, local104, local29, arg4); + @Pc(117) int[] local117 = TextureOp29SubOp4.anIntArrayArray10[local53]; + TextureOp29SubOp4.method2576(local117, local23, local95, arg4); + TextureOp29SubOp4.method2576(local117, local104, local29, arg4); } } } diff --git a/client/src/main/java/rt4/Static103.java b/client/src/main/java/rt4/Static103.java index 35d804d..31ac87c 100644 --- a/client/src/main/java/rt4/Static103.java +++ b/client/src/main/java/rt4/Static103.java @@ -51,8 +51,10 @@ public final class Static103 { public static int anInt2161; @OriginalMember(owner = "client!sa", name = "W", descriptor = "Z") public static boolean instantScreenFade = true; + @OriginalMember(owner = "client!gl", name = "f", descriptor = "I") + public static int anInt2263; - @OriginalMember(owner = "client!i", name = "b", descriptor = "(IIIII)I") + @OriginalMember(owner = "client!i", name = "b", descriptor = "(IIIII)I") public static int method2235(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) { if (instantScreenFade) { arg0 = 1000000; @@ -101,16 +103,11 @@ public final class Static103 { } FogManager.method3060(anInt5731, aFloat7, aFloat36, aFloat5); FogManager.method3062(anInt3709, anInt2161); - FogManager.method3063((float) Static85.anInt2263, (float) Static159.anInt3893, (float) Static148.anInt3534); + FogManager.method3063((float) anInt2263, (float) Static73.anInt3893, (float) Static73.anInt3534); FogManager.method3058(); return anInt3709; } - @OriginalMember(owner = "client!i", name = "e", descriptor = "(BI)I") - public static int method2236(@OriginalArg(1) int arg0) { - return arg0 & 0xFF; - } - @OriginalMember(owner = "client!gm", name = "f", descriptor = "(B)V") public static void setInstantFade() { instantScreenFade = true; diff --git a/client/src/main/java/rt4/Static105.java b/client/src/main/java/rt4/Static105.java deleted file mode 100644 index 6034fd7..0000000 --- a/client/src/main/java/rt4/Static105.java +++ /dev/null @@ -1,82 +0,0 @@ -package rt4; - -import org.openrs2.deob.annotation.OriginalArg; -import org.openrs2.deob.annotation.OriginalMember; -import org.openrs2.deob.annotation.Pc; - -public final class Static105 { - - @OriginalMember(owner = "client!ib", name = "a", descriptor = "(IIIIIIIILclient!th;IZJ)Z") - public static boolean method2256(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7, @OriginalArg(8) Entity arg8, @OriginalArg(9) int arg9, @OriginalArg(10) boolean arg10, @OriginalArg(11) long arg11) { - @Pc(6) boolean local6 = SceneGraph.tileHeights == SceneGraph.underwaterTileHeights; - @Pc(8) int local8 = 0; - @Pc(17) int local17; - for (@Pc(10) int local10 = arg1; local10 < arg1 + arg3; local10++) { - for (local17 = arg2; local17 < arg2 + arg4; local17++) { - if (local10 < 0 || local17 < 0 || local10 >= SceneGraph.width || local17 >= SceneGraph.length) { - return false; - } - @Pc(42) Tile local42 = SceneGraph.tiles[arg0][local10][local17]; - if (local42 != null && local42.sceneryLen >= 5) { - return false; - } - } - } - @Pc(58) Scenery local58 = new Scenery(); - local58.key = arg11; - local58.level = arg0; - local58.anInt1699 = arg5; - local58.anInt1703 = arg6; - local58.anInt1706 = arg7; - local58.entity = arg8; - local58.anInt1714 = arg9; - local58.xMin = arg1; - local58.zMin = arg2; - local58.xMax = arg1 + arg3 - 1; - local58.zMax = arg2 + arg4 - 1; - @Pc(108) int local108; - for (local17 = arg1; local17 < arg1 + arg3; local17++) { - for (local108 = arg2; local108 < arg2 + arg4; local108++) { - @Pc(115) int local115 = 0; - if (local17 > arg1) { - local115++; - } - if (local17 < arg1 + arg3 - 1) { - local115 += 4; - } - if (local108 > arg2) { - local115 += 8; - } - if (local108 < arg2 + arg4 - 1) { - local115 += 2; - } - for (@Pc(141) int local141 = arg0; local141 >= 0; local141--) { - if (SceneGraph.tiles[local141][local17][local108] == null) { - SceneGraph.tiles[local141][local17][local108] = new Tile(local141, local17, local108); - } - } - @Pc(174) Tile local174 = SceneGraph.tiles[arg0][local17][local108]; - local174.scenery[local174.sceneryLen] = local58; - local174.interiorFlags[local174.sceneryLen] = local115; - local174.allInteriorFlags |= local115; - local174.sceneryLen++; - if (local6 && SceneGraph.anIntArrayArray11[local17][local108] != 0) { - local8 = SceneGraph.anIntArrayArray11[local17][local108]; - } - } - } - if (local6 && local8 != 0) { - for (local17 = arg1; local17 < arg1 + arg3; local17++) { - for (local108 = arg2; local108 < arg2 + arg4; local108++) { - if (SceneGraph.anIntArrayArray11[local17][local108] == 0) { - SceneGraph.anIntArrayArray11[local17][local108] = local8; - } - } - } - } - if (arg10) { - SceneGraph.scenery[SceneGraph.sceneryLen++] = local58; - } - return true; - } -} diff --git a/client/src/main/java/rt4/Static107.java b/client/src/main/java/rt4/Static107.java deleted file mode 100644 index fa1da06..0000000 --- a/client/src/main/java/rt4/Static107.java +++ /dev/null @@ -1,10 +0,0 @@ -package rt4; - -import org.openrs2.deob.annotation.OriginalMember; - -public final class Static107 { - - @OriginalMember(owner = "client!id", name = "b", descriptor = "I") - public static int anInt2875 = -1; - -} diff --git a/client/src/main/java/rt4/Static109.java b/client/src/main/java/rt4/Static109.java deleted file mode 100644 index a45abc4..0000000 --- a/client/src/main/java/rt4/Static109.java +++ /dev/null @@ -1,16 +0,0 @@ -package rt4; - -import org.openrs2.deob.annotation.OriginalMember; - -public final class Static109 { - - @OriginalMember(owner = "client!ig", name = "b", descriptor = "I") - public static int anInt2882; - - @OriginalMember(owner = "client!ig", name = "f", descriptor = "I") - public static int anInt2884; - - @OriginalMember(owner = "client!ig", name = "i", descriptor = "I") - public static int anInt2886; - -} diff --git a/client/src/main/java/rt4/Static111.java b/client/src/main/java/rt4/Static111.java deleted file mode 100644 index 2b0a87f..0000000 --- a/client/src/main/java/rt4/Static111.java +++ /dev/null @@ -1,51 +0,0 @@ -package rt4; - -import org.openrs2.deob.annotation.OriginalArg; -import org.openrs2.deob.annotation.OriginalMember; - -public final class Static111 { - - @OriginalMember(owner = "client!ii", name = "a", descriptor = "(Lclient!be;III)V") - public static void method2291(@OriginalArg(0) Component arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2) { - if (arg0.xMode == 0) { - arg0.y = arg0.baseY; - } else if (arg0.xMode == 1) { - arg0.y = (arg1 - arg0.height) / 2 + arg0.baseY; - } else if (arg0.xMode == 2) { - arg0.y = arg1 - arg0.height - arg0.baseY; - } else if (arg0.xMode == 3) { - arg0.y = arg0.baseY * arg1 >> 14; - } else if (arg0.xMode == 4) { - arg0.y = (arg1 * arg0.baseY >> 14) + (arg1 - arg0.height) / 2; - } else { - arg0.y = arg1 - (arg1 * arg0.baseY >> 14) - arg0.height; - } - if (arg0.yMode == 0) { - arg0.x = arg0.baseX; - } else if (arg0.yMode == 1) { - arg0.x = arg0.baseX + (arg2 - arg0.width) / 2; - } else if (arg0.yMode == 2) { - arg0.x = arg2 - arg0.baseX - arg0.width; - } else if (arg0.yMode == 3) { - arg0.x = arg0.baseX * arg2 >> 14; - } else if (arg0.yMode == 4) { - arg0.x = (arg0.baseX * arg2 >> 14) + (arg2 - arg0.width) / 2; - } else { - arg0.x = arg2 - (arg2 * arg0.baseX >> 14) - arg0.width; - } - if (!Static121.qaOpTest || InterfaceList.getServerActiveProperties(arg0).events == 0 && arg0.type != 0) { - return; - } - if (arg0.y < 0) { - arg0.y = 0; - } else if (arg0.height + arg0.y > arg1) { - arg0.y = arg1 - arg0.height; - } - if (arg0.x < 0) { - arg0.x = 0; - } else if (arg2 < arg0.x + arg0.width) { - arg0.x = arg2 - arg0.width; - } - } - -} diff --git a/client/src/main/java/rt4/Static112.java b/client/src/main/java/rt4/Static112.java index 5c68768..2382e37 100644 --- a/client/src/main/java/rt4/Static112.java +++ b/client/src/main/java/rt4/Static112.java @@ -7,27 +7,33 @@ public final class Static112 { @OriginalMember(owner = "client!hd", name = "e", descriptor = "Lclient!qf;") public static Sprite aClass3_Sub2_Sub1_6; + @OriginalMember(owner = "client!d", name = "ib", descriptor = "Lclient!qf;") + public static Sprite aClass3_Sub2_Sub1_1; + @OriginalMember(owner = "client!oi", name = "h", descriptor = "Lclient!qf;") + public static Sprite aClass3_Sub2_Sub1_9; + @OriginalMember(owner = "client!qi", name = "z", descriptor = "Lclient!qf;") + public static Sprite aClass3_Sub2_Sub1_10; @OriginalMember(owner = "client!ij", name = "a", descriptor = "(B)V") public static void method2297() { - @Pc(3) int local3 = Static183.anInt4271; - @Pc(9) int local9 = Static229.anInt5138; - @Pc(11) int local11 = Static13.anInt436; - @Pc(13) int local13 = Static24.anInt761; - if (Static39.aClass3_Sub2_Sub1_1 == null || Static181.aClass3_Sub2_Sub1_9 == null) { + @Pc(3) int local3 = InterfaceList.anInt4271; + @Pc(9) int local9 = InterfaceList.anInt5138; + @Pc(11) int local11 = InterfaceList.anInt436; + @Pc(13) int local13 = InterfaceList.anInt761; + if (aClass3_Sub2_Sub1_1 == null || aClass3_Sub2_Sub1_9 == null) { if (client.js5Archive8.isFileReady(Static40.anInt1736) && client.js5Archive8.isFileReady(Static40.anInt4073)) { - Static39.aClass3_Sub2_Sub1_1 = SoftwareSprite.loadSoftwareAlphaSprite(client.js5Archive8, Static40.anInt1736); - Static181.aClass3_Sub2_Sub1_9 = SoftwareSprite.loadSoftwareAlphaSprite(client.js5Archive8, Static40.anInt4073); + aClass3_Sub2_Sub1_1 = SoftwareSprite.loadSoftwareAlphaSprite(client.js5Archive8, Static40.anInt1736); + aClass3_Sub2_Sub1_9 = SoftwareSprite.loadSoftwareAlphaSprite(client.js5Archive8, Static40.anInt4073); if (GlRenderer.enabled) { - if (Static39.aClass3_Sub2_Sub1_1 instanceof SoftwareAlphaSprite) { - Static39.aClass3_Sub2_Sub1_1 = new GlAlphaSprite((SoftwareSprite) Static39.aClass3_Sub2_Sub1_1); + if (aClass3_Sub2_Sub1_1 instanceof SoftwareAlphaSprite) { + aClass3_Sub2_Sub1_1 = new GlAlphaSprite((SoftwareSprite) aClass3_Sub2_Sub1_1); } else { - Static39.aClass3_Sub2_Sub1_1 = new GlSprite((SoftwareSprite) Static39.aClass3_Sub2_Sub1_1); + aClass3_Sub2_Sub1_1 = new GlSprite((SoftwareSprite) aClass3_Sub2_Sub1_1); } - if (Static181.aClass3_Sub2_Sub1_9 instanceof SoftwareAlphaSprite) { - Static181.aClass3_Sub2_Sub1_9 = new GlAlphaSprite((SoftwareSprite) Static181.aClass3_Sub2_Sub1_9); + if (aClass3_Sub2_Sub1_9 instanceof SoftwareAlphaSprite) { + aClass3_Sub2_Sub1_9 = new GlAlphaSprite((SoftwareSprite) aClass3_Sub2_Sub1_9); } else { - Static181.aClass3_Sub2_Sub1_9 = new GlSprite((SoftwareSprite) Static181.aClass3_Sub2_Sub1_9); + aClass3_Sub2_Sub1_9 = new GlSprite((SoftwareSprite) aClass3_Sub2_Sub1_9); } } } else if (GlRenderer.enabled) { @@ -38,13 +44,13 @@ public final class Static112 { } @Pc(112) int local112; @Pc(114) int local114; - if (Static39.aClass3_Sub2_Sub1_1 != null && Static181.aClass3_Sub2_Sub1_9 != null) { - local112 = local13 / Static39.aClass3_Sub2_Sub1_1.width; + if (aClass3_Sub2_Sub1_1 != null && aClass3_Sub2_Sub1_9 != null) { + local112 = local13 / aClass3_Sub2_Sub1_1.width; for (local114 = 0; local114 < local112; local114++) { - Static39.aClass3_Sub2_Sub1_1.render(local114 * Static39.aClass3_Sub2_Sub1_1.width + local3, local9); + aClass3_Sub2_Sub1_1.render(local114 * aClass3_Sub2_Sub1_1.width + local3, local9); } - Static181.aClass3_Sub2_Sub1_9.render(local3, local9); - Static181.aClass3_Sub2_Sub1_9.renderHorizontalFlip(local3 + local13 - Static181.aClass3_Sub2_Sub1_9.width, local9); + aClass3_Sub2_Sub1_9.render(local3, local9); + aClass3_Sub2_Sub1_9.renderHorizontalFlip(local3 + local13 - aClass3_Sub2_Sub1_9.width, local9); } Fonts.b12Full.renderLeft(LocalizedText.CHOOSE_OPTION, local3 + 3, local9 + 14, Static40.anInt4581, -1); if (GlRenderer.enabled) { @@ -66,10 +72,10 @@ public final class Static112 { } } } - if ((Static165.aClass3_Sub2_Sub1_8 == null || aClass3_Sub2_Sub1_6 == null || Static204.aClass3_Sub2_Sub1_10 == null) && client.js5Archive8.isFileReady(Static40.anInt2261) && client.js5Archive8.isFileReady(Static40.anInt3324) && client.js5Archive8.isFileReady(Static40.anInt5556)) { + if ((Static165.aClass3_Sub2_Sub1_8 == null || aClass3_Sub2_Sub1_6 == null || aClass3_Sub2_Sub1_10 == null) && client.js5Archive8.isFileReady(Static40.anInt2261) && client.js5Archive8.isFileReady(Static40.anInt3324) && client.js5Archive8.isFileReady(Static40.anInt5556)) { Static165.aClass3_Sub2_Sub1_8 = SoftwareSprite.loadSoftwareAlphaSprite(client.js5Archive8, Static40.anInt2261); aClass3_Sub2_Sub1_6 = SoftwareSprite.loadSoftwareAlphaSprite(client.js5Archive8, Static40.anInt3324); - Static204.aClass3_Sub2_Sub1_10 = SoftwareSprite.loadSoftwareAlphaSprite(client.js5Archive8, Static40.anInt5556); + aClass3_Sub2_Sub1_10 = SoftwareSprite.loadSoftwareAlphaSprite(client.js5Archive8, Static40.anInt5556); if (GlRenderer.enabled) { if (Static165.aClass3_Sub2_Sub1_8 instanceof SoftwareAlphaSprite) { Static165.aClass3_Sub2_Sub1_8 = new GlAlphaSprite((SoftwareSprite) Static165.aClass3_Sub2_Sub1_8); @@ -81,15 +87,15 @@ public final class Static112 { } else { aClass3_Sub2_Sub1_6 = new GlSprite((SoftwareSprite) aClass3_Sub2_Sub1_6); } - if (Static204.aClass3_Sub2_Sub1_10 instanceof SoftwareAlphaSprite) { - Static204.aClass3_Sub2_Sub1_10 = new GlAlphaSprite((SoftwareSprite) Static204.aClass3_Sub2_Sub1_10); + if (aClass3_Sub2_Sub1_10 instanceof SoftwareAlphaSprite) { + aClass3_Sub2_Sub1_10 = new GlAlphaSprite((SoftwareSprite) aClass3_Sub2_Sub1_10); } else { - Static204.aClass3_Sub2_Sub1_10 = new GlSprite((SoftwareSprite) Static204.aClass3_Sub2_Sub1_10); + aClass3_Sub2_Sub1_10 = new GlSprite((SoftwareSprite) aClass3_Sub2_Sub1_10); } } } @Pc(418) int local418; - if (Static165.aClass3_Sub2_Sub1_8 != null && aClass3_Sub2_Sub1_6 != null && Static204.aClass3_Sub2_Sub1_10 != null) { + if (Static165.aClass3_Sub2_Sub1_8 != null && aClass3_Sub2_Sub1_6 != null && aClass3_Sub2_Sub1_10 != null) { local203 = local13 / Static165.aClass3_Sub2_Sub1_8.width; for (local219 = 0; local219 < local203; local219++) { Static165.aClass3_Sub2_Sub1_8.render(local3 + Static165.aClass3_Sub2_Sub1_8.width * local219, local11 + local9 + -Static165.aClass3_Sub2_Sub1_8.height); @@ -99,8 +105,8 @@ public final class Static112 { aClass3_Sub2_Sub1_6.render(local3, local9 + local418 * aClass3_Sub2_Sub1_6.height + 20); aClass3_Sub2_Sub1_6.renderHorizontalFlip(local3 + local13 - aClass3_Sub2_Sub1_6.width, local9 + 20 + local418 * aClass3_Sub2_Sub1_6.height); } - Static204.aClass3_Sub2_Sub1_10.render(local3, local11 + local9 - Static204.aClass3_Sub2_Sub1_10.height); - Static204.aClass3_Sub2_Sub1_10.renderHorizontalFlip(local3 + local13 - Static204.aClass3_Sub2_Sub1_10.width, local9 - -local11 + -Static204.aClass3_Sub2_Sub1_10.height); + aClass3_Sub2_Sub1_10.render(local3, local11 + local9 - aClass3_Sub2_Sub1_10.height); + aClass3_Sub2_Sub1_10.renderHorizontalFlip(local3 + local13 - aClass3_Sub2_Sub1_10.width, local9 - -local11 + -aClass3_Sub2_Sub1_10.height); } for (local203 = 0; local203 < MiniMenu.size; local203++) { local219 = (MiniMenu.size - local203 - 1) * 15 + local9 + 35; @@ -110,7 +116,7 @@ public final class Static112 { } Fonts.b12Full.renderLeft(MiniMenu.getOp(local203), local3 + 3, local219, local418, 0); } - Static121.method2407(Static183.anInt4271, Static229.anInt5138, Static13.anInt436, Static24.anInt761); + Static121.method2407(InterfaceList.anInt4271, InterfaceList.anInt5138, InterfaceList.anInt436, InterfaceList.anInt761); } } diff --git a/client/src/main/java/rt4/Static113.java b/client/src/main/java/rt4/Static113.java deleted file mode 100644 index c4aa993..0000000 --- a/client/src/main/java/rt4/Static113.java +++ /dev/null @@ -1,23 +0,0 @@ -package rt4; - -import org.openrs2.deob.annotation.OriginalArg; -import org.openrs2.deob.annotation.OriginalMember; -import org.openrs2.deob.annotation.Pc; - -public final class Static113 { - - @OriginalMember(owner = "client!il", name = "O", descriptor = "I") - public static int anInt4612; - - @OriginalMember(owner = "client!il", name = "a", descriptor = "(BII)Z") - public static boolean method3557(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) { - if (arg1 == 11) { - arg1 = 10; - } - if (arg1 >= 5 && arg1 <= 8) { - arg1 = 4; - } - @Pc(30) LocType local30 = LocTypeList.get(arg0); - return local30.isReady(arg1); - } -} diff --git a/client/src/main/java/rt4/Static114.java b/client/src/main/java/rt4/Static114.java index 8ca9bb6..3b002f7 100644 --- a/client/src/main/java/rt4/Static114.java +++ b/client/src/main/java/rt4/Static114.java @@ -22,7 +22,7 @@ public final class Static114 { SoftwareRaster.drawRect(6, 6, local24 + 8, 4 + 4 + local31, 16777215); } Fonts.p12Full.method2852(arg1, 10, 10, local24, local31, 16777215, -1, 1, 1, 0); - Static133.method4012(6, local24 + 8, 6, local31 + 4 + 4); + InterfaceList.method4012(6, local24 + 8, 6, local31 + 4 + 4); if (!arg0) { Static121.method2407(10, 10, local31, local24); } else if (GlRenderer.enabled) { diff --git a/client/src/main/java/rt4/Static115.java b/client/src/main/java/rt4/Static115.java deleted file mode 100644 index 4952528..0000000 --- a/client/src/main/java/rt4/Static115.java +++ /dev/null @@ -1,115 +0,0 @@ -package rt4; - -import org.openrs2.deob.annotation.OriginalArg; -import org.openrs2.deob.annotation.OriginalMember; -import org.openrs2.deob.annotation.Pc; - -public final class Static115 { - - @OriginalMember(owner = "client!ja", name = "f", descriptor = "Lclient!ih;") - public static final LinkedList mediumPriorityRequests = new LinkedList(); - - @OriginalMember(owner = "client!ja", name = "r", descriptor = "I") - public static int anInt2941 = -1; - - @OriginalMember(owner = "client!ja", name = "s", descriptor = "Lclient!na;") - public static final JagString HTTP_PROTOCOL = JagString.parse("http:)4)4"); - @OriginalMember(owner = "client!od", name = "g", descriptor = "S") - public static short aShort25 = 256; - @OriginalMember(owner = "client!an", name = "db", descriptor = "S") - public static short aShort9 = 205; - @OriginalMember(owner = "client!mc", name = "tb", descriptor = "S") - public static short aShort22 = 1; - @OriginalMember(owner = "client!ac", name = "k", descriptor = "S") - public static short aShort1 = 32767; - @OriginalMember(owner = "client!nc", name = "n", descriptor = "I") - public static int anInt4055 = 0; - @OriginalMember(owner = "client!tm", name = "i", descriptor = "I") - public static int anInt5377 = 0; - @OriginalMember(owner = "client!bn", name = "eb", descriptor = "I") - public static int anInt773 = 0; - @OriginalMember(owner = "client!ah", name = "n", descriptor = "I") - public static int anInt983 = 0; - @OriginalMember(owner = "client!sc", name = "p", descriptor = "I") - public static int anInt5029 = 0; - @OriginalMember(owner = "client!kd", name = "yb", descriptor = "S") - public static short aShort21 = 32767; - @OriginalMember(owner = "client!ee", name = "f", descriptor = "S") - public static short aShort12 = 1; - - @OriginalMember(owner = "client!ja", name = "a", descriptor = "(IIIIB)V") - public static void method2310(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) { - if (Cross.type == 1) { - Sprites.crosses[Cross.milliseconds / 100].render(Cross.x - 8, Cross.y + -8); - } - if (Cross.type == 2) { - Sprites.crosses[Cross.milliseconds / 100 + 4].render(Cross.x - 8, Cross.y + -8); - } - Player.setTutorialIsland(); - } - - @OriginalMember(owner = "client!ja", name = "a", descriptor = "(IIIIIZ)V") - public static void method2314(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) boolean arg4) { - if (arg0 < 1) { - arg0 = 1; - } - if (arg2 < 1) { - arg2 = 1; - } - if (GlRenderer.enabled) { - @Pc(25) int local25 = arg2 - 334; - if (local25 < 0) { - local25 = 0; - } else if (local25 > 100) { - local25 = 100; - } - @Pc(51) int local51 = local25 * (aShort9 - aShort25) / 100 + aShort25; - if (aShort22 > local51) { - local51 = aShort22; - } else if (aShort1 < local51) { - local51 = aShort1; - } - @Pc(73) int local73 = local51 * arg2 * 512 / (arg0 * 334); - @Pc(115) int local115; - @Pc(122) int local122; - @Pc(86) short local86; - if (local73 < aShort12) { - local86 = aShort12; - local51 = arg0 * 334 * local86 / (arg2 * 512); - if (aShort1 < local51) { - local51 = aShort1; - local115 = arg2 * 512 * local51 / (local86 * 334); - local122 = (arg0 - local115) / 2; - if (arg4) { - GlRaster.method1177(); - GlRaster.method1186(arg3, arg1, local122, arg2, 0); - GlRaster.method1186(arg0 + arg3 - local122, arg1, local122, arg2, 0); - } - arg3 += local122; - arg0 -= local122 * 2; - } - } else if (aShort21 < local73) { - local86 = aShort21; - local51 = local86 * arg0 * 334 / (arg2 * 512); - if (aShort22 > local51) { - local51 = aShort22; - local115 = local86 * arg0 * 334 / (local51 * 512); - local122 = (arg2 - local115) / 2; - if (arg4) { - GlRaster.method1177(); - GlRaster.method1186(arg3, arg1, arg0, local122, 0); - GlRaster.method1186(arg3, arg1 + arg2 - local122, arg0, local122, 0); - } - arg2 -= local122 * 2; - arg1 += local122; - } - } - anInt5029 = local51 * arg2 / 334; - } - anInt4055 = (short) arg0; - anInt5377 = (short) arg2; - anInt773 = arg1; - anInt983 = arg3; - } - -} diff --git a/client/src/main/java/rt4/Static118.java b/client/src/main/java/rt4/Static118.java deleted file mode 100644 index 218a060..0000000 --- a/client/src/main/java/rt4/Static118.java +++ /dev/null @@ -1,78 +0,0 @@ -package rt4; - -import org.openrs2.deob.annotation.OriginalArg; -import org.openrs2.deob.annotation.OriginalMember; -import org.openrs2.deob.annotation.Pc; - -public final class Static118 { - - @OriginalMember(owner = "client!jd", name = "i", descriptor = "Lclient!be;") - public static Component clickedInventoryComponent; - - @OriginalMember(owner = "client!jd", name = "a", descriptor = "(II[Lclient!be;)V") - public static void method2354(@OriginalArg(1) int arg0, @OriginalArg(2) Component[] arg1) { - for (@Pc(7) int local7 = 0; local7 < arg1.length; local7++) { - @Pc(15) Component local15 = arg1[local7]; - if (local15 != null && local15.layer == arg0 && (!local15.if3 || !Static36.method947(local15))) { - if (local15.type == 0) { - if (!local15.if3 && Static36.method947(local15) && local15 != Static180.aClass13_22) { - continue; - } - method2354(local15.id, arg1); - if (local15.createdComponents != null) { - method2354(local15.id, local15.createdComponents); - } - @Pc(73) ComponentPointer local73 = (ComponentPointer) InterfaceList.openInterfaces.get((long) local15.id); - if (local73 != null) { - Static96.method1949(local73.anInt5878); - } - } - if (local15.type == 6) { - @Pc(105) int local105; - if (local15.modelSeqId != -1 || local15.anInt462 != -1) { - @Pc(100) boolean local100 = Static154.method2926(local15); - if (local100) { - local105 = local15.anInt462; - } else { - local105 = local15.modelSeqId; - } - if (local105 != -1) { - @Pc(118) SeqType local118 = SeqTypeList.get(local105); - if (local118 != null) { - local15.anInt500 += Static178.anInt4247; - while (local15.anInt500 > local118.anIntArray474[local15.anInt510]) { - local15.anInt500 -= local118.anIntArray474[local15.anInt510]; - local15.anInt510++; - if (local118.frames.length <= local15.anInt510) { - local15.anInt510 -= local118.anInt5362; - if (local15.anInt510 < 0 || local118.frames.length <= local15.anInt510) { - local15.anInt510 = 0; - } - } - local15.anInt496 = local15.anInt510 + 1; - if (local118.frames.length <= local15.anInt496) { - local15.anInt496 -= local118.anInt5362; - if (local15.anInt496 < 0 || local118.frames.length <= local15.anInt496) { - local15.anInt496 = -1; - } - } - InterfaceList.redraw(local15); - } - } - } - } - if (local15.modelRotationSpeed != 0 && !local15.if3) { - @Pc(239) int local239 = local15.modelRotationSpeed >> 16; - @Pc(243) int local243 = local239 * Static178.anInt4247; - local105 = local15.modelRotationSpeed << 16 >> 16; - local15.modelXAngle = local243 + local15.modelXAngle & 0x7FF; - local105 *= Static178.anInt4247; - local15.modelYAngle = local15.modelYAngle + local105 & 0x7FF; - InterfaceList.redraw(local15); - } - } - } - } - } - -} diff --git a/client/src/main/java/rt4/Static119.java b/client/src/main/java/rt4/Static119.java deleted file mode 100644 index 9592c08..0000000 --- a/client/src/main/java/rt4/Static119.java +++ /dev/null @@ -1,10 +0,0 @@ -package rt4; - -import org.openrs2.deob.annotation.OriginalMember; - -public final class Static119 { - - @OriginalMember(owner = "client!je", name = "eb", descriptor = "[I") - public static int[] anIntArray282; - -} diff --git a/client/src/main/java/rt4/Static123.java b/client/src/main/java/rt4/Static123.java index dd0c9d3..aad342d 100644 --- a/client/src/main/java/rt4/Static123.java +++ b/client/src/main/java/rt4/Static123.java @@ -5,7 +5,9 @@ import org.openrs2.deob.annotation.Pc; public final class Static123 { - @OriginalMember(owner = "client!jj", name = "e", descriptor = "I") + @OriginalMember(owner = "client!qk", name = "b", descriptor = "Lclient!na;") + public static final JagString aClass100_900 = JagString.parse("tbrefresh"); + @OriginalMember(owner = "client!jj", name = "e", descriptor = "I") public static int anInt3058 = 0; @OriginalMember(owner = "client!jj", name = "j", descriptor = "Z") @@ -13,12 +15,22 @@ public final class Static123 { @OriginalMember(owner = "client!ml", name = "K", descriptor = "I") public static int anInt3947; + @OriginalMember(owner = "client!k", name = "l", descriptor = "[I") + public static int[] anIntArray292; + @OriginalMember(owner = "client!ta", name = "o", descriptor = "[I") + public static int[] anIntArray454; + @OriginalMember(owner = "client!nd", name = "s", descriptor = "I") + public static int anInt4069; + @OriginalMember(owner = "client!qk", name = "c", descriptor = "[I") + public static int[] anIntArray427; + @OriginalMember(owner = "client!lj", name = "B", descriptor = "I") + public static int anInt3555; @OriginalMember(owner = "client!jj", name = "a", descriptor = "(Z)V") public static void topBannerRefresh() { if (!client.advertSuppressed && client.modeWhere != 2) { try { - Static206.aClass100_900.browserControlCall(client.instance); + aClass100_900.browserControlCall(client.instance); } catch (@Pc(26) Throwable local26) { } } @@ -32,7 +44,7 @@ public final class Static123 { @Pc(14) int local14; if (Static8.anIntArray8 != null) { for (local14 = 0; local14 < Static8.anIntArray8.length; local14++) { - if (Static8.anIntArray8[local14] != -1000000 && (local10.anInt4444 <= Static8.anIntArray8[local14] || local10.anInt4447 <= Static8.anIntArray8[local14]) && (local10.anInt4460 <= Static96.anIntArray234[local14] || local10.anInt4445 <= Static96.anIntArray234[local14]) && (local10.anInt4460 >= Static127.anIntArray292[local14] || local10.anInt4445 >= Static127.anIntArray292[local14]) && (local10.anInt4458 <= Static234.anIntArray454[local14] || local10.anInt4449 <= Static234.anIntArray454[local14]) && (local10.anInt4458 >= Static206.anIntArray427[local14] || local10.anInt4449 >= Static206.anIntArray427[local14])) { + if (Static8.anIntArray8[local14] != -1000000 && (local10.anInt4444 <= Static8.anIntArray8[local14] || local10.anInt4447 <= Static8.anIntArray8[local14]) && (local10.anInt4460 <= Static96.anIntArray234[local14] || local10.anInt4445 <= Static96.anIntArray234[local14]) && (local10.anInt4460 >= anIntArray292[local14] || local10.anInt4445 >= anIntArray292[local14]) && (local10.anInt4458 <= anIntArray454[local14] || local10.anInt4449 <= anIntArray454[local14]) && (local10.anInt4458 >= anIntArray427[local14] || local10.anInt4449 >= anIntArray427[local14])) { continue label194; } } @@ -42,7 +54,7 @@ public final class Static123 { @Pc(158) int local158; @Pc(137) boolean local137; if (local10.anInt4453 == 1) { - local14 = local10.anInt4452 + SceneGraph.visibility - Static167.anInt4069; + local14 = local10.anInt4452 + SceneGraph.visibility - anInt4069; if (local14 >= 0 && local14 <= SceneGraph.visibility + SceneGraph.visibility) { local115 = local10.anInt4461 + SceneGraph.visibility - Static193.anInt4539; if (local115 < 0) { @@ -60,7 +72,7 @@ public final class Static123 { } } if (local137) { - local158 = Static149.anInt3555 - local10.anInt4460; + local158 = anInt3555 - local10.anInt4460; if (local158 > 32) { local10.anInt4462 = 1; } else { @@ -80,11 +92,11 @@ public final class Static123 { } else if (local10.anInt4453 == 2) { local14 = local10.anInt4461 + SceneGraph.visibility - Static193.anInt4539; if (local14 >= 0 && local14 <= SceneGraph.visibility + SceneGraph.visibility) { - local115 = local10.anInt4452 + SceneGraph.visibility - Static167.anInt4069; + local115 = local10.anInt4452 + SceneGraph.visibility - anInt4069; if (local115 < 0) { local115 = 0; } - local126 = local10.anInt4446 + SceneGraph.visibility - Static167.anInt4069; + local126 = local10.anInt4446 + SceneGraph.visibility - anInt4069; if (local126 > SceneGraph.visibility + SceneGraph.visibility) { local126 = SceneGraph.visibility + SceneGraph.visibility; } @@ -106,8 +118,8 @@ public final class Static123 { local10.anInt4462 = 4; local158 = -local158; } - local10.anInt4448 = (local10.anInt4460 - Static149.anInt3555 << 8) / local158; - local10.anInt4456 = (local10.anInt4445 - Static149.anInt3555 << 8) / local158; + local10.anInt4448 = (local10.anInt4460 - anInt3555 << 8) / local158; + local10.anInt4456 = (local10.anInt4445 - anInt3555 << 8) / local158; local10.anInt4459 = (local10.anInt4444 - anInt3947 << 8) / local158; local10.anInt4463 = (local10.anInt4447 - anInt3947 << 8) / local158; SceneGraph.aClass120Array2[SceneGraph.anInt4870++] = local10; @@ -125,11 +137,11 @@ public final class Static123 { local126 = SceneGraph.visibility + SceneGraph.visibility; } if (local115 <= local126) { - @Pc(408) int local408 = local10.anInt4452 + SceneGraph.visibility - Static167.anInt4069; + @Pc(408) int local408 = local10.anInt4452 + SceneGraph.visibility - anInt4069; if (local408 < 0) { local408 = 0; } - local158 = local10.anInt4446 + SceneGraph.visibility - Static167.anInt4069; + local158 = local10.anInt4446 + SceneGraph.visibility - anInt4069; if (local158 > SceneGraph.visibility + SceneGraph.visibility) { local158 = SceneGraph.visibility + SceneGraph.visibility; } @@ -144,8 +156,8 @@ public final class Static123 { } if (local430) { local10.anInt4462 = 5; - local10.anInt4448 = (local10.anInt4460 - Static149.anInt3555 << 8) / local14; - local10.anInt4456 = (local10.anInt4445 - Static149.anInt3555 << 8) / local14; + local10.anInt4448 = (local10.anInt4460 - anInt3555 << 8) / local14; + local10.anInt4456 = (local10.anInt4445 - anInt3555 << 8) / local14; local10.anInt4454 = (local10.anInt4458 - Static217.anInt4903 << 8) / local14; local10.anInt4450 = (local10.anInt4449 - Static217.anInt4903 << 8) / local14; SceneGraph.aClass120Array2[SceneGraph.anInt4870++] = local10; diff --git a/client/src/main/java/rt4/Static126.java b/client/src/main/java/rt4/Static126.java index 75675e8..187be8e 100644 --- a/client/src/main/java/rt4/Static126.java +++ b/client/src/main/java/rt4/Static126.java @@ -5,6 +5,11 @@ import org.openrs2.deob.annotation.Pc; public final class Static126 { + @OriginalMember(owner = "client!sc", name = "z", descriptor = "[Z") + public static final boolean[] aBooleanArray116 = new boolean[100]; + @OriginalMember(owner = "client!rg", name = "s", descriptor = "I") + public static int anInt5574 = -1; + @OriginalMember(owner = "client!jm", name = "a", descriptor = "(Z)V") public static void method2460() { if (InterfaceList.topLevelInterface != -1) { @@ -14,16 +19,16 @@ public final class Static126 { if (InterfaceList.aBooleanArray100[local15]) { InterfaceList.rectangleRedraw[local15] = true; } - Static223.aBooleanArray116[local15] = InterfaceList.aBooleanArray100[local15]; + aBooleanArray116[local15] = InterfaceList.aBooleanArray100[local15]; InterfaceList.aBooleanArray100[local15] = false; } - Static97.anInt2503 = -1; - Static169.mouseOverInventoryInterface = null; + Static87.anInt2503 = -1; + InterfaceList.mouseOverInventoryInterface = null; Static182.anInt4311 = client.loop; if (GlRenderer.enabled) { - Static263.aBoolean299 = true; + ScriptRunner.aBoolean299 = true; } - Static214.anInt5574 = -1; + anInt5574 = -1; if (InterfaceList.topLevelInterface != -1) { InterfaceList.rectangles = 0; Static9.method182(); @@ -33,6 +38,6 @@ public final class Static126 { } else { SoftwareRaster.method2503(); } - Static178.anInt4247 = 0; + Protocol.anInt4247 = 0; } } diff --git a/client/src/main/java/rt4/Static127.java b/client/src/main/java/rt4/Static127.java deleted file mode 100644 index dbfa5f6..0000000 --- a/client/src/main/java/rt4/Static127.java +++ /dev/null @@ -1,163 +0,0 @@ -package rt4; - -import org.openrs2.deob.annotation.OriginalArg; -import org.openrs2.deob.annotation.OriginalMember; -import org.openrs2.deob.annotation.Pc; - -public final class Static127 { - - @OriginalMember(owner = "client!hh", name = "a", descriptor = "Lclient!na;") - public static final JagString aClass100_520 = JagString.parse("(U4"); - @OriginalMember(owner = "client!mj", name = "g", descriptor = "Lclient!na;") - public static final JagString aClass100_761 = JagString.parse("(U3"); - @OriginalMember(owner = "client!wh", name = "u", descriptor = "Lclient!na;") - public static final JagString aClass100_1097 = JagString.parse("(U2"); - @OriginalMember(owner = "client!bm", name = "p", descriptor = "Lclient!na;") - public static final JagString aClass100_133 = JagString.parse("(U1"); - @OriginalMember(owner = "client!tb", name = "P", descriptor = "Lclient!na;") - public static final JagString aClass100_1002 = JagString.parse("(U5"); - @OriginalMember(owner = "client!jh", name = "g", descriptor = "Lclient!na;") - public static final JagString aClass100_591 = JagString.parse("(Udns"); - @OriginalMember(owner = "client!dm", name = "n", descriptor = "Lclient!na;") - public static final JagString PERCENT_SIGN = JagString.parse("(U"); - @OriginalMember(owner = "client!k", name = "j", descriptor = "I") - public static int anInt3126; - - @OriginalMember(owner = "client!k", name = "l", descriptor = "[I") - public static int[] anIntArray292; - - @OriginalMember(owner = "client!k", name = "m", descriptor = "Z") - public static boolean neverRemoveRoofs = false; - - @OriginalMember(owner = "client!we", name = "a", descriptor = "(BILclient!be;)I") - public static int method3212(@OriginalArg(1) int arg0, @OriginalArg(2) Component arg1) { - if (arg1.anIntArrayArray4 == null || arg0 >= arg1.anIntArrayArray4.length) { - return -2; - } - try { - @Pc(33) int[] local33 = arg1.anIntArrayArray4[arg0]; - @Pc(35) byte local35 = 0; - @Pc(37) int local37 = 0; - @Pc(39) int local39 = 0; - while (true) { - @Pc(41) int local41 = 0; - @Pc(46) int local46 = local33[local39++]; - @Pc(48) byte local48 = 0; - if (local46 == 0) { - return local37; - } - if (local46 == 15) { - local48 = 1; - } - if (local46 == 16) { - local48 = 2; - } - if (local46 == 1) { - local41 = PlayerSkillXpTable.boostedLevels[local33[local39++]]; - } - if (local46 == 17) { - local48 = 3; - } - if (local46 == 2) { - local41 = PlayerSkillXpTable.baseLevels[local33[local39++]]; - } - if (local46 == 3) { - local41 = PlayerSkillXpTable.experience[local33[local39++]]; - } - @Pc(124) int local124; - @Pc(135) Component local135; - @Pc(140) int local140; - @Pc(152) int local152; - if (local46 == 4) { - local124 = local33[local39++] << 16; - @Pc(131) int local131 = local124 + local33[local39++]; - local135 = InterfaceList.getComponent(local131); - local140 = local33[local39++]; - if (local140 != -1 && (!ObjTypeList.get(local140).members || LoginManager.mapMembers)) { - for (local152 = 0; local152 < local135.objTypes.length; local152++) { - if (local140 + 1 == local135.objTypes[local152]) { - local41 += local135.objCounts[local152]; - } - } - } - } - if (local46 == 5) { - local41 = VarpDomain.activeVarps[local33[local39++]]; - } - if (local46 == 6) { - local41 = PlayerSkillXpTable.xpLevelLookup[PlayerSkillXpTable.baseLevels[local33[local39++]] - 1]; - } - if (local46 == 7) { - local41 = VarpDomain.activeVarps[local33[local39++]] * 100 / 46875; - } - if (local46 == 8) { - local41 = PlayerList.self.combatLevel; - } - if (local46 == 9) { - for (local124 = 0; local124 < 25; local124++) { - if (Static182.aBooleanArray97[local124]) { - local41 += PlayerSkillXpTable.baseLevels[local124]; - } - } - } - if (local46 == 10) { - local124 = local33[local39++] << 16; - local124 += local33[local39++]; - local135 = InterfaceList.getComponent(local124); - local140 = local33[local39++]; - if (local140 != -1 && (!ObjTypeList.get(local140).members || LoginManager.mapMembers)) { - for (local152 = 0; local152 < local135.objTypes.length; local152++) { - if (local135.objTypes[local152] == local140 + 1) { - local41 = 999999999; - break; - } - } - } - } - if (local46 == 11) { - local41 = Player.runEnergy; - } - if (local46 == 12) { - local41 = Player.weight; - } - if (local46 == 13) { - local124 = VarpDomain.activeVarps[local33[local39++]]; - @Pc(353) int local353 = local33[local39++]; - local41 = (0x1 << local353 & local124) == 0 ? 0 : 1; - } - if (local46 == 14) { - local124 = local33[local39++]; - local41 = VarpDomain.getVarbit(local124); - } - if (local46 == 18) { - local41 = (PlayerList.self.xFine >> 7) + Camera.originX; - } - if (local46 == 19) { - local41 = (PlayerList.self.zFine >> 7) + Camera.originZ; - } - if (local46 == 20) { - local41 = local33[local39++]; - } - if (local48 == 0) { - if (local35 == 0) { - local37 += local41; - } - if (local35 == 1) { - local37 -= local41; - } - if (local35 == 2 && local41 != 0) { - local37 /= local41; - } - if (local35 == 3) { - local37 *= local41; - } - local35 = 0; - } else { - local35 = local48; - } - } - } catch (@Pc(464) Exception local464) { - return -1; - } - } -} diff --git a/client/src/main/java/rt4/Static13.java b/client/src/main/java/rt4/Static13.java deleted file mode 100644 index 0dadd31..0000000 --- a/client/src/main/java/rt4/Static13.java +++ /dev/null @@ -1,13 +0,0 @@ -package rt4; - -import org.openrs2.deob.annotation.OriginalMember; - -public final class Static13 { - - @OriginalMember(owner = "client!bc", name = "X", descriptor = "I") - public static int anInt436; - - @OriginalMember(owner = "client!bc", name = "Z", descriptor = "I") - public static int anInt437; - -} diff --git a/client/src/main/java/rt4/Static130.java b/client/src/main/java/rt4/Static130.java deleted file mode 100644 index 8299c32..0000000 --- a/client/src/main/java/rt4/Static130.java +++ /dev/null @@ -1,10 +0,0 @@ -package rt4; - -import org.openrs2.deob.annotation.OriginalMember; - -public final class Static130 { - - @OriginalMember(owner = "client!kc", name = "p", descriptor = "[I") - public static int[] anIntArray299; - -} diff --git a/client/src/main/java/rt4/Static131.java b/client/src/main/java/rt4/Static131.java index eb76d9c..1dcca35 100644 --- a/client/src/main/java/rt4/Static131.java +++ b/client/src/main/java/rt4/Static131.java @@ -13,35 +13,6 @@ public final class Static131 { @OriginalMember(owner = "client!kd", name = "Bb", descriptor = "I") public static int anInt3260 = -1; - @OriginalMember(owner = "client!kd", name = "a", descriptor = "([IIIII)V") - public static void method2576(@OriginalArg(0) int[] arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3) { - arg1--; - @Pc(14) int local14 = arg2 - 1; - @Pc(17) int local17 = local14 - 7; - while (local17 > arg1) { - @Pc(22) int local22 = arg1 + 1; - arg0[local22] = arg3; - @Pc(27) int local27 = local22 + 1; - arg0[local27] = arg3; - @Pc(32) int local32 = local27 + 1; - arg0[local32] = arg3; - @Pc(37) int local37 = local32 + 1; - arg0[local37] = arg3; - @Pc(42) int local42 = local37 + 1; - arg0[local42] = arg3; - @Pc(47) int local47 = local42 + 1; - arg0[local47] = arg3; - @Pc(52) int local52 = local47 + 1; - arg0[local52] = arg3; - arg1 = local52 + 1; - arg0[arg1] = arg3; - } - while (local14 > arg1) { - arg1++; - arg0[arg1] = arg3; - } - } - @OriginalMember(owner = "client!kd", name = "a", descriptor = "([[F[[II[[FI[ILclient!fj;BLclient!gi;[[FI)V") public static void method2578(@OriginalArg(0) float[][] arg0, @OriginalArg(1) int[][] arg1, @OriginalArg(2) int arg2, @OriginalArg(3) float[][] arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int[] arg5, @OriginalArg(6) Light_Class45 arg6, @OriginalArg(8) Light arg7, @OriginalArg(9) float[][] arg8, @OriginalArg(10) int arg9) { @Pc(7) int[] local7 = new int[arg5.length / 2]; diff --git a/client/src/main/java/rt4/Static132.java b/client/src/main/java/rt4/Static132.java deleted file mode 100644 index 25285fa..0000000 --- a/client/src/main/java/rt4/Static132.java +++ /dev/null @@ -1,144 +0,0 @@ -package rt4; - -import org.openrs2.deob.annotation.OriginalArg; -import org.openrs2.deob.annotation.OriginalMember; -import org.openrs2.deob.annotation.Pc; - -public final class Static132 { - - @OriginalMember(owner = "client!ke", name = "U", descriptor = "I") - public static int anInt3291 = 0; - - @OriginalMember(owner = "client!ke", name = "f", descriptor = "(B)V") - public static void method2608() { - @Pc(7) int local7 = 0; - for (@Pc(23) int local23 = 0; local23 < 104; local23++) { - for (@Pc(30) int local30 = 0; local30 < 104; local30++) { - if (Static254.method4348(true, local23, local30, SceneGraph.tiles, local7)) { - local7++; - } - if (local7 >= 512) { - return; - } - } - } - } - - @OriginalMember(owner = "client!ke", name = "a", descriptor = "(Lclient!rh;IIIIIIIZ)V") - public static void method2610(@OriginalArg(0) PlainTile arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7, @OriginalArg(8) boolean arg8) { - @Pc(6) int local6; - @Pc(7) int local7 = local6 = (arg6 << 7) - Static149.anInt3555; - @Pc(14) int local14; - @Pc(15) int local15 = local14 = (arg7 << 7) - Static217.anInt4903; - @Pc(20) int local20; - @Pc(21) int local21 = local20 = local7 + 128; - @Pc(26) int local26; - @Pc(27) int local27 = local26 = local15 + 128; - @Pc(37) int local37 = SceneGraph.tileHeights[arg1][arg6][arg7] - Static123.anInt3947; - @Pc(49) int local49 = SceneGraph.tileHeights[arg1][arg6 + 1][arg7] - Static123.anInt3947; - @Pc(63) int local63 = SceneGraph.tileHeights[arg1][arg6 + 1][arg7 + 1] - Static123.anInt3947; - @Pc(75) int local75 = SceneGraph.tileHeights[arg1][arg6][arg7 + 1] - Static123.anInt3947; - @Pc(85) int local85 = local15 * arg4 + local7 * arg5 >> 16; - @Pc(95) int local95 = local15 * arg5 - local7 * arg4 >> 16; - @Pc(97) int local97 = local85; - @Pc(107) int local107 = local37 * arg3 - local95 * arg2 >> 16; - @Pc(117) int local117 = local37 * arg2 + local95 * arg3 >> 16; - @Pc(119) int local119 = local107; - if (local117 < 50) { - return; - } - local85 = local14 * arg4 + local21 * arg5 >> 16; - @Pc(143) int local143 = local14 * arg5 - local21 * arg4 >> 16; - local21 = local85; - local85 = local49 * arg3 - local143 * arg2 >> 16; - @Pc(165) int local165 = local49 * arg2 + local143 * arg3 >> 16; - local49 = local85; - if (local165 < 50) { - return; - } - local85 = local27 * arg4 + local20 * arg5 >> 16; - local27 = local27 * arg5 - local20 * arg4 >> 16; - @Pc(193) int local193 = local85; - local85 = local63 * arg3 - local27 * arg2 >> 16; - local27 = local63 * arg2 + local27 * arg3 >> 16; - local63 = local85; - if (local27 < 50) { - return; - } - local85 = local26 * arg4 + local6 * arg5 >> 16; - @Pc(239) int local239 = local26 * arg5 - local6 * arg4 >> 16; - @Pc(241) int local241 = local85; - local85 = local75 * arg3 - local239 * arg2 >> 16; - @Pc(261) int local261 = local75 * arg2 + local239 * arg3 >> 16; - if (local261 < 50) { - return; - } - @Pc(275) int local275 = Rasteriser.centerX + (local97 << 9) / local117; - @Pc(283) int local283 = Rasteriser.centerY + (local119 << 9) / local117; - @Pc(291) int local291 = Rasteriser.centerX + (local21 << 9) / local165; - @Pc(299) int local299 = Rasteriser.centerY + (local49 << 9) / local165; - @Pc(307) int local307 = Rasteriser.centerX + (local193 << 9) / local27; - @Pc(315) int local315 = Rasteriser.centerY + (local63 << 9) / local27; - @Pc(323) int local323 = Rasteriser.centerX + (local241 << 9) / local261; - @Pc(331) int local331 = Rasteriser.centerY + (local85 << 9) / local261; - Rasteriser.alpha = 0; - @Pc(475) int local475; - if ((local307 - local323) * (local299 - local331) - (local315 - local331) * (local291 - local323) > 0) { - if (MiniMenu.aBoolean187 && Static19.method583(MiniMenu.anInt2388 + Rasteriser.centerX, MiniMenu.anInt3259 + Rasteriser.centerY, local315, local331, local299, local307, local323, local291)) { - MiniMenu.anInt1742 = arg6; - MiniMenu.anInt2954 = arg7; - } - if (!GlRenderer.enabled && !arg8) { - Rasteriser.testX = false; - if (local307 < 0 || local323 < 0 || local291 < 0 || local307 > Rasteriser.width || local323 > Rasteriser.width || local291 > Rasteriser.width) { - Rasteriser.testX = true; - } - if (arg0.anInt4869 == -1) { - if (arg0.anInt4865 != 12345678) { - Rasteriser.fillGouraudTriangle(local315, local331, local299, local307, local323, local291, arg0.anInt4865, arg0.anInt4864, arg0.anInt4867); - } - } else if (!Preferences.manyGroundTextures) { - local475 = Rasteriser.textureProvider.getAverageColor(arg0.anInt4869); - Rasteriser.fillGouraudTriangle(local315, local331, local299, local307, local323, local291, Static216.method1640(local475, arg0.anInt4865), Static216.method1640(local475, arg0.anInt4864), Static216.method1640(local475, arg0.anInt4867)); - } else if (arg0.aBoolean241) { - Rasteriser.fillTexturedTriangle(local315, local331, local299, local307, local323, local291, arg0.anInt4865, arg0.anInt4864, arg0.anInt4867, local97, local21, local241, local119, local49, local85, local117, local165, local261, arg0.anInt4869); - } else { - Rasteriser.fillTexturedTriangle(local315, local331, local299, local307, local323, local291, arg0.anInt4865, arg0.anInt4864, arg0.anInt4867, local193, local241, local21, local63, local85, local49, local27, local261, local165, arg0.anInt4869); - } - } - } - if ((local275 - local291) * (local331 - local299) - (local283 - local299) * (local323 - local291) <= 0) { - return; - } - if (MiniMenu.aBoolean187 && Static19.method583(MiniMenu.anInt2388 + Rasteriser.centerX, MiniMenu.anInt3259 + Rasteriser.centerY, local283, local299, local331, local275, local291, local323)) { - MiniMenu.anInt1742 = arg6; - MiniMenu.anInt2954 = arg7; - } - if (GlRenderer.enabled || arg8) { - return; - } - Rasteriser.testX = false; - if (local275 < 0 || local291 < 0 || local323 < 0 || local275 > Rasteriser.width || local291 > Rasteriser.width || local323 > Rasteriser.width) { - Rasteriser.testX = true; - } - if (arg0.anInt4869 == -1) { - if (arg0.anInt4872 != 12345678) { - Rasteriser.fillGouraudTriangle(local283, local299, local331, local275, local291, local323, arg0.anInt4872, arg0.anInt4867, arg0.anInt4864); - } - } else if (Preferences.manyGroundTextures) { - Rasteriser.fillTexturedTriangle(local283, local299, local331, local275, local291, local323, arg0.anInt4872, arg0.anInt4867, arg0.anInt4864, local97, local21, local241, local119, local49, local85, local117, local165, local261, arg0.anInt4869); - } else { - local475 = Rasteriser.textureProvider.getAverageColor(arg0.anInt4869); - Rasteriser.fillGouraudTriangle(local283, local299, local331, local275, local291, local323, Static216.method1640(local475, arg0.anInt4872), Static216.method1640(local475, arg0.anInt4867), Static216.method1640(local475, arg0.anInt4864)); - } - } - - @OriginalMember(owner = "client!we", name = "b", descriptor = "(BI)V") - public static void method3214(@OriginalArg(1) int arg0) { - for (@Pc(11) Node local11 = InterfaceList.properties.head(); local11 != null; local11 = InterfaceList.properties.next()) { - if ((local11.key >> 48 & 0xFFFFL) == (long) arg0) { - local11.unlink(); - } - } - } -} diff --git a/client/src/main/java/rt4/Static133.java b/client/src/main/java/rt4/Static133.java deleted file mode 100644 index 9f2a30d..0000000 --- a/client/src/main/java/rt4/Static133.java +++ /dev/null @@ -1,26 +0,0 @@ -package rt4; - -import org.openrs2.deob.annotation.OriginalArg; -import org.openrs2.deob.annotation.OriginalMember; -import org.openrs2.deob.annotation.Pc; - -public final class Static133 { - - @OriginalMember(owner = "client!kf", name = "f", descriptor = "I") - public static int anInt5230; - - @OriginalMember(owner = "client!kf", name = "d", descriptor = "[Lclient!cl;") - public static final AnimFrameset[] aClass3_Sub2_Sub7Array7 = new AnimFrameset[14]; - - @OriginalMember(owner = "client!kf", name = "l", descriptor = "I") - public static int anInt5235 = 0; - - @OriginalMember(owner = "client!kf", name = "a", descriptor = "(IIBII)V") - public static void method4012(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3) { - for (@Pc(12) int local12 = 0; local12 < InterfaceList.rectangles; local12++) { - if (InterfaceList.rectangleWidth[local12] + InterfaceList.rectangleX[local12] > arg0 && arg1 + arg0 > InterfaceList.rectangleX[local12] && arg2 < InterfaceList.rectangleHeight[local12] + InterfaceList.rectangleY[local12] && InterfaceList.rectangleY[local12] < arg2 + arg3) { - InterfaceList.aBooleanArray100[local12] = true; - } - } - } -} diff --git a/client/src/main/java/rt4/Static134.java b/client/src/main/java/rt4/Static134.java index ea3cfe5..33a40ba 100644 --- a/client/src/main/java/rt4/Static134.java +++ b/client/src/main/java/rt4/Static134.java @@ -16,11 +16,11 @@ public final class Static134 { @OriginalMember(owner = "client!kh", name = "a", descriptor = "(IIIBII)V") public static void method2622(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4) { @Pc(8) int local8 = arg2 + 1; - Static131.method2576(Static71.anIntArrayArray10[arg2], arg4, arg1, arg0); + TextureOp29SubOp4.method2576(TextureOp29SubOp4.anIntArrayArray10[arg2], arg4, arg1, arg0); @Pc(17) int local17 = arg3 - 1; - Static131.method2576(Static71.anIntArrayArray10[arg3], arg4, arg1, arg0); + TextureOp29SubOp4.method2576(TextureOp29SubOp4.anIntArrayArray10[arg3], arg4, arg1, arg0); for (@Pc(29) int local29 = local8; local29 <= local17; local29++) { - @Pc(40) int[] local40 = Static71.anIntArrayArray10[local29]; + @Pc(40) int[] local40 = TextureOp29SubOp4.anIntArrayArray10[local29]; local40[arg4] = local40[arg1] = arg0; } } diff --git a/client/src/main/java/rt4/Static138.java b/client/src/main/java/rt4/Static138.java deleted file mode 100644 index 8b3b33a..0000000 --- a/client/src/main/java/rt4/Static138.java +++ /dev/null @@ -1,55 +0,0 @@ -package rt4; - -import org.openrs2.deob.annotation.OriginalMember; - -public final class Static138 { - - @OriginalMember(owner = "client!km", name = "tc", descriptor = "Lclient!na;") - private static final JagString aClass100_641 = JagString.parse("Dec"); - - @OriginalMember(owner = "client!km", name = "vc", descriptor = "Lclient!na;") - private static final JagString aClass100_642 = JagString.parse("Jul"); - - @OriginalMember(owner = "client!km", name = "xc", descriptor = "Lclient!na;") - private static final JagString aClass100_644 = JagString.parse("May"); - - @OriginalMember(owner = "client!km", name = "yc", descriptor = "Lclient!na;") - private static final JagString aClass100_645 = JagString.parse("Nov"); - - @OriginalMember(owner = "client!km", name = "zc", descriptor = "Lclient!na;") - private static final JagString aClass100_646 = JagString.parse("Mar"); - - @OriginalMember(owner = "client!km", name = "Gc", descriptor = "Lclient!na;") - private static final JagString aClass100_649 = JagString.parse("Jan"); - - @OriginalMember(owner = "client!km", name = "Hc", descriptor = "Lclient!na;") - private static final JagString aClass100_650 = JagString.parse("Feb"); - - @OriginalMember(owner = "client!km", name = "Tc", descriptor = "Lclient!na;") - private static final JagString aClass100_655 = JagString.parse("Apr"); - - @OriginalMember(owner = "client!km", name = "Wc", descriptor = "Lclient!na;") - private static final JagString aClass100_656 = JagString.parse("Jun"); - - @OriginalMember(owner = "client!km", name = "Qc", descriptor = "Lclient!na;") - private static final JagString aClass100_653 = JagString.parse("Aug"); - - @OriginalMember(owner = "client!km", name = "cd", descriptor = "Lclient!na;") - private static final JagString aClass100_657 = JagString.parse("Sep"); - - @OriginalMember(owner = "client!km", name = "dd", descriptor = "Lclient!na;") - private static final JagString aClass100_658 = JagString.parse("Oct"); - - @OriginalMember(owner = "client!km", name = "Ac", descriptor = "[Lclient!na;") - public static final JagString[] aClass100Array102 = new JagString[] { aClass100_649, aClass100_650, aClass100_646, aClass100_655, aClass100_644, aClass100_656, aClass100_642, aClass100_653, aClass100_657, aClass100_658, aClass100_645, aClass100_641 }; - - @OriginalMember(owner = "client!km", name = "Mc", descriptor = "Lclient!na;") - public static final JagString LOGINSCREEN = JagString.parse("loginscreen"); - - @OriginalMember(owner = "client!km", name = "Rc", descriptor = "[I") - public static final int[] anIntArray324 = new int[] { 19, 55, 38, 155, 255, 110, 137, 205, 76 }; - - @OriginalMember(owner = "client!km", name = "Sc", descriptor = "Lclient!na;") - public static final JagString TRADE = JagString.parse(":trade:"); - -} diff --git a/client/src/main/java/rt4/Static14.java b/client/src/main/java/rt4/Static14.java deleted file mode 100644 index 3d94f10..0000000 --- a/client/src/main/java/rt4/Static14.java +++ /dev/null @@ -1,22 +0,0 @@ -package rt4; - -import org.openrs2.deob.annotation.OriginalArg; -import org.openrs2.deob.annotation.OriginalMember; -import org.openrs2.deob.annotation.Pc; - -public final class Static14 { - - @OriginalMember(owner = "client!bd", name = "b", descriptor = "Lclient!na;") - public static final JagString aClass100_80 = JagString.parse("(U(Y"); - - @OriginalMember(owner = "client!bd", name = "a", descriptor = "(BI)V") - public static void method475(@OriginalArg(1) int arg0) { - @Pc(8) Inv local8 = (Inv) Inv.objectContainerCache.get((long) arg0); - if (local8 != null) { - for (@Pc(24) int local24 = 0; local24 < local8.objectIds.length; local24++) { - local8.objectIds[local24] = -1; - local8.anIntArray422[local24] = 0; - } - } - } -} diff --git a/client/src/main/java/rt4/Static141.java b/client/src/main/java/rt4/Static141.java deleted file mode 100644 index bae9a8c..0000000 --- a/client/src/main/java/rt4/Static141.java +++ /dev/null @@ -1,10 +0,0 @@ -package rt4; - -import org.openrs2.deob.annotation.OriginalMember; - -public final class Static141 { - - @OriginalMember(owner = "client!lb", name = "z", descriptor = "I") - public static int anInt3473; - -} diff --git a/client/src/main/java/rt4/Static143.java b/client/src/main/java/rt4/Static143.java deleted file mode 100644 index 3e70874..0000000 --- a/client/src/main/java/rt4/Static143.java +++ /dev/null @@ -1,19 +0,0 @@ -package rt4; - -import org.openrs2.deob.annotation.OriginalMember; - -public final class Static143 { - - @OriginalMember(owner = "client!ld", name = "b", descriptor = "[Lclient!nc;") - public static final MapMarker[] hintMapMarkers = new MapMarker[4]; - - @OriginalMember(owner = "client!ld", name = "c", descriptor = "I") - public static int anInt3484 = -1; - - @OriginalMember(owner = "client!ld", name = "d", descriptor = "Lclient!na;") - public static final JagString aClass100_668 = JagString.parse("Hidden)2use"); - - @OriginalMember(owner = "client!ld", name = "i", descriptor = "I") - public static int anInt3486 = 0; - -} diff --git a/client/src/main/java/rt4/Static145.java b/client/src/main/java/rt4/Static145.java index 0709e0c..6949a73 100644 --- a/client/src/main/java/rt4/Static145.java +++ b/client/src/main/java/rt4/Static145.java @@ -8,8 +8,12 @@ public final class Static145 { @OriginalMember(owner = "client!lf", name = "k", descriptor = "I") public static int anInt3502 = -1; + @OriginalMember(owner = "client!vg", name = "e", descriptor = "[I") + public static int[] anIntArray516; + @OriginalMember(owner = "client!ri", name = "d", descriptor = "[I") + public static int[] anIntArray188; - @OriginalMember(owner = "client!lf", name = "a", descriptor = "(I)V") + @OriginalMember(owner = "client!lf", name = "a", descriptor = "(I)V") public static void method2742() { if (client.gameState == 10 && GlRenderer.enabled) { client.setGameState(28); @@ -44,20 +48,20 @@ public final class Static145 { for (local15 = 192; local15 < 255; local15++) { Static221.anIntArray235[local15] = Flames.anIntArray445[3]; } - Static270.anIntArray562 = new int[32768]; - Static263.anIntArray516 = new int[32768]; + Static267.anIntArray562 = new int[32768]; + anIntArray516 = new int[32768]; Static69.method1545(null); Static103.anIntArray254 = new int[32768]; - Static216.anIntArray188 = new int[32768]; + anIntArray188 = new int[32768]; Static221.aClass3_Sub2_Sub1_Sub1_3 = new SoftwareSprite(128, 254); } @OriginalMember(owner = "client!lf", name = "b", descriptor = "(I)V") public static void method2744() { - @Pc(3) int local3 = Static229.anInt5138; - @Pc(9) int local9 = Static24.anInt761; - @Pc(11) int local11 = Static183.anInt4271; - @Pc(15) int local15 = Static13.anInt436; + @Pc(3) int local3 = InterfaceList.anInt5138; + @Pc(9) int local9 = InterfaceList.anInt761; + @Pc(11) int local11 = InterfaceList.anInt4271; + @Pc(15) int local15 = InterfaceList.anInt436; if (GlRenderer.enabled) { GlRaster.method1186(local11, local3, local9, local15, 6116423); GlRaster.method1186(local11 + 1, local3 + 1, local9 - 2, 16, 0); @@ -78,7 +82,7 @@ public final class Static145 { } Fonts.b12Full.renderLeft(MiniMenu.getOp(local107), local11 + 3, local127, local129, 0); } - Static121.method2407(Static183.anInt4271, Static229.anInt5138, Static13.anInt436, Static24.anInt761); + Static121.method2407(InterfaceList.anInt4271, InterfaceList.anInt5138, InterfaceList.anInt436, InterfaceList.anInt761); } } diff --git a/client/src/main/java/rt4/Static146.java b/client/src/main/java/rt4/Static146.java index cbe224b..2f422e0 100644 --- a/client/src/main/java/rt4/Static146.java +++ b/client/src/main/java/rt4/Static146.java @@ -14,7 +14,7 @@ public final class Static146 { @OriginalMember(owner = "client!lg", name = "a", descriptor = "(I)V") public static void method2750(@OriginalArg(0) int arg0) { - Static235.anInt5276 = arg0; + Static156.anInt5276 = arg0; for (@Pc(3) int local3 = 0; local3 < SceneGraph.width; local3++) { for (@Pc(8) int local8 = 0; local8 < SceneGraph.length; local8++) { if (SceneGraph.tiles[arg0][local3][local8] == null) { diff --git a/client/src/main/java/rt4/Static147.java b/client/src/main/java/rt4/Static147.java index 8747359..a302a67 100644 --- a/client/src/main/java/rt4/Static147.java +++ b/client/src/main/java/rt4/Static147.java @@ -8,8 +8,18 @@ public final class Static147 { @OriginalMember(owner = "client!lh", name = "z", descriptor = "Lclient!na;") public static final JagString aClass100_672 = JagString.parse("(U (X"); + @OriginalMember(owner = "client!fg", name = "d", descriptor = "[I") + public static final int[] anIntArray159 = new int[6]; + @OriginalMember(owner = "client!fg", name = "l", descriptor = "[I") + public static final int[] anIntArray164 = new int[6]; + @OriginalMember(owner = "client!fg", name = "m", descriptor = "[I") + public static final int[] anIntArray165 = new int[6]; + @OriginalMember(owner = "client!fg", name = "r", descriptor = "[I") + public static final int[] anIntArray169 = new int[6]; + @OriginalMember(owner = "client!fg", name = "t", descriptor = "[I") + public static final int[] anIntArray170 = new int[6]; - @OriginalMember(owner = "client!lh", name = "b", descriptor = "(II)V") + @OriginalMember(owner = "client!lh", name = "b", descriptor = "(II)V") public static void method2761(@OriginalArg(0) int arg0) { UnderwaterMaterialRenderer.anInt3241 = arg0; MaterialManager.resetArgument(3); @@ -25,7 +35,7 @@ public final class Static147 { @Pc(29) int local29; @Pc(39) int local39; for (local5 = 0; local5 < local3; local5++) { - local15 = arg0.anIntArray168[local5] - Static149.anInt3555; + local15 = arg0.anIntArray168[local5] - Static123.anInt3555; local22 = arg0.anIntArray160[local5] - Static123.anInt3947; local29 = arg0.anIntArray163[local5] - Static217.anInt4903; local39 = local29 * arg3 + local15 * arg4 >> 16; @@ -36,12 +46,12 @@ public final class Static147 { return; } if (arg0.anIntArray161 != null) { - Static68.anIntArray159[local5] = local39; - Static68.anIntArray170[local5] = local61; - Static68.anIntArray169[local5] = local71; + anIntArray159[local5] = local39; + anIntArray170[local5] = local61; + anIntArray169[local5] = local71; } - Static68.anIntArray165[local5] = Rasteriser.centerX + (local39 << 9) / local71; - Static68.anIntArray164[local5] = Rasteriser.centerY + (local61 << 9) / local71; + anIntArray165[local5] = Rasteriser.centerX + (local39 << 9) / local71; + anIntArray164[local5] = Rasteriser.centerY + (local61 << 9) / local71; } Rasteriser.alpha = 0; local3 = arg0.anIntArray166.length; @@ -49,14 +59,14 @@ public final class Static147 { local15 = arg0.anIntArray166[local5]; local22 = arg0.anIntArray162[local5]; local29 = arg0.anIntArray158[local5]; - local39 = Static68.anIntArray165[local15]; - @Pc(148) int local148 = Static68.anIntArray165[local22]; - @Pc(152) int local152 = Static68.anIntArray165[local29]; - @Pc(156) int local156 = Static68.anIntArray164[local15]; - @Pc(160) int local160 = Static68.anIntArray164[local22]; - @Pc(164) int local164 = Static68.anIntArray164[local29]; + local39 = anIntArray165[local15]; + @Pc(148) int local148 = anIntArray165[local22]; + @Pc(152) int local152 = anIntArray165[local29]; + @Pc(156) int local156 = anIntArray164[local15]; + @Pc(160) int local160 = anIntArray164[local22]; + @Pc(164) int local164 = anIntArray164[local29]; if ((local39 - local148) * (local164 - local160) - (local156 - local160) * (local152 - local148) > 0) { - if (MiniMenu.aBoolean187 && Static19.method583(MiniMenu.anInt2388 + Rasteriser.centerX, MiniMenu.anInt3259 + Rasteriser.centerY, local156, local160, local164, local39, local148, local152)) { + if (MiniMenu.aBoolean187 && method583(MiniMenu.anInt2388 + Rasteriser.centerX, MiniMenu.anInt3259 + Rasteriser.centerY, local156, local160, local164, local39, local148, local152)) { MiniMenu.anInt1742 = arg5; MiniMenu.anInt2954 = arg6; } @@ -71,11 +81,11 @@ public final class Static147 { } } else if (!Preferences.manyGroundTextures) { @Pc(373) int local373 = Rasteriser.textureProvider.getAverageColor(arg0.anIntArray161[local5]); - Rasteriser.fillGouraudTriangle(local156, local160, local164, local39, local148, local152, Static216.method1640(local373, arg0.anIntArray167[local5]), Static216.method1640(local373, arg0.anIntArray172[local5]), Static216.method1640(local373, arg0.anIntArray171[local5])); + Rasteriser.fillGouraudTriangle(local156, local160, local164, local39, local148, local152, method1640(local373, arg0.anIntArray167[local5]), method1640(local373, arg0.anIntArray172[local5]), method1640(local373, arg0.anIntArray171[local5])); } else if (arg0.aBoolean113) { - Rasteriser.fillTexturedTriangle(local156, local160, local164, local39, local148, local152, arg0.anIntArray167[local5], arg0.anIntArray172[local5], arg0.anIntArray171[local5], Static68.anIntArray159[0], Static68.anIntArray159[1], Static68.anIntArray159[3], Static68.anIntArray170[0], Static68.anIntArray170[1], Static68.anIntArray170[3], Static68.anIntArray169[0], Static68.anIntArray169[1], Static68.anIntArray169[3], arg0.anIntArray161[local5]); + Rasteriser.fillTexturedTriangle(local156, local160, local164, local39, local148, local152, arg0.anIntArray167[local5], arg0.anIntArray172[local5], arg0.anIntArray171[local5], anIntArray159[0], anIntArray159[1], anIntArray159[3], anIntArray170[0], anIntArray170[1], anIntArray170[3], anIntArray169[0], anIntArray169[1], anIntArray169[3], arg0.anIntArray161[local5]); } else { - Rasteriser.fillTexturedTriangle(local156, local160, local164, local39, local148, local152, arg0.anIntArray167[local5], arg0.anIntArray172[local5], arg0.anIntArray171[local5], Static68.anIntArray159[local15], Static68.anIntArray159[local22], Static68.anIntArray159[local29], Static68.anIntArray170[local15], Static68.anIntArray170[local22], Static68.anIntArray170[local29], Static68.anIntArray169[local15], Static68.anIntArray169[local22], Static68.anIntArray169[local29], arg0.anIntArray161[local5]); + Rasteriser.fillTexturedTriangle(local156, local160, local164, local39, local148, local152, arg0.anIntArray167[local5], arg0.anIntArray172[local5], arg0.anIntArray171[local5], anIntArray159[local15], anIntArray159[local22], anIntArray159[local29], anIntArray170[local15], anIntArray170[local22], anIntArray170[local29], anIntArray169[local15], anIntArray169[local22], anIntArray169[local29], arg0.anIntArray161[local5]); } } } @@ -88,4 +98,33 @@ public final class Static147 { Component.models.clear(); Component.fonts.clear(); } + + @OriginalMember(owner = "client!bi", name = "a", descriptor = "(IIIIIIII)Z") + public static boolean method583(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7) { + if (arg1 < arg2 && arg1 < arg3 && arg1 < arg4) { + return false; + } else if (arg1 > arg2 && arg1 > arg3 && arg1 > arg4) { + return false; + } else if (arg0 < arg5 && arg0 < arg6 && arg0 < arg7) { + return false; + } else if (arg0 > arg5 && arg0 > arg6 && arg0 > arg7) { + return false; + } else { + @Pc(59) int local59 = (arg1 - arg2) * (arg6 - arg5) - (arg0 - arg5) * (arg3 - arg2); + @Pc(75) int local75 = (arg1 - arg4) * (arg5 - arg7) - (arg0 - arg7) * (arg2 - arg4); + @Pc(91) int local91 = (arg1 - arg3) * (arg7 - arg6) - (arg0 - arg6) * (arg4 - arg3); + return local59 * local91 > 0 && local91 * local75 > 0; + } + } + + @OriginalMember(owner = "client!ri", name = "a", descriptor = "(II)I") + public static int method1640(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) { + arg1 = arg1 * (arg0 & 0x7F) >> 7; + if (arg1 < 2) { + arg1 = 2; + } else if (arg1 > 126) { + arg1 = 126; + } + return (arg0 & 0xFF80) + arg1; + } } diff --git a/client/src/main/java/rt4/Static148.java b/client/src/main/java/rt4/Static148.java deleted file mode 100644 index 36f3ccc..0000000 --- a/client/src/main/java/rt4/Static148.java +++ /dev/null @@ -1,13 +0,0 @@ -package rt4; - -import org.openrs2.deob.annotation.OriginalMember; - -public final class Static148 { - - @OriginalMember(owner = "client!li", name = "t", descriptor = "I") - public static int anInt3534; - - @OriginalMember(owner = "client!li", name = "w", descriptor = "Lclient!sc;") - public static HashTable aClass133_13; - -} diff --git a/client/src/main/java/rt4/Static149.java b/client/src/main/java/rt4/Static149.java deleted file mode 100644 index 5e5b7d8..0000000 --- a/client/src/main/java/rt4/Static149.java +++ /dev/null @@ -1,15 +0,0 @@ -package rt4; - -import org.openrs2.deob.annotation.OriginalMember; - -public final class Static149 { - - @OriginalMember(owner = "client!lj", name = "B", descriptor = "I") - public static int anInt3555; - - @OriginalMember(owner = "client!lj", name = "w", descriptor = "I") - public static int clickedInventoryComponentX = 0; - - @OriginalMember(owner = "client!lj", name = "z", descriptor = "[I") - public static int[] anIntArray338 = new int[2]; -} diff --git a/client/src/main/java/rt4/Static15.java b/client/src/main/java/rt4/Static15.java deleted file mode 100644 index 822d4d9..0000000 --- a/client/src/main/java/rt4/Static15.java +++ /dev/null @@ -1,36 +0,0 @@ -package rt4; - -import org.openrs2.deob.annotation.OriginalMember; -import org.openrs2.deob.annotation.Pc; - -public final class Static15 { - - @OriginalMember(owner = "client!dc", name = "M", descriptor = "Lclient!na;") - public static final JagString aClass100_268 = JagString.parse(")4"); - @OriginalMember(owner = "client!he", name = "gb", descriptor = "Lclient!na;") - public static final JagString aClass100_518 = JagString.parse("www"); - @OriginalMember(owner = "client!e", name = "Tc", descriptor = "Lclient!na;") - public static final JagString aClass100_365 = JagString.parse("www)2wtqa"); - @OriginalMember(owner = "client!lk", name = "J", descriptor = "Lclient!na;") - public static final JagString aClass100_687 = JagString.parse(")4p="); - @OriginalMember(owner = "client!en", name = "x", descriptor = "Lclient!na;") - public static final JagString aClass100_424 = JagString.parse("http:)4)4"); - @OriginalMember(owner = "client!gf", name = "I", descriptor = "Lclient!na;") - public static final JagString aClass100_886 = JagString.parse(")3runescape)3com)4l="); - @OriginalMember(owner = "client!v", name = "a", descriptor = "Lclient!na;") - public static final JagString aClass100_98 = JagString.parse(")4a="); - - @OriginalMember(owner = "client!be", name = "a", descriptor = "(Z)Lclient!na;") - public static JagString method479() { - @Pc(8) JagString local8 = aClass100_518; - @Pc(10) JagString local10 = JagString.EMPTY; - if (client.modeWhere != 0) { - local8 = aClass100_365; - } - if (client.settings != null) { - local10 = JagString.concatenate(new JagString[] { aClass100_687, client.settings}); - } - return JagString.concatenate(new JagString[] { aClass100_424, local8, aClass100_886, JagString.parseInt(client.language), aClass100_98, JagString.parseInt(client.affiliate), local10, aClass100_268 }); - } - -} diff --git a/client/src/main/java/rt4/Static150.java b/client/src/main/java/rt4/Static150.java deleted file mode 100644 index af6c19d..0000000 --- a/client/src/main/java/rt4/Static150.java +++ /dev/null @@ -1,72 +0,0 @@ -package rt4; - -import org.openrs2.deob.annotation.OriginalArg; -import org.openrs2.deob.annotation.OriginalMember; -import org.openrs2.deob.annotation.Pc; - -public final class Static150 { - - @OriginalMember(owner = "client!lk", name = "V", descriptor = "I") - public static int anInt3582 = 0; - - @OriginalMember(owner = "client!lk", name = "a", descriptor = "(IIILclient!be;Z)V") - public static void method2801(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) Component arg2, @OriginalArg(4) boolean arg3) { - @Pc(4) int local4 = arg2.width; - @Pc(7) int local7 = arg2.height; - if (arg2.dynamicWidthValue == 0) { - arg2.width = arg2.baseWidth; - } else if (arg2.dynamicWidthValue == 1) { - arg2.width = arg1 - arg2.baseWidth; - } else if (arg2.dynamicWidthValue == 2) { - arg2.width = arg2.baseWidth * arg1 >> 14; - } else if (arg2.dynamicWidthValue == 3) { - if (arg2.type == 2) { - arg2.width = arg2.baseWidth * 32 + (arg2.baseWidth - 1) * arg2.anInt512; - } else if (arg2.type == 7) { - arg2.width = arg2.baseWidth * 115 + arg2.anInt512 * (arg2.baseWidth - 1); - } - } - if (arg2.dynamicHeightValue == 0) { - arg2.height = arg2.baseHeight; - } else if (arg2.dynamicHeightValue == 1) { - arg2.height = arg0 - arg2.baseHeight; - } else if (arg2.dynamicHeightValue == 2) { - arg2.height = arg0 * arg2.baseHeight >> 14; - } else if (arg2.dynamicHeightValue == 3) { - if (arg2.type == 2) { - arg2.height = (arg2.baseHeight - 1) * arg2.anInt516 + arg2.baseHeight * 32; - } else if (arg2.type == 7) { - arg2.height = arg2.baseHeight * 12 + (arg2.baseHeight - 1) * arg2.anInt516; - } - } - if (arg2.dynamicWidthValue == 4) { - arg2.width = arg2.aspectWidth * arg2.height / arg2.aspectHeight; - } - if (arg2.dynamicHeightValue == 4) { - arg2.height = arg2.aspectHeight * arg2.width / arg2.aspectWidth; - } - if (Static121.qaOpTest && (InterfaceList.getServerActiveProperties(arg2).events != 0 || arg2.type == 0)) { - if (arg2.height < 5 && arg2.width < 5) { - arg2.height = 5; - arg2.width = 5; - } else { - if (arg2.width <= 0) { - arg2.width = 5; - } - if (arg2.height <= 0) { - arg2.height = 5; - } - } - } - if (arg2.clientCode == 1337) { - Static280.aClass13_26 = arg2; - } - if (arg3 && arg2.onResize != null && (local4 != arg2.width || arg2.height != local7)) { - @Pc(305) HookRequest local305 = new HookRequest(); - local305.arguments = arg2.onResize; - local305.source = arg2; - InterfaceList.lowPriorityRequests.addTail(local305); - } - } - -} diff --git a/client/src/main/java/rt4/Static152.java b/client/src/main/java/rt4/Static152.java index 213bc9c..375b5d4 100644 --- a/client/src/main/java/rt4/Static152.java +++ b/client/src/main/java/rt4/Static152.java @@ -12,7 +12,7 @@ public final class Static152 { @OriginalMember(owner = "client!wl", name = "a", descriptor = "(IBIIIII)V") public static void method4670(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5) { @Pc(18) int local18 = arg2 - arg4; - Static251.method4278(arg2); + Static241.method4278(arg2); @Pc(23) int local23 = 0; if (local18 < 0) { local18 = 0; @@ -27,14 +27,14 @@ public final class Static152 { @Pc(78) int local78; @Pc(87) int local87; if (arg1 >= TextureOp29.anInt5773 && TextureOp29.anInt2869 >= arg1) { - @Pc(52) int[] local52 = Static71.anIntArrayArray10[arg1]; - local61 = Static78.method1690(TextureOp29.anInt5063, arg5 - arg2, TextureOp29.anInt4164); - local69 = Static78.method1690(TextureOp29.anInt5063, arg2 + arg5, TextureOp29.anInt4164); - local78 = Static78.method1690(TextureOp29.anInt5063, arg5 - local18, TextureOp29.anInt4164); - local87 = Static78.method1690(TextureOp29.anInt5063, arg5 + local18, TextureOp29.anInt4164); - Static131.method2576(local52, local61, local78, arg3); - Static131.method2576(local52, local78, local87, arg0); - Static131.method2576(local52, local87, local69, arg3); + @Pc(52) int[] local52 = TextureOp29SubOp4.anIntArrayArray10[arg1]; + local61 = Static231.method1690(TextureOp29.anInt5063, arg5 - arg2, TextureOp29.anInt4164); + local69 = Static231.method1690(TextureOp29.anInt5063, arg2 + arg5, TextureOp29.anInt4164); + local78 = Static231.method1690(TextureOp29.anInt5063, arg5 - local18, TextureOp29.anInt4164); + local87 = Static231.method1690(TextureOp29.anInt5063, arg5 + local18, TextureOp29.anInt4164); + TextureOp29SubOp4.method2576(local52, local61, local78, arg3); + TextureOp29SubOp4.method2576(local52, local78, local87, arg0); + TextureOp29SubOp4.method2576(local52, local87, local69, arg3); } @Pc(107) int local107 = -1; while (local23 < local32) { @@ -59,31 +59,31 @@ public final class Static152 { local61 = arg1 + local32; if (TextureOp29.anInt5773 <= local61 && TextureOp29.anInt2869 >= local161) { if (local32 >= local18) { - local69 = Static78.method1690(TextureOp29.anInt5063, local23 + arg5, TextureOp29.anInt4164); - local78 = Static78.method1690(TextureOp29.anInt5063, arg5 - local23, TextureOp29.anInt4164); + local69 = Static231.method1690(TextureOp29.anInt5063, local23 + arg5, TextureOp29.anInt4164); + local78 = Static231.method1690(TextureOp29.anInt5063, arg5 - local23, TextureOp29.anInt4164); if (TextureOp29.anInt2869 >= local61) { - Static131.method2576(Static71.anIntArrayArray10[local61], local78, local69, arg3); + TextureOp29SubOp4.method2576(TextureOp29SubOp4.anIntArrayArray10[local61], local78, local69, arg3); } if (local161 >= TextureOp29.anInt5773) { - Static131.method2576(Static71.anIntArrayArray10[local161], local78, local69, arg3); + TextureOp29SubOp4.method2576(TextureOp29SubOp4.anIntArrayArray10[local161], local78, local69, arg3); } } else { local69 = Static241.anIntArray522[local32]; - local78 = Static78.method1690(TextureOp29.anInt5063, local23 + arg5, TextureOp29.anInt4164); - local87 = Static78.method1690(TextureOp29.anInt5063, arg5 - local23, TextureOp29.anInt4164); - local264 = Static78.method1690(TextureOp29.anInt5063, arg5 + local69, TextureOp29.anInt4164); - local273 = Static78.method1690(TextureOp29.anInt5063, arg5 - local69, TextureOp29.anInt4164); + local78 = Static231.method1690(TextureOp29.anInt5063, local23 + arg5, TextureOp29.anInt4164); + local87 = Static231.method1690(TextureOp29.anInt5063, arg5 - local23, TextureOp29.anInt4164); + local264 = Static231.method1690(TextureOp29.anInt5063, arg5 + local69, TextureOp29.anInt4164); + local273 = Static231.method1690(TextureOp29.anInt5063, arg5 - local69, TextureOp29.anInt4164); if (TextureOp29.anInt2869 >= local61) { - local280 = Static71.anIntArrayArray10[local61]; - Static131.method2576(local280, local87, local273, arg3); - Static131.method2576(local280, local273, local264, arg0); - Static131.method2576(local280, local264, local78, arg3); + local280 = TextureOp29SubOp4.anIntArrayArray10[local61]; + TextureOp29SubOp4.method2576(local280, local87, local273, arg3); + TextureOp29SubOp4.method2576(local280, local273, local264, arg0); + TextureOp29SubOp4.method2576(local280, local264, local78, arg3); } if (local161 >= TextureOp29.anInt5773) { - local280 = Static71.anIntArrayArray10[local161]; - Static131.method2576(local280, local87, local273, arg3); - Static131.method2576(local280, local273, local264, arg0); - Static131.method2576(local280, local264, local78, arg3); + local280 = TextureOp29SubOp4.anIntArrayArray10[local161]; + TextureOp29SubOp4.method2576(local280, local87, local273, arg3); + TextureOp29SubOp4.method2576(local280, local273, local264, arg0); + TextureOp29SubOp4.method2576(local280, local264, local78, arg3); } } } @@ -94,30 +94,30 @@ public final class Static152 { local69 = arg5 + local32; local78 = arg5 - local32; if (local69 >= TextureOp29.anInt4164 && TextureOp29.anInt5063 >= local78) { - local69 = Static78.method1690(TextureOp29.anInt5063, local69, TextureOp29.anInt4164); - local78 = Static78.method1690(TextureOp29.anInt5063, local78, TextureOp29.anInt4164); + local69 = Static231.method1690(TextureOp29.anInt5063, local69, TextureOp29.anInt4164); + local78 = Static231.method1690(TextureOp29.anInt5063, local78, TextureOp29.anInt4164); if (local23 < local18) { local87 = local40 >= local23 ? local40 : Static241.anIntArray522[local23]; - local264 = Static78.method1690(TextureOp29.anInt5063, local87 + arg5, TextureOp29.anInt4164); - local273 = Static78.method1690(TextureOp29.anInt5063, arg5 - local87, TextureOp29.anInt4164); + local264 = Static231.method1690(TextureOp29.anInt5063, local87 + arg5, TextureOp29.anInt4164); + local273 = Static231.method1690(TextureOp29.anInt5063, arg5 - local87, TextureOp29.anInt4164); if (TextureOp29.anInt2869 >= local61) { - local280 = Static71.anIntArrayArray10[local61]; - Static131.method2576(local280, local78, local273, arg3); - Static131.method2576(local280, local273, local264, arg0); - Static131.method2576(local280, local264, local69, arg3); + local280 = TextureOp29SubOp4.anIntArrayArray10[local61]; + TextureOp29SubOp4.method2576(local280, local78, local273, arg3); + TextureOp29SubOp4.method2576(local280, local273, local264, arg0); + TextureOp29SubOp4.method2576(local280, local264, local69, arg3); } if (local161 >= TextureOp29.anInt5773) { - local280 = Static71.anIntArrayArray10[local161]; - Static131.method2576(local280, local78, local273, arg3); - Static131.method2576(local280, local273, local264, arg0); - Static131.method2576(local280, local264, local69, arg3); + local280 = TextureOp29SubOp4.anIntArrayArray10[local161]; + TextureOp29SubOp4.method2576(local280, local78, local273, arg3); + TextureOp29SubOp4.method2576(local280, local273, local264, arg0); + TextureOp29SubOp4.method2576(local280, local264, local69, arg3); } } else { if (TextureOp29.anInt2869 >= local61) { - Static131.method2576(Static71.anIntArrayArray10[local61], local78, local69, arg3); + TextureOp29SubOp4.method2576(TextureOp29SubOp4.anIntArrayArray10[local61], local78, local69, arg3); } if (local161 >= TextureOp29.anInt5773) { - Static131.method2576(Static71.anIntArrayArray10[local161], local78, local69, arg3); + TextureOp29SubOp4.method2576(TextureOp29SubOp4.anIntArrayArray10[local161], local78, local69, arg3); } } } diff --git a/client/src/main/java/rt4/Static154.java b/client/src/main/java/rt4/Static154.java deleted file mode 100644 index f03bd64..0000000 --- a/client/src/main/java/rt4/Static154.java +++ /dev/null @@ -1,40 +0,0 @@ -package rt4; - -import org.openrs2.deob.annotation.OriginalArg; -import org.openrs2.deob.annotation.OriginalMember; -import org.openrs2.deob.annotation.Pc; - -public final class Static154 { - - @OriginalMember(owner = "client!md", name = "a", descriptor = "(Lclient!be;I)Z") - public static boolean method2926(@OriginalArg(0) Component arg0) { - if (arg0.anIntArray43 == null) { - return false; - } - for (@Pc(14) int local14 = 0; local14 < arg0.anIntArray43.length; local14++) { - @Pc(34) int local34 = Static127.method3212(local14, arg0); - @Pc(39) int local39 = arg0.anIntArray48[local14]; - if (arg0.anIntArray43[local14] == 2) { - if (local39 <= local34) { - return false; - } - } else if (arg0.anIntArray43[local14] == 3) { - if (local34 <= local39) { - return false; - } - } else if (arg0.anIntArray43[local14] == 4) { - if (local34 == local39) { - return false; - } - } else if (local39 != local34) { - return false; - } - } - return true; - } - - @OriginalMember(owner = "client!md", name = "a", descriptor = "(JB)Lclient!na;") - public static JagString method2929(@OriginalArg(0) long arg0) { - return Static59.method1376(arg0); - } -} diff --git a/client/src/main/java/rt4/Static155.java b/client/src/main/java/rt4/Static155.java deleted file mode 100644 index dec6098..0000000 --- a/client/src/main/java/rt4/Static155.java +++ /dev/null @@ -1,10 +0,0 @@ -package rt4; - -import org.openrs2.deob.annotation.OriginalMember; - -public final class Static155 { - - @OriginalMember(owner = "client!me", name = "nb", descriptor = "I") - public static int anInt3751; - -} diff --git a/client/src/main/java/rt4/Static156.java b/client/src/main/java/rt4/Static156.java index f9d1e3f..6718e6d 100644 --- a/client/src/main/java/rt4/Static156.java +++ b/client/src/main/java/rt4/Static156.java @@ -1,5 +1,6 @@ package rt4; +import com.jogamp.opengl.GL2; import org.openrs2.deob.annotation.OriginalArg; import org.openrs2.deob.annotation.OriginalMember; import org.openrs2.deob.annotation.Pc; @@ -8,8 +9,14 @@ public final class Static156 { @OriginalMember(owner = "client!mf", name = "X", descriptor = "I") public static int loginScreenId; + @OriginalMember(owner = "client!tb", name = "Q", descriptor = "I") + public static int anInt5276 = 0; + @OriginalMember(owner = "client!bc", name = "Z", descriptor = "I") + public static int anInt437; + @OriginalMember(owner = "client!rc", name = "p", descriptor = "I") + public static int anInt1142 = 0; - @OriginalMember(owner = "client!mf", name = "a", descriptor = "(IIIII[[[B[I[I[I[I[IIBII)V") + @OriginalMember(owner = "client!mf", name = "a", descriptor = "(IIIII[[[B[I[I[I[I[IIBII)V") public static void method2954(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) byte[][][] arg5, @OriginalArg(6) int[] arg6, @OriginalArg(7) int[] arg7, @OriginalArg(8) int[] arg8, @OriginalArg(9) int[] arg9, @OriginalArg(10) int[] arg10, @OriginalArg(11) int arg11, @OriginalArg(12) byte arg12, @OriginalArg(13) int arg13, @OriginalArg(14) int arg14) { if (arg0 < 0) { arg0 = 0; @@ -21,30 +28,30 @@ public final class Static156 { } else if (arg2 >= SceneGraph.length * 128) { arg2 = SceneGraph.length * 128 - 1; } - Static109.anInt2886 = MathUtils.sin[arg3]; + Static160.anInt2886 = MathUtils.sin[arg3]; Static121.anInt3038 = MathUtils.cos[arg3]; Static231.anInt5205 = MathUtils.sin[arg4]; Static81.anInt2222 = MathUtils.cos[arg4]; - Static149.anInt3555 = arg0; + Static123.anInt3555 = arg0; Static123.anInt3947 = arg1; Static217.anInt4903 = arg2; - Static167.anInt4069 = arg0 / 128; + Static123.anInt4069 = arg0 / 128; Static193.anInt4539 = arg2 / 128; - Static31.anInt987 = Static167.anInt4069 - SceneGraph.visibility; - if (Static31.anInt987 < 0) { - Static31.anInt987 = 0; + LightingManager.anInt987 = Static123.anInt4069 - SceneGraph.visibility; + if (LightingManager.anInt987 < 0) { + LightingManager.anInt987 = 0; } - Static80.anInt4698 = Static193.anInt4539 - SceneGraph.visibility; - if (Static80.anInt4698 < 0) { - Static80.anInt4698 = 0; + LightingManager.anInt4698 = Static193.anInt4539 - SceneGraph.visibility; + if (LightingManager.anInt4698 < 0) { + LightingManager.anInt4698 = 0; } - Static2.anInt15 = Static167.anInt4069 + SceneGraph.visibility; - if (Static2.anInt15 > SceneGraph.width) { - Static2.anInt15 = SceneGraph.width; + LightingManager.anInt15 = Static123.anInt4069 + SceneGraph.visibility; + if (LightingManager.anInt15 > SceneGraph.width) { + LightingManager.anInt15 = SceneGraph.width; } - Static215.anInt4866 = Static193.anInt4539 + SceneGraph.visibility; - if (Static215.anInt4866 > SceneGraph.length) { - Static215.anInt4866 = SceneGraph.length; + LightingManager.anInt4866 = Static193.anInt4539 + SceneGraph.visibility; + if (LightingManager.anInt4866 > SceneGraph.length) { + LightingManager.anInt4866 = SceneGraph.length; } @Pc(99) short local99; if (GlRenderer.enabled) { @@ -56,9 +63,9 @@ public final class Static156 { @Pc(113) int local113; for (local104 = 0; local104 < SceneGraph.visibility + SceneGraph.visibility + 2; local104++) { for (local113 = 0; local113 < SceneGraph.visibility + SceneGraph.visibility + 2; local113++) { - @Pc(130) int local130 = (local104 - SceneGraph.visibility << 7) - (Static149.anInt3555 & 0x7F); + @Pc(130) int local130 = (local104 - SceneGraph.visibility << 7) - (Static123.anInt3555 & 0x7F); @Pc(140) int local140 = (local113 - SceneGraph.visibility << 7) - (Static217.anInt4903 & 0x7F); - @Pc(146) int local146 = Static167.anInt4069 + local104 - SceneGraph.visibility; + @Pc(146) int local146 = Static123.anInt4069 + local104 - SceneGraph.visibility; @Pc(152) int local152 = Static193.anInt4539 + local113 - SceneGraph.visibility; if (local146 >= 0 && local152 >= 0 && local146 < SceneGraph.width && local152 < SceneGraph.length) { @Pc(176) int local176; @@ -80,14 +87,14 @@ public final class Static156 { } } Static8.anIntArray8 = arg6; - Static127.anIntArray292 = arg7; + Static123.anIntArray292 = arg7; Static96.anIntArray234 = arg8; - Static234.anIntArray454 = arg9; - Static206.anIntArray427 = arg10; + Static123.anIntArray454 = arg9; + Static123.anIntArray427 = arg10; Static123.method2419(); if (SceneGraph.underWaterGroundTiles != null) { SceneGraph.setUnderwater(true); - Static248.method3292(arg0, arg1, arg2, null, 0, (byte) 0, arg13, arg14); + method3292(arg0, arg1, arg2, null, 0, (byte) 0, arg13, arg14); if (GlRenderer.enabled) { MaterialManager.renderingUnderwater = false; MaterialManager.setMaterial(0, 0); @@ -96,11 +103,223 @@ public final class Static156 { } SceneGraph.setUnderwater(false); } - Static248.method3292(arg0, arg1, arg2, arg5, arg11, arg12, arg13, arg14); + method3292(arg0, arg1, arg2, arg5, arg11, arg12, arg13, arg14); } @OriginalMember(owner = "client!mf", name = "a", descriptor = "(BLclient!wa;)Lclient!ta;") public static TextureOp29SubOp4 method2960(@OriginalArg(1) Buffer arg0) { return new TextureOp29SubOp4(arg0.g2b(), arg0.g2b(), arg0.g2b(), arg0.g2b(), arg0.g3(), arg0.g3(), arg0.g1()); } + + @OriginalMember(owner = "client!uc", name = "a", descriptor = "(III[[[BIBII)V") + public static void method3292(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) byte[][][] arg3, @OriginalArg(4) int arg4, @OriginalArg(5) byte arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7) { + anInt437++; + anInt1142 = 0; + @Pc(9) int local9 = arg6 - 16; + @Pc(13) int local13 = arg6 + 16; + @Pc(17) int local17 = arg7 - 16; + @Pc(21) int local21 = arg7 + 16; + @Pc(32) int local32; + @Pc(37) int local37; + @Pc(183) int local183; + for (@Pc(23) int local23 = anInt5276; local23 < SceneGraph.levels; local23++) { + @Pc(30) Tile[][] local30 = SceneGraph.tiles[local23]; + for (local32 = LightingManager.anInt987; local32 < LightingManager.anInt15; local32++) { + for (local37 = LightingManager.anInt4698; local37 < LightingManager.anInt4866; local37++) { + @Pc(46) Tile local46 = local30[local32][local37]; + if (local46 != null) { + if (SceneGraph.aBooleanArrayArray1[local32 + SceneGraph.visibility - Static123.anInt4069][local37 + SceneGraph.visibility - Static193.anInt4539] && (arg3 == null || local23 < arg4 || arg3[local23][local32][local37] != arg5)) { + local46.aBoolean45 = true; + local46.aBoolean46 = true; + if (local46.sceneryLen > 0) { + local46.aBoolean47 = true; + } else { + local46.aBoolean47 = false; + } + anInt1142++; + } else { + local46.aBoolean45 = false; + local46.aBoolean46 = false; + local46.anInt663 = 0; + if (local32 >= local9 && local32 <= local13 && local37 >= local17 && local37 <= local21) { + if (local46.wall != null) { + @Pc(103) Wall local103 = local46.wall; + local103.primary.method4545(0, local23, local103.anInt3051, local103.xFine, local103.zFine); + if (local103.secondary != null) { + local103.secondary.method4545(0, local23, local103.anInt3051, local103.xFine, local103.zFine); + } + } + if (local46.wallDecor != null) { + @Pc(134) WallDecor local134 = local46.wallDecor; + local134.primary.method4545(local134.anInt1388, local23, local134.anInt1391, local134.anInt1390, local134.anInt1393); + if (local134.secondary != null) { + local134.secondary.method4545(local134.anInt1388, local23, local134.anInt1391, local134.anInt1390, local134.anInt1393); + } + } + if (local46.groundDecor != null) { + @Pc(167) GroundDecor local167 = local46.groundDecor; + local167.entity.method4545(0, local23, local167.anInt733, local167.xFine, local167.zFine); + } + if (local46.scenery != null) { + for (local183 = 0; local183 < local46.sceneryLen; local183++) { + @Pc(192) Scenery local192 = local46.scenery[local183]; + local192.entity.method4545(local192.anInt1714, local23, local192.anInt1706, local192.anInt1699, local192.anInt1703); + } + } + } + } + } + } + } + } + @Pc(240) boolean local240 = SceneGraph.tileHeights == SceneGraph.underwaterTileHeights; + if (GlRenderer.enabled) { + @Pc(244) GL2 gl = GlRenderer.gl; + gl.glPushMatrix(); + gl.glTranslatef((float) -arg0, (float) -arg1, (float) -arg2); + if (local240) { + UnderwaterMaterialRenderer.applyFogFade(); + MaterialManager.setMaterial(-1, 3); + MaterialManager.renderingUnderwater = true; + UnderwaterMaterialRenderer.method4609(); + Static152.anInt3604 = -1; + Static247.anInt730 = -1; + for (local32 = 0; local32 < SceneGraph.underwaterHdTiles[0].length; local32++) { + @Pc(285) GlTile local285 = SceneGraph.underwaterHdTiles[0][local32]; + @Pc(294) float local294 = 251.5F - (local285.blend ? 1.0F : 0.5F); + if (local285.underwaterColor != Static152.anInt3604) { + Static152.anInt3604 = local285.underwaterColor; + WaterMaterialRenderer.method619(local285.underwaterColor); + FogManager.method3066(WaterMaterialRenderer.method2422()); + } + local285.method1944(SceneGraph.tiles, local294, false); + } + UnderwaterMaterialRenderer.method4608(); + } else { + local32 = anInt5276; + while (true) { + if (local32 >= SceneGraph.levels) { + LightingManager.method2402(Static123.anInt4069, Static193.anInt4539, SceneGraph.tiles); + break; + } + for (local37 = 0; local37 < SceneGraph.underwaterHdTiles[local32].length; local37++) { + @Pc(336) GlTile local336 = SceneGraph.underwaterHdTiles[local32][local37]; + @Pc(350) float local350 = 201.5F - (float) local32 * 50.0F - (local336.blend ? 1.0F : 0.5F); + if (local336.texture != -1 && Rasteriser.textureProvider.getMaterialType(local336.texture) == MaterialManager.WATER && Preferences.highWaterDetail) { + WaterMaterialRenderer.method619(local336.underwaterColor); + } + local336.method1944(SceneGraph.tiles, local350, false); + } + if (local32 == 0 && Preferences.sceneryShadowsType > 0) { + GlRenderer.method4159(101.5F); + ShadowManager.method4198(Static123.anInt4069, Static193.anInt4539, SceneGraph.visibility, arg1, SceneGraph.aBooleanArrayArray1, SceneGraph.tileHeights[0]); + } + local32++; + } + } + gl.glPopMatrix(); + } + @Pc(434) int local434; + @Pc(438) int local438; + @Pc(450) Tile local450; + @Pc(399) int local399; + @Pc(406) Tile[][] local406; + @Pc(415) int local415; + @Pc(428) int local428; + for (local399 = anInt5276; local399 < SceneGraph.levels; local399++) { + local406 = SceneGraph.tiles[local399]; + for (local37 = -SceneGraph.visibility; local37 <= 0; local37++) { + local415 = Static123.anInt4069 + local37; + local183 = Static123.anInt4069 - local37; + if (local415 >= LightingManager.anInt987 || local183 < LightingManager.anInt15) { + for (local428 = -SceneGraph.visibility; local428 <= 0; local428++) { + local434 = Static193.anInt4539 + local428; + local438 = Static193.anInt4539 - local428; + if (local415 >= LightingManager.anInt987) { + if (local434 >= LightingManager.anInt4698) { + local450 = local406[local415][local434]; + if (local450 != null && local450.aBoolean45) { + Static247.method4245(local450, true); + } + } + if (local438 < LightingManager.anInt4866) { + local450 = local406[local415][local438]; + if (local450 != null && local450.aBoolean45) { + Static247.method4245(local450, true); + } + } + } + if (local183 < LightingManager.anInt15) { + if (local434 >= LightingManager.anInt4698) { + local450 = local406[local183][local434]; + if (local450 != null && local450.aBoolean45) { + Static247.method4245(local450, true); + } + } + if (local438 < LightingManager.anInt4866) { + local450 = local406[local183][local438]; + if (local450 != null && local450.aBoolean45) { + Static247.method4245(local450, true); + } + } + } + if (anInt1142 == 0) { + if (!local240) { + MiniMenu.aBoolean187 = false; + } + return; + } + } + } + } + } + for (local399 = anInt5276; local399 < SceneGraph.levels; local399++) { + local406 = SceneGraph.tiles[local399]; + for (local37 = -SceneGraph.visibility; local37 <= 0; local37++) { + local415 = Static123.anInt4069 + local37; + local183 = Static123.anInt4069 - local37; + if (local415 >= LightingManager.anInt987 || local183 < LightingManager.anInt15) { + for (local428 = -SceneGraph.visibility; local428 <= 0; local428++) { + local434 = Static193.anInt4539 + local428; + local438 = Static193.anInt4539 - local428; + if (local415 >= LightingManager.anInt987) { + if (local434 >= LightingManager.anInt4698) { + local450 = local406[local415][local434]; + if (local450 != null && local450.aBoolean45) { + Static247.method4245(local450, false); + } + } + if (local438 < LightingManager.anInt4866) { + local450 = local406[local415][local438]; + if (local450 != null && local450.aBoolean45) { + Static247.method4245(local450, false); + } + } + } + if (local183 < LightingManager.anInt15) { + if (local434 >= LightingManager.anInt4698) { + local450 = local406[local183][local434]; + if (local450 != null && local450.aBoolean45) { + Static247.method4245(local450, false); + } + } + if (local438 < LightingManager.anInt4866) { + local450 = local406[local183][local438]; + if (local450 != null && local450.aBoolean45) { + Static247.method4245(local450, false); + } + } + } + if (anInt1142 == 0) { + if (!local240) { + MiniMenu.aBoolean187 = false; + } + return; + } + } + } + } + } + MiniMenu.aBoolean187 = false; + } } diff --git a/client/src/main/java/rt4/Static159.java b/client/src/main/java/rt4/Static159.java deleted file mode 100644 index 8408dc5..0000000 --- a/client/src/main/java/rt4/Static159.java +++ /dev/null @@ -1,60 +0,0 @@ -package rt4; - -import org.openrs2.deob.annotation.OriginalArg; -import org.openrs2.deob.annotation.OriginalMember; -import org.openrs2.deob.annotation.Pc; - -public final class Static159 { - - @OriginalMember(owner = "client!mi", name = "Z", descriptor = "I") - public static int anInt3893; - - @OriginalMember(owner = "client!mi", name = "a", descriptor = "([IBLclient!km;[I[I)V") - public static void method3037(@OriginalArg(0) int[] arg0, @OriginalArg(2) Npc arg1, @OriginalArg(3) int[] arg2, @OriginalArg(4) int[] arg3) { - for (@Pc(3) int local3 = 0; local3 < arg3.length; local3++) { - @Pc(15) int local15 = arg3[local3]; - @Pc(19) int local19 = arg0[local3]; - @Pc(23) int local23 = arg2[local3]; - for (@Pc(25) int local25 = 0; local19 != 0 && arg1.aClass147Array3.length > local25; local25++) { - if ((local19 & 0x1) != 0) { - if (local15 == -1) { - arg1.aClass147Array3[local25] = null; - } else { - @Pc(60) SeqType local60 = SeqTypeList.get(local15); - @Pc(65) Npc_Class147 local65 = arg1.aClass147Array3[local25]; - @Pc(68) int local68 = local60.anInt5347; - if (local65 != null) { - if (local15 == local65.anInt5396) { - if (local68 == 0) { - local65 = arg1.aClass147Array3[local25] = null; - } else if (local68 == 1) { - local65.anInt5399 = 0; - local65.anInt5400 = 0; - local65.anInt5398 = 1; - local65.anInt5404 = 0; - local65.anInt5408 = local23; - SoundPlayer.playSeqSound(arg1.zFine, local60, arg1.xFine, false, 0); - } else if (local68 == 2) { - local65.anInt5400 = 0; - } - } else if (local60.forcedPriority >= SeqTypeList.get(local65.anInt5396).forcedPriority) { - local65 = arg1.aClass147Array3[local25] = null; - } - } - if (local65 == null) { - local65 = arg1.aClass147Array3[local25] = new Npc_Class147(); - local65.anInt5398 = 1; - local65.anInt5404 = 0; - local65.anInt5408 = local23; - local65.anInt5396 = local15; - local65.anInt5400 = 0; - local65.anInt5399 = 0; - SoundPlayer.playSeqSound(arg1.zFine, local60, arg1.xFine, false, 0); - } - } - } - local19 >>>= 0x1; - } - } - } -} diff --git a/client/src/main/java/rt4/Static16.java b/client/src/main/java/rt4/Static16.java deleted file mode 100644 index fd72939..0000000 --- a/client/src/main/java/rt4/Static16.java +++ /dev/null @@ -1,90 +0,0 @@ -package rt4; - -import org.openrs2.deob.annotation.OriginalMember; -import org.openrs2.deob.annotation.Pc; - -public final class Static16 { - - @OriginalMember(owner = "client!bf", name = "B", descriptor = "I") - public static int anInt548 = -1; - - @OriginalMember(owner = "client!bf", name = "G", descriptor = "I") - public static int anInt551 = 0; - - @OriginalMember(owner = "client!bf", name = "I", descriptor = "[I") - public static final int[] anIntArray52 = new int[] { 16776960, 16711680, 65280, 65535, 16711935, 16777215 }; - - @OriginalMember(owner = "client!bf", name = "c", descriptor = "(I)V") - public static void method501() { - if (!GlRenderer.enabled || Static231.aBoolean252) { - return; - } - @Pc(14) Tile[][][] local14 = SceneGraph.tiles; - for (@Pc(22) int local22 = 0; local22 < local14.length; local22++) { - @Pc(30) Tile[][] local30 = local14[local22]; - for (@Pc(32) int local32 = 0; local32 < local30.length; local32++) { - for (@Pc(42) int local42 = 0; local42 < local30[local32].length; local42++) { - @Pc(54) Tile local54 = local30[local32][local42]; - if (local54 != null) { - @Pc(71) GlModel local71; - if (local54.groundDecor != null && local54.groundDecor.entity instanceof GlModel) { - local71 = (GlModel) local54.groundDecor.entity; - if ((local54.groundDecor.key & Long.MIN_VALUE) == 0L) { - local71.method4111(false, true, true, false, true, true); - } else { - local71.method4111(true, true, true, true, true, true); - } - } - if (local54.wallDecor != null) { - if (local54.wallDecor.primary instanceof GlModel) { - local71 = (GlModel) local54.wallDecor.primary; - if ((local54.wallDecor.key & Long.MIN_VALUE) == 0L) { - local71.method4111(false, true, true, false, true, true); - } else { - local71.method4111(true, true, true, true, true, true); - } - } - if (local54.wallDecor.secondary instanceof GlModel) { - local71 = (GlModel) local54.wallDecor.secondary; - if ((Long.MIN_VALUE & local54.wallDecor.key) == 0L) { - local71.method4111(false, true, true, false, true, true); - } else { - local71.method4111(true, true, true, true, true, true); - } - } - } - if (local54.wall != null) { - if (local54.wall.primary instanceof GlModel) { - local71 = (GlModel) local54.wall.primary; - if ((local54.wall.key & Long.MIN_VALUE) == 0L) { - local71.method4111(false, true, true, false, true, true); - } else { - local71.method4111(true, true, true, true, true, true); - } - } - if (local54.wall.secondary instanceof GlModel) { - local71 = (GlModel) local54.wall.secondary; - if ((Long.MIN_VALUE & local54.wall.key) == 0L) { - local71.method4111(false, true, true, false, true, true); - } else { - local71.method4111(true, true, true, true, true, true); - } - } - } - for (@Pc(270) int local270 = 0; local270 < local54.sceneryLen; local270++) { - if (local54.scenery[local270].entity instanceof GlModel) { - @Pc(293) GlModel local293 = (GlModel) local54.scenery[local270].entity; - if ((Long.MIN_VALUE & local54.scenery[local270].key) == 0L) { - local293.method4111(false, true, true, false, true, true); - } else { - local293.method4111(true, true, true, true, true, true); - } - } - } - } - } - } - } - Static231.aBoolean252 = true; - } -} diff --git a/client/src/main/java/rt4/Static160.java b/client/src/main/java/rt4/Static160.java index e28df3d..f452ef2 100644 --- a/client/src/main/java/rt4/Static160.java +++ b/client/src/main/java/rt4/Static160.java @@ -6,7 +6,10 @@ import org.openrs2.deob.annotation.Pc; public final class Static160 { - @OriginalMember(owner = "client!mj", name = "a", descriptor = "(IILclient!be;IB)V") + @OriginalMember(owner = "client!ig", name = "i", descriptor = "I") + public static int anInt2886; + + @OriginalMember(owner = "client!mj", name = "a", descriptor = "(IILclient!be;IB)V") public static void method3047(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) Component arg2, @OriginalArg(3) int arg3) { if (GlRenderer.enabled) { GlRaster.setClip(arg0, arg1, arg2.width + arg0, arg2.height + arg1); @@ -32,15 +35,15 @@ public final class Static160 { public static boolean method3049(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4) { @Pc(9) int local9 = arg3 * Static231.anInt5205 + arg0 * Static81.anInt2222 >> 16; @Pc(19) int local19 = arg3 * Static81.anInt2222 - arg0 * Static231.anInt5205 >> 16; - @Pc(29) int local29 = arg1 * Static109.anInt2886 + local19 * Static121.anInt3038 >> 16; - @Pc(39) int local39 = arg1 * Static121.anInt3038 - local19 * Static109.anInt2886 >> 16; + @Pc(29) int local29 = arg1 * anInt2886 + local19 * Static121.anInt3038 >> 16; + @Pc(39) int local39 = arg1 * Static121.anInt3038 - local19 * anInt2886 >> 16; if (local29 < 1) { local29 = 1; } @Pc(50) int local50 = (local9 << 9) / local29; @Pc(56) int local56 = (local39 << 9) / local29; - @Pc(66) int local66 = arg2 * Static109.anInt2886 + local19 * Static121.anInt3038 >> 16; - @Pc(76) int local76 = arg2 * Static121.anInt3038 - local19 * Static109.anInt2886 >> 16; + @Pc(66) int local66 = arg2 * anInt2886 + local19 * Static121.anInt3038 >> 16; + @Pc(76) int local76 = arg2 * Static121.anInt3038 - local19 * anInt2886 >> 16; if (local66 < 1) { local66 = 1; } diff --git a/client/src/main/java/rt4/Static163.java b/client/src/main/java/rt4/Static163.java deleted file mode 100644 index 90e6228..0000000 --- a/client/src/main/java/rt4/Static163.java +++ /dev/null @@ -1,22 +0,0 @@ -package rt4; - -import org.openrs2.deob.annotation.OriginalArg; -import org.openrs2.deob.annotation.OriginalMember; -import org.openrs2.deob.annotation.Pc; - -public final class Static163 { - - @OriginalMember(owner = "client!n", name = "e", descriptor = "Lclient!na;") - public static final JagString aClass100_767 = JagString.parse(")2"); - - @OriginalMember(owner = "client!n", name = "a", descriptor = "(IIIIII)V") - public static void method3105(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4) { - @Pc(11) int local11 = Static78.method1690(TextureOp29.anInt2869, arg2, TextureOp29.anInt5773); - @Pc(17) int local17 = Static78.method1690(TextureOp29.anInt2869, arg4, TextureOp29.anInt5773); - @Pc(23) int local23 = Static78.method1690(TextureOp29.anInt5063, arg3, TextureOp29.anInt4164); - @Pc(35) int local35 = Static78.method1690(TextureOp29.anInt5063, arg1, TextureOp29.anInt4164); - for (@Pc(37) int local37 = local11; local37 <= local17; local37++) { - Static131.method2576(Static71.anIntArrayArray10[local37], local23, local35, arg0); - } - } -} diff --git a/client/src/main/java/rt4/Static164.java b/client/src/main/java/rt4/Static164.java index d715e62..f02de9b 100644 --- a/client/src/main/java/rt4/Static164.java +++ b/client/src/main/java/rt4/Static164.java @@ -6,6 +6,8 @@ import org.openrs2.deob.annotation.Pc; public final class Static164 { + @OriginalMember(owner = "client!ii", name = "e", descriptor = "Lclient!na;") + public static final JagString aClass100_570 = JagString.parse(")2"); @OriginalMember(owner = "client!na", name = "W", descriptor = "Z") public static boolean newTab; @@ -139,15 +141,57 @@ public final class Static164 { @OriginalMember(owner = "client!na", name = "a", descriptor = "(Lclient!ba;Lclient!ba;IIIZZ)I") public static int method3115(@OriginalArg(0) World arg0, @OriginalArg(1) World arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) boolean arg4, @OriginalArg(6) boolean arg5) { - @Pc(8) int local8 = Static270.method4595(arg1, arg3, arg0, arg5); + @Pc(8) int local8 = method4595(arg1, arg3, arg0, arg5); if (local8 != 0) { return arg5 ? -local8 : local8; } else if (arg2 == -1) { return 0; } else { - @Pc(42) int local42 = Static270.method4595(arg1, arg2, arg0, arg4); + @Pc(42) int local42 = method4595(arg1, arg2, arg0, arg4); return arg4 ? -local42 : local42; } } + @OriginalMember(owner = "client!wb", name = "a", descriptor = "(Lclient!ba;IILclient!ba;Z)I") + public static int method4595(@OriginalArg(0) World arg0, @OriginalArg(1) int arg1, @OriginalArg(3) World arg2, @OriginalArg(4) boolean arg3) { + if (arg1 == 1) { + @Pc(11) int local11 = arg0.players; + @Pc(14) int local14 = arg2.players; + if (!arg3) { + if (local14 == -1) { + local14 = 2001; + } + if (local11 == -1) { + local11 = 2001; + } + } + return local11 - local14; + } else if (arg1 == 2) { + return arg0.getWorldInfo().name.compare(arg2.getWorldInfo().name); + } else if (arg1 == 3) { + if (arg0.activity.strEquals(aClass100_570)) { + if (arg2.activity.strEquals(aClass100_570)) { + return 0; + } else if (arg3) { + return -1; + } else { + return 1; + } + } else if (arg2.activity.strEquals(aClass100_570)) { + return arg3 ? 1 : -1; + } else { + return arg0.activity.compare(arg2.activity); + } + } else if (arg1 == 4) { + return arg0.isLootShare() ? (arg2.isLootShare() ? 0 : 1) : arg2.isLootShare() ? -1 : 0; + } else if (arg1 == 5) { + return arg0.isQuickChat() ? (arg2.isQuickChat() ? 0 : 1) : (arg2.isQuickChat() ? -1 : 0); + } else if (arg1 == 6) { + return arg0.isPvp() ? (arg2.isPvp() ? 0 : 1) : (arg2.isPvp() ? -1 : 0); + } else if (arg1 == 7) { + return arg0.isMembers() ? (arg2.isMembers() ? 0 : 1) : (arg2.isMembers() ? -1 : 0); + } else { + return arg0.id - arg2.id; + } + } } diff --git a/client/src/main/java/rt4/Static165.java b/client/src/main/java/rt4/Static165.java index 4ecb7e5..323f66a 100644 --- a/client/src/main/java/rt4/Static165.java +++ b/client/src/main/java/rt4/Static165.java @@ -63,15 +63,6 @@ public final class Static165 { } } - @OriginalMember(owner = "client!nb", name = "a", descriptor = "(II)Lclient!na;") - public static JagString method3165() { - @Pc(21) JagString local21 = new JagString(); - local21.length = 1; - local21.chars = new byte[1]; - local21.chars[0] = -96; - return local21; - } - @OriginalMember(owner = "client!gi", name = "a", descriptor = "(IIIIB)V") public static void method1760(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) { if (arg1 - arg0 >= TextureOp29.anInt4164 && TextureOp29.anInt5063 >= arg0 + arg1 && arg3 - arg0 >= TextureOp29.anInt5773 && TextureOp29.anInt2869 >= arg0 + arg3) { @@ -83,7 +74,7 @@ public final class Static165 { @OriginalMember(owner = "client!fl", name = "a", descriptor = "(IIIIII)V") public static void method1568(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4) { - Static131.method2576(Static71.anIntArrayArray10[arg0], arg1 - arg2, arg2 + arg1, arg4); + TextureOp29SubOp4.method2576(TextureOp29SubOp4.anIntArrayArray10[arg0], arg1 - arg2, arg2 + arg1, arg4); @Pc(17) int local17 = 0; @Pc(21) int local21 = arg2 * arg2; @Pc(25) int local25 = arg3 * arg3; @@ -125,8 +116,8 @@ public final class Static165 { local48 += -local98; @Pc(179) int local179 = arg1 - local17; local98 -= local60; - Static131.method2576(Static71.anIntArrayArray10[local109], local179, local160, arg4); - Static131.method2576(Static71.anIntArrayArray10[local105], local179, local160, arg4); + TextureOp29SubOp4.method2576(TextureOp29SubOp4.anIntArrayArray10[local109], local179, local160, arg4); + TextureOp29SubOp4.method2576(TextureOp29SubOp4.anIntArrayArray10[local105], local179, local160, arg4); } } @@ -149,9 +140,9 @@ public final class Static165 { @Pc(95) int local95; @Pc(104) int local104; if (arg4 >= TextureOp29.anInt5773 && TextureOp29.anInt2869 >= arg4) { - local95 = Static78.method1690(TextureOp29.anInt5063, arg2 + arg3, TextureOp29.anInt4164); - local104 = Static78.method1690(TextureOp29.anInt5063, arg3 - arg2, TextureOp29.anInt4164); - Static131.method2576(Static71.anIntArrayArray10[arg4], local104, local95, arg0); + local95 = Static231.method1690(TextureOp29.anInt5063, arg2 + arg3, TextureOp29.anInt4164); + local104 = Static231.method1690(TextureOp29.anInt5063, arg3 - arg2, TextureOp29.anInt4164); + TextureOp29SubOp4.method2576(TextureOp29SubOp4.anIntArrayArray10[arg4], local104, local95, arg0); } @Pc(118) int local118 = local67 * (arg1 - 1); while (local17 > 0) { @@ -178,13 +169,13 @@ public final class Static165 { local42 += -local118; local104 = local17 + arg4; if (TextureOp29.anInt5773 <= local104 && TextureOp29.anInt2869 >= local95) { - @Pc(213) int local213 = Static78.method1690(TextureOp29.anInt5063, local15 + arg3, TextureOp29.anInt4164); - @Pc(222) int local222 = Static78.method1690(TextureOp29.anInt5063, arg3 - local15, TextureOp29.anInt4164); + @Pc(213) int local213 = Static231.method1690(TextureOp29.anInt5063, local15 + arg3, TextureOp29.anInt4164); + @Pc(222) int local222 = Static231.method1690(TextureOp29.anInt5063, arg3 - local15, TextureOp29.anInt4164); if (local95 >= TextureOp29.anInt5773) { - Static131.method2576(Static71.anIntArrayArray10[local95], local222, local213, arg0); + TextureOp29SubOp4.method2576(TextureOp29SubOp4.anIntArrayArray10[local95], local222, local213, arg0); } if (TextureOp29.anInt2869 >= local104) { - Static131.method2576(Static71.anIntArrayArray10[local104], local222, local213, arg0); + TextureOp29SubOp4.method2576(TextureOp29SubOp4.anIntArrayArray10[local104], local222, local213, arg0); } } local118 -= local67; diff --git a/client/src/main/java/rt4/Static166.java b/client/src/main/java/rt4/Static166.java deleted file mode 100644 index 166cd17..0000000 --- a/client/src/main/java/rt4/Static166.java +++ /dev/null @@ -1,5 +0,0 @@ -package rt4; - -public final class Static166 { - -} diff --git a/client/src/main/java/rt4/Static167.java b/client/src/main/java/rt4/Static167.java deleted file mode 100644 index 4474e63..0000000 --- a/client/src/main/java/rt4/Static167.java +++ /dev/null @@ -1,10 +0,0 @@ -package rt4; - -import org.openrs2.deob.annotation.OriginalMember; - -public final class Static167 { - - @OriginalMember(owner = "client!nd", name = "s", descriptor = "I") - public static int anInt4069; - -} diff --git a/client/src/main/java/rt4/Static169.java b/client/src/main/java/rt4/Static169.java deleted file mode 100644 index c2bbaad..0000000 --- a/client/src/main/java/rt4/Static169.java +++ /dev/null @@ -1,72 +0,0 @@ -package rt4; - -import java.awt.Frame; -import org.openrs2.deob.annotation.OriginalArg; -import org.openrs2.deob.annotation.OriginalMember; -import org.openrs2.deob.annotation.Pc; - -public final class Static169 { - - @OriginalMember(owner = "client!nf", name = "h", descriptor = "Lclient!be;") - public static Component mouseOverInventoryInterface; - - @OriginalMember(owner = "client!nf", name = "i", descriptor = "I") - public static int anInt4075 = -1; - - @OriginalMember(owner = "client!nf", name = "a", descriptor = "(Lclient!na;BZ)V") - public static void openUrl(@OriginalArg(0) JagString arg0, @OriginalArg(2) boolean arg1) { - if (!arg1) { - try { - GameShell.instance.getAppletContext().showDocument(arg0.method3127(GameShell.instance.getCodeBase()), "_top"); - } catch (@Pc(22) Exception local22) { - } - return; - } - if (GlRenderer.enabled && GameShell.openWindowJavaScript) { - try { - BrowserControl.call(GameShell.signLink.applet, "openjs", new Object[] { arg0.method3127(GameShell.instance.getCodeBase()).toString() }); - return; - } catch (@Pc(48) Throwable local48) { - } - } - try { - GameShell.instance.getAppletContext().showDocument(arg0.method3127(GameShell.instance.getCodeBase()), "_blank"); - } catch (@Pc(59) Exception local59) { - } - } - - @OriginalMember(owner = "client!nf", name = "a", descriptor = "(IIIIILsignlink!ll;)Ljava/awt/Frame;") - public static Frame method3176(@OriginalArg(2) int arg0, @OriginalArg(3) int arg1, @OriginalArg(4) int arg2, @OriginalArg(5) SignLink arg3) { - if (!arg3.isFullScreenSupported()) { - return null; - } - @Pc(20) DisplayMode[] local20 = DisplayMode.method3558(arg3); - if (local20 == null) { - return null; - } - @Pc(27) boolean local27 = false; - for (@Pc(29) int local29 = 0; local29 < local20.length; local29++) { - if (arg2 == local20[local29].width && arg1 == local20[local29].height && (!local27 || local20[local29].bitDepth > arg0)) { - arg0 = local20[local29].bitDepth; - local27 = true; - } - } - if (!local27) { - return null; - } - @Pc(90) PrivilegedRequest local90 = arg3.enterFullScreen(arg0, arg1, arg2); - while (local90.status == 0) { - ThreadUtils.sleep(10L); - } - @Pc(103) Frame local103 = (Frame) local90.result; - if (local103 == null) { - return null; - } else if (local90.status == 2) { - DisplayMode.exitFullScreen(local103, arg3); - return null; - } else { - return local103; - } - } - -} diff --git a/client/src/main/java/rt4/Static171.java b/client/src/main/java/rt4/Static171.java index 8638a90..4ab74bf 100644 --- a/client/src/main/java/rt4/Static171.java +++ b/client/src/main/java/rt4/Static171.java @@ -13,7 +13,7 @@ public final class Static171 { return -1; } for (@Pc(20) int local20 = 0; local20 < WorldMap.labels.anInt5074; local20++) { - if (WorldMap.labels.aClass100Array153[local20].method3140(Static101.aClass100_538, Static197.aClass100_872).method3142(arg0)) { + if (WorldMap.labels.aClass100Array153[local20].method3140(WorldMap.aClass100_538, WorldMap.aClass100_872).method3142(arg0)) { return local20; } } @@ -24,7 +24,7 @@ public final class Static171 { public static int method3219(@OriginalArg(1) int arg0, @OriginalArg(2) Random arg1) { if (arg0 <= 0) { throw new IllegalArgumentException(); - } else if (Static209.method3702(arg0)) { + } else if (method3702(arg0)) { return (int) (((long) arg1.nextInt() & 0xFFFFFFFFL) * (long) arg0 >> 32); } else { @Pc(38) int local38 = Integer.MIN_VALUE - (int) (4294967296L % (long) arg0); @@ -32,8 +32,18 @@ public final class Static171 { do { local41 = arg1.nextInt(); } while (local38 <= local41); - return Static39.method990(local41, arg0); + return method990(local41, arg0); } } + @OriginalMember(owner = "client!d", name = "c", descriptor = "(III)I") + public static int method990(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) { + @Pc(11) int local11 = arg1 - 1 & arg0 >> 31; + return local11 + (arg0 + (arg0 >>> 31)) % arg1; + } + + @OriginalMember(owner = "client!ra", name = "a", descriptor = "(BI)Z") + public static boolean method3702(@OriginalArg(1) int arg0) { + return arg0 == (-arg0 & arg0); + } } diff --git a/client/src/main/java/rt4/Static172.java b/client/src/main/java/rt4/Static172.java deleted file mode 100644 index b62fd41..0000000 --- a/client/src/main/java/rt4/Static172.java +++ /dev/null @@ -1,46 +0,0 @@ -package rt4; - -import org.openrs2.deob.annotation.OriginalArg; -import org.openrs2.deob.annotation.OriginalMember; -import org.openrs2.deob.annotation.Pc; - -public final class Static172 { - - @OriginalMember(owner = "client!nj", name = "k", descriptor = "I") - public static int anInt4165; - - @OriginalMember(owner = "client!nj", name = "h", descriptor = "Lclient!ih;") - public static final LinkedList aClass69_97 = new LinkedList(); - - @OriginalMember(owner = "client!nj", name = "a", descriptor = "(IIZ[I[I)V") - public static void method3223(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int[] arg2, @OriginalArg(4) int[] arg3) { - if (arg0 >= arg1) { - return; - } - @Pc(22) int local22 = (arg1 + arg0) / 2; - @Pc(24) int local24 = arg0; - @Pc(28) int local28 = arg2[local22]; - arg2[local22] = arg2[arg1]; - arg2[arg1] = local28; - @Pc(42) int local42 = arg3[local22]; - arg3[local22] = arg3[arg1]; - arg3[arg1] = local42; - for (@Pc(54) int local54 = arg0; local54 < arg1; local54++) { - if (arg2[local54] > (local54 & 0x1) + local28) { - @Pc(79) int local79 = arg2[local54]; - arg2[local54] = arg2[local24]; - arg2[local24] = local79; - @Pc(93) int local93 = arg3[local54]; - arg3[local54] = arg3[local24]; - arg3[local24++] = local93; - } - } - arg2[arg1] = arg2[local24]; - arg2[local24] = local28; - arg3[arg1] = arg3[local24]; - arg3[local24] = local42; - method3223(arg0, local24 - 1, arg2, arg3); - method3223(local24 + 1, arg1, arg2, arg3); - } - -} diff --git a/client/src/main/java/rt4/Static173.java b/client/src/main/java/rt4/Static173.java index c4ce08d..7bb88bc 100644 --- a/client/src/main/java/rt4/Static173.java +++ b/client/src/main/java/rt4/Static173.java @@ -11,7 +11,7 @@ public final class Static173 { @OriginalMember(owner = "client!nk", name = "a", descriptor = "(Z[J[I)V") public static void method3243(@OriginalArg(1) long[] arg0, @OriginalArg(2) int[] arg1) { - Static83.method436(arg0, 0, arg0.length - 1, arg1); + method436(arg0, 0, arg0.length - 1, arg1); } @OriginalMember(owner = "client!nk", name = "a", descriptor = "(IIIIIB)V") @@ -42,27 +42,58 @@ public final class Static173 { if (TextureOp29.anInt5773 > arg4) { arg4 = TextureOp29.anInt5773; } else { - Static131.method2576(Static71.anIntArrayArray10[arg4++], arg1, arg3, arg0); + TextureOp29SubOp4.method2576(TextureOp29SubOp4.anIntArrayArray10[arg4++], arg1, arg3, arg0); } if (arg2 <= TextureOp29.anInt2869) { - Static131.method2576(Static71.anIntArrayArray10[arg2--], arg1, arg3, arg0); + TextureOp29SubOp4.method2576(TextureOp29SubOp4.anIntArrayArray10[arg2--], arg1, arg3, arg0); } else { arg2 = TextureOp29.anInt2869; } @Pc(98) int local98; if (local24 && local43) { for (local98 = arg4; local98 <= arg2; local98++) { - @Pc(105) int[] local105 = Static71.anIntArrayArray10[local98]; + @Pc(105) int[] local105 = TextureOp29SubOp4.anIntArrayArray10[local98]; local105[arg1] = local105[arg3] = arg0; } } else if (local24) { for (local98 = arg4; local98 <= arg2; local98++) { - Static71.anIntArrayArray10[local98][arg1] = arg0; + TextureOp29SubOp4.anIntArrayArray10[local98][arg1] = arg0; } } else if (local43) { for (local98 = arg4; local98 <= arg2; local98++) { - Static71.anIntArrayArray10[local98][arg3] = arg0; + TextureOp29SubOp4.anIntArrayArray10[local98][arg3] = arg0; } } } + + @OriginalMember(owner = "client!gj", name = "a", descriptor = "([JII[II)V") + public static void method436(@OriginalArg(0) long[] arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int[] arg3) { + if (arg1 >= arg2) { + return; + } + @Pc(20) int local20 = arg1; + @Pc(26) int local26 = (arg2 + arg1) / 2; + @Pc(30) long local30 = arg0[local26]; + arg0[local26] = arg0[arg2]; + arg0[arg2] = local30; + @Pc(44) int local44 = arg3[local26]; + arg3[local26] = arg3[arg2]; + arg3[arg2] = local44; + for (@Pc(56) int local56 = arg1; local56 < arg2; local56++) { + if (arg0[local56] < local30 + (long) (local56 & 0x1)) { + @Pc(76) long local76 = arg0[local56]; + arg0[local56] = arg0[local20]; + arg0[local20] = local76; + @Pc(90) int local90 = arg3[local56]; + arg3[local56] = arg3[local20]; + arg3[local20++] = local90; + } + } + arg0[arg2] = arg0[local20]; + arg0[local20] = local30; + arg3[arg2] = arg3[local20]; + arg3[local20] = local44; + method436(arg0, arg1, local20 - 1, arg3); + method436(arg0, local20 + 1, arg2, arg3); + } } diff --git a/client/src/main/java/rt4/Static175.java b/client/src/main/java/rt4/Static175.java deleted file mode 100644 index 8d212dd..0000000 --- a/client/src/main/java/rt4/Static175.java +++ /dev/null @@ -1,23 +0,0 @@ -package rt4; - -import org.openrs2.deob.annotation.OriginalMember; - -public final class Static175 { - - @OriginalMember(owner = "client!nm", name = "W", descriptor = "Lclient!na;") - public static JagString url; - - @OriginalMember(owner = "client!nm", name = "U", descriptor = "I") - public static int mapFilesMissingCount = 0; - - @OriginalMember(owner = "client!nm", name = "a", descriptor = "(Z)V") - public static void method3279() { - if (Static267.anInt5775 > 0) { - LoginManager.processLogout(); - } else { - Static233.aClass95_4 = Protocol.socket; - Protocol.socket = null; - client.setGameState(40); - } - } -} diff --git a/client/src/main/java/rt4/Static176.java b/client/src/main/java/rt4/Static176.java index d495086..57d1a7a 100644 --- a/client/src/main/java/rt4/Static176.java +++ b/client/src/main/java/rt4/Static176.java @@ -18,7 +18,13 @@ public final class Static176 { public static final JagString aClass100_783 = JagString.parse(")4p="); @OriginalMember(owner = "client!rc", name = "G", descriptor = "Lclient!na;") public static final JagString aClass100_230 = JagString.parse(""); - @OriginalMember(owner = "client!ob", name = "f", descriptor = "Lclient!ve;") + @OriginalMember(owner = "client!ja", name = "s", descriptor = "Lclient!na;") + public static final JagString HTTP_PROTOCOL = JagString.parse("http:)4)4"); + @OriginalMember(owner = "client!vd", name = "F", descriptor = "Lclient!na;") + public static final JagString aClass100_945 = JagString.parse("0"); + @OriginalMember(owner = "client!q", name = "a", descriptor = "Lclient!na;") + public static final JagString aClass100_260 = JagString.parse(")1a2)1m"); + @OriginalMember(owner = "client!ob", name = "f", descriptor = "Lclient!ve;") public static Js5 aClass153_76; @OriginalMember(owner = "client!ob", name = "a", descriptor = "[Z") @@ -35,7 +41,7 @@ public final class Static176 { @OriginalMember(owner = "client!ob", name = "a", descriptor = "(IB)Z") public static boolean hopWorld(@OriginalArg(0) int arg0) { - @Pc(3) World local3 = Static54.getWorld(arg0); + @Pc(3) World local3 = ScriptRunner.getWorld(arg0); if (local3 == null) { return false; } else if (SignLink.anInt5928 == 1 || SignLink.anInt5928 == 2 || client.modeWhere == 2) { @@ -57,7 +63,7 @@ public final class Static176 { if (client.settings != null) { local89 = JagString.concatenate(new JagString[] { aClass100_783, client.settings}); } - @Pc(182) JagString local182 = JagString.concatenate(new JagString[] { Static115.HTTP_PROTOCOL, local3.hostname, local62, aClass100_1107, JagString.parseInt(client.language), aClass100_801, JagString.parseInt(client.affiliate), local89, Static139.aClass100_659, client.objectTag ? aClass100_184 : Static260.aClass100_945, aClass100_420, client.javaScript ? aClass100_184 : Static260.aClass100_945, Static198.aClass100_260, client.advertSuppressed ? aClass100_184 : Static260.aClass100_945 }); + @Pc(182) JagString local182 = JagString.concatenate(new JagString[] { HTTP_PROTOCOL, local3.hostname, local62, aClass100_1107, JagString.parseInt(client.language), aClass100_801, JagString.parseInt(client.affiliate), local89, Static139.aClass100_659, client.objectTag ? aClass100_184 : aClass100_945, aClass100_420, client.javaScript ? aClass100_184 : aClass100_945, aClass100_260, client.advertSuppressed ? aClass100_184 : aClass100_945 }); try { client.instance.getAppletContext().showDocument(local182.method3107(), "_self"); return true; @@ -67,10 +73,4 @@ public final class Static176 { } } - @OriginalMember(owner = "client!ob", name = "a", descriptor = "(IIIIII)V") - public static void method3308(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4) { - for (@Pc(8) int local8 = arg2; local8 <= arg0; local8++) { - Static131.method2576(Static71.anIntArrayArray10[local8], arg3, arg1, arg4); - } - } } diff --git a/client/src/main/java/rt4/Static178.java b/client/src/main/java/rt4/Static178.java deleted file mode 100644 index c6c8e92..0000000 --- a/client/src/main/java/rt4/Static178.java +++ /dev/null @@ -1,10 +0,0 @@ -package rt4; - -import org.openrs2.deob.annotation.OriginalMember; - -public final class Static178 { - - @OriginalMember(owner = "client!od", name = "i", descriptor = "I") - public static int anInt4247 = 0; - -} diff --git a/client/src/main/java/rt4/Static18.java b/client/src/main/java/rt4/Static18.java index 5e67c23..d0881ab 100644 --- a/client/src/main/java/rt4/Static18.java +++ b/client/src/main/java/rt4/Static18.java @@ -28,7 +28,7 @@ public final class Static18 { } else if (local5 > 100) { local5 = 100; } - local29 = local5 * (Static187.aShort27 - Static263.aShort30) / 100 + Static263.aShort30; + local29 = local5 * (ScriptRunner.aShort27 - ScriptRunner.aShort30) / 100 + ScriptRunner.aShort30; arg3 = local29 * arg3 >> 8; } local5 = 2048 - arg6 & 0x7FF; @@ -59,7 +59,7 @@ public final class Static18 { @OriginalMember(owner = "client!bh", name = "a", descriptor = "(B)Lclient!ba;") public static World getFirstWorld() { - Static51.worldPos = 0; + WorldList.worldPos = 0; return WorldList.getNextWorld(); } diff --git a/client/src/main/java/rt4/Static180.java b/client/src/main/java/rt4/Static180.java deleted file mode 100644 index dd57422..0000000 --- a/client/src/main/java/rt4/Static180.java +++ /dev/null @@ -1,30 +0,0 @@ -package rt4; - -import org.openrs2.deob.annotation.OriginalArg; -import org.openrs2.deob.annotation.OriginalMember; -import org.openrs2.deob.annotation.Pc; - -public final class Static180 { - - @OriginalMember(owner = "client!og", name = "e", descriptor = "Lclient!be;") - public static Component aClass13_22; - - @OriginalMember(owner = "client!og", name = "a", descriptor = "(BIILclient!fe;III)V") - public static void method3326(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) PathingEntity arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5) { - Static198.method1026(arg5, arg1, arg2.zFine, arg4, arg0, arg2.xFine, arg3); - } - - @OriginalMember(owner = "client!og", name = "a", descriptor = "(III)I") - public static int method3330(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) { - if (arg0 > 22050) { - arg1 = arg0; - arg0 = 22050; - } - while (arg0 != 0) { - @Pc(21) int local21 = arg1 % arg0; - arg1 = arg0; - arg0 = local21; - } - return arg1; - } -} diff --git a/client/src/main/java/rt4/Static181.java b/client/src/main/java/rt4/Static181.java deleted file mode 100644 index e1f7892..0000000 --- a/client/src/main/java/rt4/Static181.java +++ /dev/null @@ -1,25 +0,0 @@ -package rt4; - -import org.openrs2.deob.annotation.OriginalArg; -import org.openrs2.deob.annotation.OriginalMember; - -public final class Static181 { - - @OriginalMember(owner = "client!oi", name = "h", descriptor = "Lclient!qf;") - public static Sprite aClass3_Sub2_Sub1_9; - - @OriginalMember(owner = "client!oi", name = "a", descriptor = "(IIIIIIIIII)V") - public static void method3340(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7, @OriginalArg(8) int arg8) { - if (arg5 >= TextureOp29.anInt4164 && arg5 <= TextureOp29.anInt5063 && arg0 >= TextureOp29.anInt4164 && arg0 <= TextureOp29.anInt5063 && arg6 >= TextureOp29.anInt4164 && TextureOp29.anInt5063 >= arg6 && TextureOp29.anInt4164 <= arg1 && arg1 <= TextureOp29.anInt5063 && TextureOp29.anInt5773 <= arg4 && arg4 <= TextureOp29.anInt2869 && arg7 >= TextureOp29.anInt5773 && TextureOp29.anInt2869 >= arg7 && arg2 >= TextureOp29.anInt5773 && TextureOp29.anInt2869 >= arg2 && arg3 >= TextureOp29.anInt5773 && arg3 <= TextureOp29.anInt2869) { - Static38.method962(arg2, arg8, arg7, arg6, arg1, arg3, arg4, arg0, arg5); - } else { - Static165.method3162(arg5, arg0, arg7, arg8, arg3, arg2, arg1, arg6, arg4); - } - } - - @OriginalMember(owner = "client!oi", name = "a", descriptor = "(I[I[Ljava/lang/Object;)V") - public static void method3346(@OriginalArg(1) int[] arg0, @OriginalArg(2) Object[] arg1) { - Static53.method1292(arg1, arg0.length - 1, arg0, 0); - } - -} diff --git a/client/src/main/java/rt4/Static183.java b/client/src/main/java/rt4/Static183.java deleted file mode 100644 index 055c026..0000000 --- a/client/src/main/java/rt4/Static183.java +++ /dev/null @@ -1,45 +0,0 @@ -package rt4; - -import org.openrs2.deob.annotation.OriginalArg; -import org.openrs2.deob.annotation.OriginalMember; -import org.openrs2.deob.annotation.Pc; - -public final class Static183 { - - @OriginalMember(owner = "client!ok", name = "b", descriptor = "I") - public static int anInt4271; - - @OriginalMember(owner = "client!ok", name = "f", descriptor = "J") - public static long prevClickTime = 0L; - - @OriginalMember(owner = "client!ok", name = "a", descriptor = "(IIB)Lclient!ce;") - public static SecondaryLinkedList method3333(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) { - @Pc(9) SecondaryLinkedList local9 = new SecondaryLinkedList(); - for (@Pc(14) Map local14 = (Map) MapList.aClass69_120.head(); local14 != null; local14 = (Map) MapList.aClass69_120.next()) { - if (local14.aBoolean50 && local14.method664(arg1, arg0)) { - local9.addTail(local14); - } - } - return local9; - } - - @OriginalMember(owner = "client!ok", name = "a", descriptor = "(IIIIIII)V") - public static void method3334(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5) { - @Pc(5) int local5 = arg4 + arg1; - @Pc(14) int local14 = arg3 - arg4; - @Pc(29) int local29 = arg4 + arg5; - @Pc(31) int local31; - for (local31 = arg1; local31 < local5; local31++) { - Static131.method2576(Static71.anIntArrayArray10[local31], arg5, arg0, arg2); - } - for (local31 = arg3; local31 > local14; local31--) { - Static131.method2576(Static71.anIntArrayArray10[local31], arg5, arg0, arg2); - } - @Pc(70) int local70 = arg0 - arg4; - for (local31 = local5; local31 <= local14; local31++) { - @Pc(83) int[] local83 = Static71.anIntArrayArray10[local31]; - Static131.method2576(local83, arg5, local29, arg2); - Static131.method2576(local83, local70, arg0, arg2); - } - } -} diff --git a/client/src/main/java/rt4/Static184.java b/client/src/main/java/rt4/Static184.java deleted file mode 100644 index 2bef8b4..0000000 --- a/client/src/main/java/rt4/Static184.java +++ /dev/null @@ -1,27 +0,0 @@ -package rt4; - -import org.openrs2.deob.annotation.OriginalArg; -import org.openrs2.deob.annotation.OriginalMember; -import org.openrs2.deob.annotation.Pc; - -public final class Static184 { - - @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) { - 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") - public static int method3388(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2) { - @Pc(3) int local3 = arg1 & 0x3; - if (local3 == 0) { - return arg2; - } else if (local3 == 1) { - return 1023 - arg0; - } else if (local3 == 2) { - return 1023 - arg2; - } else { - return arg0; - } - } -} diff --git a/client/src/main/java/rt4/Static185.java b/client/src/main/java/rt4/Static185.java index fa8efbc..76e3597 100644 --- a/client/src/main/java/rt4/Static185.java +++ b/client/src/main/java/rt4/Static185.java @@ -9,397 +9,27 @@ public final class Static185 { @OriginalMember(owner = "client!p", name = "e", descriptor = "I") public static int anInt4370; - @OriginalMember(owner = "client!p", name = "a", descriptor = "(IZIZLclient!mj;IIIBII)V") - public static void method3397(@OriginalArg(0) int arg0, @OriginalArg(1) boolean arg1, @OriginalArg(2) int arg2, @OriginalArg(3) boolean arg3, @OriginalArg(4) CollisionMap arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7, @OriginalArg(9) int arg8, @OriginalArg(10) int arg9) { - if (arg1 && !SceneGraph.allLevelsAreVisible() && (SceneGraph.tileFlags[0][arg7][arg8] & 0x2) == 0) { - if ((SceneGraph.tileFlags[arg2][arg7][arg8] & 0x10) != 0) { - return; - } - if (Static4.method22(arg8, arg7, arg2) != LoginManager.centralPlane) { - return; - } - } - if (arg2 < SceneGraph.firstVisibleLevel) { - SceneGraph.firstVisibleLevel = arg2; - } - @Pc(62) LocType local62 = LocTypeList.get(arg5); - if (GlRenderer.enabled && local62.aBoolean216) { - return; - } - @Pc(84) int local84; - @Pc(81) int local81; - if (arg9 == 1 || arg9 == 3) { - local81 = local62.width; - local84 = local62.length; - } else { - local84 = local62.width; - local81 = local62.length; - } - @Pc(103) int local103; - @Pc(112) int local112; - if (arg7 + local84 <= 104) { - local103 = arg7 + (local84 >> 1); - local112 = arg7 + (local84 + 1 >> 1); - } else { - local112 = arg7 + 1; - local103 = arg7; - } - @Pc(129) int local129; - @Pc(133) int local133; - if (local81 + arg8 > 104) { - local129 = arg8; - local133 = arg8 + 1; - } else { - local129 = (local81 >> 1) + arg8; - local133 = arg8 + (local81 + 1 >> 1); - } - @Pc(153) int[][] local153 = SceneGraph.tileHeights[arg0]; - @Pc(165) int local165 = (local84 << 6) + (arg7 << 7); - @Pc(173) int local173 = (local81 << 6) + (arg8 << 7); - @Pc(199) int local199 = local153[local103][local133] + local153[local112][local129] + local153[local103][local129] + local153[local112][local133] >> 2; - @Pc(201) int local201 = 0; - @Pc(213) int[][] local213; - if (GlRenderer.enabled && arg0 != 0) { - local213 = SceneGraph.tileHeights[0]; - local201 = local199 - (local213[local112][local133] + local213[local112][local129] + local213[local103][local129] + local213[local103][local133] >> 2); - } - local213 = null; - @Pc(261) long local261 = (long) (arg7 | 0x40000000 | arg8 << 7 | arg6 << 14 | arg9 << 20); - if (arg3) { - local213 = SceneGraph.surfaceTileHeights[0]; - } else if (arg0 < 3) { - local213 = SceneGraph.tileHeights[arg0 + 1]; - } - if (local62.anInt4429 == 0 || arg3) { - local261 |= Long.MIN_VALUE; - } - if (local62.anInt4438 == 1) { - local261 |= 0x400000L; - } - if (local62.aBoolean213) { - local261 |= 0x80000000L; - } - if (local62.hasAreaSound()) { - AreaSoundManager.add(arg8, local62, arg9, null, arg7, arg2, null); - } - @Pc(330) boolean local330 = local62.aBoolean212 & !arg3; - local261 |= (long) arg5 << 32; - @Pc(387) Entity local387; - @Pc(403) Loc_Class139 local403; - if (arg6 == 22) { - if (Preferences.showGroundDecorations || local62.anInt4429 != 0 || local62.anInt4435 == 1 || local62.aBoolean206) { - if (local62.anInt4430 == -1 && local62.multiLocs == null && !local62.aBoolean214) { - local403 = local62.method3428(arg9, local165, local153, 22, local199, local213, arg1, null, local330, local173); - if (GlRenderer.enabled && local330) { - Static242.method4211(local403.aClass36_Sub1_3, local165, local201, local173); - } - local387 = local403.aClass8_10; - } else { - local387 = new Loc(arg5, 22, arg9, arg0, arg7, arg8, local62.anInt4430, local62.aBoolean209, null); - } - SceneGraph.setGroundDecor(arg2, arg7, arg8, local199, local387, local261, local62.aBoolean211); - if (local62.anInt4435 == 1 && arg4 != null) { - arg4.flagGroundDecor(arg7, arg8); - } - } - } else if (arg6 == 10 || arg6 == 11) { - if (local62.anInt4430 == -1 && local62.multiLocs == null && !local62.aBoolean214) { - local403 = local62.method3428(arg6 == 11 ? arg9 + 4 : arg9, local165, local153, 10, local199, local213, arg1, null, local330, local173); - if (GlRenderer.enabled && local330) { - Static242.method4211(local403.aClass36_Sub1_3, local165, local201, local173); - } - local387 = local403.aClass8_10; - } else { - local387 = new Loc(arg5, 10, arg6 == 11 ? arg9 + 4 : arg9, arg0, arg7, arg8, local62.anInt4430, local62.aBoolean209, null); - } - if (local387 != null) { - @Pc(531) boolean local531 = Static5.method35(arg2, arg7, arg8, local199, local84, local81, local387, local261); - if (local62.aBoolean215 && local531 && arg1) { - @Pc(541) int local541 = 15; - if (local387 instanceof Model) { - local541 = ((Model) local387).method4566() / 4; - if (local541 > 30) { - local541 = 30; - } - } - for (@Pc(560) int local560 = 0; local560 <= local84; local560++) { - for (@Pc(565) int local565 = 0; local565 <= local81; local565++) { - if (SceneGraph.aByteArrayArrayArray9[arg2][arg7 + local560][local565 + arg8] < local541) { - SceneGraph.aByteArrayArrayArray9[arg2][arg7 + local560][arg8 + local565] = (byte) local541; - } - } - } - } - } - if (local62.anInt4435 != 0 && arg4 != null) { - arg4.flagScenery(arg7, local62.aBoolean207, arg8, local84, local81); - } - } else if (arg6 >= 12) { - if (local62.anInt4430 == -1 && local62.multiLocs == null && !local62.aBoolean214) { - local403 = local62.method3428(arg9, local165, local153, arg6, local199, local213, arg1, null, local330, local173); - if (GlRenderer.enabled && local330) { - Static242.method4211(local403.aClass36_Sub1_3, local165, local201, local173); - } - local387 = local403.aClass8_10; - } else { - local387 = new Loc(arg5, arg6, arg9, arg0, arg7, arg8, local62.anInt4430, local62.aBoolean209, null); - } - Static5.method35(arg2, arg7, arg8, local199, 1, 1, local387, local261); - if (arg1 && arg6 >= 12 && arg6 <= 17 && arg6 != 13 && arg2 > 0) { - SceneGraph.anIntArrayArrayArray6[arg2][arg7][arg8] |= 0x4; - } - if (local62.anInt4435 != 0 && arg4 != null) { - arg4.flagScenery(arg7, local62.aBoolean207, arg8, local84, local81); - } - } else if (arg6 == 0) { - if (local62.anInt4430 == -1 && local62.multiLocs == null && !local62.aBoolean214) { - local403 = local62.method3428(arg9, local165, local153, 0, local199, local213, arg1, null, local330, local173); - if (GlRenderer.enabled && local330) { - Static242.method4211(local403.aClass36_Sub1_3, local165, local201, local173); - } - local387 = local403.aClass8_10; - } else { - local387 = new Loc(arg5, 0, arg9, arg0, arg7, arg8, local62.anInt4430, local62.aBoolean209, null); - } - SceneGraph.setWall(arg2, arg7, arg8, local199, local387, null, Static267.anIntArray517[arg9], 0, local261); - if (arg1) { - if (arg9 == 0) { - if (local62.aBoolean215) { - SceneGraph.aByteArrayArrayArray9[arg2][arg7][arg8] = 50; - SceneGraph.aByteArrayArrayArray9[arg2][arg7][arg8 + 1] = 50; - } - if (local62.aBoolean220) { - SceneGraph.anIntArrayArrayArray6[arg2][arg7][arg8] |= 0x1; - } - } else if (arg9 == 1) { - if (local62.aBoolean215) { - SceneGraph.aByteArrayArrayArray9[arg2][arg7][arg8 + 1] = 50; - SceneGraph.aByteArrayArrayArray9[arg2][arg7 + 1][arg8 + 1] = 50; - } - if (local62.aBoolean220) { - SceneGraph.anIntArrayArrayArray6[arg2][arg7][arg8 + 1] |= 0x2; - } - } else if (arg9 == 2) { - if (local62.aBoolean215) { - SceneGraph.aByteArrayArrayArray9[arg2][arg7 + 1][arg8] = 50; - SceneGraph.aByteArrayArrayArray9[arg2][arg7 + 1][arg8 + 1] = 50; - } - if (local62.aBoolean220) { - SceneGraph.anIntArrayArrayArray6[arg2][arg7 + 1][arg8] |= 0x1; - } - } else if (arg9 == 3) { - if (local62.aBoolean215) { - SceneGraph.aByteArrayArrayArray9[arg2][arg7][arg8] = 50; - SceneGraph.aByteArrayArrayArray9[arg2][arg7 + 1][arg8] = 50; - } - if (local62.aBoolean220) { - SceneGraph.anIntArrayArrayArray6[arg2][arg7][arg8] |= 0x2; - } - } - } - if (local62.anInt4435 != 0 && arg4 != null) { - arg4.flagWall(arg9, arg6, local62.aBoolean207, arg8, arg7); - } - if (local62.wallDecorOffsetScale != 16) { - Static18.method559(arg2, arg7, arg8, local62.wallDecorOffsetScale); - } - } else if (arg6 == 1) { - if (local62.anInt4430 == -1 && local62.multiLocs == null && !local62.aBoolean214) { - local403 = local62.method3428(arg9, local165, local153, 1, local199, local213, arg1, null, local330, local173); - if (GlRenderer.enabled && local330) { - Static242.method4211(local403.aClass36_Sub1_3, local165, local201, local173); - } - local387 = local403.aClass8_10; - } else { - local387 = new Loc(arg5, 1, arg9, arg0, arg7, arg8, local62.anInt4430, local62.aBoolean209, null); - } - SceneGraph.setWall(arg2, arg7, arg8, local199, local387, null, Static78.anIntArray204[arg9], 0, local261); - if (local62.aBoolean215 && arg1) { - if (arg9 == 0) { - SceneGraph.aByteArrayArrayArray9[arg2][arg7][arg8 + 1] = 50; - } else if (arg9 == 1) { - SceneGraph.aByteArrayArrayArray9[arg2][arg7 + 1][arg8 + 1] = 50; - } else if (arg9 == 2) { - SceneGraph.aByteArrayArrayArray9[arg2][arg7 + 1][arg8] = 50; - } else if (arg9 == 3) { - SceneGraph.aByteArrayArrayArray9[arg2][arg7][arg8] = 50; - } - } - if (local62.anInt4435 != 0 && arg4 != null) { - arg4.flagWall(arg9, arg6, local62.aBoolean207, arg8, arg7); - } - } else { - @Pc(1226) int local1226; - if (arg6 == 2) { - local1226 = arg9 + 1 & 0x3; - @Pc(1269) Entity local1269; - @Pc(1254) Entity local1254; - if (local62.anInt4430 == -1 && local62.multiLocs == null && !local62.aBoolean214) { - @Pc(1287) Loc_Class139 local1287 = local62.method3428(arg9 + 4, local165, local153, 2, local199, local213, arg1, null, local330, local173); - if (GlRenderer.enabled && local330) { - Static242.method4211(local1287.aClass36_Sub1_3, local165, local201, local173); - } - local1254 = local1287.aClass8_10; - local1287 = local62.method3428(local1226, local165, local153, 2, local199, local213, arg1, null, local330, local173); - if (GlRenderer.enabled && local330) { - Static242.method4211(local1287.aClass36_Sub1_3, local165, local201, local173); - } - local1269 = local1287.aClass8_10; - } else { - local1254 = new Loc(arg5, 2, arg9 + 4, arg0, arg7, arg8, local62.anInt4430, local62.aBoolean209, null); - local1269 = new Loc(arg5, 2, local1226, arg0, arg7, arg8, local62.anInt4430, local62.aBoolean209, null); - } - SceneGraph.setWall(arg2, arg7, arg8, local199, local1254, local1269, Static267.anIntArray517[arg9], Static267.anIntArray517[local1226], local261); - if (local62.aBoolean220 && arg1) { - if (arg9 == 0) { - SceneGraph.anIntArrayArrayArray6[arg2][arg7][arg8] |= 0x1; - SceneGraph.anIntArrayArrayArray6[arg2][arg7][arg8 + 1] |= 0x2; - } else if (arg9 == 1) { - SceneGraph.anIntArrayArrayArray6[arg2][arg7][arg8 + 1] |= 0x2; - SceneGraph.anIntArrayArrayArray6[arg2][arg7 + 1][arg8] |= 0x1; - } else if (arg9 == 2) { - SceneGraph.anIntArrayArrayArray6[arg2][arg7 + 1][arg8] |= 0x1; - SceneGraph.anIntArrayArrayArray6[arg2][arg7][arg8] |= 0x2; - } else if (arg9 == 3) { - SceneGraph.anIntArrayArrayArray6[arg2][arg7][arg8] |= 0x2; - SceneGraph.anIntArrayArrayArray6[arg2][arg7][arg8] |= 0x1; - } - } - if (local62.anInt4435 != 0 && arg4 != null) { - arg4.flagWall(arg9, arg6, local62.aBoolean207, arg8, arg7); - } - if (local62.wallDecorOffsetScale != 16) { - Static18.method559(arg2, arg7, arg8, local62.wallDecorOffsetScale); - } - } else if (arg6 == 3) { - if (local62.anInt4430 == -1 && local62.multiLocs == null && !local62.aBoolean214) { - local403 = local62.method3428(arg9, local165, local153, 3, local199, local213, arg1, null, local330, local173); - if (GlRenderer.enabled && local330) { - Static242.method4211(local403.aClass36_Sub1_3, local165, local201, local173); - } - local387 = local403.aClass8_10; - } else { - local387 = new Loc(arg5, 3, arg9, arg0, arg7, arg8, local62.anInt4430, local62.aBoolean209, null); - } - SceneGraph.setWall(arg2, arg7, arg8, local199, local387, null, Static78.anIntArray204[arg9], 0, local261); - if (local62.aBoolean215 && arg1) { - if (arg9 == 0) { - SceneGraph.aByteArrayArrayArray9[arg2][arg7][arg8 + 1] = 50; - } else if (arg9 == 1) { - SceneGraph.aByteArrayArrayArray9[arg2][arg7 + 1][arg8 + 1] = 50; - } else if (arg9 == 2) { - SceneGraph.aByteArrayArrayArray9[arg2][arg7 + 1][arg8] = 50; - } else if (arg9 == 3) { - SceneGraph.aByteArrayArrayArray9[arg2][arg7][arg8] = 50; - } - } - if (local62.anInt4435 != 0 && arg4 != null) { - arg4.flagWall(arg9, arg6, local62.aBoolean207, arg8, arg7); - } - } else if (arg6 == 9) { - if (local62.anInt4430 == -1 && local62.multiLocs == null && !local62.aBoolean214) { - local403 = local62.method3428(arg9, local165, local153, arg6, local199, local213, arg1, null, local330, local173); - if (GlRenderer.enabled && local330) { - Static242.method4211(local403.aClass36_Sub1_3, local165, local201, local173); - } - local387 = local403.aClass8_10; - } else { - local387 = new Loc(arg5, arg6, arg9, arg0, arg7, arg8, local62.anInt4430, local62.aBoolean209, null); - } - Static5.method35(arg2, arg7, arg8, local199, 1, 1, local387, local261); - if (local62.anInt4435 != 0 && arg4 != null) { - arg4.flagScenery(arg7, local62.aBoolean207, arg8, local84, local81); - } - if (local62.wallDecorOffsetScale != 16) { - Static18.method559(arg2, arg7, arg8, local62.wallDecorOffsetScale); - } - } else if (arg6 == 4) { - if (local62.anInt4430 == -1 && local62.multiLocs == null && !local62.aBoolean214) { - local403 = local62.method3428(arg9, local165, local153, 4, local199, local213, arg1, null, local330, local173); - if (GlRenderer.enabled && local330) { - Static242.method4211(local403.aClass36_Sub1_3, local165, local201, local173); - } - local387 = local403.aClass8_10; - } else { - local387 = new Loc(arg5, 4, arg9, arg0, arg7, arg8, local62.anInt4430, local62.aBoolean209, null); - } - Static91.method1880(arg2, arg7, arg8, local199, local387, null, Static267.anIntArray517[arg9], 0, 0, 0, local261); - } else { - @Pc(1889) long local1889; - @Pc(1934) Entity local1934; - @Pc(1950) Loc_Class139 local1950; - if (arg6 == 5) { - local1226 = 16; - local1889 = SceneGraph.getWallKey(arg2, arg7, arg8); - if (local1889 != 0L) { - local1226 = LocTypeList.get(Integer.MAX_VALUE & (int) (local1889 >>> 32)).wallDecorOffsetScale; - } - if (local62.anInt4430 == -1 && local62.multiLocs == null && !local62.aBoolean214) { - local1950 = local62.method3428(arg9, local165, local153, 4, local199, local213, arg1, null, local330, local173); - if (GlRenderer.enabled && local330) { - Static242.method4211(local1950.aClass36_Sub1_3, local165 - Static34.anIntArray80[arg9] * 8, local201, local173 - Static238.anIntArray469[arg9] * 8); - } - local1934 = local1950.aClass8_10; - } else { - local1934 = new Loc(arg5, 4, arg9, arg0, arg7, arg8, local62.anInt4430, local62.aBoolean209, null); - } - Static91.method1880(arg2, arg7, arg8, local199, local1934, null, Static267.anIntArray517[arg9], 0, local1226 * Static34.anIntArray80[arg9], Static238.anIntArray469[arg9] * local1226, local261); - } else if (arg6 == 6) { - local1226 = 8; - local1889 = SceneGraph.getWallKey(arg2, arg7, arg8); - if (local1889 != 0L) { - local1226 = LocTypeList.get(Integer.MAX_VALUE & (int) (local1889 >>> 32)).wallDecorOffsetScale / 2; - } - if (local62.anInt4430 == -1 && local62.multiLocs == null && !local62.aBoolean214) { - local1950 = local62.method3428(arg9 + 4, local165, local153, 4, local199, local213, arg1, null, local330, local173); - if (GlRenderer.enabled && local330) { - Static242.method4211(local1950.aClass36_Sub1_3, local165 - Static114.anIntArray565[arg9] * 8, local201, local173 - Static64.anIntArray154[arg9] * 8); - } - local1934 = local1950.aClass8_10; - } else { - local1934 = new Loc(arg5, 4, arg9 + 4, arg0, arg7, arg8, local62.anInt4430, local62.aBoolean209, null); - } - Static91.method1880(arg2, arg7, arg8, local199, local1934, null, 256, arg9, local1226 * Static114.anIntArray565[arg9], local1226 * Static64.anIntArray154[arg9], local261); - } else if (arg6 == 7) { - @Pc(2137) int local2137 = arg9 + 2 & 0x3; - if (local62.anInt4430 == -1 && local62.multiLocs == null && !local62.aBoolean214) { - @Pc(2183) Loc_Class139 local2183 = local62.method3428(local2137 + 4, local165, local153, 4, local199, local213, arg1, null, local330, local173); - if (GlRenderer.enabled && local330) { - Static242.method4211(local2183.aClass36_Sub1_3, local165, local201, local173); - } - local387 = local2183.aClass8_10; - } else { - local387 = new Loc(arg5, 4, local2137 + 4, arg0, arg7, arg8, local62.anInt4430, local62.aBoolean209, null); - } - Static91.method1880(arg2, arg7, arg8, local199, local387, null, 256, local2137, 0, 0, local261); - } else if (arg6 == 8) { - local1226 = 8; - local1889 = SceneGraph.getWallKey(arg2, arg7, arg8); - if (local1889 != 0L) { - local1226 = LocTypeList.get(Integer.MAX_VALUE & (int) (local1889 >>> 32)).wallDecorOffsetScale / 2; - } - @Pc(2244) int local2244 = arg9 + 2 & 0x3; - @Pc(2289) Entity local2289; - if (local62.anInt4430 == -1 && local62.multiLocs == null && !local62.aBoolean214) { - @Pc(2297) int local2297 = Static64.anIntArray154[arg9] * 8; - @Pc(2303) int local2303 = Static114.anIntArray565[arg9] * 8; - @Pc(2319) Loc_Class139 local2319 = local62.method3428(arg9 + 4, local165, local153, 4, local199, local213, arg1, null, local330, local173); - if (GlRenderer.enabled && local330) { - Static242.method4211(local2319.aClass36_Sub1_3, local165 - local2303, local201, local173 - local2297); - } - local1934 = local2319.aClass8_10; - local2319 = local62.method3428(local2244 + 4, local165, local153, 4, local199, local213, arg1, null, local330, local173); - if (GlRenderer.enabled && local330) { - Static242.method4211(local2319.aClass36_Sub1_3, local165 - local2303, local201, local173 - local2297); - } - local2289 = local2319.aClass8_10; - } else { - local1934 = new Loc(arg5, 4, arg9 + 4, arg0, arg7, arg8, local62.anInt4430, local62.aBoolean209, null); - local2289 = new Loc(arg5, 4, local2244 + 4, arg0, arg7, arg8, local62.anInt4430, local62.aBoolean209, null); - } - Static91.method1880(arg2, arg7, arg8, local199, local1934, local2289, 256, arg9, local1226 * Static114.anIntArray565[arg9], Static64.anIntArray154[arg9] * local1226, local261); - } - } - } - } + @OriginalMember(owner = "client!hc", name = "a", descriptor = "(IIIILclient!th;Lclient!th;IIIIJ)V") + public static void method1880(@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) int arg8, @OriginalArg(9) int arg9, @OriginalArg(10) long arg10) { + if (arg4 == null) { + return; + } + @Pc(6) WallDecor local6 = new WallDecor(); + local6.key = arg10; + local6.anInt1390 = arg1 * 128 + 64; + local6.anInt1393 = arg2 * 128 + 64; + local6.anInt1391 = arg3; + local6.primary = arg4; + local6.secondary = arg5; + local6.anInt1395 = arg6; + local6.anInt1388 = arg7; + local6.anInt1394 = arg8; + local6.anInt1392 = arg9; + for (@Pc(46) int local46 = arg0; local46 >= 0; local46--) { + if (SceneGraph.tiles[local46][arg1][arg2] == null) { + SceneGraph.tiles[local46][arg1][arg2] = new Tile(local46, arg1, arg2); + } + } + SceneGraph.tiles[arg0][arg1][arg2].wallDecor = local6; + } } diff --git a/client/src/main/java/rt4/Static187.java b/client/src/main/java/rt4/Static187.java deleted file mode 100644 index 5c77cfc..0000000 --- a/client/src/main/java/rt4/Static187.java +++ /dev/null @@ -1,29 +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 Static187 { - - @OriginalMember(owner = "client!pb", name = "x", descriptor = "[[[I") - public static final int[][][] anIntArrayArrayArray18 = new int[4][13][13]; - - @OriginalMember(owner = "client!pb", name = "ab", descriptor = "I") - public static int anInt4422 = 0; - - @OriginalMember(owner = "client!pb", name = "rb", descriptor = "S") - public static short aShort27 = 320; - - @OriginalMember(owner = "client!pb", name = "b", descriptor = "(III)Lclient!jj;") - public static ObjStackEntity method3420(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) { - @Pc(7) Tile local7 = SceneGraph.tiles[arg0][arg1][arg2]; - if (local7 == null) { - return null; - } else { - @Pc(14) ObjStackEntity local14 = local7.aClass79_1; - local7.aClass79_1 = null; - return local14; - } - } -} diff --git a/client/src/main/java/rt4/Static189.java b/client/src/main/java/rt4/Static189.java deleted file mode 100644 index b41a328..0000000 --- a/client/src/main/java/rt4/Static189.java +++ /dev/null @@ -1,10 +0,0 @@ -package rt4; - -import org.openrs2.deob.annotation.OriginalMember; - -public final class Static189 { - - @OriginalMember(owner = "client!pe", name = "r", descriptor = "I") - public static int anInt4457; - -} diff --git a/client/src/main/java/rt4/Static19.java b/client/src/main/java/rt4/Static19.java deleted file mode 100644 index bffe24e..0000000 --- a/client/src/main/java/rt4/Static19.java +++ /dev/null @@ -1,70 +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 Static19 { - - @OriginalMember(owner = "client!bi", name = "a", descriptor = "(IIIIIIII)Z") - public static boolean method583(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7) { - if (arg1 < arg2 && arg1 < arg3 && arg1 < arg4) { - return false; - } else if (arg1 > arg2 && arg1 > arg3 && arg1 > arg4) { - return false; - } else if (arg0 < arg5 && arg0 < arg6 && arg0 < arg7) { - return false; - } else if (arg0 > arg5 && arg0 > arg6 && arg0 > arg7) { - return false; - } else { - @Pc(59) int local59 = (arg1 - arg2) * (arg6 - arg5) - (arg0 - arg5) * (arg3 - arg2); - @Pc(75) int local75 = (arg1 - arg4) * (arg5 - arg7) - (arg0 - arg7) * (arg2 - arg4); - @Pc(91) int local91 = (arg1 - arg3) * (arg7 - arg6) - (arg0 - arg6) * (arg4 - arg3); - return local59 * local91 > 0 && local91 * local75 > 0; - } - } - - @OriginalMember(owner = "client!bi", name = "a", descriptor = "(IIBI)I") - public static int method588(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2) { - @Pc(19) int local19 = Rasteriser.palette[SoftwareModel.method4585(arg1, arg2)]; - if (arg0 > 0) { - @Pc(31) int local31 = Rasteriser.textureProvider.method3238(arg0 & 0xFFFF); - @Pc(49) int local49; - @Pc(73) int local73; - if (local31 != 0) { - if (arg2 < 0) { - local49 = 0; - } else if (arg2 > 127) { - local49 = 16777215; - } else { - local49 = arg2 * 131586; - } - if (local31 == 256) { - local19 = local49; - } else { - local73 = 256 - local31; - local19 = ((local49 & 0xFF00) * local31 + local73 * (local19 & 0xFF00) & 0xFF0000) + (local31 * (local49 & 0xFF00FF) + ((local19 & 0xFF00FF) * local73) & 0xFF00FF00) >> 8; - } - } - local49 = Rasteriser.textureProvider.method3229(arg0 & 0xFFFF); - if (local49 != 0) { - local49 += 256; - @Pc(125) int local125 = (local19 >> 16 & 0xFF) * local49; - if (local125 > 65535) { - local125 = 65535; - } - local73 = (local19 >> 8 & 0xFF) * local49; - if (local73 > 65535) { - local73 = 65535; - } - @Pc(150) int local150 = local49 * (local19 & 0xFF); - if (local150 > 65535) { - local150 = 65535; - } - local19 = (local150 >> 8) + (local73 & 0xFF00) + (local125 << 8 & 0xFF001F); - } - } - return local19; - } - -} diff --git a/client/src/main/java/rt4/Static193.java b/client/src/main/java/rt4/Static193.java index 0027ddd..f6af03b 100644 --- a/client/src/main/java/rt4/Static193.java +++ b/client/src/main/java/rt4/Static193.java @@ -6,7 +6,9 @@ import org.openrs2.deob.annotation.Pc; public final class Static193 { - @OriginalMember(owner = "client!pi", name = "U", descriptor = "I") + @OriginalMember(owner = "client!ec", name = "B", descriptor = "[[I") + public static final int[][] anIntArrayArray8 = new int[][] { new int[0], { 128, 0, 128, 128, 0, 128 }, { 0, 0, 128, 0, 128, 128, 64, 128 }, { 0, 128, 0, 0, 128, 0, 64, 128 }, { 0, 0, 64, 128, 0, 128 }, { 128, 128, 64, 128, 128, 0 }, { 64, 0, 128, 0, 128, 128, 64, 128 }, { 128, 0, 128, 128, 0, 128, 0, 64, 64, 0 }, { 0, 0, 64, 0, 0, 64 }, { 0, 0, 128, 0, 128, 128, 64, 96, 32, 64 }, { 0, 128, 0, 0, 32, 64, 64, 96, 128, 128 }, { 0, 128, 0, 0, 32, 32, 96, 32, 128, 0, 128, 128 } }; + @OriginalMember(owner = "client!pi", name = "U", descriptor = "I") public static int anInt4539; @OriginalMember(owner = "client!pi", name = "a", descriptor = "([[[B[[B[[B[[I[[F[[I[[B[[B[[FI[[F[[I[[I[[II)[Lclient!hg;") @@ -41,9 +43,9 @@ public final class Static193 { if (arg2[local16][local112] != 0) { @Pc(135) int[] local135; if (arg6[local16][local112] == 0) { - local135 = Static228.anIntArrayArray35[0]; + local135 = Static1.anIntArrayArray35[0]; } else { - local135 = Static53.anIntArrayArray8[arg1[local16][local112]]; + local135 = anIntArrayArray8[arg1[local16][local112]]; if (local135.length == 0) { continue; } @@ -128,7 +130,7 @@ public final class Static193 { @Pc(754) int local754; if (arg6[local16][local112] == 0) { local655 = local524 == arg2[local16 - 1][local112 - 1] ? 1 : -1; - local614 = Static228.anIntArrayArray35[0]; + local614 = Static1.anIntArrayArray35[0]; local678 = local524 == arg2[local16 + 1][local112 - 1] ? 1 : -1; if (arg2[local16][local112 - 1] == local524) { local678++; @@ -171,7 +173,7 @@ public final class Static193 { local628 = (byte) (local794 <= local789 ? 0 : 1); arg7[local16][local112] = local628; } else { - local614 = Static53.anIntArrayArray8[arg1[local16][local112]]; + local614 = anIntArrayArray8[arg1[local16][local112]]; local574 = Static69.aBooleanArrayArray2[arg1[local16][local112]]; local628 = arg7[local16][local112]; if (local614.length == 0) { @@ -198,19 +200,19 @@ public final class Static193 { @Pc(969) int local969 = (local655 >> 16) - 1; @Pc(975) int local975 = (local712 >> 16) - 1; @Pc(981) GlTile local981 = (GlTile) local103.get(local861); - Static53.method1291(arg13, local655 <= local655, Static19.method588(local969, local883, local931), local981, local614, local112, local155, local16, local655 <= local712, arg8, local754 >= local655, arg4, local169, Static19.method588(local969, local925, local957), Static19.method588(local969, local901, local949), local655 <= local678, arg12, arg10, local628, Static19.method588(local969, local909, local939), local574); + method1291(arg13, local655 <= local655, Static1.method588(local969, local883, local931), local981, local614, local112, local155, local16, local655 <= local712, arg8, local754 >= local655, arg4, local169, Static1.method588(local969, local925, local957), Static1.method588(local969, local901, local949), local655 <= local678, arg12, arg10, local628, Static1.method588(local969, local909, local939), local574); @Pc(1050) int local1050 = (local754 >> 16) - 1; if (local869 != local861) { local981 = (GlTile) local103.get(local869); - Static53.method1291(arg13, local678 <= local655, Static19.method588(local963, local883, local931), local981, local614, local112, local155, local16, local712 >= local678, arg8, local678 <= local754, arg4, local169, Static19.method588(local963, local925, local957), Static19.method588(local963, local901, local949), local678 <= local678, arg12, arg10, local628, Static19.method588(local963, local909, local939), local574); + method1291(arg13, local678 <= local655, Static1.method588(local963, local883, local931), local981, local614, local112, local155, local16, local712 >= local678, arg8, local678 <= local754, arg4, local169, Static1.method588(local963, local925, local957), Static1.method588(local963, local901, local949), local678 <= local678, arg12, arg10, local628, Static1.method588(local963, local909, local939), local574); } if (local877 != local861 && local877 != local869) { local981 = (GlTile) local103.get(local877); - Static53.method1291(arg13, local655 >= local712, Static19.method588(local975, local883, local931), local981, local614, local112, local155, local16, local712 <= local712, arg8, local712 <= local754, arg4, local169, Static19.method588(local975, local925, local957), Static19.method588(local975, local901, local949), local678 >= local712, arg12, arg10, local628, Static19.method588(local975, local909, local939), local574); + method1291(arg13, local655 >= local712, Static1.method588(local975, local883, local931), local981, local614, local112, local155, local16, local712 <= local712, arg8, local712 <= local754, arg4, local169, Static1.method588(local975, local925, local957), Static1.method588(local975, local901, local949), local678 >= local712, arg12, arg10, local628, Static1.method588(local975, local909, local939), local574); } if (local917 != local861 && local917 != local869 && local917 != local877) { local981 = (GlTile) local103.get(local917); - Static53.method1291(arg13, local754 <= local655, Static19.method588(local1050, local883, local931), local981, local614, local112, local155, local16, local754 <= local712, arg8, local754 >= local754, arg4, local169, Static19.method588(local1050, local925, local957), Static19.method588(local1050, local901, local949), local678 >= local754, arg12, arg10, local628, Static19.method588(local1050, local909, local939), local574); + method1291(arg13, local754 <= local655, Static1.method588(local1050, local883, local931), local981, local614, local112, local155, local16, local754 <= local712, arg8, local754 >= local754, arg4, local169, Static1.method588(local1050, local925, local957), Static1.method588(local1050, local901, local949), local678 >= local754, arg12, arg10, local628, Static1.method588(local1050, local909, local939), local574); } } } @@ -233,4 +235,19 @@ public final class Static193 { return local1348; } + @OriginalMember(owner = "client!ec", name = "a", descriptor = "([[IZILclient!hg;[IIIIZ[[FZI[[FIIIZ[[I[[FBI[Z)V") + public static void method1291(@OriginalArg(0) int[][] arg0, @OriginalArg(1) boolean arg1, @OriginalArg(2) int arg2, @OriginalArg(3) GlTile arg3, @OriginalArg(4) int[] arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7, @OriginalArg(8) boolean arg8, @OriginalArg(9) float[][] arg9, @OriginalArg(10) boolean arg10, @OriginalArg(12) float[][] arg11, @OriginalArg(13) int arg12, @OriginalArg(14) int arg13, @OriginalArg(15) int arg14, @OriginalArg(16) boolean arg15, @OriginalArg(17) int[][] arg16, @OriginalArg(18) float[][] arg17, @OriginalArg(19) byte arg18, @OriginalArg(20) int arg19, @OriginalArg(21) boolean[] arg20) { + @Pc(11) int local11 = (arg2 << 8) + (arg1 ? 255 : 0); + @Pc(25) int local25 = (arg8 ? 255 : 0) + (arg14 << 8); + @Pc(31) int[] local31 = new int[arg4.length / 2]; + @Pc(41) int local41 = (arg10 ? 255 : 0) + (arg13 << 8); + @Pc(51) int local51 = (arg19 << 8) + (arg15 ? 255 : 0); + for (@Pc(53) int local53 = 0; local53 < local31.length; local53++) { + @Pc(67) int local67 = arg4[local53 + local53]; + @Pc(80) int[][] local80 = arg0 == null || arg20 == null || !arg20[local53] ? arg16 : arg0; + @Pc(88) int local88 = arg4[local53 + local53 + 1]; + local31[local53] = Static1.method3683(local41, (float) arg12, local11, local51, arg0, local80, arg7, arg17, local25, arg18, false, arg3, arg9, arg5, local67, arg11, local88); + } + arg3.method1945(arg6, arg7, arg5, local31, null, false); + } } diff --git a/client/src/main/java/rt4/Static197.java b/client/src/main/java/rt4/Static197.java deleted file mode 100644 index 6cda4eb..0000000 --- a/client/src/main/java/rt4/Static197.java +++ /dev/null @@ -1,16 +0,0 @@ -package rt4; - -import org.openrs2.deob.annotation.OriginalMember; - -public final class Static197 { - - @OriginalMember(owner = "client!pm", name = "hb", descriptor = "I") - public static int anInt4620; - - @OriginalMember(owner = "client!pm", name = "Y", descriptor = "Lclient!na;") - public static final JagString aClass100_872 = JagString.parse("
"); - - @OriginalMember(owner = "client!pm", name = "ab", descriptor = "Z") - public static boolean aBoolean228 = true; - -} diff --git a/client/src/main/java/rt4/Static198.java b/client/src/main/java/rt4/Static198.java deleted file mode 100644 index 7e8348b..0000000 --- a/client/src/main/java/rt4/Static198.java +++ /dev/null @@ -1,50 +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 Static198 { - - @OriginalMember(owner = "client!q", name = "a", descriptor = "Lclient!na;") - public static final JagString aClass100_260 = JagString.parse(")1a2)1m"); - - @OriginalMember(owner = "client!q", name = "a", descriptor = "(IIIIIIBI)V") - public static void method1026(@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(7) int arg6) { - if (arg5 < 128 || arg2 < 128 || arg5 > 13056 || arg2 > 13056) { - Static16.anInt548 = -1; - Static65.anInt1951 = -1; - return; - } - @Pc(38) int local38 = SceneGraph.getTileHeight(Player.level, arg5, arg2) - arg3; - @Pc(42) int local42 = arg2 - Camera.renderZ; - @Pc(46) int local46 = local38 - Static5.anInt40; - @Pc(50) int local50 = arg5 - Camera.renderX; - @Pc(54) int local54 = MathUtils.sin[Camera.cameraPitch]; - @Pc(58) int local58 = MathUtils.cos[Camera.cameraPitch]; - @Pc(62) int local62 = MathUtils.sin[Camera.cameraYaw]; - @Pc(66) int local66 = MathUtils.cos[Camera.cameraYaw]; - @Pc(76) int local76 = local50 * local66 + local62 * local42 >> 16; - @Pc(87) int local87 = local42 * local66 - local62 * local50 >> 16; - @Pc(89) int local89 = local76; - @Pc(99) int local99 = local58 * local46 - local87 * local54 >> 16; - @Pc(113) int local113 = local87 * local58 + local46 * local54 >> 16; - if (local113 < 50) { - Static16.anInt548 = -1; - Static65.anInt1951 = -1; - } else if (GlRenderer.enabled) { - @Pc(150) int local150 = arg1 * 512 >> 8; - Static65.anInt1951 = local150 * local89 / local113 + arg0; - @Pc(164) int local164 = arg6 * 512 >> 8; - Static16.anInt548 = local164 * local99 / local113 + arg4; - } else { - Static65.anInt1951 = (local89 << 9) / local113 + arg0; - Static16.anInt548 = (local99 << 9) / local113 + arg4; - } - } - - @OriginalMember(owner = "client!q", name = "a", descriptor = "(B)I") - public static int method1029() { - return PlayerAppearance.aClass99_33.method3100(); - } -} diff --git a/client/src/main/java/rt4/Static199.java b/client/src/main/java/rt4/Static199.java deleted file mode 100644 index cac9171..0000000 --- a/client/src/main/java/rt4/Static199.java +++ /dev/null @@ -1,13 +0,0 @@ -package rt4; - -import org.openrs2.deob.annotation.OriginalArg; -import org.openrs2.deob.annotation.OriginalMember; - -public final class Static199 { - - @OriginalMember(owner = "client!qc", name = "a", descriptor = "(BI)I") - public static int method3594(@OriginalArg(1) int arg0) { - return arg0 >> 11 & 0x7F; - } - -} diff --git a/client/src/main/java/rt4/Static2.java b/client/src/main/java/rt4/Static2.java deleted file mode 100644 index 63b57a3..0000000 --- a/client/src/main/java/rt4/Static2.java +++ /dev/null @@ -1,108 +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 Static2 { - - @OriginalMember(owner = "client!aa", name = "m", descriptor = "I") - public static int anInt15; - - @OriginalMember(owner = "client!aa", name = "a", descriptor = "I") - public static int anInt7 = 0; - - @OriginalMember(owner = "client!aa", name = "a", descriptor = "(SI)Z") - public static boolean method5(@OriginalArg(0) short arg0) { - if (arg0 == 47 || arg0 == 5 || arg0 == 43 || arg0 == 35 || arg0 == 58 || arg0 == 22 || arg0 == 40 || arg0 == 3) { - return true; - } else if (arg0 == 9 || arg0 == 12 || arg0 == 1006 || arg0 == 1003) { - return true; - } else if (arg0 == 25 || arg0 == 23 || arg0 == 48 || arg0 == 7 || arg0 == 13) { - return true; - } else { - return arg0 == 8 || arg0 == 32 || arg0 == 28 || arg0 == 59 || arg0 == 51 || arg0 == 41; - } - } - - @OriginalMember(owner = "client!aa", name = "a", descriptor = "([Lclient!be;ZI)V") - public static void method7(@OriginalArg(0) Component[] arg0, @OriginalArg(2) int arg1) { - for (@Pc(11) int local11 = 0; local11 < arg0.length; local11++) { - @Pc(23) Component local23 = arg0[local11]; - if (local23 != null) { - if (local23.type == 0) { - if (local23.createdComponents != null) { - method7(local23.createdComponents, arg1); - } - @Pc(49) ComponentPointer local49 = (ComponentPointer) InterfaceList.openInterfaces.get((long) local23.id); - if (local49 != null) { - Static54.runScripts(arg1, local49.anInt5878); - } - } - @Pc(72) HookRequest local72; - if (arg1 == 0 && local23.onDialogAbort != null) { - local72 = new HookRequest(); - local72.arguments = local23.onDialogAbort; - local72.source = local23; - ScriptRunner.run(local72); - } - if (arg1 == 1 && local23.onWidgetsOpenClose != null) { - if (local23.createdComponentId >= 0) { - @Pc(103) Component local103 = InterfaceList.getComponent(local23.id); - if (local103 == null || local103.createdComponents == null || local23.createdComponentId >= local103.createdComponents.length || local103.createdComponents[local23.createdComponentId] != local23) { - continue; - } - } - local72 = new HookRequest(); - local72.arguments = local23.onWidgetsOpenClose; - local72.source = local23; - ScriptRunner.run(local72); - } - } - } - } - - @OriginalMember(owner = "client!aa", name = "a", descriptor = "(BLclient!be;)V") - public static void method13(@OriginalArg(1) Component arg0) { - @Pc(16) int local16 = arg0.clientCode; - if (local16 == 324) { - if (Static158.anInt3851 == -1) { - Static158.anInt3851 = arg0.spriteId; - Static145.anInt3502 = arg0.anInt519; - } - if (PlayerAppearance.DEFAULT.gender) { - arg0.spriteId = Static158.anInt3851; - } else { - arg0.spriteId = Static145.anInt3502; - } - } else if (local16 == 325) { - if (Static158.anInt3851 == -1) { - Static145.anInt3502 = arg0.anInt519; - Static158.anInt3851 = arg0.spriteId; - } - if (PlayerAppearance.DEFAULT.gender) { - arg0.spriteId = Static145.anInt3502; - } else { - arg0.spriteId = Static158.anInt3851; - } - } else if (local16 == 327) { - arg0.modelXAngle = 150; - arg0.modelYAngle = (int) (Math.sin((double) client.loop / 40.0D) * 256.0D) & 0x7FF; - arg0.modelType = 5; - arg0.modelId = -1; - } else if (local16 == 328) { - if (PlayerList.self.username == null) { - arg0.modelId = 0; - } else { - arg0.modelXAngle = 150; - arg0.modelYAngle = (int) (Math.sin((double) client.loop / 40.0D) * 256.0D) & 0x7FF; - arg0.modelType = 5; - arg0.modelId = ((int) PlayerList.self.username.encode37() << 11) + 2047; - arg0.anInt496 = PlayerList.self.anInt3388; - arg0.anInt500 = 0; - arg0.modelSeqId = PlayerList.self.movementSeqId; - arg0.anInt510 = PlayerList.self.anInt3407; - } - } - } -} diff --git a/client/src/main/java/rt4/Static201.java b/client/src/main/java/rt4/Static201.java deleted file mode 100644 index 35ebd7d..0000000 --- a/client/src/main/java/rt4/Static201.java +++ /dev/null @@ -1,16 +0,0 @@ -package rt4; - -import org.openrs2.deob.annotation.OriginalMember; - -public final class Static201 { - - @OriginalMember(owner = "client!qf", name = "S", descriptor = "I") - public static int anInt1864; - - @OriginalMember(owner = "client!qf", name = "M", descriptor = "I") - public static int anInt1862 = 0; - - @OriginalMember(owner = "client!qf", name = "X", descriptor = "Lclient!be;") - public static Component aClass13_13 = null; - -} diff --git a/client/src/main/java/rt4/Static202.java b/client/src/main/java/rt4/Static202.java deleted file mode 100644 index f3c95d6..0000000 --- a/client/src/main/java/rt4/Static202.java +++ /dev/null @@ -1,28 +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 Static202 { - - @OriginalMember(owner = "client!qg", name = "a", descriptor = "([Lclient!na;[SI)V") - public static void method3656(@OriginalArg(0) JagString[] arg0, @OriginalArg(1) short[] arg1) { - Static54.method1307(arg1, arg0.length - 1, arg0, 0); - } - - @OriginalMember(owner = "client!qg", name = "a", descriptor = "(IBII)I") - public static int method3659(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2) { - @Pc(3) int local3 = arg0 & 0x3; - if (local3 == 0) { - return arg2; - } else if (local3 == 1) { - return 7 - arg1; - } else if (local3 == 2) { - return 7 - arg2; - } else { - return arg1; - } - } - -} diff --git a/client/src/main/java/rt4/Static204.java b/client/src/main/java/rt4/Static204.java deleted file mode 100644 index 0bae9e9..0000000 --- a/client/src/main/java/rt4/Static204.java +++ /dev/null @@ -1,51 +0,0 @@ -package rt4; - -import org.openrs2.deob.annotation.OriginalArg; -import org.openrs2.deob.annotation.OriginalMember; -import org.openrs2.deob.annotation.Pc; - -public final class Static204 { - - @OriginalMember(owner = "client!qi", name = "z", descriptor = "Lclient!qf;") - public static Sprite aClass3_Sub2_Sub1_10; - - @OriginalMember(owner = "client!qi", name = "b", descriptor = "(II)I") - public static int method3674(@OriginalArg(0) int arg0) { - @Pc(5) int local5 = 0; - if (arg0 < 0 || arg0 >= 65536) { - local5 += 16; - arg0 >>>= 0x10; - } - if (arg0 >= 256) { - local5 += 8; - arg0 >>>= 0x8; - } - if (arg0 >= 16) { - local5 += 4; - arg0 >>>= 0x4; - } - if (arg0 >= 4) { - arg0 >>>= 0x2; - local5 += 2; - } - if (arg0 >= 1) { - arg0 >>>= 0x1; - local5++; - } - return arg0 + local5; - } - - @OriginalMember(owner = "client!qi", name = "a", descriptor = "(IIBI)I") - public static int method3675(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2) { - @Pc(3) int local3 = arg0 & 0x3; - if (local3 == 0) { - return arg1; - } else if (local3 == 1) { - return arg2; - } else if (local3 == 2) { - return 1023 - arg1; - } else { - return 1023 - arg2; - } - } -} diff --git a/client/src/main/java/rt4/Static206.java b/client/src/main/java/rt4/Static206.java deleted file mode 100644 index d697438..0000000 --- a/client/src/main/java/rt4/Static206.java +++ /dev/null @@ -1,55 +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 Static206 { - - @OriginalMember(owner = "client!qk", name = "c", descriptor = "[I") - public static int[] anIntArray427; - - @OriginalMember(owner = "client!qk", name = "a", descriptor = "Lclient!na;") - public static final JagString aClass100_899 = JagString.parse("0(U"); - - @OriginalMember(owner = "client!qk", name = "b", descriptor = "Lclient!na;") - public static final JagString aClass100_900 = JagString.parse("tbrefresh"); - - @OriginalMember(owner = "client!qk", name = "f", descriptor = "I") - public static int clickedInventoryComponentY = 0; - - @OriginalMember(owner = "client!qk", name = "h", descriptor = "I") - public static int anInt4774 = 0; - - @OriginalMember(owner = "client!qk", name = "a", descriptor = "(ZIIIIFII)[I") - public static int[] method3679(@OriginalArg(5) float arg0) { - @Pc(11) int[] local11 = new int[2048]; - @Pc(15) TextureOp4 local15 = new TextureOp4(); - local15.anInt646 = 8; - local15.anInt642 = 4; - local15.anInt650 = 35; - local15.anInt641 = 8; - local15.anInt648 = (int) (arg0 * 4096.0F); - local15.aBoolean44 = true; - local15.method4630(); - Static10.method348(1, 2048); - local15.method584(0, local11); - return local11; - } - - @OriginalMember(owner = "client!qk", name = "a", descriptor = "(BLclient!wa;)Lclient!j;") - public static TextureOp method3680(@OriginalArg(1) Buffer arg0) { - arg0.g1(); - @Pc(13) int local13 = arg0.g1(); - @Pc(17) TextureOp local17 = Static223.method3860(local13); - local17.anInt5840 = arg0.g1(); - @Pc(26) int local26 = arg0.g1(); - for (@Pc(34) int local34 = 0; local34 < local26; local34++) { - @Pc(41) int local41 = arg0.g1(); - local17.method4629(local41, arg0); - } - local17.method4630(); - return local17; - } - -} diff --git a/client/src/main/java/rt4/Static207.java b/client/src/main/java/rt4/Static207.java deleted file mode 100644 index 41e75a2..0000000 --- a/client/src/main/java/rt4/Static207.java +++ /dev/null @@ -1,79 +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 Static207 { - - @OriginalMember(owner = "client!ql", name = "h", descriptor = "Lclient!na;") - public static final JagString aClass100_903 = JagString.parse("Hidden)2"); - - @OriginalMember(owner = "client!ql", name = "a", descriptor = "(IFII[[I[[II[[FIBIZLclient!hg;[[FII[[FI)I") - public static int method3683(@OriginalArg(0) int arg0, @OriginalArg(1) float arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int[][] arg4, @OriginalArg(5) int[][] arg5, @OriginalArg(6) int arg6, @OriginalArg(7) float[][] arg7, @OriginalArg(8) int arg8, @OriginalArg(10) int arg9, @OriginalArg(11) boolean arg10, @OriginalArg(12) GlTile arg11, @OriginalArg(13) float[][] arg12, @OriginalArg(14) int arg13, @OriginalArg(15) int arg14, @OriginalArg(16) float[][] arg15, @OriginalArg(17) int arg16) { - @Pc(20) int local20; - if (arg9 == 1) { - local20 = arg14; - arg14 = arg16; - arg16 = 128 - local20; - } else if (arg9 == 2) { - arg16 = 128 - arg16; - arg14 = 128 - arg14; - } else if (arg9 == 3) { - local20 = arg14; - arg14 = 128 - arg16; - arg16 = local20; - } - @Pc(66) float local66; - @Pc(72) float local72; - @Pc(80) int local80; - @Pc(78) float local78; - if (arg14 == 0 && arg16 == 0) { - local66 = arg15[arg6][arg13]; - local72 = arg7[arg6][arg13]; - local78 = arg12[arg6][arg13]; - local80 = arg2; - } else if (arg14 == 128 && arg16 == 0) { - local80 = arg3; - local66 = arg15[arg6 + 1][arg13]; - local72 = arg7[arg6 + 1][arg13]; - local78 = arg12[arg6 + 1][arg13]; - } else if (arg14 == 128 && arg16 == 128) { - local72 = arg7[arg6 + 1][arg13 + 1]; - local78 = arg12[arg6 + 1][arg13 + 1]; - local66 = arg15[arg6 + 1][arg13 + 1]; - local80 = arg8; - } else if (arg14 == 0 && arg16 == 128) { - local72 = arg7[arg6][arg13 + 1]; - local66 = arg15[arg6][arg13 + 1]; - local78 = arg12[arg6][arg13 + 1]; - local80 = arg0; - } else { - local78 = arg12[arg6][arg13]; - local66 = arg15[arg6][arg13]; - @Pc(219) float local219 = (float) arg16 / 128.0F; - @Pc(224) float local224 = (float) arg14 / 128.0F; - @Pc(238) float local238 = local78 + (arg12[arg6 + 1][arg13] - local78) * local224; - @Pc(253) float local253 = local66 + (arg15[arg6 + 1][arg13] - local66) * local224; - @Pc(261) float local261 = arg12[arg6][arg13 + 1]; - @Pc(269) float local269 = arg15[arg6][arg13 + 1]; - @Pc(286) float local286 = local269 + (arg15[arg6 + 1][arg13 + 1] - local269) * local224; - local72 = arg7[arg6][arg13]; - local66 = local253 + local219 * (local286 - local253); - @Pc(309) float local309 = arg7[arg6][arg13 + 1]; - @Pc(326) float local326 = local261 + (arg12[arg6 + 1][arg13 + 1] - local261) * local224; - local78 = local238 + local219 * (local326 - local238); - @Pc(352) float local352 = local309 + (arg7[arg6 + 1][arg13 + 1] - local309) * local224; - @Pc(367) float local367 = local72 + (arg7[arg6 + 1][arg13] - local72) * local224; - local72 = local367 + (local352 - local367) * local219; - @Pc(382) int local382 = Static69.method1540(arg14, arg2, arg3); - @Pc(388) int local388 = Static69.method1540(arg14, arg0, arg8); - local80 = Static69.method1540(arg16, local382, local388); - } - @Pc(405) int local405 = arg16 + (arg13 << 7); - @Pc(413) int local413 = Static182.method3361(arg14, arg13, arg5, arg6, arg16); - @Pc(420) int local420 = (arg6 << 7) + arg14; - return arg11.method1941(local420, local413, local405, local78, local66, local72, arg10 ? local80 & 0xFFFFFF00 : local80, arg4 == null ? 0.0F : (float) (local413 - Static182.method3361(arg14, arg13, arg4, arg6, arg16)) / arg1); - } - -} diff --git a/client/src/main/java/rt4/Static209.java b/client/src/main/java/rt4/Static209.java deleted file mode 100644 index 050e1e0..0000000 --- a/client/src/main/java/rt4/Static209.java +++ /dev/null @@ -1,13 +0,0 @@ -package rt4; - -import org.openrs2.deob.annotation.OriginalArg; -import org.openrs2.deob.annotation.OriginalMember; - -public final class Static209 { - - @OriginalMember(owner = "client!ra", name = "a", descriptor = "(BI)Z") - public static boolean method3702(@OriginalArg(1) int arg0) { - return arg0 == (-arg0 & arg0); - } - -} diff --git a/client/src/main/java/rt4/Static211.java b/client/src/main/java/rt4/Static211.java deleted file mode 100644 index 2c0206c..0000000 --- a/client/src/main/java/rt4/Static211.java +++ /dev/null @@ -1,13 +0,0 @@ -package rt4; - -import org.openrs2.deob.annotation.OriginalMember; - -public final class Static211 { - - @OriginalMember(owner = "client!rc", name = "R", descriptor = "Z") - private static boolean aBoolean74; - - @OriginalMember(owner = "client!rc", name = "p", descriptor = "I") - public static int anInt1142 = 0; - -} diff --git a/client/src/main/java/rt4/Static214.java b/client/src/main/java/rt4/Static214.java deleted file mode 100644 index 4ba5aac..0000000 --- a/client/src/main/java/rt4/Static214.java +++ /dev/null @@ -1,44 +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 Static214 { - - @OriginalMember(owner = "client!rg", name = "s", descriptor = "I") - public static int anInt5574 = -1; - - @OriginalMember(owner = "client!rg", name = "a", descriptor = "(Lclient!e;I)V") - public static void method4359(@OriginalArg(0) Player arg0) { - @Pc(12) AreaSound local12 = (AreaSound) AreaSoundManager.playerSounds.get(arg0.username.encode37()); - if (local12 == null) { - AreaSoundManager.add(arg0.movementQueueZ[0], null, 0, null, arg0.movementQueueX[0], Player.level, arg0); - } else { - local12.update(); - } - } - - @OriginalMember(owner = "client!rg", name = "a", descriptor = "(IZII)I") - public static int method4360(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2) { - @Pc(3) int local3 = arg0 & 0x3; - if (local3 == 0) { - return arg2; - } else if (local3 == 1) { - return arg1; - } else if (local3 == 2) { - return 7 - arg2; - } else { - return 7 - arg1; - } - } - - @OriginalMember(owner = "client!rg", name = "a", descriptor = "(IIIIIIIII)V") - public static void method4364(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5, @OriginalArg(7) int arg6, @OriginalArg(8) int arg7) { - @Pc(7) int local7 = arg2 - arg7; - @Pc(16) int local16 = (arg0 - arg4 << 16) / local7; - @Pc(21) int local21 = arg5 - arg3; - @Pc(30) int local30 = (arg6 - arg1 << 16) / local21; - WorldMap.method2735(arg1, arg5, arg3, arg2, arg4, arg7, local30, local16); - } -} diff --git a/client/src/main/java/rt4/Static215.java b/client/src/main/java/rt4/Static215.java deleted file mode 100644 index 406571e..0000000 --- a/client/src/main/java/rt4/Static215.java +++ /dev/null @@ -1,13 +0,0 @@ -package rt4; - -import org.openrs2.deob.annotation.OriginalMember; - -public final class Static215 { - - @OriginalMember(owner = "client!rh", name = "d", descriptor = "I") - public static int anInt4866; - - @OriginalMember(owner = "client!rh", name = "g", descriptor = "I") - public static final int anInt4868 = -1; - -} diff --git a/client/src/main/java/rt4/Static216.java b/client/src/main/java/rt4/Static216.java deleted file mode 100644 index c2d5107..0000000 --- a/client/src/main/java/rt4/Static216.java +++ /dev/null @@ -1,21 +0,0 @@ -package rt4; - -import org.openrs2.deob.annotation.OriginalArg; -import org.openrs2.deob.annotation.OriginalMember; - -public final class Static216 { - - @OriginalMember(owner = "client!ri", name = "d", descriptor = "[I") - public static int[] anIntArray188; - - @OriginalMember(owner = "client!ri", name = "a", descriptor = "(II)I") - public static int method1640(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) { - arg1 = arg1 * (arg0 & 0x7F) >> 7; - if (arg1 < 2) { - arg1 = 2; - } else if (arg1 > 126) { - arg1 = 126; - } - return (arg0 & 0xFF80) + arg1; - } -} diff --git a/client/src/main/java/rt4/Static217.java b/client/src/main/java/rt4/Static217.java index 9756bf3..6d391a2 100644 --- a/client/src/main/java/rt4/Static217.java +++ b/client/src/main/java/rt4/Static217.java @@ -43,7 +43,7 @@ public final class Static217 { @Pc(72) int local72 = local64 & 0x3; if (arg3 == local60 && local56 >= arg8 && local56 < arg8 + 8 && arg9 <= local50 && arg9 + 8 > local50) { @Pc(103) LocType local103 = LocTypeList.get(local7); - @Pc(120) int local120 = Static52.method1286(local50 & 0x7, arg4, local72, local103.length, local103.width, local56 & 0x7) + arg5; + @Pc(120) int local120 = method1286(local50 & 0x7, arg4, local72, local103.length, local103.width, local56 & 0x7) + arg5; @Pc(137) int local137 = Static241.method4541(local103.width, arg4, local103.length, local56 & 0x7, local72, local50 & 0x7) + arg6; if (local120 > 0 && local137 > 0 && local120 < 103 && local137 < 103) { @Pc(154) CollisionMap local154 = null; @@ -56,10 +56,29 @@ public final class Static217 { local154 = arg0[local159]; } } - Static185.method3397(arg1, !arg7, arg1, arg7, local154, local7, local68, local120, local137, local72 + arg4 & 0x3); + LoginManager.method3397(arg1, !arg7, arg1, arg7, local154, local7, local68, local120, local137, local72 + arg4 & 0x3); } } } } } + + @OriginalMember(owner = "client!eb", name = "a", descriptor = "(IIIIIII)I") + public static int method1286(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(6) int arg5) { + if ((arg2 & 0x1) == 1) { + @Pc(10) int local10 = arg4; + arg4 = arg3; + arg3 = local10; + } + @Pc(18) int local18 = arg1 & 0x3; + if (local18 == 0) { + return arg5; + } else if (local18 == 1) { + return arg0; + } else if (local18 == 2) { + return 7 + 1 - arg5 - arg4; + } else { + return 7 + 1 - arg0 - arg3; + } + } } diff --git a/client/src/main/java/rt4/Static219.java b/client/src/main/java/rt4/Static219.java deleted file mode 100644 index 28d8468..0000000 --- a/client/src/main/java/rt4/Static219.java +++ /dev/null @@ -1,34 +0,0 @@ -package rt4; - -import org.openrs2.deob.annotation.OriginalMember; - -public final class Static219 { - - @OriginalMember(owner = "client!rl", name = "T", descriptor = "Lclient!na;") - private static final JagString aClass100_921 = JagString.parse("Sat"); - - @OriginalMember(owner = "client!rl", name = "U", descriptor = "Lclient!na;") - private static final JagString aClass100_922 = JagString.parse("Mon"); - - @OriginalMember(owner = "client!rl", name = "W", descriptor = "Lclient!na;") - private static final JagString aClass100_923 = JagString.parse("Fri"); - - @OriginalMember(owner = "client!rl", name = "db", descriptor = "Lclient!na;") - private static final JagString aClass100_927 = JagString.parse("Sun"); - - @OriginalMember(owner = "client!rl", name = "cb", descriptor = "Lclient!na;") - private static final JagString aClass100_926 = JagString.parse("Tue"); - - @OriginalMember(owner = "client!rl", name = "ab", descriptor = "Lclient!na;") - private static final JagString aClass100_924 = JagString.parse("Wed"); - - @OriginalMember(owner = "client!rl", name = "bb", descriptor = "Lclient!na;") - private static final JagString aClass100_925 = JagString.parse("Thu"); - - @OriginalMember(owner = "client!rl", name = "Y", descriptor = "[Lclient!na;") - public static final JagString[] aClass100Array149 = new JagString[] { aClass100_927, aClass100_922, aClass100_926, aClass100_924, aClass100_925, aClass100_923, aClass100_921 }; - - @OriginalMember(owner = "client!rl", name = "eb", descriptor = "Lclient!na;") - public static final JagString aClass100_928 = JagString.parse("(U0a )2 in: "); - -} diff --git a/client/src/main/java/rt4/Static220.java b/client/src/main/java/rt4/Static220.java index 2351f82..74f4933 100644 --- a/client/src/main/java/rt4/Static220.java +++ b/client/src/main/java/rt4/Static220.java @@ -16,7 +16,7 @@ public final class Static220 { public static void spawnGroundObject(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) { @Pc(9) LinkedList local9 = SceneGraph.objStacks[Player.level][arg1][arg0]; if (local9 == null) { - Static187.method3420(Player.level, arg1, arg0); + method3420(Player.level, arg1, arg0); return; } @Pc(28) int local28 = -99999999; @@ -34,7 +34,7 @@ public final class Static220 { } } if (local30 == null) { - Static187.method3420(Player.level, arg1, arg0); + method3420(Player.level, arg1, arg0); return; } local9.addHead(local30); @@ -55,4 +55,15 @@ public final class Static220 { Static69.method1543(Player.level, arg1, arg0, SceneGraph.getTileHeight(Player.level, arg1 * 128 + 64, arg0 * 128 + 64), local30.value, local152, local89, local91); } + @OriginalMember(owner = "client!pb", name = "b", descriptor = "(III)Lclient!jj;") + public static ObjStackEntity method3420(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) { + @Pc(7) Tile local7 = SceneGraph.tiles[arg0][arg1][arg2]; + if (local7 == null) { + return null; + } else { + @Pc(14) ObjStackEntity local14 = local7.aClass79_1; + local7.aClass79_1 = null; + return local14; + } + } } diff --git a/client/src/main/java/rt4/Static221.java b/client/src/main/java/rt4/Static221.java index d8e4834..4faf551 100644 --- a/client/src/main/java/rt4/Static221.java +++ b/client/src/main/java/rt4/Static221.java @@ -6,7 +6,9 @@ import org.openrs2.deob.annotation.Pc; public final class Static221 { - @OriginalMember(owner = "client!s", name = "a", descriptor = "[I") + @OriginalMember(owner = "client!cl", name = "ab", descriptor = "[I") + public static final int[] anIntArray83 = new int[256]; + @OriginalMember(owner = "client!s", name = "a", descriptor = "[I") public static int[] tt; @OriginalMember(owner = "client!nd", name = "y", descriptor = "Lclient!mm;") public static SoftwareSprite aClass3_Sub2_Sub1_Sub1_3; @@ -23,7 +25,7 @@ public final class Static221 { @Pc(24) int local24 = SoftwareRaster.width * arg1; @Pc(26) int local26 = 0; for (@Pc(28) int local28 = 1; local28 < 255; local28++) { - @Pc(43) int local43 = (256 - local28) * Static35.anIntArray83[local28] / 256; + @Pc(43) int local43 = (256 - local28) * anIntArray83[local28] / 256; if (local43 < 0) { local43 = 0; } @@ -31,7 +33,7 @@ public final class Static221 { @Pc(55) int local55; for (local55 = local43; local55 < 128; local55++) { @Pc(65) int local65 = SoftwareRaster.pixels[local24++ + arg0]; - @Pc(70) int local70 = Static216.anIntArray188[local20++]; + @Pc(70) int local70 = Static145.anIntArray188[local20++]; if (local70 == 0) { aClass3_Sub2_Sub1_Sub1_3.pixels[local26++] = local65; } else { @@ -110,7 +112,7 @@ public final class Static221 { continue; } if (arg7[local114][local72] != 0) { - local176 = Static228.anIntArrayArray35[arg7[local114][local72]]; + local176 = Static1.anIntArrayArray35[arg7[local114][local72]]; local28.anInt2016 += ((local176.length >> 1) - 2) * 3; local28.anInt2019 += local176.length >> 1; continue; @@ -121,7 +123,7 @@ public final class Static221 { if (local151.anInt5899 == -1) { local224 = arg7[local114][local72]; if (local224 != 0) { - local234 = Static53.anIntArrayArray8[local224]; + local234 = Static193.anIntArrayArray8[local224]; local28.anInt2016 += ((local234.length >> 1) - 2) * 3; local28.anInt2019 += local234.length >> 1; } @@ -157,11 +159,11 @@ public final class Static221 { local328 = local114 > local349 && local114 < local355; } if (local315 && local328) { - local234 = Static228.anIntArrayArray35[0]; + local234 = Static1.anIntArrayArray35[0]; } else if (local315) { - local234 = Static228.anIntArrayArray35[1]; + local234 = Static1.anIntArrayArray35[1]; } else if (local328) { - local234 = Static228.anIntArrayArray35[1]; + local234 = Static1.anIntArrayArray35[1]; } } else { local315 = local90 <= local114 - 1; @@ -179,11 +181,11 @@ public final class Static221 { local328 = local349 < local114 && local355 > local114; } if (local315 && local328) { - local234 = Static228.anIntArrayArray35[0]; + local234 = Static1.anIntArrayArray35[0]; } else if (local315) { - local234 = Static228.anIntArrayArray35[1]; + local234 = Static1.anIntArrayArray35[1]; } else if (local328) { - local234 = Static228.anIntArrayArray35[1]; + local234 = Static1.anIntArrayArray35[1]; } } if (local234 != null) { @@ -194,14 +196,14 @@ public final class Static221 { } } if (local135) { - local234 = Static53.anIntArrayArray8[arg7[local114][local72]]; - local176 = Static228.anIntArrayArray35[arg7[local114][local72]]; + local234 = Static193.anIntArrayArray8[arg7[local114][local72]]; + local176 = Static1.anIntArrayArray35[arg7[local114][local72]]; local28.anInt2016 += ((local176.length >> 1) - 2) * 3; local28.anInt2016 += ((local234.length >> 1) - 2) * 3; local28.anInt2019 += local176.length >> 1; local28.anInt2019 += local234.length >> 1; } else { - local176 = Static228.anIntArrayArray35[0]; + local176 = Static1.anIntArrayArray35[0]; local28.anInt2016 += ((local176.length >> 1) - 2) * 3; local28.anInt2019 += local176.length >> 1; } @@ -238,13 +240,13 @@ public final class Static221 { continue; } if (arg7[local114][local72] != 0) { - Static131.method2578(arg0, arg9, local114, arg6, local72, Static228.anIntArrayArray35[arg7[local114][local72]], local28, local18, arg10, arg2[local114][local72]); + Static131.method2578(arg0, arg9, local114, arg6, local72, Static1.anIntArrayArray35[arg7[local114][local72]], local28, local18, arg10, arg2[local114][local72]); continue; } } else if (local775 != 0) { local805 = FloTypeList.method4395(local775 - 1); if (local805.anInt5899 == -1) { - Static131.method2578(arg0, arg9, local114, arg6, local72, Static53.anIntArrayArray8[arg7[local114][local72]], local28, local18, arg10, arg2[local114][local72]); + Static131.method2578(arg0, arg9, local114, arg6, local72, Static193.anIntArrayArray8[arg7[local114][local72]], local28, local18, arg10, arg2[local114][local72]); continue; } @Pc(815) byte local815 = arg7[local114][local72]; @@ -277,12 +279,12 @@ public final class Static221 { local947 = local355 < local114 && local973 > local114; } if (local328 && local947) { - local917 = Static228.anIntArrayArray35[0]; + local917 = Static1.anIntArrayArray35[0]; } else if (local328) { - local917 = Static228.anIntArrayArray35[1]; + local917 = Static1.anIntArrayArray35[1]; local789 = 1; } else if (local947) { - local917 = Static228.anIntArrayArray35[1]; + local917 = Static1.anIntArrayArray35[1]; local789 = 3; } } else { @@ -301,12 +303,12 @@ public final class Static221 { local947 = local114 > local355 && local973 > local114; } if (local328 && local947) { - local917 = Static228.anIntArrayArray35[0]; + local917 = Static1.anIntArrayArray35[0]; } else if (local328) { local789 = 0; - local917 = Static228.anIntArrayArray35[1]; + local917 = Static1.anIntArrayArray35[1]; } else if (local947) { - local917 = Static228.anIntArrayArray35[1]; + local917 = Static1.anIntArrayArray35[1]; local789 = 2; } } @@ -317,10 +319,10 @@ public final class Static221 { } } if (local791) { - Static131.method2578(arg0, arg9, local114, arg6, local72, Static53.anIntArrayArray8[arg7[local114][local72]], local28, local18, arg10, arg2[local114][local72]); - Static131.method2578(arg0, arg9, local114, arg6, local72, Static228.anIntArrayArray35[arg7[local114][local72]], local28, local18, arg10, arg2[local114][local72]); + Static131.method2578(arg0, arg9, local114, arg6, local72, Static193.anIntArrayArray8[arg7[local114][local72]], local28, local18, arg10, arg2[local114][local72]); + Static131.method2578(arg0, arg9, local114, arg6, local72, Static1.anIntArrayArray35[arg7[local114][local72]], local28, local18, arg10, arg2[local114][local72]); } else { - Static131.method2578(arg0, arg9, local114, arg6, local72, Static228.anIntArrayArray35[0], local28, local18, arg10, local789); + Static131.method2578(arg0, arg9, local114, arg6, local72, Static1.anIntArrayArray35[0], local28, local18, arg10, local789); } } local24++; diff --git a/client/src/main/java/rt4/Static222.java b/client/src/main/java/rt4/Static222.java deleted file mode 100644 index 9e1bede..0000000 --- a/client/src/main/java/rt4/Static222.java +++ /dev/null @@ -1,16 +0,0 @@ -package rt4; - -import org.openrs2.deob.annotation.OriginalArg; -import org.openrs2.deob.annotation.OriginalMember; - -public final class Static222 { - - @OriginalMember(owner = "client!sa", name = "a", descriptor = "(IIIBI)V") - public static void method3826(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(4) int arg3) { - if (arg3 <= arg2) { - Static131.method2576(Static71.anIntArrayArray10[arg1], arg3, arg2, arg0); - } else { - Static131.method2576(Static71.anIntArrayArray10[arg1], arg2, arg3, arg0); - } - } -} diff --git a/client/src/main/java/rt4/Static223.java b/client/src/main/java/rt4/Static223.java deleted file mode 100644 index 1344040..0000000 --- a/client/src/main/java/rt4/Static223.java +++ /dev/null @@ -1,139 +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 Static223 { - - @OriginalMember(owner = "client!sc", name = "z", descriptor = "[Z") - public static final boolean[] aBooleanArray116 = new boolean[100]; - - @OriginalMember(owner = "client!sc", name = "a", descriptor = "(IIILclient!km;)V") - public static void animateNpc(@OriginalArg(0) int arg0, @OriginalArg(1) int animationId, @OriginalArg(3) Npc npc) { - if (npc.seqId == animationId && animationId != -1) { - @Pc(10) SeqType seqType = SeqTypeList.get(animationId); - @Pc(13) int local13 = seqType.anInt5347; - if (local13 == 1) { - npc.anInt3373 = 1; - npc.anInt3425 = 0; - npc.anInt3360 = 0; - npc.anInt3371 = 0; - npc.anInt3420 = arg0; - SoundPlayer.playSeqSound(npc.zFine, seqType, npc.xFine, false, npc.anInt3425); - } - if (local13 == 2) { - npc.anInt3371 = 0; - } - } else if (animationId == -1 || npc.seqId == -1 || SeqTypeList.get(animationId).forcedPriority >= SeqTypeList.get(npc.seqId).forcedPriority) { - npc.anInt3360 = 0; - npc.seqId = animationId; - npc.anInt3373 = 1; - npc.anInt3371 = 0; - npc.anInt3420 = arg0; - npc.anInt3405 = npc.movementQueueSize; - npc.anInt3425 = 0; - if (npc.seqId != -1) { - SoundPlayer.playSeqSound(npc.zFine, SeqTypeList.get(npc.seqId), npc.xFine, false, npc.anInt3425); - } - } - } - - @OriginalMember(owner = "client!sc", name = "a", descriptor = "()V") - public static void method3858() { - for (@Pc(1) int local1 = 0; local1 < SceneGraph.sceneryLen; local1++) { - @Pc(8) Scenery local8 = SceneGraph.scenery[local1]; - SceneGraph.removeScenery(local8); - SceneGraph.scenery[local1] = null; - } - SceneGraph.sceneryLen = 0; - } - - @OriginalMember(owner = "client!sc", name = "a", descriptor = "(IZ)Lclient!j;") - public static TextureOp method3860(@OriginalArg(0) int arg0) { - if (arg0 == 0) { - return new TextureOp20(); - } else if (arg0 == 1) { - return new TextureOpColorFill(); - } else if (arg0 == 2) { - return new TextureOp27(); - } else if (arg0 == 3) { - return new TextureOp25(); - } else if (arg0 == 4) { - return new TextureOp17(); - } else if (arg0 == 5) { - return new TextureOp21(); - } else if (arg0 == 6) { - return new TextureOp2(); - } else if (arg0 == 7) { - return new TextureOpCombine(); - } else if (arg0 == 8) { - return new TextureOpCurve(); - } else if (arg0 == 9) { - return new TextureOp7(); - } else if (arg0 == 10) { - return new TextureOpColorGradient(); - } else if (arg0 == 11) { - return new TextureOp18(); - } else if (arg0 == 12) { - return new TextureOp1(); - } else if (arg0 == 13) { - return new TextureOp26(); - } else if (arg0 == 14) { - return new TextureOp28(); - } else if (arg0 == 15) { - return new TextureOp14(); - } else if (arg0 == 16) { - return new TextureOp8(); - } else if (arg0 == 17) { - return new TextureOp13(); - } else if (arg0 == 18) { - return new TextureOpTiledSprite(); - } else if (arg0 == 19) { - return new TextureOp16(); - } else if (arg0 == 20) { - return new TextureOp11(); - } else if (arg0 == 21) { - return new TextureOp5(); - } else if (arg0 == 22) { - return new TextureOp31(); - } else if (arg0 == 23) { - return new TextureOp15(); - } else if (arg0 == 24) { - return new TextureOp10(); - } else if (arg0 == 25) { - return new TextureOp30(); - } else if (arg0 == 26) { - return new TextureOpBinary(); - } else if (arg0 == 27) { - return new TextureOp6(); - } else if (arg0 == 28) { - return new TextureOp22(); - } else if (arg0 == 29) { - return new TextureOp29(); - } else if (arg0 == 30) { - return new TextureOp9(); - } else if (arg0 == 31) { - return new TextureOp12(); - } else if (arg0 == 32) { - return new TextureOp24(); - } else if (arg0 == 33) { - return new TextureOp3(); - } else if (arg0 == 34) { - return new TextureOp4(); - } else if (arg0 == 35) { - return new TextureOp23(); - } else if (arg0 == 36) { - return new TextureOp32(); - } else if (arg0 == 37) { - return new TextureOp19(); - } else if (arg0 == 38) { - return new TextureOp33(); - } else if (arg0 == 39) { - return new TextureOpSprite(); - } else { - return null; - } - } - -} diff --git a/client/src/main/java/rt4/Static224.java b/client/src/main/java/rt4/Static224.java deleted file mode 100644 index 7120242..0000000 --- a/client/src/main/java/rt4/Static224.java +++ /dev/null @@ -1,34 +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 Static224 { - - @OriginalMember(owner = "client!sd", name = "R", descriptor = "I") - public static int anInt5062; - - @OriginalMember(owner = "client!sd", name = "c", descriptor = "(II)V") - public static void method3884(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) { - @Pc(7) Tile local7 = SceneGraph.tiles[0][arg0][arg1]; - for (@Pc(9) int local9 = 0; local9 < 3; local9++) { - @Pc(30) Tile local30 = SceneGraph.tiles[local9][arg0][arg1] = SceneGraph.tiles[local9 + 1][arg0][arg1]; - if (local30 != null) { - local30.anInt672--; - for (@Pc(40) int local40 = 0; local40 < local30.sceneryLen; local40++) { - @Pc(49) Scenery local49 = local30.scenery[local40]; - if ((local49.key >> 29 & 0x3L) == 2L && local49.xMin == arg0 && local49.zMin == arg1) { - local49.level--; - } - } - } - } - if (SceneGraph.tiles[0][arg0][arg1] == null) { - SceneGraph.tiles[0][arg0][arg1] = new Tile(0, arg0, arg1); - } - SceneGraph.tiles[0][arg0][arg1].aClass3_Sub5_1 = local7; - SceneGraph.tiles[3][arg0][arg1] = null; - } - -} diff --git a/client/src/main/java/rt4/Static225.java b/client/src/main/java/rt4/Static225.java deleted file mode 100644 index 676f965..0000000 --- a/client/src/main/java/rt4/Static225.java +++ /dev/null @@ -1,20 +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 Static225 { - - @OriginalMember(owner = "client!se", name = "h", descriptor = "I") - public static int anInt5073 = -1; - - @OriginalMember(owner = "client!se", name = "a", descriptor = "(IIIIZ)I") - public static int method3891(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) { - @Pc(8) int local8 = arg3 & 0xF; - @Pc(29) int local29 = local8 >= 4 ? (local8 == 12 || local8 == 14 ? arg0 : arg1) : arg2; - @Pc(42) int local42 = local8 < 8 ? arg0 : arg2; - return ((local8 & 0x1) == 0 ? local42 : -local42) + ((local8 & 0x2) == 0 ? local29 : -local29); - } - -} diff --git a/client/src/main/java/rt4/Static226.java b/client/src/main/java/rt4/Static226.java index 4f4d66d..c215f9a 100644 --- a/client/src/main/java/rt4/Static226.java +++ b/client/src/main/java/rt4/Static226.java @@ -9,8 +9,10 @@ public final class Static226 { public static int anInt5084 = 0; @OriginalMember(owner = "client!ml", name = "Q", descriptor = "I") public static int anInt3953 = 0; + @OriginalMember(owner = "client!wl", name = "u", descriptor = "I") + public static int anInt5895 = 0; - @OriginalMember(owner = "client!sf", name = "b", descriptor = "(B)V") + @OriginalMember(owner = "client!sf", name = "b", descriptor = "(B)V") public static void method3901() { @Pc(16) int local16 = Fonts.b12Full.getStringWidth(LocalizedText.CHOOSE_OPTION); @Pc(18) int local18; @@ -22,9 +24,9 @@ public final class Static226 { } } local18 = MiniMenu.size * 15 + 21; - @Pc(43) int local43 = Static60.anInt1892; + @Pc(43) int local43 = ScriptRunner.anInt1892; local16 += 8; - local27 = Static155.anInt3751 - local16 / 2; + local27 = ScriptRunner.anInt3751 - local16 / 2; if (local43 + local18 > GameShell.canvasHeight) { local43 = GameShell.canvasHeight - local18; } @@ -38,23 +40,23 @@ public final class Static226 { local43 = 0; } if (anInt3953 == 1) { - if (Static155.anInt3751 == Mouse.anInt5850 && Static280.anInt5895 == Static60.anInt1892) { - Static13.anInt436 = MiniMenu.size * 15 + (Static40.aBoolean298 ? 26 : 22); + if (ScriptRunner.anInt3751 == Mouse.anInt5850 && anInt5895 == ScriptRunner.anInt1892) { + InterfaceList.anInt436 = MiniMenu.size * 15 + (Static40.aBoolean298 ? 26 : 22); anInt3953 = 0; - Static229.anInt5138 = local43; - Static183.anInt4271 = local27; + InterfaceList.anInt5138 = local43; + InterfaceList.anInt4271 = local27; Static40.aBoolean108 = true; - Static24.anInt761 = local16; + InterfaceList.anInt761 = local16; } - } else if (Static155.anInt3751 == Mouse.clickX && Static60.anInt1892 == Mouse.clickY) { - Static183.anInt4271 = local27; + } else if (ScriptRunner.anInt3751 == Mouse.clickX && ScriptRunner.anInt1892 == Mouse.clickY) { + InterfaceList.anInt4271 = local27; anInt3953 = 0; - Static24.anInt761 = local16; - Static229.anInt5138 = local43; - Static13.anInt436 = (Static40.aBoolean298 ? 26 : 22) + MiniMenu.size * 15; + InterfaceList.anInt761 = local16; + InterfaceList.anInt5138 = local43; + InterfaceList.anInt436 = (Static40.aBoolean298 ? 26 : 22) + MiniMenu.size * 15; Static40.aBoolean108 = true; } else { - Static280.anInt5895 = Mouse.clickY; + anInt5895 = Mouse.clickY; Mouse.anInt5850 = Mouse.clickX; anInt3953 = 1; } diff --git a/client/src/main/java/rt4/Static228.java b/client/src/main/java/rt4/Static228.java deleted file mode 100644 index 7a4bd06..0000000 --- a/client/src/main/java/rt4/Static228.java +++ /dev/null @@ -1,53 +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 Static228 { - - @OriginalMember(owner = "client!sh", name = "e", descriptor = "Lclient!na;") - public static final JagString aClass100_967 = JagString.parse(""); - - @OriginalMember(owner = "client!sh", name = "f", descriptor = "I") - public static int anInt5103 = -1; - - @OriginalMember(owner = "client!sh", name = "i", descriptor = "[[I") - public static final int[][] anIntArrayArray35 = new int[][] { { 0, 128, 0, 0, 128, 0, 128, 128 }, { 0, 128, 0, 0, 128, 0 }, { 0, 0, 64, 128, 0, 128 }, { 128, 128, 64, 128, 128, 0 }, { 0, 0, 128, 0, 128, 128, 64, 128 }, { 0, 128, 0, 0, 128, 0, 64, 128 }, { 64, 128, 0, 128, 0, 0, 64, 0 }, { 0, 0, 64, 0, 0, 64 }, { 128, 0, 128, 128, 0, 128, 0, 64, 64, 0 }, { 0, 128, 0, 0, 32, 64, 64, 96, 128, 128 }, { 0, 0, 128, 0, 128, 128, 64, 96, 32, 64 }, { 0, 0, 128, 0, 96, 32, 32, 32 } }; - - @OriginalMember(owner = "client!sh", name = "a", descriptor = "(IZBIZ)V") - public static void sortWorldList(@OriginalArg(0) int arg0, @OriginalArg(1) boolean arg1, @OriginalArg(3) int arg2, @OriginalArg(4) boolean arg3) { - Static79.method1697(arg0, arg2, WorldList.sorted.length - 1, arg3, 0, arg1); - } - - @OriginalMember(owner = "client!sh", name = "a", descriptor = "(I[JII[Ljava/lang/Object;)V") - public static void method3909(@OriginalArg(0) int arg0, @OriginalArg(1) long[] arg1, @OriginalArg(3) int arg2, @OriginalArg(4) Object[] arg3) { - if (arg2 >= arg0) { - return; - } - @Pc(16) int local16 = arg2; - @Pc(23) int local23 = (arg2 + arg0) / 2; - @Pc(27) long local27 = arg1[local23]; - arg1[local23] = arg1[arg0]; - arg1[arg0] = local27; - @Pc(41) Object local41 = arg3[local23]; - arg3[local23] = arg3[arg0]; - arg3[arg0] = local41; - for (@Pc(53) int local53 = arg2; local53 < arg0; local53++) { - if (local27 + (long) (local53 & 0x1) > arg1[local53]) { - @Pc(72) long local72 = arg1[local53]; - arg1[local53] = arg1[local16]; - arg1[local16] = local72; - @Pc(86) Object local86 = arg3[local53]; - arg3[local53] = arg3[local16]; - arg3[local16++] = local86; - } - } - arg1[arg0] = arg1[local16]; - arg1[local16] = local27; - arg3[arg0] = arg3[local16]; - arg3[local16] = local41; - method3909(local16 - 1, arg1, arg2, arg3); - method3909(arg0, arg1, local16 + 1, arg3); - } -} diff --git a/client/src/main/java/rt4/Static229.java b/client/src/main/java/rt4/Static229.java deleted file mode 100644 index 63c1bea..0000000 --- a/client/src/main/java/rt4/Static229.java +++ /dev/null @@ -1,10 +0,0 @@ -package rt4; - -import org.openrs2.deob.annotation.OriginalMember; - -public final class Static229 { - - @OriginalMember(owner = "client!si", name = "ab", descriptor = "I") - public static int anInt5138; - -} diff --git a/client/src/main/java/rt4/Static23.java b/client/src/main/java/rt4/Static23.java deleted file mode 100644 index 2f530c8..0000000 --- a/client/src/main/java/rt4/Static23.java +++ /dev/null @@ -1,61 +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 Static23 { - - @OriginalMember(owner = "client!bm", name = "a", descriptor = "(IBIIII)V") - public static void method645(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4) { - @Pc(3) int local3; - @Pc(10) int local10; - for (local3 = arg1; local3 <= arg3 + arg1; local3++) { - for (local10 = arg2; local10 <= arg4 + arg2; local10++) { - if (local10 >= 0 && local10 < 104 && local3 >= 0 && local3 < 104) { - SceneGraph.aByteArrayArrayArray9[arg0][local10][local3] = 127; - } - } - } - for (local3 = arg1; local3 < arg3 + arg1; local3++) { - for (local10 = arg2; local10 < arg2 + arg4; local10++) { - if (local10 >= 0 && local10 < 104 && local3 >= 0 && local3 < 104) { - SceneGraph.tileHeights[arg0][local10][local3] = arg0 <= 0 ? 0 : SceneGraph.tileHeights[arg0 - 1][local10][local3]; - } - } - } - if (arg2 > 0 && arg2 < 104) { - for (local3 = arg1 + 1; local3 < arg1 + arg3; local3++) { - if (local3 >= 0 && local3 < 104) { - SceneGraph.tileHeights[arg0][arg2][local3] = SceneGraph.tileHeights[arg0][arg2 - 1][local3]; - } - } - } - if (arg1 > 0 && arg1 < 104) { - for (local3 = arg2 + 1; local3 < arg2 + arg4; local3++) { - if (local3 >= 0 && local3 < 104) { - SceneGraph.tileHeights[arg0][local3][arg1] = SceneGraph.tileHeights[arg0][local3][arg1 - 1]; - } - } - } - if (arg2 < 0 || arg1 < 0 || arg2 >= 104 || arg1 >= 104) { - return; - } - if (arg0 == 0) { - if (arg2 > 0 && SceneGraph.tileHeights[arg0][arg2 - 1][arg1] != 0) { - SceneGraph.tileHeights[arg0][arg2][arg1] = SceneGraph.tileHeights[arg0][arg2 - 1][arg1]; - } else if (arg1 > 0 && SceneGraph.tileHeights[arg0][arg2][arg1 - 1] != 0) { - SceneGraph.tileHeights[arg0][arg2][arg1] = SceneGraph.tileHeights[arg0][arg2][arg1 - 1]; - } else if (arg2 > 0 && arg1 > 0 && SceneGraph.tileHeights[arg0][arg2 - 1][arg1 - 1] != 0) { - SceneGraph.tileHeights[arg0][arg2][arg1] = SceneGraph.tileHeights[arg0][arg2 - 1][arg1 - 1]; - } - } else if (arg2 > 0 && SceneGraph.tileHeights[arg0 - 1][arg2 - 1][arg1] != SceneGraph.tileHeights[arg0][arg2 - 1][arg1]) { - SceneGraph.tileHeights[arg0][arg2][arg1] = SceneGraph.tileHeights[arg0][arg2 - 1][arg1]; - } else if (arg1 > 0 && SceneGraph.tileHeights[arg0][arg2][arg1 - 1] != SceneGraph.tileHeights[arg0 - 1][arg2][arg1 - 1]) { - SceneGraph.tileHeights[arg0][arg2][arg1] = SceneGraph.tileHeights[arg0][arg2][arg1 - 1]; - } else if (arg2 > 0 && arg1 > 0 && SceneGraph.tileHeights[arg0][arg2 - 1][arg1 - 1] != SceneGraph.tileHeights[arg0 - 1][arg2 - 1][arg1 - 1]) { - SceneGraph.tileHeights[arg0][arg2][arg1] = SceneGraph.tileHeights[arg0][arg2 - 1][arg1 - 1]; - } - } - -} diff --git a/client/src/main/java/rt4/Static230.java b/client/src/main/java/rt4/Static230.java deleted file mode 100644 index 6fccb06..0000000 --- a/client/src/main/java/rt4/Static230.java +++ /dev/null @@ -1,96 +0,0 @@ -package rt4; - -import java.nio.charset.StandardCharsets; - -import org.openrs2.deob.annotation.OriginalArg; -import org.openrs2.deob.annotation.OriginalMember; -import org.openrs2.deob.annotation.Pc; - -public final class Static230 { - - @OriginalMember(owner = "client!wd", name = "e", descriptor = "Lclient!na;") - public static final JagString aClass100_989 = JagString.parse("cookieprefix"); - @OriginalMember(owner = "client!u", name = "g", descriptor = "Lclient!na;") - public static final JagString aClass100_1029 = JagString.parse("cookiehost"); - @OriginalMember(owner = "client!lc", name = "m", descriptor = "Lclient!na;") - public static final JagString aClass100_667 = JagString.parse("settings="); - @OriginalMember(owner = "client!wh", name = "n", descriptor = "Lclient!na;") - public static final JagString aClass100_1095 = JagString.parse("; version=1; path=)4; domain="); - @OriginalMember(owner = "client!tm", name = "d", descriptor = "Lclient!na;") - public static final JagString aClass100_1018 = JagString.parse("; Expires=Thu)1 01)2Jan)21970 00:00:00 GMT; Max)2Age=0"); - @OriginalMember(owner = "client!vg", name = "h", descriptor = "Lclient!na;") - public static final JagString aClass100_1082 = JagString.parse("; Expires="); - @OriginalMember(owner = "client!s", name = "g", descriptor = "Lclient!na;") - public static final JagString aClass100_821 = JagString.parse("document)3cookie=(R"); - @OriginalMember(owner = "client!sc", name = "f", descriptor = "Lclient!na;") - public static final JagString aClass100_946 = JagString.parse("(R"); - @OriginalMember(owner = "client!fb", name = "i", descriptor = "Lclient!na;") - public static final JagString aClass100_431 = JagString.parse("; Max)2Age="); - - @OriginalMember(owner = "client!sj", name = "p", descriptor = "I") - public static int anInt5150 = 1; - - @OriginalMember(owner = "client!sj", name = "u", descriptor = "Z") - public static boolean dynamicMapRegion = false; - - @OriginalMember(owner = "client!sj", name = "H", descriptor = "I") - public static int anInt5161 = 0; - - @OriginalMember(owner = "client!sj", name = "c", descriptor = "(I)V") - public static void method3947() { - PlayerAppearance.aClass99_33.clear(); - PlayerAppearance.aClass99_21.clear(); - } - - @OriginalMember(owner = "client!sj", name = "a", descriptor = "(IIBIII)V") - public static void method3950(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4) { - if (arg0 >= TextureOp29.anInt4164 && arg3 <= TextureOp29.anInt5063 && TextureOp29.anInt5773 <= arg4 && TextureOp29.anInt2869 >= arg2) { - Static176.method3308(arg2, arg3, arg4, arg0, arg1); - } else { - Static163.method3105(arg1, arg3, arg4, arg0, arg2); - } - } - - @OriginalMember(owner = "client!sj", name = "a", descriptor = "(Ljava/lang/String;I)Lclient!na;") - public static JagString method3952(@OriginalArg(0) String arg0) { - @Pc(14) byte[] local14 = arg0.getBytes(StandardCharsets.ISO_8859_1); - @Pc(23) JagString local23 = new JagString(); - local23.chars = local14; - local23.length = 0; - for (@Pc(31) int local31 = 0; local31 < local14.length; local31++) { - if (local14[local31] != 0) { - local14[local23.length++] = local14[local31]; - } - } - return local23; - } - - @OriginalMember(owner = "client!sj", name = "a", descriptor = "(ILclient!na;)V") - public static void method3954(@OriginalArg(1) JagString arg0) { - client.settings = arg0; - if (GameShell.signLink.applet == null) { - return; - } - try { - @Pc(17) JagString local17 = aClass100_989.fromParameters(GameShell.signLink.applet); - @Pc(23) JagString local23 = aClass100_1029.fromParameters(GameShell.signLink.applet); - @Pc(48) JagString local48 = JagString.concatenate(new JagString[] { local17, aClass100_667, arg0, aClass100_1095, local23 }); - if (arg0.length() == 0) { - local48 = JagString.concatenate(new JagString[] { local48, aClass100_1018 }); - } else { - local48 = JagString.concatenate(new JagString[] { local48, aClass100_1082, Static33.method873(MonotonicClock.currentTimeMillis() + 94608000000L), aClass100_431, Static154.method2929(94608000L) }); - } - JagString.concatenate(new JagString[] { aClass100_821, local48, aClass100_946 }).method3134(GameShell.signLink.applet); - } catch (@Pc(124) Throwable local124) { - } - } - - @OriginalMember(owner = "client!sj", name = "c", descriptor = "(II)V") - public static void method3956(@OriginalArg(0) int arg0) { - if (MidiPlayer.state == 0) { - MidiPlayer.stream.setVolume(arg0); - } else { - MidiPlayer.volume = arg0; - } - } -} diff --git a/client/src/main/java/rt4/Static231.java b/client/src/main/java/rt4/Static231.java index 6f31cd8..6df6927 100644 --- a/client/src/main/java/rt4/Static231.java +++ b/client/src/main/java/rt4/Static231.java @@ -15,16 +15,16 @@ public final class Static231 { @OriginalMember(owner = "client!sk", name = "lb", descriptor = "Z") public static boolean aBoolean252 = false; - @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) { @Pc(15) int local15 = arg4 - arg2; @Pc(19) int local19 = arg1 - arg3; if (local15 == 0) { if (local19 != 0) { - Static54.method1306(arg1, arg3, arg0, arg2); + method1306(arg1, arg3, arg0, arg2); } } else if (local19 == 0) { - Static234.method4019(arg2, arg0, arg4, arg3); + method4019(arg2, arg0, arg4, arg3); } else { @Pc(50) int local50 = (local19 << 12) / local15; @Pc(59) int local59 = arg3 - (local50 * arg2 >> 12); @@ -70,4 +70,49 @@ public final class Static231 { } } + @OriginalMember(owner = "client!ta", name = "a", descriptor = "(IIZII)V") + public static void method4019(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3) { + if (arg3 >= TextureOp29.anInt5773 && arg3 <= TextureOp29.anInt2869) { + @Pc(15) int local15 = method1690(TextureOp29.anInt5063, arg0, TextureOp29.anInt4164); + @Pc(21) int local21 = method1690(TextureOp29.anInt5063, arg2, TextureOp29.anInt4164); + method3826(arg1, arg3, local21, local15); + } + } + + @OriginalMember(owner = "client!gd", name = "a", descriptor = "(IIBI)I") + public static int method1690(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2) { + return arg2 > arg1 ? arg2 : arg1 > arg0 ? arg0 : arg1; + } + + @OriginalMember(owner = "client!sa", name = "a", descriptor = "(IIIBI)V") + public static void method3826(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(4) int arg3) { + if (arg3 <= arg2) { + TextureOp29SubOp4.method2576(TextureOp29SubOp4.anIntArrayArray10[arg1], arg3, arg2, arg0); + } else { + TextureOp29SubOp4.method2576(TextureOp29SubOp4.anIntArrayArray10[arg1], arg2, arg3, arg0); + } + } + + @OriginalMember(owner = "client!ed", name = "a", descriptor = "(ZIIII)V") + public static void method1306(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3) { + if (arg3 >= TextureOp29.anInt4164 && arg3 <= TextureOp29.anInt5063) { + @Pc(22) int local22 = method1690(TextureOp29.anInt2869, arg1, TextureOp29.anInt5773); + @Pc(28) int local28 = method1690(TextureOp29.anInt2869, arg0, TextureOp29.anInt5773); + method2054(local22, arg3, local28, arg2); + } + } + + @OriginalMember(owner = "client!hm", name = "a", descriptor = "(IIIII)V") + public static void method2054(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3) { + @Pc(8) int local8; + if (arg0 <= arg2) { + for (local8 = arg0; local8 < arg2; local8++) { + TextureOp29SubOp4.anIntArrayArray10[local8][arg1] = arg3; + } + } else { + for (local8 = arg2; local8 < arg0; local8++) { + TextureOp29SubOp4.anIntArrayArray10[local8][arg1] = arg3; + } + } + } } diff --git a/client/src/main/java/rt4/Static232.java b/client/src/main/java/rt4/Static232.java index 1ab9138..2cea16a 100644 --- a/client/src/main/java/rt4/Static232.java +++ b/client/src/main/java/rt4/Static232.java @@ -6,15 +6,18 @@ import org.openrs2.deob.annotation.Pc; public final class Static232 { - @OriginalMember(owner = "client!sm", name = "a", descriptor = "(IIIIIIIIIII)V") + @OriginalMember(owner = "client!nj", name = "h", descriptor = "Lclient!ih;") + public static final LinkedList aClass69_97 = new LinkedList(); + + @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) { @Pc(9) int local9 = arg2 - arg4; @Pc(11) int local11 = -1; - if (Static201.anInt1864 > 0) { - if (Static91.anInt2428 <= 10) { - local11 = Static91.anInt2428 * 5; + if (WorldMap.anInt1864 > 0) { + if (Static1.anInt2428 <= 10) { + local11 = Static1.anInt2428 * 5; } else { - local11 = 50 - (Static91.anInt2428 - 10) * 5; + local11 = 50 - (Static1.anInt2428 - 10) * 5; } } @Pc(39) int local39 = arg1 - arg6; @@ -47,7 +50,7 @@ public final class Static232 { local243.anInt4307 = local65; local243.anInt4314 = local144; local243.id = local222.mapElement; - Static172.aClass69_97.addTail(local243); + aClass69_97.addTail(local243); } else { MapList.sprites[local222.mapElement].render(local65 - 7, local144 + -7); } @@ -59,22 +62,14 @@ public final class Static232 { } } } - for (@Pc(285) MapElement local285 = (MapElement) Static172.aClass69_97.head(); local285 != null; local285 = (MapElement) Static172.aClass69_97.next()) { + for (@Pc(285) MapElement local285 = (MapElement) aClass69_97.head(); local285 != null; local285 = (MapElement) aClass69_97.next()) { SoftwareRaster.method2502(local285.anInt4307, local285.anInt4314, 15, local11); SoftwareRaster.method2502(local285.anInt4307, local285.anInt4314, 13, local11); SoftwareRaster.method2502(local285.anInt4307, local285.anInt4314, 11, local11); SoftwareRaster.method2502(local285.anInt4307, local285.anInt4314, 9, local11); MapList.sprites[local285.id].render(local285.anInt4307 - 7, local285.anInt4314 + -7); } - Static172.aClass69_97.clear(); + aClass69_97.clear(); } - @OriginalMember(owner = "client!sm", name = "a", descriptor = "(II)V") - public static void method3993(@OriginalArg(0) int arg0) { - Static149.anIntArray338 = new int[arg0]; - Static267.anIntArray518 = new int[arg0]; - Static243.anIntArray476 = new int[arg0]; - Static50.anIntArray134 = new int[arg0]; - Static79.anIntArray205 = new int[arg0]; - } } diff --git a/client/src/main/java/rt4/Static233.java b/client/src/main/java/rt4/Static233.java index 0873c56..56cff7d 100644 --- a/client/src/main/java/rt4/Static233.java +++ b/client/src/main/java/rt4/Static233.java @@ -6,9 +6,6 @@ import org.openrs2.deob.annotation.Pc; public final class Static233 { - @OriginalMember(owner = "client!t", name = "l", descriptor = "Lclient!ma;") - public static BufferedSocket aClass95_4; - @OriginalMember(owner = "client!t", name = "o", descriptor = "I") public static int anInt5217; @@ -24,13 +21,13 @@ public final class Static233 { @OriginalMember(owner = "client!t", name = "a", descriptor = "(IIIZIII)V") public static void method4000(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5) { @Pc(3) int local3 = 0; - @Pc(5) MapMarker[] local5 = Static143.hintMapMarkers; + @Pc(5) MapMarker[] local5 = MiniMap.hintMapMarkers; while (local5.length > local3) { @Pc(17) MapMarker local17 = local5[local3]; if (local17 != null && local17.type == 2) { - Static198.method1026(arg0 >> 1, arg4, (local17.anInt4046 - Camera.originZ << 7) + local17.anInt4047, local17.anInt4050 * 2, arg2 >> 1, local17.anInt4045 + (local17.targetX - Camera.originX << 7), arg3); - if (Static65.anInt1951 > -1 && client.loop % 20 < 10) { - Sprites.headhints[local17.anInt4048].render(arg1 + Static65.anInt1951 - 12, arg5 + -28 - -Static16.anInt548); + ScriptRunner.method1026(arg0 >> 1, arg4, (local17.anInt4046 - Camera.originZ << 7) + local17.anInt4047, local17.anInt4050 * 2, arg2 >> 1, local17.anInt4045 + (local17.targetX - Camera.originX << 7), arg3); + if (ScriptRunner.anInt1951 > -1 && client.loop % 20 < 10) { + Sprites.headhints[local17.anInt4048].render(arg1 + ScriptRunner.anInt1951 - 12, arg5 + -28 - -ScriptRunner.anInt548); } } local3++; @@ -52,7 +49,7 @@ public final class Static233 { client.audioLoop(); for (@Pc(36) int local36 = 0; local36 < 13; local36++) { for (@Pc(43) int local43 = 0; local43 < 13; local43++) { - @Pc(56) int local56 = Static187.anIntArrayArrayArray18[local29][local36][local43]; + @Pc(56) int local56 = Protocol.anIntArrayArrayArray18[local29][local36][local43]; if (local56 != -1) { @Pc(67) int local67 = local56 >> 24 & 0x3; if (!arg0 || local67 == 0) { diff --git a/client/src/main/java/rt4/Static234.java b/client/src/main/java/rt4/Static234.java deleted file mode 100644 index 79b476b..0000000 --- a/client/src/main/java/rt4/Static234.java +++ /dev/null @@ -1,24 +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 Static234 { - - @OriginalMember(owner = "client!ta", name = "o", descriptor = "[I") - public static int[] anIntArray454; - - @OriginalMember(owner = "client!ta", name = "B", descriptor = "I") - public static int anInt5245 = 0; - - @OriginalMember(owner = "client!ta", name = "a", descriptor = "(IIZII)V") - public static void method4019(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3) { - if (arg3 >= TextureOp29.anInt5773 && arg3 <= TextureOp29.anInt2869) { - @Pc(15) int local15 = Static78.method1690(TextureOp29.anInt5063, arg0, TextureOp29.anInt4164); - @Pc(21) int local21 = Static78.method1690(TextureOp29.anInt5063, arg2, TextureOp29.anInt4164); - Static222.method3826(arg1, arg3, local21, local15); - } - } - -} diff --git a/client/src/main/java/rt4/Static235.java b/client/src/main/java/rt4/Static235.java deleted file mode 100644 index dbc6df8..0000000 --- a/client/src/main/java/rt4/Static235.java +++ /dev/null @@ -1,15 +0,0 @@ -package rt4; - -import org.openrs2.deob.annotation.OriginalMember; - -public final class Static235 { - - @OriginalMember(owner = "client!tb", name = "Q", descriptor = "I") - public static int anInt5276 = 0; - - @OriginalMember(owner = "client!tb", name = "h", descriptor = "(I)I") - public static int method4044() { - return Cheat.shiftClick && Keyboard.pressedKeys[Keyboard.KEY_SHIFT] && MiniMenu.size > 2 ? MiniMenu.cursors[MiniMenu.size - 2] : MiniMenu.cursors[MiniMenu.size - 1]; - } - -} diff --git a/client/src/main/java/rt4/Static236.java b/client/src/main/java/rt4/Static236.java deleted file mode 100644 index 10d1e6d..0000000 --- a/client/src/main/java/rt4/Static236.java +++ /dev/null @@ -1,62 +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 Static236 { - - @OriginalMember(owner = "client!df", name = "n", descriptor = "I") - public static int anInt1396 = 0; - @OriginalMember(owner = "client!di", name = "H", descriptor = "Z") - public static boolean aBoolean84 = false; - - @OriginalMember(owner = "client!tc", name = "a", descriptor = "(B)I") - public static int method4047() { - if (Static127.neverRemoveRoofs) { - return 0; - } else if (SceneGraph.allLevelsAreVisible()) { - return Preferences.removeRoofsSelectively ? 2 : 1; - } else { - return 1; - } - } - - @OriginalMember(owner = "client!tc", name = "a", descriptor = "(IILclient!be;BIIII)V") - public static void method4049(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) Component arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5, @OriginalArg(7) int arg6) { - if (aBoolean84) { - anInt1396 = 32; - } else { - anInt1396 = 0; - } - aBoolean84 = false; - @Pc(139) int local139; - if (Mouse.pressedButton != 0) { - if (arg4 <= arg3 && arg4 + 16 > arg3 && arg0 >= arg5 && arg5 + 16 > arg0) { - arg2.scrollY -= 4; - InterfaceList.redraw(arg2); - } else if (arg3 >= arg4 && arg3 < arg4 + 16 && arg0 >= arg1 + arg5 - 16 && arg1 + arg5 > arg0) { - arg2.scrollY += 4; - InterfaceList.redraw(arg2); - } else if (arg3 >= arg4 - anInt1396 && arg3 < arg4 + anInt1396 + 16 && arg0 >= arg5 + 16 && arg1 + arg5 - 16 > arg0) { - local139 = arg1 * (arg1 - 32) / arg6; - if (local139 < 8) { - local139 = 8; - } - @Pc(150) int local150 = arg1 - local139 - 32; - @Pc(162) int local162 = arg0 - local139 / 2 - arg5 - 16; - arg2.scrollY = (arg6 - arg1) * local162 / local150; - InterfaceList.redraw(arg2); - aBoolean84 = true; - } - } - if (MouseWheel.wheelRotation == 0) { - return; - } - local139 = arg2.width; - if (arg4 - local139 <= arg3 && arg5 <= arg0 && arg3 < arg4 + 16 && arg1 + arg5 >= arg0) { - arg2.scrollY += MouseWheel.wheelRotation * 45; - InterfaceList.redraw(arg2); - } - } -} diff --git a/client/src/main/java/rt4/Static238.java b/client/src/main/java/rt4/Static238.java deleted file mode 100644 index 03f9efa..0000000 --- a/client/src/main/java/rt4/Static238.java +++ /dev/null @@ -1,10 +0,0 @@ -package rt4; - -import org.openrs2.deob.annotation.OriginalMember; - -public final class Static238 { - - @OriginalMember(owner = "client!te", name = "B", descriptor = "[I") - public static final int[] anIntArray469 = new int[] { 0, -1, 0, 1 }; - -} diff --git a/client/src/main/java/rt4/Static24.java b/client/src/main/java/rt4/Static24.java deleted file mode 100644 index 9acbeef..0000000 --- a/client/src/main/java/rt4/Static24.java +++ /dev/null @@ -1,10 +0,0 @@ -package rt4; - -import org.openrs2.deob.annotation.OriginalMember; - -public final class Static24 { - - @OriginalMember(owner = "client!bn", name = "O", descriptor = "I") - public static int anInt761; - -} diff --git a/client/src/main/java/rt4/Static241.java b/client/src/main/java/rt4/Static241.java index 49f40d6..ff9fa29 100644 --- a/client/src/main/java/rt4/Static241.java +++ b/client/src/main/java/rt4/Static241.java @@ -43,10 +43,10 @@ public final class Static241 { @Pc(14) int local14 = arg3 - arg4; if (local14 == 0) { if (local9 != 0) { - Static101.method2054(arg2, arg4, arg1, arg0); + Static231.method2054(arg2, arg4, arg1, arg0); } } else if (local9 == 0) { - Static222.method3826(arg0, arg2, arg3, arg4); + Static231.method3826(arg0, arg2, arg3, arg4); } else { if (local9 < 0) { local9 = -local9; @@ -84,7 +84,7 @@ public final class Static241 { @Pc(136) int local136; if (local70) { for (local136 = arg4; local136 <= arg3; local136++) { - Static71.anIntArrayArray10[local136][local74] = arg0; + TextureOp29SubOp4.anIntArrayArray10[local136][local74] = arg0; local116 += local111; if (local116 > 0) { local74 += local123; @@ -94,7 +94,7 @@ public final class Static241 { } else { for (local136 = arg4; local136 <= arg3; local136++) { local116 += local111; - Static71.anIntArrayArray10[local74][local136] = arg0; + TextureOp29SubOp4.anIntArrayArray10[local74][local136] = arg0; if (local116 > 0) { local74 += local123; local116 -= local78; @@ -104,4 +104,10 @@ public final class Static241 { } } + @OriginalMember(owner = "client!ug", name = "a", descriptor = "(II)V") + public static void method4278(@OriginalArg(0) int arg0) { + if (anIntArray522 == null || anIntArray522.length < arg0) { + anIntArray522 = new int[arg0]; + } + } } diff --git a/client/src/main/java/rt4/Static243.java b/client/src/main/java/rt4/Static243.java deleted file mode 100644 index c024d33..0000000 --- a/client/src/main/java/rt4/Static243.java +++ /dev/null @@ -1,10 +0,0 @@ -package rt4; - -import org.openrs2.deob.annotation.OriginalMember; - -public final class Static243 { - - @OriginalMember(owner = "client!tk", name = "K", descriptor = "[I") - public static int[] anIntArray476 = new int[2]; - -} diff --git a/client/src/main/java/rt4/Static245.java b/client/src/main/java/rt4/Static245.java deleted file mode 100644 index aacec2e..0000000 --- a/client/src/main/java/rt4/Static245.java +++ /dev/null @@ -1,166 +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 Static245 { - - @OriginalMember(owner = "client!tm", name = "a", descriptor = "(III[Lclient!mj;IB[BIIIZ)V") - public static void method4228(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) CollisionMap[] arg3, @OriginalArg(4) int arg4, @OriginalArg(6) byte[] arg5, @OriginalArg(7) int arg6, @OriginalArg(8) int arg7, @OriginalArg(9) int arg8, @OriginalArg(10) boolean arg9) { - @Pc(17) int local17; - if (!arg9) { - for (@Pc(10) int local10 = 0; local10 < 8; local10++) { - for (local17 = 0; local17 < 8; local17++) { - if (arg1 + local10 > 0 && local10 + arg1 < 103 && local17 + arg4 > 0 && arg4 + local17 < 103) { - arg3[arg2].flags[local10 + arg1][local17 + arg4] &= 0xFEFFFFFF; - } - } - } - } - @Pc(87) byte local87; - if (arg9) { - local87 = 1; - } else { - local87 = 4; - } - @Pc(96) Buffer local96 = new Buffer(arg5); - @Pc(103) int local103; - @Pc(108) int local108; - for (local17 = 0; local17 < local87; local17++) { - for (local103 = 0; local103 < 64; local103++) { - for (local108 = 0; local108 < 64; local108++) { - if (arg6 == local17 && arg8 <= local103 && arg8 + 8 > local103 && arg7 <= local108 && local108 < arg7 + 8) { - SceneGraph.readTile(0, 0, arg9, local96, Static202.method3659(arg0, local103 & 0x7, local108 & 0x7) + arg4, Static214.method4360(arg0, local108 & 0x7, local103 & 0x7) + arg1, arg0, arg2); - } else { - SceneGraph.readTile(0, 0, arg9, local96, -1, -1, 0, 0); - } - } - } - } - @Pc(232) int local232; - @Pc(417) int local417; - @Pc(255) int local255; - @Pc(266) int local266; - @Pc(316) int local316; - while (local96.data.length > local96.offset) { - local103 = local96.g1(); - if (local103 != 129) { - local96.offset--; - break; - } - for (local108 = 0; local108 < 4; local108++) { - @Pc(223) byte local223 = local96.g1b(); - @Pc(237) int local237; - if (local223 == 0) { - if (local108 <= arg6) { - local237 = arg1 + 7; - local232 = arg1; - local255 = arg4 + 7; - if (local255 < 0) { - local255 = 0; - } else if (local255 >= 104) { - local255 = 104; - } - if (local237 < 0) { - local237 = 0; - } else if (local237 >= 104) { - local237 = 104; - } - local417 = arg4; - if (arg4 < 0) { - local417 = 0; - } else if (arg4 >= 104) { - local417 = 104; - } - if (arg1 < 0) { - local232 = 0; - } else if (arg1 >= 104) { - local232 = 104; - } - while (local237 > local232) { - while (local417 < local255) { - SceneGraph.aByteArrayArrayArray13[arg2][local232][local417] = 0; - local417++; - } - local232++; - } - } - } else if (local223 == 1) { - for (local232 = 0; local232 < 64; local232 += 4) { - for (local237 = 0; local237 < 64; local237 += 4) { - @Pc(246) byte local246 = local96.g1b(); - if (local108 <= arg6) { - for (local255 = local232; local255 < local232 + 4; local255++) { - for (local266 = local237; local266 < local237 + 4; local266++) { - if (local255 >= arg8 && local255 < arg8 + 8 && local266 >= arg7 && arg7 + 8 > arg7) { - local316 = arg1 + Static214.method4360(arg0, local266 & 0x7, local255 & 0x7); - @Pc(328) int local328 = Static202.method3659(arg0, local255 & 0x7, local266 & 0x7) + arg4; - if (local316 >= 0 && local316 < 104 && local328 >= 0 && local328 < 104) { - SceneGraph.aByteArrayArrayArray13[arg2][local316][local328] = local246; - } - } - } - } - } - } - } - } else if (local223 == 2) { - } - } - } - @Pc(497) int local497; - if (GlRenderer.enabled && !arg9) { - @Pc(472) Environment local472 = null; - label207: while (true) { - label200: do { - while (local96.data.length > local96.offset) { - local108 = local96.g1(); - if (local108 != 0) { - if (local108 != 1) { - throw new IllegalStateException(); - } - local497 = local96.g1(); - continue label200; - } - local472 = new Environment(local96); - } - if (local472 == null) { - local472 = new Environment(); - } - Static103.aClass92ArrayArray1[arg1 >> 3][arg4 >> 3] = local472; - break label207; - } while (local497 <= 0); - for (local232 = 0; local232 < local497; local232++) { - @Pc(517) Light local517 = new Light(local96); - if (local517.anInt2243 == 31) { - @Pc(529) LightType local529 = LightTypeList.get(local96.g2()); - local517.method1762(local529.anInt2865, local529.anInt2873, local529.anInt2867, local529.anInt2872); - } - local417 = local517.anInt2240 >> 7; - local255 = local517.anInt2245 >> 7; - if (arg6 == local517.anInt2241 && local417 >= arg8 && arg8 + 8 > local417 && arg7 <= local255 && arg7 + 8 > local255) { - local266 = Static204.method3675(arg0, local517.anInt2240 & 0x3FF, local517.anInt2245 & 0x3FF) + (arg1 << 7); - local316 = Static184.method3388(local517.anInt2240 & 0x3FF, arg0, local517.anInt2245 & 0x3FF) + (arg4 << 7); - local517.anInt2240 = local266; - local517.anInt2245 = local316; - local417 = local517.anInt2240 >> 7; - local255 = local517.anInt2245 >> 7; - if (local417 >= 0 && local255 >= 0 && local417 < 104 && local255 < 104) { - local517.aBoolean125 = (SceneGraph.tileFlags[1][local417][local255] & 0x2) != 0; - local517.anInt2235 = SceneGraph.tileHeights[local517.anInt2241][local417][local255] - local517.anInt2235; - LightingManager.method2389(local517); - } - } - } - } - } - local103 = arg1 + 7; - local108 = arg4 + 7; - for (local497 = arg1; local497 < local103; local497++) { - for (local232 = arg4; local232 < local108; local232++) { - SceneGraph.aByteArrayArrayArray13[arg2][local497][local232] = 0; - } - } - } -} diff --git a/client/src/main/java/rt4/Static247.java b/client/src/main/java/rt4/Static247.java index 67e5188..cc07cbf 100644 --- a/client/src/main/java/rt4/Static247.java +++ b/client/src/main/java/rt4/Static247.java @@ -16,6 +16,8 @@ public final class Static247 { 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!km", name = "Rc", descriptor = "[I") + public static final int[] anIntArray324 = new int[] { 19, 55, 38, 155, 255, 110, 137, 205, 76 }; @OriginalMember(owner = "client!bl", name = "X", descriptor = "I") public static int anInt730 = -1; @@ -25,7 +27,7 @@ public final class Static247 { if (arg5 == 1) { Static134.method2622(arg0, arg3, arg2, arg4, arg1); } else { - Static183.method3334(arg3, arg2, arg0, arg4, arg5, arg1); + method3334(arg3, arg2, arg0, arg4, arg5, arg1); } } else if (arg5 == 1) { Static173.method3246(arg0, arg1, arg4, arg3, arg2); @@ -112,25 +114,25 @@ public final class Static247 { continue; } } - if (local18 <= Static167.anInt4069 && local18 > Static31.anInt987) { + if (local18 <= Static123.anInt4069 && local18 > LightingManager.anInt987) { local153 = local31[local18 - 1][local21]; if (local153 != null && local153.aBoolean46 && (local153.aBoolean45 || (local8.allInteriorFlags & 0x1) == 0)) { continue; } } - if (local18 >= Static167.anInt4069 && local18 < Static2.anInt15 - 1) { + if (local18 >= Static123.anInt4069 && local18 < LightingManager.anInt15 - 1) { local153 = local31[local18 + 1][local21]; if (local153 != null && local153.aBoolean46 && (local153.aBoolean45 || (local8.allInteriorFlags & 0x4) == 0)) { continue; } } - if (local21 <= Static193.anInt4539 && local21 > Static80.anInt4698) { + if (local21 <= Static193.anInt4539 && local21 > LightingManager.anInt4698) { local153 = local31[local18][local21 - 1]; if (local153 != null && local153.aBoolean46 && (local153.aBoolean45 || (local8.allInteriorFlags & 0x8) == 0)) { continue; } } - if (local21 >= Static193.anInt4539 && local21 < Static215.anInt4866 - 1) { + if (local21 >= Static193.anInt4539 && local21 < LightingManager.anInt4866 - 1) { local153 = local31[local18][local21 + 1]; if (local153 != null && local153.aBoolean46 && (local153.aBoolean45 || (local8.allInteriorFlags & 0x2) == 0)) { continue; @@ -148,34 +150,34 @@ public final class Static247 { if (local153.plainTile == null) { if (local153.shapedTile != null) { if (Static9.method187(0, local18, local21)) { - Static147.method2762(local153.shapedTile, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local18, local21, true); + Static147.method2762(local153.shapedTile, Static160.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local18, local21, true); } else { - Static147.method2762(local153.shapedTile, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local18, local21, false); + Static147.method2762(local153.shapedTile, Static160.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local18, local21, false); } } } else if (Static9.method187(0, local18, local21)) { - Static132.method2610(local153.plainTile, 0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local18, local21, true); + method2610(local153.plainTile, 0, Static160.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local18, local21, true); } else { - Static132.method2610(local153.plainTile, 0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local18, local21, false); + method2610(local153.plainTile, 0, Static160.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local18, local21, false); } var22 = local153.wall; if (var22 != null) { if (GlRenderer.enabled) { if ((var22.anInt3049 & local8.anInt670) == 0) { - LightingManager.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21); + LightingManager.method2393(Static123.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21); } else { - LightingManager.method2388(var22.anInt3049, Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local27, local18, local21); + LightingManager.method2388(var22.anInt3049, Static123.anInt3555, Static123.anInt3947, Static217.anInt4903, local27, local18, local21); } } - var22.primary.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, var22.xFine - Static149.anInt3555, var22.anInt3051 - Static123.anInt3947, var22.zFine - Static217.anInt4903, var22.key, local24, null); + var22.primary.render(0, Static160.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, var22.xFine - Static123.anInt3555, var22.anInt3051 - Static123.anInt3947, var22.zFine - Static217.anInt4903, var22.key, local24, null); } for (local65 = 0; local65 < local153.sceneryLen; local65++) { var25 = local153.scenery[local65]; if (var25 != null) { if (GlRenderer.enabled) { - LightingManager.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21); + LightingManager.method2393(Static123.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21); } - var25.entity.render(var25.anInt1714, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, var25.anInt1699 - Static149.anInt3555, var25.anInt1706 - Static123.anInt3947, var25.anInt1703 - Static217.anInt4903, var25.key, local24, null); + var25.entity.render(var25.anInt1714, Static160.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, var25.anInt1699 - Static123.anInt3555, var25.anInt1706 - Static123.anInt3947, var25.anInt1703 - Static217.anInt4903, var25.key, local24, null); } } if (GlRenderer.enabled) { @@ -186,18 +188,18 @@ public final class Static247 { if (local8.plainTile == null) { if (local8.shapedTile != null) { if (Static9.method187(local27, local18, local21)) { - Static147.method2762(local8.shapedTile, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local18, local21, true); + Static147.method2762(local8.shapedTile, Static160.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local18, local21, true); } else { var24 = true; - Static147.method2762(local8.shapedTile, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local18, local21, false); + Static147.method2762(local8.shapedTile, Static160.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local18, local21, false); } } } else if (Static9.method187(local27, local18, local21)) { - Static132.method2610(local8.plainTile, local27, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local18, local21, true); + method2610(local8.plainTile, local27, Static160.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local18, local21, true); } else { var24 = true; if (local8.plainTile.anInt4865 != 12345678 || MiniMenu.aBoolean187 && local24 <= MiniMenu.anInt3902) { - Static132.method2610(local8.plainTile, local27, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local18, local21, false); + method2610(local8.plainTile, local27, Static160.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local18, local21, false); } } if (var24) { @@ -207,9 +209,9 @@ public final class Static247 { GlRenderer.method4159(local33 + 50.0F - 1.5F); } if (GlRenderer.enabled) { - LightingManager.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21); + LightingManager.method2393(Static123.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21); } - local549.entity.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local549.xFine - Static149.anInt3555, local549.anInt733 - Static123.anInt3947, local549.zFine - Static217.anInt4903, local549.key, local24, null); + local549.entity.render(0, Static160.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local549.xFine - Static123.anInt3555, local549.anInt733 - Static123.anInt3947, local549.zFine - Static217.anInt4903, local549.key, local24, null); if (GlRenderer.enabled && local549.aBoolean49) { GlRenderer.method4159(local33); } @@ -220,9 +222,9 @@ public final class Static247 { @Pc(616) Wall local616 = local8.wall; @Pc(619) WallDecor local619 = local8.wallDecor; if (local616 != null || local619 != null) { - if (Static167.anInt4069 == local18) { + if (Static123.anInt4069 == local18) { var10++; - } else if (Static167.anInt4069 < local18) { + } else if (Static123.anInt4069 < local18) { var10 += 2; } if (Static193.anInt4539 == local21) { @@ -230,7 +232,7 @@ public final class Static247 { } else if (Static193.anInt4539 > local21) { var10 += 6; } - local65 = Static138.anIntArray324[var10]; + local65 = anIntArray324[var10]; local8.anInt670 = Static191.anIntArray386[var10]; } if (local616 != null) { @@ -253,17 +255,17 @@ public final class Static247 { local8.anInt665 = anIntArray307[var10]; local8.anInt667 = 9 - local8.anInt665; } - if ((local616.anInt3049 & local65) != 0 && !Static260.method3850(local27, local18, local21, local616.anInt3049)) { + if ((local616.anInt3049 & local65) != 0 && !method3850(local27, local18, local21, local616.anInt3049)) { if (GlRenderer.enabled) { - LightingManager.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21); + LightingManager.method2393(Static123.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21); } - local616.primary.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local616.xFine - Static149.anInt3555, local616.anInt3051 - Static123.anInt3947, local616.zFine - Static217.anInt4903, local616.key, local24, null); + local616.primary.render(0, Static160.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local616.xFine - Static123.anInt3555, local616.anInt3051 - Static123.anInt3947, local616.zFine - Static217.anInt4903, local616.key, local24, null); } - if ((local616.anInt3052 & local65) != 0 && !Static260.method3850(local27, local18, local21, local616.anInt3052)) { + if ((local616.anInt3052 & local65) != 0 && !method3850(local27, local18, local21, local616.anInt3052)) { if (GlRenderer.enabled) { - LightingManager.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21); + LightingManager.method2393(Static123.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21); } - local616.secondary.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local616.xFine - Static149.anInt3555, local616.anInt3051 - Static123.anInt3947, local616.zFine - Static217.anInt4903, local616.key, local24, null); + local616.secondary.render(0, Static160.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local616.xFine - Static123.anInt3555, local616.anInt3051 - Static123.anInt3947, local616.zFine - Static217.anInt4903, local616.key, local24, null); } } if (local619 != null && !method4611(local27, local18, local21, local619.primary.getMinY())) { @@ -272,11 +274,11 @@ public final class Static247 { } if ((local619.anInt1395 & local65) != 0) { if (GlRenderer.enabled) { - LightingManager.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21); + LightingManager.method2393(Static123.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21); } - local619.primary.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local619.anInt1390 + local619.anInt1394 - Static149.anInt3555, local619.anInt1391 - Static123.anInt3947, local619.anInt1393 + local619.anInt1392 - Static217.anInt4903, local619.key, local24, null); + local619.primary.render(0, Static160.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local619.anInt1390 + local619.anInt1394 - Static123.anInt3555, local619.anInt1391 - Static123.anInt3947, local619.anInt1393 + local619.anInt1392 - Static217.anInt4903, local619.key, local24, null); } else if (local619.anInt1395 == 256) { - local894 = local619.anInt1390 - Static149.anInt3555; + local894 = local619.anInt1390 - Static123.anInt3555; local899 = local619.anInt1391 - Static123.anInt3947; local904 = local619.anInt1393 - Static217.anInt4903; var17 = local619.anInt1388; @@ -293,14 +295,14 @@ public final class Static247 { } if (local928 < var18) { if (GlRenderer.enabled) { - LightingManager.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21); + LightingManager.method2393(Static123.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21); } - local619.primary.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local894 + local619.anInt1394, local899, local904 + local619.anInt1392, local619.key, local24, null); + local619.primary.render(0, Static160.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local894 + local619.anInt1394, local899, local904 + local619.anInt1392, local619.key, local24, null); } else if (local619.secondary != null) { if (GlRenderer.enabled) { - LightingManager.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21); + LightingManager.method2393(Static123.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21); } - local619.secondary.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local894, local899, local904, local619.key, local24, null); + local619.secondary.render(0, Static160.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local894, local899, local904, local619.key, local24, null); } } if (GlRenderer.enabled) { @@ -314,9 +316,9 @@ public final class Static247 { GlRenderer.method4159(local33 + 50.0F - 1.5F); } if (GlRenderer.enabled) { - LightingManager.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21); + LightingManager.method2393(Static123.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21); } - local1001.entity.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local1001.xFine - Static149.anInt3555, local1001.anInt733 - Static123.anInt3947, local1001.zFine - Static217.anInt4903, local1001.key, local24, null); + local1001.entity.render(0, Static160.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local1001.xFine - Static123.anInt3555, local1001.anInt733 - Static123.anInt3947, local1001.zFine - Static217.anInt4903, local1001.key, local24, null); if (GlRenderer.enabled && local1001.aBoolean49) { GlRenderer.method4159(local33); } @@ -324,22 +326,22 @@ public final class Static247 { @Pc(1064) ObjStackEntity local1064 = local8.aClass79_1; if (local1064 != null && local1064.anInt3063 == 0) { if (GlRenderer.enabled) { - LightingManager.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21); + LightingManager.method2393(Static123.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21); } if (local1064.aClass8_7 != null) { - local1064.aClass8_7.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local1064.anInt3064 - Static149.anInt3555, local1064.anInt3057 - Static123.anInt3947, local1064.anInt3061 - Static217.anInt4903, local1064.aLong108, local24, null); + local1064.aClass8_7.render(0, Static160.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local1064.anInt3064 - Static123.anInt3555, local1064.anInt3057 - Static123.anInt3947, local1064.anInt3061 - Static217.anInt4903, local1064.aLong108, local24, null); } if (local1064.aClass8_8 != null) { - local1064.aClass8_8.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local1064.anInt3064 - Static149.anInt3555, local1064.anInt3057 - Static123.anInt3947, local1064.anInt3061 - Static217.anInt4903, local1064.aLong108, local24, null); + local1064.aClass8_8.render(0, Static160.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local1064.anInt3064 - Static123.anInt3555, local1064.anInt3057 - Static123.anInt3947, local1064.anInt3061 - Static217.anInt4903, local1064.aLong108, local24, null); } if (local1064.aClass8_9 != null) { - local1064.aClass8_9.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local1064.anInt3064 - Static149.anInt3555, local1064.anInt3057 - Static123.anInt3947, local1064.anInt3061 - Static217.anInt4903, local1064.aLong108, local24, null); + local1064.aClass8_9.render(0, Static160.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local1064.anInt3064 - Static123.anInt3555, local1064.anInt3057 - Static123.anInt3947, local1064.anInt3061 - Static217.anInt4903, local1064.aLong108, local24, null); } } } local894 = local8.allInteriorFlags; if (local894 != 0) { - if (local18 < Static167.anInt4069 && (local894 & 0x4) != 0) { + if (local18 < Static123.anInt4069 && (local894 & 0x4) != 0) { var32 = local31[local18 + 1][local21]; if (var32 != null && var32.aBoolean46) { Static7.aClass69_32.addTail(var32); @@ -351,7 +353,7 @@ public final class Static247 { Static7.aClass69_32.addTail(var32); } } - if (local18 > Static167.anInt4069 && (local894 & 0x1) != 0) { + if (local18 > Static123.anInt4069 && (local894 & 0x1) != 0) { var32 = local31[local18 - 1][local21]; if (var32 != null && var32.aBoolean46) { Static7.aClass69_32.addTail(var32); @@ -369,54 +371,54 @@ public final class Static247 { if (local8.anInt663 != 0) { var24 = true; for (var10 = 0; var10 < local8.sceneryLen; var10++) { - if (local8.scenery[var10].anInt1707 != Static13.anInt437 && (local8.interiorFlags[var10] & local8.anInt663) == local8.anInt665) { + if (local8.scenery[var10].anInt1707 != Static156.anInt437 && (local8.interiorFlags[var10] & local8.anInt663) == local8.anInt665) { var24 = false; break; } } if (var24) { var22 = local8.wall; - if (!Static260.method3850(local27, local18, local21, var22.anInt3049)) { + if (!method3850(local27, local18, local21, var22.anInt3049)) { if (GlRenderer.enabled) { label882: { if ((var22.key & 0xFC000L) == 16384L) { - local65 = var22.xFine - Static149.anInt3555; + local65 = var22.xFine - Static123.anInt3555; local115 = var22.zFine - Static217.anInt4903; local1332 = (int) (var22.key >> 20 & 0x3L); if (local1332 == 0) { local65 -= 64; local115 += 64; if (local115 < local65 && local18 > 0 && local21 < SceneGraph.length - 1) { - LightingManager.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18 - 1, local21 + 1); + LightingManager.method2393(Static123.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18 - 1, local21 + 1); break label882; } } else if (local1332 == 1) { local65 += 64; local115 += 64; if (local115 < -local65 && local18 < SceneGraph.width - 1 && local21 < SceneGraph.length - 1) { - LightingManager.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18 + 1, local21 + 1); + LightingManager.method2393(Static123.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18 + 1, local21 + 1); break label882; } } else if (local1332 == 2) { local65 += 64; local115 -= 64; if (local115 > local65 && local18 < SceneGraph.width - 1 && local21 > 0) { - LightingManager.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18 + 1, local21 - 1); + LightingManager.method2393(Static123.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18 + 1, local21 - 1); break label882; } } else if (local1332 == 3) { local65 -= 64; local115 -= 64; if (local115 > -local65 && local18 > 0 && local21 > 0) { - LightingManager.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18 - 1, local21 - 1); + LightingManager.method2393(Static123.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18 - 1, local21 - 1); break label882; } } } - LightingManager.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21); + LightingManager.method2393(Static123.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21); } } - var22.primary.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, var22.xFine - Static149.anInt3555, var22.anInt3051 - Static123.anInt3947, var22.zFine - Static217.anInt4903, var22.key, local24, null); + var22.primary.render(0, Static160.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, var22.xFine - Static123.anInt3555, var22.anInt3051 - Static123.anInt3947, var22.zFine - Static217.anInt4903, var22.key, local24, null); } local8.anInt663 = 0; } @@ -430,7 +432,7 @@ public final class Static247 { var10 = 0; label767: for (local65 = 0; local65 < var9; local65++) { var25 = local8.scenery[local65]; - if (var25.anInt1707 != Static13.anInt437) { + if (var25.anInt1707 != Static156.anInt437) { for (local1332 = var25.xMin; local1332 <= var25.xMax; local1332++) { for (local894 = var25.zMin; local894 <= var25.zMax; local894++) { var32 = local31[local1332][local894]; @@ -460,8 +462,8 @@ public final class Static247 { } } SceneGraph.aClass31Array2[var10++] = var25; - local1332 = Static167.anInt4069 - var25.xMin; - local894 = var25.xMax - Static167.anInt4069; + local1332 = Static123.anInt4069 - var25.xMin; + local894 = var25.xMax - Static123.anInt4069; if (local894 > local1332) { local1332 = local894; } @@ -479,14 +481,14 @@ public final class Static247 { local115 = -1; for (local1332 = 0; local1332 < var10; local1332++) { @Pc(1628) Scenery local1628 = SceneGraph.aClass31Array2[local1332]; - if (local1628.anInt1707 != Static13.anInt437) { + if (local1628.anInt1707 != Static156.anInt437) { if (local1628.anInt1705 > local65) { local65 = local1628.anInt1705; local115 = local1332; } else if (local1628.anInt1705 == local65) { - local899 = local1628.anInt1699 - Static149.anInt3555; + local899 = local1628.anInt1699 - Static123.anInt3555; local904 = local1628.anInt1703 - Static217.anInt4903; - var17 = SceneGraph.aClass31Array2[local115].anInt1699 - Static149.anInt3555; + var17 = SceneGraph.aClass31Array2[local115].anInt1699 - Static123.anInt3555; var18 = SceneGraph.aClass31Array2[local115].anInt1703 - Static217.anInt4903; if (local899 * local899 + local904 * local904 > var17 * var17 + var18 * var18) { local115 = local1332; @@ -498,12 +500,12 @@ public final class Static247 { break; } @Pc(1697) Scenery local1697 = SceneGraph.aClass31Array2[local115]; - local1697.anInt1707 = Static13.anInt437; + local1697.anInt1707 = Static156.anInt437; if (!Static73.method1599(local27, local1697.xMin, local1697.xMax, local1697.zMin, local1697.zMax, local1697.entity.getMinY())) { if (GlRenderer.enabled) { if ((local1697.key & 0xFC000L) == 147456L) { - LightingManager.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21); - local894 = local1697.anInt1699 - Static149.anInt3555; + LightingManager.method2393(Static123.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21); + local894 = local1697.anInt1699 - Static123.anInt3555; local899 = local1697.anInt1703 - Static217.anInt4903; local904 = (int) (local1697.key >> 20 & 0x3L); if (local904 == 1 || local904 == 3) { @@ -518,10 +520,10 @@ public final class Static247 { LightingManager.method2397(local24, local18, local21 + 1, local18 - 1, local21); } } else { - LightingManager.method2391(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local1697.xMin, local1697.zMin, local1697.xMax, local1697.zMax); + LightingManager.method2391(Static123.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local1697.xMin, local1697.zMin, local1697.xMax, local1697.zMax); } } - local1697.entity.render(local1697.anInt1714, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local1697.anInt1699 - Static149.anInt3555, local1697.anInt1706 - Static123.anInt3947, local1697.anInt1703 - Static217.anInt4903, local1697.key, local24, null); + local1697.entity.render(local1697.anInt1714, Static160.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local1697.anInt1699 - Static123.anInt3555, local1697.anInt1706 - Static123.anInt3947, local1697.anInt1703 - Static217.anInt4903, local1697.key, local24, null); } for (local894 = local1697.xMin; local894 <= local1697.xMax; local894++) { for (local899 = local1697.zMin; local899 <= local1697.zMax; local899++) { @@ -544,41 +546,41 @@ public final class Static247 { } } while (!local8.aBoolean46); } while (local8.anInt663 != 0); - if (local18 > Static167.anInt4069 || local18 <= Static31.anInt987) { + if (local18 > Static123.anInt4069 || local18 <= LightingManager.anInt987) { break; } local153 = local31[local18 - 1][local21]; } while (local153 != null && local153.aBoolean46); - if (local18 < Static167.anInt4069 || local18 >= Static2.anInt15 - 1) { + if (local18 < Static123.anInt4069 || local18 >= LightingManager.anInt15 - 1) { break; } local153 = local31[local18 + 1][local21]; } while (local153 != null && local153.aBoolean46); - if (local21 > Static193.anInt4539 || local21 <= Static80.anInt4698) { + if (local21 > Static193.anInt4539 || local21 <= LightingManager.anInt4698) { break; } local153 = local31[local18][local21 - 1]; } while (local153 != null && local153.aBoolean46); - if (local21 < Static193.anInt4539 || local21 >= Static215.anInt4866 - 1) { + if (local21 < Static193.anInt4539 || local21 >= LightingManager.anInt4866 - 1) { break; } local153 = local31[local18][local21 + 1]; } while (local153 != null && local153.aBoolean46); local8.aBoolean46 = false; - Static211.anInt1142--; + Static156.anInt1142--; @Pc(1999) ObjStackEntity local1999 = local8.aClass79_1; if (local1999 != null && local1999.anInt3063 != 0) { if (GlRenderer.enabled) { - LightingManager.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21); + LightingManager.method2393(Static123.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21); } if (local1999.aClass8_7 != null) { - local1999.aClass8_7.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local1999.anInt3064 - Static149.anInt3555, local1999.anInt3057 - Static123.anInt3947 - local1999.anInt3063, local1999.anInt3061 - Static217.anInt4903, local1999.aLong108, local24, null); + local1999.aClass8_7.render(0, Static160.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local1999.anInt3064 - Static123.anInt3555, local1999.anInt3057 - Static123.anInt3947 - local1999.anInt3063, local1999.anInt3061 - Static217.anInt4903, local1999.aLong108, local24, null); } if (local1999.aClass8_8 != null) { - local1999.aClass8_8.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local1999.anInt3064 - Static149.anInt3555, local1999.anInt3057 - Static123.anInt3947 - local1999.anInt3063, local1999.anInt3061 - Static217.anInt4903, local1999.aLong108, local24, null); + local1999.aClass8_8.render(0, Static160.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local1999.anInt3064 - Static123.anInt3555, local1999.anInt3057 - Static123.anInt3947 - local1999.anInt3063, local1999.anInt3061 - Static217.anInt4903, local1999.aLong108, local24, null); } if (local1999.aClass8_9 != null) { - local1999.aClass8_9.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local1999.anInt3064 - Static149.anInt3555, local1999.anInt3057 - Static123.anInt3947 - local1999.anInt3063, local1999.anInt3061 - Static217.anInt4903, local1999.aLong108, local24, null); + local1999.aClass8_9.render(0, Static160.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local1999.anInt3064 - Static123.anInt3555, local1999.anInt3057 - Static123.anInt3947 - local1999.anInt3063, local1999.anInt3061 - Static217.anInt4903, local1999.aLong108, local24, null); } } if (local8.anInt670 != 0) { @@ -586,11 +588,11 @@ public final class Static247 { if (local2109 != null && !method4611(local27, local18, local21, local2109.primary.getMinY())) { if ((local2109.anInt1395 & local8.anInt670) != 0) { if (GlRenderer.enabled) { - LightingManager.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21); + LightingManager.method2393(Static123.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21); } - local2109.primary.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local2109.anInt1390 + local2109.anInt1394 - Static149.anInt3555, local2109.anInt1391 - Static123.anInt3947, local2109.anInt1393 + local2109.anInt1392 - Static217.anInt4903, local2109.key, local24, null); + local2109.primary.render(0, Static160.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local2109.anInt1390 + local2109.anInt1394 - Static123.anInt3555, local2109.anInt1391 - Static123.anInt3947, local2109.anInt1393 + local2109.anInt1392 - Static217.anInt4903, local2109.key, local24, null); } else if (local2109.anInt1395 == 256) { - local65 = local2109.anInt1390 - Static149.anInt3555; + local65 = local2109.anInt1390 - Static123.anInt3555; local115 = local2109.anInt1391 - Static123.anInt3947; local1332 = local2109.anInt1393 - Static217.anInt4903; local894 = local2109.anInt1388; @@ -606,30 +608,30 @@ public final class Static247 { } if (local904 >= local899) { if (GlRenderer.enabled) { - LightingManager.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21); + LightingManager.method2393(Static123.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21); } - local2109.primary.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local65 + local2109.anInt1394, local115, local1332 + local2109.anInt1392, local2109.key, local24, null); + local2109.primary.render(0, Static160.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local65 + local2109.anInt1394, local115, local1332 + local2109.anInt1392, local2109.key, local24, null); } else if (local2109.secondary != null) { if (GlRenderer.enabled) { - LightingManager.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21); + LightingManager.method2393(Static123.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21); } - local2109.secondary.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local65, local115, local1332, local2109.key, local24, null); + local2109.secondary.render(0, Static160.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local65, local115, local1332, local2109.key, local24, null); } } } @Pc(2275) Wall local2275 = local8.wall; if (local2275 != null) { - if ((local2275.anInt3052 & local8.anInt670) != 0 && !Static260.method3850(local27, local18, local21, local2275.anInt3052)) { + if ((local2275.anInt3052 & local8.anInt670) != 0 && !method3850(local27, local18, local21, local2275.anInt3052)) { if (GlRenderer.enabled) { - LightingManager.method2388(local2275.anInt3052, Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local27, local18, local21); + LightingManager.method2388(local2275.anInt3052, Static123.anInt3555, Static123.anInt3947, Static217.anInt4903, local27, local18, local21); } - local2275.secondary.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local2275.xFine - Static149.anInt3555, local2275.anInt3051 - Static123.anInt3947, local2275.zFine - Static217.anInt4903, local2275.key, local24, null); + local2275.secondary.render(0, Static160.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local2275.xFine - Static123.anInt3555, local2275.anInt3051 - Static123.anInt3947, local2275.zFine - Static217.anInt4903, local2275.key, local24, null); } - if ((local2275.anInt3049 & local8.anInt670) != 0 && !Static260.method3850(local27, local18, local21, local2275.anInt3049)) { + if ((local2275.anInt3049 & local8.anInt670) != 0 && !method3850(local27, local18, local21, local2275.anInt3049)) { if (GlRenderer.enabled) { - LightingManager.method2388(local2275.anInt3049, Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local27, local18, local21); + LightingManager.method2388(local2275.anInt3049, Static123.anInt3555, Static123.anInt3947, Static217.anInt4903, local27, local18, local21); } - local2275.primary.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local2275.xFine - Static149.anInt3555, local2275.anInt3051 - Static123.anInt3947, local2275.zFine - Static217.anInt4903, local2275.key, local24, null); + local2275.primary.render(0, Static160.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local2275.xFine - Static123.anInt3555, local2275.anInt3051 - Static123.anInt3947, local2275.zFine - Static217.anInt4903, local2275.key, local24, null); } } } @@ -640,7 +642,7 @@ public final class Static247 { Static7.aClass69_32.addTail(local2388); } } - if (local18 < Static167.anInt4069) { + if (local18 < Static123.anInt4069) { local2388 = local31[local18 + 1][local21]; if (local2388 != null && local2388.aBoolean46) { Static7.aClass69_32.addTail(local2388); @@ -652,7 +654,7 @@ public final class Static247 { Static7.aClass69_32.addTail(local2388); } } - if (local18 > Static167.anInt4069) { + if (local18 > Static123.anInt4069) { local2388 = local31[local18 - 1][local21]; if (local2388 != null && local2388.aBoolean46) { Static7.aClass69_32.addTail(local2388); @@ -682,7 +684,7 @@ public final class Static247 { MiniMenu.anInt4999 = arg2; Static241.aBoolean302 = true; MiniMenu.anInt5393 = arg4; - Static35.anInt1092 = arg5; + MiniMenu.anInt1092 = arg5; InterfaceList.redraw(local8); } @@ -701,4 +703,261 @@ public final class Static247 { return false; } } + + @OriginalMember(owner = "client!vd", name = "b", descriptor = "(IIII)Z") + public static boolean method3850(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) { + if (!Static9.method187(arg0, arg1, arg2)) { + return false; + } + @Pc(10) int local10 = arg1 << 7; + @Pc(14) int local14 = arg2 << 7; + @Pc(24) int local24 = SceneGraph.tileHeights[arg0][arg1][arg2] - 1; + @Pc(28) int local28 = local24 - 120; + @Pc(32) int local32 = local24 - 230; + @Pc(36) int local36 = local24 - 238; + if (arg3 < 16) { + if (arg3 == 1) { + if (local10 > Static123.anInt3555) { + if (!SceneGraph.method4394(local10, local24, local14)) { + return false; + } + if (!SceneGraph.method4394(local10, local24, local14 + 128)) { + return false; + } + } + if (arg0 > 0) { + if (!SceneGraph.method4394(local10, local28, local14)) { + return false; + } + if (!SceneGraph.method4394(local10, local28, local14 + 128)) { + return false; + } + } + if (!SceneGraph.method4394(local10, local32, local14)) { + return false; + } + if (!SceneGraph.method4394(local10, local32, local14 + 128)) { + return false; + } + return true; + } + if (arg3 == 2) { + if (local14 < Static217.anInt4903) { + if (!SceneGraph.method4394(local10, local24, local14 + 128)) { + return false; + } + if (!SceneGraph.method4394(local10 + 128, local24, local14 + 128)) { + return false; + } + } + if (arg0 > 0) { + if (!SceneGraph.method4394(local10, local28, local14 + 128)) { + return false; + } + if (!SceneGraph.method4394(local10 + 128, local28, local14 + 128)) { + return false; + } + } + if (!SceneGraph.method4394(local10, local32, local14 + 128)) { + return false; + } + if (!SceneGraph.method4394(local10 + 128, local32, local14 + 128)) { + return false; + } + return true; + } + if (arg3 == 4) { + if (local10 < Static123.anInt3555) { + if (!SceneGraph.method4394(local10 + 128, local24, local14)) { + return false; + } + if (!SceneGraph.method4394(local10 + 128, local24, local14 + 128)) { + return false; + } + } + if (arg0 > 0) { + if (!SceneGraph.method4394(local10 + 128, local28, local14)) { + return false; + } + if (!SceneGraph.method4394(local10 + 128, local28, local14 + 128)) { + return false; + } + } + if (!SceneGraph.method4394(local10 + 128, local32, local14)) { + return false; + } + if (!SceneGraph.method4394(local10 + 128, local32, local14 + 128)) { + return false; + } + return true; + } + if (arg3 == 8) { + if (local14 > Static217.anInt4903) { + if (!SceneGraph.method4394(local10, local24, local14)) { + return false; + } + if (!SceneGraph.method4394(local10 + 128, local24, local14)) { + return false; + } + } + if (arg0 > 0) { + if (!SceneGraph.method4394(local10, local28, local14)) { + return false; + } + if (!SceneGraph.method4394(local10 + 128, local28, local14)) { + return false; + } + } + if (!SceneGraph.method4394(local10, local32, local14)) { + return false; + } + if (!SceneGraph.method4394(local10 + 128, local32, local14)) { + return false; + } + return true; + } + } + if (!SceneGraph.method4394(local10 + 64, local36, local14 + 64)) { + return false; + } else if (arg3 == 16) { + return SceneGraph.method4394(local10, local32, local14 + 128); + } else if (arg3 == 32) { + return SceneGraph.method4394(local10 + 128, local32, local14 + 128); + } else if (arg3 == 64) { + return SceneGraph.method4394(local10 + 128, local32, local14); + } else if (arg3 == 128) { + return SceneGraph.method4394(local10, local32, local14); + } else { + return true; + } + } + + @OriginalMember(owner = "client!ke", name = "a", descriptor = "(Lclient!rh;IIIIIIIZ)V") + public static void method2610(@OriginalArg(0) PlainTile arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7, @OriginalArg(8) boolean arg8) { + @Pc(6) int local6; + @Pc(7) int local7 = local6 = (arg6 << 7) - Static123.anInt3555; + @Pc(14) int local14; + @Pc(15) int local15 = local14 = (arg7 << 7) - Static217.anInt4903; + @Pc(20) int local20; + @Pc(21) int local21 = local20 = local7 + 128; + @Pc(26) int local26; + @Pc(27) int local27 = local26 = local15 + 128; + @Pc(37) int local37 = SceneGraph.tileHeights[arg1][arg6][arg7] - Static123.anInt3947; + @Pc(49) int local49 = SceneGraph.tileHeights[arg1][arg6 + 1][arg7] - Static123.anInt3947; + @Pc(63) int local63 = SceneGraph.tileHeights[arg1][arg6 + 1][arg7 + 1] - Static123.anInt3947; + @Pc(75) int local75 = SceneGraph.tileHeights[arg1][arg6][arg7 + 1] - Static123.anInt3947; + @Pc(85) int local85 = local15 * arg4 + local7 * arg5 >> 16; + @Pc(95) int local95 = local15 * arg5 - local7 * arg4 >> 16; + @Pc(97) int local97 = local85; + @Pc(107) int local107 = local37 * arg3 - local95 * arg2 >> 16; + @Pc(117) int local117 = local37 * arg2 + local95 * arg3 >> 16; + @Pc(119) int local119 = local107; + if (local117 < 50) { + return; + } + local85 = local14 * arg4 + local21 * arg5 >> 16; + @Pc(143) int local143 = local14 * arg5 - local21 * arg4 >> 16; + local21 = local85; + local85 = local49 * arg3 - local143 * arg2 >> 16; + @Pc(165) int local165 = local49 * arg2 + local143 * arg3 >> 16; + local49 = local85; + if (local165 < 50) { + return; + } + local85 = local27 * arg4 + local20 * arg5 >> 16; + local27 = local27 * arg5 - local20 * arg4 >> 16; + @Pc(193) int local193 = local85; + local85 = local63 * arg3 - local27 * arg2 >> 16; + local27 = local63 * arg2 + local27 * arg3 >> 16; + local63 = local85; + if (local27 < 50) { + return; + } + local85 = local26 * arg4 + local6 * arg5 >> 16; + @Pc(239) int local239 = local26 * arg5 - local6 * arg4 >> 16; + @Pc(241) int local241 = local85; + local85 = local75 * arg3 - local239 * arg2 >> 16; + @Pc(261) int local261 = local75 * arg2 + local239 * arg3 >> 16; + if (local261 < 50) { + return; + } + @Pc(275) int local275 = Rasteriser.centerX + (local97 << 9) / local117; + @Pc(283) int local283 = Rasteriser.centerY + (local119 << 9) / local117; + @Pc(291) int local291 = Rasteriser.centerX + (local21 << 9) / local165; + @Pc(299) int local299 = Rasteriser.centerY + (local49 << 9) / local165; + @Pc(307) int local307 = Rasteriser.centerX + (local193 << 9) / local27; + @Pc(315) int local315 = Rasteriser.centerY + (local63 << 9) / local27; + @Pc(323) int local323 = Rasteriser.centerX + (local241 << 9) / local261; + @Pc(331) int local331 = Rasteriser.centerY + (local85 << 9) / local261; + Rasteriser.alpha = 0; + @Pc(475) int local475; + if ((local307 - local323) * (local299 - local331) - (local315 - local331) * (local291 - local323) > 0) { + if (MiniMenu.aBoolean187 && Static147.method583(MiniMenu.anInt2388 + Rasteriser.centerX, MiniMenu.anInt3259 + Rasteriser.centerY, local315, local331, local299, local307, local323, local291)) { + MiniMenu.anInt1742 = arg6; + MiniMenu.anInt2954 = arg7; + } + if (!GlRenderer.enabled && !arg8) { + Rasteriser.testX = false; + if (local307 < 0 || local323 < 0 || local291 < 0 || local307 > Rasteriser.width || local323 > Rasteriser.width || local291 > Rasteriser.width) { + Rasteriser.testX = true; + } + if (arg0.anInt4869 == -1) { + if (arg0.anInt4865 != 12345678) { + Rasteriser.fillGouraudTriangle(local315, local331, local299, local307, local323, local291, arg0.anInt4865, arg0.anInt4864, arg0.anInt4867); + } + } else if (!Preferences.manyGroundTextures) { + local475 = Rasteriser.textureProvider.getAverageColor(arg0.anInt4869); + Rasteriser.fillGouraudTriangle(local315, local331, local299, local307, local323, local291, Static147.method1640(local475, arg0.anInt4865), Static147.method1640(local475, arg0.anInt4864), Static147.method1640(local475, arg0.anInt4867)); + } else if (arg0.aBoolean241) { + Rasteriser.fillTexturedTriangle(local315, local331, local299, local307, local323, local291, arg0.anInt4865, arg0.anInt4864, arg0.anInt4867, local97, local21, local241, local119, local49, local85, local117, local165, local261, arg0.anInt4869); + } else { + Rasteriser.fillTexturedTriangle(local315, local331, local299, local307, local323, local291, arg0.anInt4865, arg0.anInt4864, arg0.anInt4867, local193, local241, local21, local63, local85, local49, local27, local261, local165, arg0.anInt4869); + } + } + } + if ((local275 - local291) * (local331 - local299) - (local283 - local299) * (local323 - local291) <= 0) { + return; + } + if (MiniMenu.aBoolean187 && Static147.method583(MiniMenu.anInt2388 + Rasteriser.centerX, MiniMenu.anInt3259 + Rasteriser.centerY, local283, local299, local331, local275, local291, local323)) { + MiniMenu.anInt1742 = arg6; + MiniMenu.anInt2954 = arg7; + } + if (GlRenderer.enabled || arg8) { + return; + } + Rasteriser.testX = false; + if (local275 < 0 || local291 < 0 || local323 < 0 || local275 > Rasteriser.width || local291 > Rasteriser.width || local323 > Rasteriser.width) { + Rasteriser.testX = true; + } + if (arg0.anInt4869 == -1) { + if (arg0.anInt4872 != 12345678) { + Rasteriser.fillGouraudTriangle(local283, local299, local331, local275, local291, local323, arg0.anInt4872, arg0.anInt4867, arg0.anInt4864); + } + } else if (Preferences.manyGroundTextures) { + Rasteriser.fillTexturedTriangle(local283, local299, local331, local275, local291, local323, arg0.anInt4872, arg0.anInt4867, arg0.anInt4864, local97, local21, local241, local119, local49, local85, local117, local165, local261, arg0.anInt4869); + } else { + local475 = Rasteriser.textureProvider.getAverageColor(arg0.anInt4869); + Rasteriser.fillGouraudTriangle(local283, local299, local331, local275, local291, local323, Static147.method1640(local475, arg0.anInt4872), Static147.method1640(local475, arg0.anInt4867), Static147.method1640(local475, arg0.anInt4864)); + } + } + + @OriginalMember(owner = "client!ok", name = "a", descriptor = "(IIIIIII)V") + public static void method3334(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5) { + @Pc(5) int local5 = arg4 + arg1; + @Pc(14) int local14 = arg3 - arg4; + @Pc(29) int local29 = arg4 + arg5; + @Pc(31) int local31; + for (local31 = arg1; local31 < local5; local31++) { + TextureOp29SubOp4.method2576(TextureOp29SubOp4.anIntArrayArray10[local31], arg5, arg0, arg2); + } + for (local31 = arg3; local31 > local14; local31--) { + TextureOp29SubOp4.method2576(TextureOp29SubOp4.anIntArrayArray10[local31], arg5, arg0, arg2); + } + @Pc(70) int local70 = arg0 - arg4; + for (local31 = local5; local31 <= local14; local31++) { + @Pc(83) int[] local83 = TextureOp29SubOp4.anIntArrayArray10[local31]; + TextureOp29SubOp4.method2576(local83, arg5, local29, arg2); + TextureOp29SubOp4.method2576(local83, local70, arg0, arg2); + } + } } diff --git a/client/src/main/java/rt4/Static248.java b/client/src/main/java/rt4/Static248.java deleted file mode 100644 index de2e70c..0000000 --- a/client/src/main/java/rt4/Static248.java +++ /dev/null @@ -1,224 +0,0 @@ -package rt4; - -import com.jogamp.opengl.*; -import org.openrs2.deob.annotation.OriginalArg; -import org.openrs2.deob.annotation.OriginalMember; -import org.openrs2.deob.annotation.Pc; - -public final class Static248 { - - @OriginalMember(owner = "client!uc", name = "a", descriptor = "I") - public static int anInt4229 = 2; - - @OriginalMember(owner = "client!uc", name = "a", descriptor = "(III[[[BIBII)V") - public static void method3292(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) byte[][][] arg3, @OriginalArg(4) int arg4, @OriginalArg(5) byte arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7) { - Static13.anInt437++; - Static211.anInt1142 = 0; - @Pc(9) int local9 = arg6 - 16; - @Pc(13) int local13 = arg6 + 16; - @Pc(17) int local17 = arg7 - 16; - @Pc(21) int local21 = arg7 + 16; - @Pc(32) int local32; - @Pc(37) int local37; - @Pc(183) int local183; - for (@Pc(23) int local23 = Static235.anInt5276; local23 < SceneGraph.levels; local23++) { - @Pc(30) Tile[][] local30 = SceneGraph.tiles[local23]; - for (local32 = Static31.anInt987; local32 < Static2.anInt15; local32++) { - for (local37 = Static80.anInt4698; local37 < Static215.anInt4866; local37++) { - @Pc(46) Tile local46 = local30[local32][local37]; - if (local46 != null) { - if (SceneGraph.aBooleanArrayArray1[local32 + SceneGraph.visibility - Static167.anInt4069][local37 + SceneGraph.visibility - Static193.anInt4539] && (arg3 == null || local23 < arg4 || arg3[local23][local32][local37] != arg5)) { - local46.aBoolean45 = true; - local46.aBoolean46 = true; - if (local46.sceneryLen > 0) { - local46.aBoolean47 = true; - } else { - local46.aBoolean47 = false; - } - Static211.anInt1142++; - } else { - local46.aBoolean45 = false; - local46.aBoolean46 = false; - local46.anInt663 = 0; - if (local32 >= local9 && local32 <= local13 && local37 >= local17 && local37 <= local21) { - if (local46.wall != null) { - @Pc(103) Wall local103 = local46.wall; - local103.primary.method4545(0, local23, local103.anInt3051, local103.xFine, local103.zFine); - if (local103.secondary != null) { - local103.secondary.method4545(0, local23, local103.anInt3051, local103.xFine, local103.zFine); - } - } - if (local46.wallDecor != null) { - @Pc(134) WallDecor local134 = local46.wallDecor; - local134.primary.method4545(local134.anInt1388, local23, local134.anInt1391, local134.anInt1390, local134.anInt1393); - if (local134.secondary != null) { - local134.secondary.method4545(local134.anInt1388, local23, local134.anInt1391, local134.anInt1390, local134.anInt1393); - } - } - if (local46.groundDecor != null) { - @Pc(167) GroundDecor local167 = local46.groundDecor; - local167.entity.method4545(0, local23, local167.anInt733, local167.xFine, local167.zFine); - } - if (local46.scenery != null) { - for (local183 = 0; local183 < local46.sceneryLen; local183++) { - @Pc(192) Scenery local192 = local46.scenery[local183]; - local192.entity.method4545(local192.anInt1714, local23, local192.anInt1706, local192.anInt1699, local192.anInt1703); - } - } - } - } - } - } - } - } - @Pc(240) boolean local240 = SceneGraph.tileHeights == SceneGraph.underwaterTileHeights; - if (GlRenderer.enabled) { - @Pc(244) GL2 gl = GlRenderer.gl; - gl.glPushMatrix(); - gl.glTranslatef((float) -arg0, (float) -arg1, (float) -arg2); - if (local240) { - UnderwaterMaterialRenderer.applyFogFade(); - MaterialManager.setMaterial(-1, 3); - MaterialManager.renderingUnderwater = true; - UnderwaterMaterialRenderer.method4609(); - Static152.anInt3604 = -1; - Static247.anInt730 = -1; - for (local32 = 0; local32 < SceneGraph.underwaterHdTiles[0].length; local32++) { - @Pc(285) GlTile local285 = SceneGraph.underwaterHdTiles[0][local32]; - @Pc(294) float local294 = 251.5F - (local285.blend ? 1.0F : 0.5F); - if (local285.underwaterColor != Static152.anInt3604) { - Static152.anInt3604 = local285.underwaterColor; - WaterMaterialRenderer.method619(local285.underwaterColor); - FogManager.method3066(WaterMaterialRenderer.method2422()); - } - local285.method1944(SceneGraph.tiles, local294, false); - } - UnderwaterMaterialRenderer.method4608(); - } else { - local32 = Static235.anInt5276; - while (true) { - if (local32 >= SceneGraph.levels) { - LightingManager.method2402(Static167.anInt4069, Static193.anInt4539, SceneGraph.tiles); - break; - } - for (local37 = 0; local37 < SceneGraph.underwaterHdTiles[local32].length; local37++) { - @Pc(336) GlTile local336 = SceneGraph.underwaterHdTiles[local32][local37]; - @Pc(350) float local350 = 201.5F - (float) local32 * 50.0F - (local336.blend ? 1.0F : 0.5F); - if (local336.texture != -1 && Rasteriser.textureProvider.getMaterialType(local336.texture) == MaterialManager.WATER && Preferences.highWaterDetail) { - WaterMaterialRenderer.method619(local336.underwaterColor); - } - local336.method1944(SceneGraph.tiles, local350, false); - } - if (local32 == 0 && Preferences.sceneryShadowsType > 0) { - GlRenderer.method4159(101.5F); - Static242.method4198(Static167.anInt4069, Static193.anInt4539, SceneGraph.visibility, arg1, SceneGraph.aBooleanArrayArray1, SceneGraph.tileHeights[0]); - } - local32++; - } - } - gl.glPopMatrix(); - } - @Pc(434) int local434; - @Pc(438) int local438; - @Pc(450) Tile local450; - @Pc(399) int local399; - @Pc(406) Tile[][] local406; - @Pc(415) int local415; - @Pc(428) int local428; - for (local399 = Static235.anInt5276; local399 < SceneGraph.levels; local399++) { - local406 = SceneGraph.tiles[local399]; - for (local37 = -SceneGraph.visibility; local37 <= 0; local37++) { - local415 = Static167.anInt4069 + local37; - local183 = Static167.anInt4069 - local37; - if (local415 >= Static31.anInt987 || local183 < Static2.anInt15) { - for (local428 = -SceneGraph.visibility; local428 <= 0; local428++) { - local434 = Static193.anInt4539 + local428; - local438 = Static193.anInt4539 - local428; - if (local415 >= Static31.anInt987) { - if (local434 >= Static80.anInt4698) { - local450 = local406[local415][local434]; - if (local450 != null && local450.aBoolean45) { - Static247.method4245(local450, true); - } - } - if (local438 < Static215.anInt4866) { - local450 = local406[local415][local438]; - if (local450 != null && local450.aBoolean45) { - Static247.method4245(local450, true); - } - } - } - if (local183 < Static2.anInt15) { - if (local434 >= Static80.anInt4698) { - local450 = local406[local183][local434]; - if (local450 != null && local450.aBoolean45) { - Static247.method4245(local450, true); - } - } - if (local438 < Static215.anInt4866) { - local450 = local406[local183][local438]; - if (local450 != null && local450.aBoolean45) { - Static247.method4245(local450, true); - } - } - } - if (Static211.anInt1142 == 0) { - if (!local240) { - MiniMenu.aBoolean187 = false; - } - return; - } - } - } - } - } - for (local399 = Static235.anInt5276; local399 < SceneGraph.levels; local399++) { - local406 = SceneGraph.tiles[local399]; - for (local37 = -SceneGraph.visibility; local37 <= 0; local37++) { - local415 = Static167.anInt4069 + local37; - local183 = Static167.anInt4069 - local37; - if (local415 >= Static31.anInt987 || local183 < Static2.anInt15) { - for (local428 = -SceneGraph.visibility; local428 <= 0; local428++) { - local434 = Static193.anInt4539 + local428; - local438 = Static193.anInt4539 - local428; - if (local415 >= Static31.anInt987) { - if (local434 >= Static80.anInt4698) { - local450 = local406[local415][local434]; - if (local450 != null && local450.aBoolean45) { - Static247.method4245(local450, false); - } - } - if (local438 < Static215.anInt4866) { - local450 = local406[local415][local438]; - if (local450 != null && local450.aBoolean45) { - Static247.method4245(local450, false); - } - } - } - if (local183 < Static2.anInt15) { - if (local434 >= Static80.anInt4698) { - local450 = local406[local183][local434]; - if (local450 != null && local450.aBoolean45) { - Static247.method4245(local450, false); - } - } - if (local438 < Static215.anInt4866) { - local450 = local406[local183][local438]; - if (local450 != null && local450.aBoolean45) { - Static247.method4245(local450, false); - } - } - } - if (Static211.anInt1142 == 0) { - if (!local240) { - MiniMenu.aBoolean187 = false; - } - return; - } - } - } - } - } - MiniMenu.aBoolean187 = false; - } -} diff --git a/client/src/main/java/rt4/Static251.java b/client/src/main/java/rt4/Static251.java deleted file mode 100644 index fc489fa..0000000 --- a/client/src/main/java/rt4/Static251.java +++ /dev/null @@ -1,18 +0,0 @@ -package rt4; - -import org.openrs2.deob.annotation.OriginalArg; -import org.openrs2.deob.annotation.OriginalMember; - -public final class Static251 { - - @OriginalMember(owner = "client!ug", name = "b", descriptor = "[F") - public static final float[] aFloatArray28 = new float[4]; - - @OriginalMember(owner = "client!ug", name = "a", descriptor = "(II)V") - public static void method4278(@OriginalArg(0) int arg0) { - if (Static241.anIntArray522 == null || Static241.anIntArray522.length < arg0) { - Static241.anIntArray522 = new int[arg0]; - } - } - -} diff --git a/client/src/main/java/rt4/Static252.java b/client/src/main/java/rt4/Static252.java index a80a205..405ce1b 100644 --- a/client/src/main/java/rt4/Static252.java +++ b/client/src/main/java/rt4/Static252.java @@ -10,37 +10,37 @@ public final class Static252 { @OriginalMember(owner = "client!uh", name = "f", descriptor = "(I)V") public static void method4302() { - if (Static236.method4047() != 2) { + if (ScriptRunner.method4047() != 2) { return; } - @Pc(27) byte local27 = (byte) (Static253.anInt3325 - 4 & 0xFF); - @Pc(31) int local31 = Static253.anInt3325 % 104; + @Pc(27) byte local27 = (byte) (ScriptRunner.anInt3325 - 4 & 0xFF); + @Pc(31) int local31 = ScriptRunner.anInt3325 % 104; @Pc(33) int local33; @Pc(40) int local40; for (local33 = 0; local33 < 4; local33++) { for (local40 = 0; local40 < 104; local40++) { - Static266.aByteArrayArrayArray15[local33][local31][local40] = local27; + ScriptRunner.aByteArrayArrayArray15[local33][local31][local40] = local27; } } if (Player.level == 3) { return; } for (local33 = 0; local33 < 2; local33++) { - Static79.anIntArray205[local33] = -1000000; - Static149.anIntArray338[local33] = 1000000; - Static267.anIntArray518[local33] = 0; - Static243.anIntArray476[local33] = 1000000; - Static50.anIntArray134[local33] = 0; + ScriptRunner.anIntArray205[local33] = -1000000; + ScriptRunner.anIntArray338[local33] = 1000000; + ScriptRunner.anIntArray518[local33] = 0; + ScriptRunner.anIntArray476[local33] = 1000000; + ScriptRunner.anIntArray134[local33] = 0; } if (Camera.cameraType != 1) { local33 = SceneGraph.getTileHeight(Player.level, Camera.renderX, Camera.renderZ); if (local33 - Static5.anInt40 < 800 && (SceneGraph.tileFlags[Player.level][Camera.renderX >> 7][Camera.renderZ >> 7] & 0x4) != 0) { - Static254.method4348(false, Camera.renderX >> 7, Camera.renderZ >> 7, SceneGraph.tiles, 1); + ScriptRunner.method4348(false, Camera.renderX >> 7, Camera.renderZ >> 7, SceneGraph.tiles, 1); } return; } if ((SceneGraph.tileFlags[Player.level][PlayerList.self.xFine >> 7][PlayerList.self.zFine >> 7] & 0x4) != 0) { - Static254.method4348(false, PlayerList.self.xFine >> 7, PlayerList.self.zFine >> 7, SceneGraph.tiles, 0); + ScriptRunner.method4348(false, PlayerList.self.xFine >> 7, PlayerList.self.zFine >> 7, SceneGraph.tiles, 0); } if (Camera.cameraPitch >= 310) { return; @@ -73,7 +73,7 @@ public final class Static252 { local40--; } if ((SceneGraph.tileFlags[Player.level][local33][local40] & 0x4) != 0) { - Static254.method4348(false, local33, local40, SceneGraph.tiles, 1); + ScriptRunner.method4348(false, local33, local40, SceneGraph.tiles, 1); break; } local186 += local192; @@ -85,7 +85,7 @@ public final class Static252 { } local186 -= 65536; if ((SceneGraph.tileFlags[Player.level][local33][local40] & 0x4) != 0) { - Static254.method4348(false, local33, local40, SceneGraph.tiles, 1); + ScriptRunner.method4348(false, local33, local40, SceneGraph.tiles, 1); break; } } @@ -101,7 +101,7 @@ public final class Static252 { local33--; } if ((SceneGraph.tileFlags[Player.level][local33][local40] & 0x4) != 0) { - Static254.method4348(false, local33, local40, SceneGraph.tiles, 1); + ScriptRunner.method4348(false, local33, local40, SceneGraph.tiles, 1); break; } local186 += local192; @@ -113,7 +113,7 @@ public final class Static252 { } local186 -= 65536; if ((SceneGraph.tileFlags[Player.level][local33][local40] & 0x4) != 0) { - Static254.method4348(false, local33, local40, SceneGraph.tiles, 1); + ScriptRunner.method4348(false, local33, local40, SceneGraph.tiles, 1); break; } } diff --git a/client/src/main/java/rt4/Static253.java b/client/src/main/java/rt4/Static253.java deleted file mode 100644 index 99b9609..0000000 --- a/client/src/main/java/rt4/Static253.java +++ /dev/null @@ -1,790 +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 Static253 { - - @OriginalMember(owner = "client!bi", name = "jb", descriptor = "Z") - 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!sj", name = "D", descriptor = "I") - public static int anInt5158; - @OriginalMember(owner = "client!ej", name = "X", descriptor = "I") - public static int anInt1815; - @OriginalMember(owner = "client!uj", name = "H", descriptor = "I") - public static int anInt5559; - @OriginalMember(owner = "client!bb", name = "M", descriptor = "I") - public static int anInt406; - @OriginalMember(owner = "client!qc", name = "cb", descriptor = "I") - public static int anInt4675; - - @OriginalMember(owner = "client!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) { - anInt3325++; - method3711(); - if (!arg1) { - method964(true); - method3240(true); - method964(false); - } - method3240(false); - if (!arg1) { - method3532(); - } - method4239(); - if (GlRenderer.enabled) { - Static115.method2314(arg3, arg4, arg0, arg2, true); - arg2 = Static115.anInt983; - arg4 = Static115.anInt773; - arg3 = Static115.anInt4055; - arg0 = Static115.anInt5377; - } - @Pc(59) int local59; - @Pc(57) int local57; - if (Camera.cameraType == 1) { - local57 = Static230.anInt5161 + (int)Camera.yawTarget & 0x7FF; - local59 = (int)Camera.pitchTarget; - if (local59 < Static234.anInt5245 / 256) { - local59 = Static234.anInt5245 / 256; - } - if (Static176.customCameraActive[4] && Camera.cameraAmplitude[4] + 128 > local59) { - local59 = Camera.cameraAmplitude[4] + 128; - } - Static18.method555(Camera.cameraX, arg0, SceneGraph.getTileHeight(Player.level, PlayerList.self.xFine, PlayerList.self.zFine) - 50, Camera.ZOOM - -(local59 * 3), local57, Camera.cameraZ, local59); - } - local57 = Static5.anInt40; - local59 = Camera.renderX; - @Pc(121) int local121 = Camera.renderZ; - @Pc(123) int local123 = Camera.cameraPitch; - @Pc(125) int local125 = Camera.cameraYaw; - @Pc(127) int local127; - @Pc(171) int local171; - for (local127 = 0; local127 < 5; 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) Camera.cameraFrequency[local127] / 100.0D)) * (double) Camera.cameraAmplitude[local127]); - if (local127 == 3) { - Camera.cameraYaw = local171 + Camera.cameraYaw & 0x7FF; - } - if (local127 == 4) { - Camera.cameraPitch += local171; - if (Camera.cameraPitch < 128) { - Camera.cameraPitch = 128; - } - if (Camera.cameraPitch > 383) { - Camera.cameraPitch = 383; - } - } - if (local127 == 2) { - Camera.renderZ += local171; - } - if (local127 == 1) { - Static5.anInt40 += local171; - } - if (local127 == 0) { - Camera.renderX += local171; - } - } - } - Static252.method4302(); - if (GlRenderer.enabled) { - GlRaster.setClip(arg2, arg4, arg2 + arg3, arg4 - -arg0); - @Pc(248) float local248 = (float) Camera.cameraPitch * 0.17578125F; - @Pc(253) float local253 = (float) Camera.cameraYaw * 0.17578125F; - if (Camera.cameraType == 3) { - local248 = Static146.aFloat15 * 360.0F / 6.2831855F; - local253 = Camera.aFloat10 * 360.0F / 6.2831855F; - } - GlRenderer.method4171(arg2, arg4, arg3, arg0, arg3 / 2 + arg2, arg4 - -(arg0 / 2), local248, local253, Static115.anInt5029, Static115.anInt5029); - } else { - SoftwareRaster.setClip(arg2, arg4, arg3 + arg2, arg0 + arg4); - Rasteriser.prepare(); - } - if (Static40.aBoolean108 || Static155.anInt3751 < arg2 || Static155.anInt3751 >= arg3 + arg2 || arg4 > Static60.anInt1892 || arg0 + arg4 <= Static60.anInt1892) { - Static39.aBoolean77 = false; - Static2.anInt7 = 0; - } else { - Static39.aBoolean77 = true; - Static2.anInt7 = 0; - local171 = Rasteriser.screenUpperX; - @Pc(344) int local344 = Rasteriser.screenLowerY; - local127 = Rasteriser.screenLowerX; - Static150.anInt3582 = local127 + (local171 - local127) * (-arg2 + Static155.anInt3751) / arg3; - @Pc(361) int local361 = Rasteriser.screenUpperY; - Static34.anInt1053 = (local361 - local344) * (Static60.anInt1892 - arg4) / arg0 + local344; - } - client.audioLoop(); - @Pc(387) byte local387 = Static236.method4047() == 2 ? (byte) anInt3325 : 1; - if (GlRenderer.enabled) { - GlRenderer.restoreLighting(); - GlRenderer.setDepthTestEnabled(true); - GlRenderer.setFogEnabled(true); - if (client.gameState == 10) { - local171 = Static103.method2235(Static178.anInt4247, Camera.renderZ >> 10, Preferences.brightness, Camera.renderX >> 10); - } else { - local171 = Static103.method2235(Static178.anInt4247, PlayerList.self.movementQueueZ[0] >> 3, Preferences.brightness, PlayerList.self.movementQueueX[0] >> 3); - } - LightingManager.method2394(client.loop, !Preferences.flickeringEffectsOn); - GlRenderer.clearColorAndDepthBuffers(local171); - method2731(Camera.cameraPitch, Camera.renderZ, Static5.anInt40, Camera.renderX, Camera.cameraYaw); - GlRenderer.anInt5323 = client.loop; - Static156.method2954(Camera.renderX, Static5.anInt40, Camera.renderZ, Camera.cameraPitch, Camera.cameraYaw, Static266.aByteArrayArrayArray15, Static79.anIntArray205, Static149.anIntArray338, Static267.anIntArray518, Static50.anIntArray134, Static243.anIntArray476, Player.level + 1, local387, PlayerList.self.xFine >> 7, PlayerList.self.zFine >> 7); - Static263.aBoolean299 = true; - LightingManager.method2390(); - method2731(0, 0, 0, 0, 0); - client.audioLoop(); - Static223.method3858(); - method2726(arg4, arg3, arg2, Static115.anInt5029, arg0, Static115.anInt5029); - Static233.method4000(arg3, arg2, arg0, Static115.anInt5029, Static115.anInt5029, arg4); - } else { - SoftwareRaster.fillRect(arg2, arg4, arg3, arg0, 0); - Static156.method2954(Camera.renderX, Static5.anInt40, Camera.renderZ, Camera.cameraPitch, Camera.cameraYaw, Static266.aByteArrayArrayArray15, Static79.anIntArray205, Static149.anIntArray338, Static267.anIntArray518, Static50.anIntArray134, Static243.anIntArray476, Player.level + 1, local387, PlayerList.self.xFine >> 7, PlayerList.self.zFine >> 7); - client.audioLoop(); - Static223.method3858(); - method2726(arg4, arg3, arg2, 256, arg0, 256); - Static233.method4000(arg3, arg2, arg0, 256, 256, arg4); - } - ((Js5GlTextureProvider) Rasteriser.textureProvider).method3239(Static178.anInt4247); - Static115.method2310(arg3, arg4, arg0, arg2); - Camera.cameraPitch = local123; - Camera.renderZ = local121; - Static5.anInt40 = local57; - Camera.renderX = local59; - Camera.cameraYaw = local125; - if (aBoolean43 && client.js5NetQueue.method2328() == 0) { - aBoolean43 = false; - } - if (aBoolean43) { - if (GlRenderer.enabled) { - GlRaster.method1186(arg2, arg4, arg3, arg0, 0); - } else { - SoftwareRaster.fillRect(arg2, arg4, arg3, arg0, 0); - } - Static114.drawTextOnScreen(false, LocalizedText.LOADING); - } - if (!arg1 && !aBoolean43 && !Static40.aBoolean108 && arg2 <= Static155.anInt3751 && arg3 + arg2 > Static155.anInt3751 && arg4 <= Static60.anInt1892 && arg0 + arg4 > Static60.anInt1892) { - MiniMenu.addEntries(arg4, arg3, arg0, arg2, Static60.anInt1892, Static155.anInt3751); - } - } - - @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) { - anInt5854 = 0; - @Pc(5) int local5; - @Pc(642) int local642; - @Pc(74) int local74; - @Pc(265) int local265; - @Pc(310) int local310; - @Pc(359) int local359; - @Pc(639) int local639; - for (local5 = -1; local5 < PlayerList.size + NpcList.size; local5++) { - @Pc(17) PathingEntity local17; - if (local5 == -1) { - local17 = PlayerList.self; - } else if (PlayerList.size > local5) { - local17 = PlayerList.players[PlayerList.ids[local5]]; - } else { - local17 = NpcList.npcs[NpcList.ids[local5 - PlayerList.size]]; - } - if (local17 != null && local17.method2682()) { - @Pc(58) NpcType local58; - if (local17 instanceof Npc) { - local58 = ((Npc) local17).type; - if (local58.multiNpcs != null) { - local58 = local58.getMultiNpc(); - } - if (local58 == null) { - continue; - } - } - @Pc(161) int local161; - if (local5 >= PlayerList.size) { - local58 = ((Npc) local17).type; - if (local58.multiNpcs != null) { - local58 = local58.getMultiNpc(); - } - if (local58.prayerIcon >= 0 && Sprites.headiconPrayers.length > local58.prayerIcon) { - if (local58.anInt3730 == -1) { - local265 = local17.method2691() + 15; - } else { - local265 = local58.anInt3730 + 15; - } - Static180.method3326(arg4 >> 1, arg3, local17, arg5, local265, arg1 >> 1); - if (Static65.anInt1951 > -1) { - Sprites.headiconPrayers[local58.prayerIcon].render(arg2 + Static65.anInt1951 - 12, arg0 + -30 - -Static16.anInt548); - } - } - @Pc(308) MapMarker[] local308 = Static143.hintMapMarkers; - for (local310 = 0; local310 < local308.length; local310++) { - @Pc(322) MapMarker local322 = local308[local310]; - if (local322 != null && local322.type == 1 && local322.actorTargetId == NpcList.ids[local5 - PlayerList.size] && client.loop % 20 < 10) { - if (local58.anInt3730 == -1) { - local359 = local17.method2691() + 15; - } else { - local359 = local58.anInt3730 + 15; - } - Static180.method3326(arg4 >> 1, arg3, local17, arg5, local359, arg1 >> 1); - if (Static65.anInt1951 > -1) { - Sprites.headhints[local322.anInt4048].render(arg2 + Static65.anInt1951 - 12, Static16.anInt548 + -28 + arg0); - } - } - } - } else { - local74 = 30; - @Pc(77) Player local77 = (Player) local17; - if (local77.anInt1669 != -1 || local77.anInt1649 != -1) { - Static180.method3326(arg4 >> 1, arg3, local17, arg5, local17.method2691() + 15, arg1 >> 1); - if (Static65.anInt1951 > -1) { - if (local77.anInt1669 != -1) { - Sprites.headiconPks[local77.anInt1669].render(Static65.anInt1951 + arg2 - 12, arg0 + -30 + Static16.anInt548); - local74 += 25; - } - if (local77.anInt1649 != -1) { - Sprites.headiconPrayers[local77.anInt1649].render(arg2 + Static65.anInt1951 - 12, arg0 - (-Static16.anInt548 + local74)); - local74 += 25; - } - } - } - if (local5 >= 0) { - @Pc(159) MapMarker[] local159 = Static143.hintMapMarkers; - for (local161 = 0; local161 < local159.length; local161++) { - @Pc(173) MapMarker local173 = local159[local161]; - if (local173 != null && local173.type == 10 && PlayerList.ids[local5] == local173.actorTargetId) { - Static180.method3326(arg4 >> 1, arg3, local17, arg5, local17.method2691() + 15, arg1 >> 1); - if (Static65.anInt1951 > -1) { - Sprites.headhints[local173.anInt4048].render(arg2 + Static65.anInt1951 - 12, arg0 + (Static16.anInt548 - local74)); - } - } - } - } - } - 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); - if (Static65.anInt1951 > -1 && anInt5854 < Static191.anInt4506) { - Static191.anIntArray389[anInt5854] = Fonts.b12Full.getStringWidth(local17.chatMessage) / 2; - Static191.anIntArray387[anInt5854] = Fonts.b12Full.lineHeight; - Static191.anIntArray385[anInt5854] = Static65.anInt1951; - Static191.anIntArray392[anInt5854] = Static16.anInt548; - Static191.anIntArray390[anInt5854] = local17.chatColor; - Static191.anIntArray391[anInt5854] = local17.chatEffect; - Static191.anIntArray384[anInt5854] = local17.chatLoops; - Static191.aClass100Array132[anInt5854] = local17.chatMessage; - anInt5854++; - } - } - if (local17.hitpointsBarVisibleUntil > client.loop) { - @Pc(508) Sprite local508 = Sprites.hitbars[0]; - @Pc(512) Sprite local512 = Sprites.hitbars[1]; - if (local17 instanceof Npc) { - @Pc(518) Npc local518 = (Npc) local17; - @Pc(528) Sprite[] local528 = (Sprite[]) HitBarList.hitBars.get((long) local518.type.hitBarId); - if (local528 == null) { - local528 = SpriteLoader.loadAlphaSprites(local518.type.hitBarId, client.js5Archive8); - if (local528 != null) { - HitBarList.hitBars.put(local528, (long) local518.type.hitBarId); - } - } - if (local528 != null && local528.length == 2) { - local512 = local528[1]; - local508 = local528[0]; - } - @Pc(571) NpcType local571 = local518.type; - if (local571.anInt3730 == -1) { - local310 = local17.method2691(); - } else { - local310 = local571.anInt3730; - } - } else { - local310 = local17.method2691(); - } - Static180.method3326(arg4 >> 1, arg3, local17, arg5, local508.height + local310 + 10, arg1 >> 1); - if (Static65.anInt1951 > -1) { - local161 = Static65.anInt1951 + arg2 - (local508.width >> 1); - local359 = Static16.anInt548 + arg0 - 3; - local508.render(local161, local359); - local639 = local508.width * local17.hitpointsBar / 255; - local642 = local508.height; - if (GlRenderer.enabled) { - GlRaster.method1183(local161, local359, local161 + local639, local359 + local642); - } else { - SoftwareRaster.method2498(local161, local359, local161 + local639, local642 + local359); - } - local512.render(local161, local359); - if (GlRenderer.enabled) { - GlRaster.setClip(arg2, arg0, arg1 + arg2, arg0 - -arg4); - } else { - SoftwareRaster.setClip(arg2, arg0, arg1 + arg2, arg4 + arg0); - } - } - } - for (local74 = 0; local74 < 4; local74++) { - if (local17.anIntArray319[local74] > client.loop) { - if (local17 instanceof Npc) { - @Pc(725) Npc local725 = (Npc) local17; - @Pc(728) NpcType local728 = local725.type; - if (local728.anInt3730 == -1) { - local265 = local17.method2691() / 2; - } else { - local265 = local728.anInt3730 / 2; - } - } else { - local265 = local17.method2691() / 2; - } - Static180.method3326(arg4 >> 1, arg3, local17, arg5, local265, arg1 >> 1); - if (Static65.anInt1951 > -1) { - if (local74 == 1) { - Static16.anInt548 -= 20; - } - if (local74 == 2) { - Static16.anInt548 -= 10; - Static65.anInt1951 -= 15; - } - if (local74 == 3) { - Static16.anInt548 -= 10; - Static65.anInt1951 += 15; - } - Sprites.hitmarks[local17.anIntArray321[local74]].render(arg2 + Static65.anInt1951 - 12, arg0 + Static16.anInt548 - 12); - Fonts.p11Full.renderCenter(JagString.parseInt(local17.anIntArray322[local74]), Static65.anInt1951 + arg2 - 1, Static16.anInt548 + 3 + arg0, 16777215, 0); - } - } - } - } - } - for (local5 = 0; local5 < anInt5854; local5++) { - local74 = Static191.anIntArray392[local5]; - @Pc(859) int local859 = Static191.anIntArray385[local5]; - local310 = Static191.anIntArray387[local5]; - local265 = Static191.anIntArray389[local5]; - @Pc(869) boolean local869 = true; - while (local869) { - local869 = false; - for (local359 = 0; local359 < local5; local359++) { - if (Static191.anIntArray392[local359] - Static191.anIntArray387[local359] < local74 + 2 && local74 - local310 < Static191.anIntArray392[local359] - -2 && local859 - local265 < Static191.anIntArray385[local359] + Static191.anIntArray389[local359] && Static191.anIntArray385[local359] - Static191.anIntArray389[local359] < local265 + local859 && Static191.anIntArray392[local359] - Static191.anIntArray387[local359] < local74) { - local74 = Static191.anIntArray392[local359] - Static191.anIntArray387[local359]; - local869 = true; - } - } - } - Static65.anInt1951 = Static191.anIntArray385[local5]; - Static16.anInt548 = Static191.anIntArray392[local5] = local74; - @Pc(962) JagString local962 = Static191.aClass100Array132[local5]; - if (VarpDomain.anInt2157 == 0) { - local639 = 16776960; - if (Static191.anIntArray390[local5] < 6) { - local639 = Static16.anIntArray52[Static191.anIntArray390[local5]]; - } - if (Static191.anIntArray390[local5] == 6) { - local639 = anInt3325 % 20 >= 10 ? 16776960 : 16711680; - } - if (Static191.anIntArray390[local5] == 7) { - local639 = anInt3325 % 20 < 10 ? 255 : 65535; - } - if (Static191.anIntArray390[local5] == 8) { - local639 = anInt3325 % 20 >= 10 ? 8454016 : 45056; - } - if (Static191.anIntArray390[local5] == 9) { - local642 = 150 - Static191.anIntArray384[local5]; - if (local642 < 50) { - local639 = local642 * 1280 + 16711680; - } else if (local642 < 100) { - local639 = 16776960 + 16384000 - local642 * 327680; - } else if (local642 < 150) { - local639 = local642 * 5 + 65280 - 500; - } - } - if (Static191.anIntArray390[local5] == 10) { - local642 = 150 - Static191.anIntArray384[local5]; - if (local642 < 50) { - local639 = local642 * 5 + 16711680; - } else if (local642 < 100) { - local639 = 16711935 - (local642 - 50) * 327680; - } else if (local642 < 150) { - local639 = local642 * 327680 + 255 + 500 - local642 * 5 - 32768000; - } - } - if (Static191.anIntArray390[local5] == 11) { - local642 = 150 - Static191.anIntArray384[local5]; - if (local642 < 50) { - local639 = 16777215 - local642 * 327685; - } else if (local642 < 100) { - local639 = local642 * 327685 + 65280 - 16384250; - } else if (local642 < 150) { - local639 = 16777215 + 32768000 - local642 * 327680; - } - } - if (Static191.anIntArray391[local5] == 0) { - Fonts.b12Full.renderCenter(local962, Static65.anInt1951 + arg2, arg0 + Static16.anInt548, local639, 0); - } - if (Static191.anIntArray391[local5] == 1) { - Fonts.b12Full.renderWave(local962, arg2 + Static65.anInt1951, Static16.anInt548 + arg0, local639, anInt3325); - } - if (Static191.anIntArray391[local5] == 2) { - Fonts.b12Full.renderWave2(local962, arg2 + Static65.anInt1951, arg0 - -Static16.anInt548, local639, anInt3325); - } - if (Static191.anIntArray391[local5] == 3) { - Fonts.b12Full.renderShake(local962, arg2 + Static65.anInt1951, Static16.anInt548 + arg0, local639, anInt3325, 150 - Static191.anIntArray384[local5]); - } - if (Static191.anIntArray391[local5] == 4) { - local642 = (150 - Static191.anIntArray384[local5]) * (Fonts.b12Full.getStringWidth(local962) + 100) / 150; - if (GlRenderer.enabled) { - GlRaster.method1183(Static65.anInt1951 + arg2 - 50, arg0, Static65.anInt1951 + arg2 + 50, arg4 + arg0); - } else { - SoftwareRaster.method2498(arg2 + Static65.anInt1951 - 50, arg0, Static65.anInt1951 + arg2 + 50, arg4 + arg0); - } - Fonts.b12Full.renderLeft(local962, arg2 + Static65.anInt1951 + 50 - local642, arg0 + Static16.anInt548, local639, 0); - if (GlRenderer.enabled) { - GlRaster.setClip(arg2, arg0, arg1 + arg2, arg4 + arg0); - } else { - SoftwareRaster.setClip(arg2, arg0, arg2 + arg1, arg0 + arg4); - } - } - if (Static191.anIntArray391[local5] == 5) { - @Pc(1372) int local1372 = 0; - local642 = 150 - Static191.anIntArray384[local5]; - if (GlRenderer.enabled) { - GlRaster.method1183(arg2, Static16.anInt548 + arg0 - Fonts.b12Full.lineHeight - 1, arg1 + arg2, arg0 + Static16.anInt548 + 5); - } else { - SoftwareRaster.method2498(arg2, Static16.anInt548 + arg0 - Fonts.b12Full.lineHeight - 1, arg2 + arg1, Static16.anInt548 + arg0 + 5); - } - if (local642 < 25) { - local1372 = local642 - 25; - } else if (local642 > 125) { - local1372 = local642 - 125; - } - Fonts.b12Full.renderCenter(local962, Static65.anInt1951 + arg2, local1372 + arg0 + Static16.anInt548, local639, 0); - if (GlRenderer.enabled) { - GlRaster.setClip(arg2, arg0, arg2 + arg1, arg0 + arg4); - } else { - SoftwareRaster.setClip(arg2, arg0, arg2 + arg1, arg0 + arg4); - } - } - } else { - Fonts.b12Full.renderCenter(local962, arg2 + Static65.anInt1951, arg0 + Static16.anInt548, 16776960, 0); - } - } - } - - @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.attachmentSetAt || local39.attachmentResetAt <= 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); - } - } - } - } - - @OriginalMember(owner = "client!ld", name = "a", descriptor = "(IIIIZI)V") - public static void method2731(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(5) int arg4) { - anInt5158 = arg1; - anInt1815 = arg4; - anInt5559 = arg0; - anInt406 = arg3; - anInt4675 = arg2; - } -} diff --git a/client/src/main/java/rt4/Static254.java b/client/src/main/java/rt4/Static254.java deleted file mode 100644 index d2735fb..0000000 --- a/client/src/main/java/rt4/Static254.java +++ /dev/null @@ -1,191 +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 Static254 { - - @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) { - @Pc(14) byte local14 = arg0 ? 1 : (byte) (Static253.anInt3325 & 0xFF); - if (local14 == Static266.aByteArrayArrayArray15[Player.level][arg1][arg2]) { - return false; - } else if ((SceneGraph.tileFlags[Player.level][arg1][arg2] & 0x4) == 0) { - return false; - } else { - @Pc(47) int local47 = 0; - @Pc(49) byte local49 = 0; - PathFinder.queueX[0] = arg1; - @Pc(69) int local69 = local49 + 1; - PathFinder.queueZ[0] = arg2; - Static266.aByteArrayArrayArray15[Player.level][arg1][arg2] = local14; - while (local47 != local69) { - @Pc(94) int local94 = PathFinder.queueX[local47] >> 16 & 0xFF; - @Pc(102) int local102 = PathFinder.queueX[local47] >> 24 & 0xFF; - @Pc(108) int local108 = PathFinder.queueX[local47] & 0xFFFF; - @Pc(116) int local116 = PathFinder.queueZ[local47] >> 16 & 0xFF; - @Pc(122) int local122 = PathFinder.queueZ[local47] & 0xFFFF; - local47 = local47 + 1 & 0xFFF; - @Pc(130) boolean local130 = false; - @Pc(132) boolean local132 = false; - if ((SceneGraph.tileFlags[Player.level][local108][local122] & 0x4) == 0) { - local130 = true; - } - @Pc(150) int local150; - @Pc(191) int local191; - label238: for (local150 = Player.level + 1; local150 <= 3; local150++) { - if ((SceneGraph.tileFlags[local150][local108][local122] & 0x8) == 0) { - @Pc(227) int local227; - @Pc(358) int local358; - if (local130 && arg3[local150][local108][local122] != null) { - if (arg3[local150][local108][local122].wall != null) { - local191 = SceneGraph.method2251(local94); - if (arg3[local150][local108][local122].wall.anInt3049 == local191 || arg3[local150][local108][local122].wall.anInt3052 == local191) { - continue; - } - if (local102 != 0) { - local227 = SceneGraph.method2251(local102); - if (local227 == arg3[local150][local108][local122].wall.anInt3049 || arg3[local150][local108][local122].wall.anInt3052 == local227) { - continue; - } - } - if (local116 != 0) { - local227 = SceneGraph.method2251(local116); - if (local227 == arg3[local150][local108][local122].wall.anInt3049 || local227 == arg3[local150][local108][local122].wall.anInt3052) { - continue; - } - } - } - if (arg3[local150][local108][local122].scenery != null) { - for (local191 = 0; local191 < arg3[local150][local108][local122].sceneryLen; local191++) { - local227 = (int) (arg3[local150][local108][local122].scenery[local191].key >> 14 & 0x3FL); - if (local227 == 21) { - local227 = 19; - } - @Pc(352) int local352 = (int) (arg3[local150][local108][local122].scenery[local191].key >> 20 & 0x3L); - local358 = local227 | local352 << 6; - if (local358 == local94 || local102 != 0 && local358 == local102 || local116 != 0 && local116 == local358) { - continue label238; - } - } - } - } - local132 = true; - @Pc(395) Tile local395 = arg3[local150][local108][local122]; - if (local395 != null && local395.sceneryLen > 0) { - for (local227 = 0; local227 < local395.sceneryLen; local227++) { - @Pc(418) Scenery local418 = local395.scenery[local227]; - if (local418.xMax != local418.xMin || local418.zMax != local418.zMin) { - for (local358 = local418.xMin; local358 <= local418.xMax; local358++) { - for (@Pc(450) int local450 = local418.zMin; local450 <= local418.zMax; local450++) { - Static266.aByteArrayArrayArray15[local150][local358][local450] = local14; - } - } - } - } - } - Static266.aByteArrayArrayArray15[local150][local108][local122] = local14; - } - } - if (local132) { - if (SceneGraph.tileHeights[Player.level + 1][local108][local122] > Static79.anIntArray205[arg4]) { - Static79.anIntArray205[arg4] = SceneGraph.tileHeights[Player.level + 1][local108][local122]; - } - local150 = local108 << 7; - if (local150 < Static149.anIntArray338[arg4]) { - Static149.anIntArray338[arg4] = local150; - } else if (Static267.anIntArray518[arg4] < local150) { - Static267.anIntArray518[arg4] = local150; - } - local191 = local122 << 7; - if (Static243.anIntArray476[arg4] > local191) { - Static243.anIntArray476[arg4] = local191; - } else if (Static50.anIntArray134[arg4] < local191) { - Static50.anIntArray134[arg4] = local191; - } - } - if (!local130) { - if (local108 >= 1 && Static266.aByteArrayArrayArray15[Player.level][local108 - 1][local122] != local14) { - PathFinder.queueX[local69] = local108 - 1 | 0x120000 | 0xD3000000; - PathFinder.queueZ[local69] = local122 | 0x130000; - local69 = local69 + 1 & 0xFFF; - Static266.aByteArrayArrayArray15[Player.level][local108 - 1][local122] = local14; - } - local122++; - if (local122 < 104) { - if (local108 - 1 >= 0 && local14 != Static266.aByteArrayArrayArray15[Player.level][local108 - 1][local122] && (SceneGraph.tileFlags[Player.level][local108][local122] & 0x4) == 0 && (SceneGraph.tileFlags[Player.level][local108 - 1][local122 - 1] & 0x4) == 0) { - PathFinder.queueX[local69] = 0x52000000 | 0x120000 | local108 - 1; - PathFinder.queueZ[local69] = local122 | 0x130000; - Static266.aByteArrayArrayArray15[Player.level][local108 - 1][local122] = local14; - local69 = local69 + 1 & 0xFFF; - } - if (local14 != Static266.aByteArrayArrayArray15[Player.level][local108][local122]) { - PathFinder.queueX[local69] = local108 | 0x13000000 | 0x520000; - PathFinder.queueZ[local69] = local122 | 0x530000; - local69 = local69 + 1 & 0xFFF; - Static266.aByteArrayArrayArray15[Player.level][local108][local122] = local14; - } - if (local108 + 1 < 104 && Static266.aByteArrayArrayArray15[Player.level][local108 + 1][local122] != local14 && (SceneGraph.tileFlags[Player.level][local108][local122] & 0x4) == 0 && (SceneGraph.tileFlags[Player.level][local108 + 1][local122 - 1] & 0x4) == 0) { - PathFinder.queueX[local69] = 0x92000000 | 0x520000 | local108 + 1; - PathFinder.queueZ[local69] = local122 | 0x530000; - Static266.aByteArrayArrayArray15[Player.level][local108 + 1][local122] = local14; - local69 = local69 + 1 & 0xFFF; - } - } - local122--; - if (local108 + 1 < 104 && local14 != Static266.aByteArrayArrayArray15[Player.level][local108 + 1][local122]) { - PathFinder.queueX[local69] = local108 + 1 | 0x920000 | 0x53000000; - PathFinder.queueZ[local69] = local122 | 0x930000; - Static266.aByteArrayArrayArray15[Player.level][local108 + 1][local122] = local14; - local69 = local69 + 1 & 0xFFF; - } - local122--; - if (local122 >= 0) { - if (local108 - 1 >= 0 && Static266.aByteArrayArrayArray15[Player.level][local108 - 1][local122] != local14 && (SceneGraph.tileFlags[Player.level][local108][local122] & 0x4) == 0 && (SceneGraph.tileFlags[Player.level][local108 - 1][local122 + 1] & 0x4) == 0) { - PathFinder.queueX[local69] = local108 - 1 | 0xD20000 | 0x12000000; - PathFinder.queueZ[local69] = local122 | 0xD30000; - Static266.aByteArrayArrayArray15[Player.level][local108 - 1][local122] = local14; - local69 = local69 + 1 & 0xFFF; - } - if (local14 != Static266.aByteArrayArrayArray15[Player.level][local108][local122]) { - PathFinder.queueX[local69] = local108 | 0xD20000 | 0x93000000; - PathFinder.queueZ[local69] = local122 | 0xD30000; - local69 = local69 + 1 & 0xFFF; - Static266.aByteArrayArrayArray15[Player.level][local108][local122] = local14; - } - if (local108 + 1 < 104 && Static266.aByteArrayArrayArray15[Player.level][local108 + 1][local122] != local14 && (SceneGraph.tileFlags[Player.level][local108][local122] & 0x4) == 0 && (SceneGraph.tileFlags[Player.level][local108 + 1][local122 + 1] & 0x4) == 0) { - PathFinder.queueX[local69] = local108 + 1 | 0xD2000000 | 0x920000; - PathFinder.queueZ[local69] = local122 | 0x930000; - Static266.aByteArrayArrayArray15[Player.level][local108 + 1][local122] = local14; - local69 = local69 + 1 & 0xFFF; - } - } - } - } - if (Static79.anIntArray205[arg4] != -1000000) { - Static79.anIntArray205[arg4] += 10; - Static149.anIntArray338[arg4] -= 50; - Static267.anIntArray518[arg4] += 50; - Static50.anIntArray134[arg4] += 50; - Static243.anIntArray476[arg4] -= 50; - } - return true; - } - } - - @OriginalMember(owner = "client!uj", name = "a", descriptor = "(Lclient!wa;II)Lclient!na;") - public static JagString method4350(@OriginalArg(0) Buffer arg0) { - try { - @Pc(7) int local7 = arg0.gsmarts(); - if (local7 > 32767) { - local7 = 32767; - } - @Pc(15) byte[] local15 = new byte[local7]; - arg0.offset += WordPack.codec.method1552(0, local7, local15, arg0.data, arg0.offset); - return JagString.decodeString(local15, local7, 0); - } catch (@Pc(47) Exception local47) { - return WordPack.CABBAGE; - } - } -} diff --git a/client/src/main/java/rt4/Static26.java b/client/src/main/java/rt4/Static26.java deleted file mode 100644 index 4c30766..0000000 --- a/client/src/main/java/rt4/Static26.java +++ /dev/null @@ -1,73 +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 Static26 { - - @OriginalMember(owner = "client!ca", name = "cb", descriptor = "Lclient!na;") - public static final JagString aClass100_160 = Static165.method3165(); - - @OriginalMember(owner = "client!ca", name = "a", descriptor = "(ZI)V") - public static void method743(@OriginalArg(0) boolean arg0) { - @Pc(13) int local13 = LoginManager.mapFilesBuffer.length; - @Pc(19) byte[][] local19; - if (GlRenderer.enabled && arg0) { - local19 = LoginManager.underWaterLocationsMapFilesBuffer; - } else { - local19 = LoginManager.locationMapFilesBuffer; - } - for (@Pc(25) int local25 = 0; local25 < local13; local25++) { - @Pc(32) byte[] local32 = local19[local25]; - if (local32 != null) { - @Pc(45) int local45 = (LoginManager.regionBitPacked[local25] >> 8) * 64 - Camera.originX; - @Pc(56) int local56 = (LoginManager.regionBitPacked[local25] & 0xFF) * 64 - Camera.originZ; - client.audioLoop(); - method2437(local45, arg0, local32, local56, PathFinder.collisionMaps); - } - } - } - - @OriginalMember(owner = "client!jk", name = "a", descriptor = "(IZ[BII[Lclient!mj;)V") - public static void method2437(@OriginalArg(0) int arg0, @OriginalArg(1) boolean arg1, @OriginalArg(2) byte[] arg2, @OriginalArg(3) int arg3, @OriginalArg(5) CollisionMap[] arg4) { - @Pc(10) Buffer local10 = new Buffer(arg2); - @Pc(12) int local12 = -1; - while (true) { - @Pc(16) int local16 = local10.gVarSmart(); - if (local16 == 0) { - return; - } - local12 += local16; - @Pc(27) int local27 = 0; - while (true) { - @Pc(31) int local31 = local10.gsmarts(); - if (local31 == 0) { - break; - } - local27 += local31 - 1; - @Pc(46) int local46 = local27 & 0x3F; - @Pc(50) int local50 = local27 >> 12; - @Pc(56) int local56 = local27 >> 6 & 0x3F; - @Pc(60) int local60 = local10.g1(); - @Pc(64) int local64 = local60 >> 2; - @Pc(68) int local68 = local60 & 0x3; - @Pc(72) int local72 = arg0 + local56; - @Pc(76) int local76 = local46 + arg3; - if (local72 > 0 && local76 > 0 && local72 < 103 && local76 < 103) { - @Pc(90) CollisionMap local90 = null; - if (!arg1) { - @Pc(95) int local95 = local50; - if ((SceneGraph.tileFlags[1][local72][local76] & 0x2) == 2) { - local95 = local50 - 1; - } - if (local95 >= 0) { - local90 = arg4[local95]; - } - } - Static185.method3397(local50, !arg1, local50, arg1, local90, local12, local64, local72, local76, local68); - } - } - } - } -} diff --git a/client/src/main/java/rt4/Static260.java b/client/src/main/java/rt4/Static260.java deleted file mode 100644 index 72f466c..0000000 --- a/client/src/main/java/rt4/Static260.java +++ /dev/null @@ -1,142 +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 Static260 { - - @OriginalMember(owner = "client!vd", name = "F", descriptor = "Lclient!na;") - public static final JagString aClass100_945 = JagString.parse("0"); - @OriginalMember(owner = "client!eg", name = "a", descriptor = "I") - public static int anInt1744; - - @OriginalMember(owner = "client!vd", name = "b", descriptor = "(IIII)Z") - public static boolean method3850(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) { - if (!Static9.method187(arg0, arg1, arg2)) { - return false; - } - @Pc(10) int local10 = arg1 << 7; - @Pc(14) int local14 = arg2 << 7; - @Pc(24) int local24 = SceneGraph.tileHeights[arg0][arg1][arg2] - 1; - @Pc(28) int local28 = local24 - 120; - @Pc(32) int local32 = local24 - 230; - @Pc(36) int local36 = local24 - 238; - if (arg3 < 16) { - if (arg3 == 1) { - if (local10 > Static149.anInt3555) { - if (!SceneGraph.method4394(local10, local24, local14)) { - return false; - } - if (!SceneGraph.method4394(local10, local24, local14 + 128)) { - return false; - } - } - if (arg0 > 0) { - if (!SceneGraph.method4394(local10, local28, local14)) { - return false; - } - if (!SceneGraph.method4394(local10, local28, local14 + 128)) { - return false; - } - } - if (!SceneGraph.method4394(local10, local32, local14)) { - return false; - } - if (!SceneGraph.method4394(local10, local32, local14 + 128)) { - return false; - } - return true; - } - if (arg3 == 2) { - if (local14 < Static217.anInt4903) { - if (!SceneGraph.method4394(local10, local24, local14 + 128)) { - return false; - } - if (!SceneGraph.method4394(local10 + 128, local24, local14 + 128)) { - return false; - } - } - if (arg0 > 0) { - if (!SceneGraph.method4394(local10, local28, local14 + 128)) { - return false; - } - if (!SceneGraph.method4394(local10 + 128, local28, local14 + 128)) { - return false; - } - } - if (!SceneGraph.method4394(local10, local32, local14 + 128)) { - return false; - } - if (!SceneGraph.method4394(local10 + 128, local32, local14 + 128)) { - return false; - } - return true; - } - if (arg3 == 4) { - if (local10 < Static149.anInt3555) { - if (!SceneGraph.method4394(local10 + 128, local24, local14)) { - return false; - } - if (!SceneGraph.method4394(local10 + 128, local24, local14 + 128)) { - return false; - } - } - if (arg0 > 0) { - if (!SceneGraph.method4394(local10 + 128, local28, local14)) { - return false; - } - if (!SceneGraph.method4394(local10 + 128, local28, local14 + 128)) { - return false; - } - } - if (!SceneGraph.method4394(local10 + 128, local32, local14)) { - return false; - } - if (!SceneGraph.method4394(local10 + 128, local32, local14 + 128)) { - return false; - } - return true; - } - if (arg3 == 8) { - if (local14 > Static217.anInt4903) { - if (!SceneGraph.method4394(local10, local24, local14)) { - return false; - } - if (!SceneGraph.method4394(local10 + 128, local24, local14)) { - return false; - } - } - if (arg0 > 0) { - if (!SceneGraph.method4394(local10, local28, local14)) { - return false; - } - if (!SceneGraph.method4394(local10 + 128, local28, local14)) { - return false; - } - } - if (!SceneGraph.method4394(local10, local32, local14)) { - return false; - } - if (!SceneGraph.method4394(local10 + 128, local32, local14)) { - return false; - } - return true; - } - } - if (!SceneGraph.method4394(local10 + 64, local36, local14 + 64)) { - return false; - } else if (arg3 == 16) { - return SceneGraph.method4394(local10, local32, local14 + 128); - } else if (arg3 == 32) { - return SceneGraph.method4394(local10 + 128, local32, local14 + 128); - } else if (arg3 == 64) { - return SceneGraph.method4394(local10 + 128, local32, local14); - } else if (arg3 == 128) { - return SceneGraph.method4394(local10, local32, local14); - } else { - return true; - } - } - -} diff --git a/client/src/main/java/rt4/Static263.java b/client/src/main/java/rt4/Static263.java deleted file mode 100644 index db191da..0000000 --- a/client/src/main/java/rt4/Static263.java +++ /dev/null @@ -1,29 +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 Static263 { - - @OriginalMember(owner = "client!vg", name = "e", descriptor = "[I") - public static int[] anIntArray516; - - @OriginalMember(owner = "client!vg", name = "b", descriptor = "S") - public static short aShort30 = 256; - - @OriginalMember(owner = "client!vg", name = "c", descriptor = "Z") - public static boolean aBoolean299 = false; - - @OriginalMember(owner = "client!vg", name = "a", descriptor = "(I[S)[S") - public static short[] method4511(@OriginalArg(1) short[] arg0) { - if (arg0 == null) { - return null; - } else { - @Pc(19) short[] local19 = new short[arg0.length]; - ArrayUtils.copy(arg0, 0, local19, 0, arg0.length); - return local19; - } - } - -} diff --git a/client/src/main/java/rt4/Static264.java b/client/src/main/java/rt4/Static264.java index a47f7bc..f1c3fff 100644 --- a/client/src/main/java/rt4/Static264.java +++ b/client/src/main/java/rt4/Static264.java @@ -6,10 +6,7 @@ import org.openrs2.deob.annotation.Pc; public final class Static264 { - @OriginalMember(owner = "client!vh", name = "c", descriptor = "Lclient!na;") - public static final JagString COLON = JagString.parse(":"); - - @OriginalMember(owner = "client!vh", name = "p", descriptor = "[I") + @OriginalMember(owner = "client!vh", name = "p", descriptor = "[I") public static final int[] anIntArray412 = new int[] { 1, 0, 0, 0, 1, 0, 2, 1, 1, 1, 0, 2, 0, 0, 1, 0 }; @OriginalMember(owner = "client!vh", name = "s", descriptor = "I") diff --git a/client/src/main/java/rt4/Static266.java b/client/src/main/java/rt4/Static266.java deleted file mode 100644 index fdb2a40..0000000 --- a/client/src/main/java/rt4/Static266.java +++ /dev/null @@ -1,16 +0,0 @@ -package rt4; - -import org.openrs2.deob.annotation.OriginalMember; - -public final class Static266 { - - @OriginalMember(owner = "client!vk", name = "f", descriptor = "[[[B") - public static byte[][][] aByteArrayArrayArray15; - - @OriginalMember(owner = "client!vk", name = "a", descriptor = "[I") - public static final int[] anIntArray471 = new int[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 73, 74, 76, 78, 83, 84, 85, 86, 91, 92, 93, 94, 95, 97, 103, 104, 105, 106, 107, 108, 113, 114, 115, 116, 118, 119, 120, 121, 122, 123, 124, 125, 133, 134, 136, 138, 143, 144, 145, 146, 151, 152, 153, 154, 155, 157, 163, 164, 165, 166, 168, 169, 174, 175, 176, 177, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 97, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 157, 215, 216, 117, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 66, 66, 66, 66, 66, 66, 65, 75, 79, 79, 79, 79, 87, 87, 87, 87, 77, 96, 98, 98, 98, 98, 98, 250, 251, 109, 109, 109, 109, 117, 252, 167, 126, 126, 126, 126, 126, 126, 125, 135, 139, 139, 139, 139, 147, 147, 147, 147, 137, 156, 158, 158, 158, 158, 158, 253, 254, 170, 170, 170, 170, 178, 255, 178 }; - - @OriginalMember(owner = "client!vk", name = "d", descriptor = "Lclient!na;") - public static final JagString aClass100_1010 = JagString.parse("null"); - -} diff --git a/client/src/main/java/rt4/Static267.java b/client/src/main/java/rt4/Static267.java index 821a5cd..d274e88 100644 --- a/client/src/main/java/rt4/Static267.java +++ b/client/src/main/java/rt4/Static267.java @@ -11,16 +11,12 @@ public final class Static267 { @OriginalMember(owner = "client!je", name = "U", descriptor = "Lclient!na;") public static final JagString aClass100_588 = JagString.parse("showingVideoAd"); - @OriginalMember(owner = "client!vl", name = "i", descriptor = "[I") - public static int[] anIntArray518 = new int[2]; - - @OriginalMember(owner = "client!vl", name = "k", descriptor = "I") - public static int anInt5775 = 0; - - @OriginalMember(owner = "client!vl", name = "l", descriptor = "I") + @OriginalMember(owner = "client!vl", name = "l", descriptor = "I") public static int anInt5776 = 0; + @OriginalMember(owner = "client!wb", name = "b", descriptor = "[I") + public static int[] anIntArray562; - @OriginalMember(owner = "client!vl", name = "a", descriptor = "(I)Z") + @OriginalMember(owner = "client!vl", name = "a", descriptor = "(I)Z") public static boolean isShowingVideoAd() { if (client.objectTag) { try { @@ -41,8 +37,8 @@ public final class Static267 { } Static123.anInt3058 += arg0 * 128; @Pc(40) int local40; - if (Static270.anIntArray562.length < Static123.anInt3058) { - Static123.anInt3058 -= Static270.anIntArray562.length; + if (anIntArray562.length < Static123.anInt3058) { + Static123.anInt3058 -= anIntArray562.length; local40 = (int) (Math.random() * 12.0D); Static69.method1545(Static233.aClass36_Sub1Array1[local40]); } @@ -52,11 +48,11 @@ public final class Static267 { @Pc(60) int local60; @Pc(89) int local89; for (local60 = 0; local60 < local54; local60++) { - local89 = Static216.anIntArray188[local40 + local58] - arg0 * Static270.anIntArray562[Static270.anIntArray562.length - 1 & Static123.anInt3058 + local40] / 6; + local89 = Static145.anIntArray188[local40 + local58] - arg0 * anIntArray562[anIntArray562.length - 1 & Static123.anInt3058 + local40] / 6; if (local89 < 0) { local89 = 0; } - Static216.anIntArray188[local40++] = local89; + Static145.anIntArray188[local40++] = local89; } @Pc(117) int local117; @Pc(125) int local125; @@ -65,17 +61,17 @@ public final class Static267 { for (local117 = 0; local117 < 128; local117++) { local125 = (int) (Math.random() * 100.0D); if (local125 < 50 && local117 > 10 && local117 < 118) { - Static216.anIntArray188[local117 + local89] = 255; + Static145.anIntArray188[local117 + local89] = 255; } else { - Static216.anIntArray188[local117 + local89] = 0; + Static145.anIntArray188[local117 + local89] = 0; } } } for (local60 = 0; local60 < 256 - arg0; local60++) { - Static35.anIntArray83[local60] = Static35.anIntArray83[local60 + arg0]; + Static221.anIntArray83[local60] = Static221.anIntArray83[local60 + arg0]; } for (local60 = 256 - arg0; local60 < 256; local60++) { - Static35.anIntArray83[local60] = (int) (Math.sin((double) Static1.anInt6 / 14.0D) * 16.0D + Math.sin((double) Static1.anInt6 / 15.0D) * 14.0D + Math.sin((double) Static1.anInt6 / 16.0D) * 12.0D); + Static221.anIntArray83[local60] = (int) (Math.sin((double) Static1.anInt6 / 14.0D) * 16.0D + Math.sin((double) Static1.anInt6 / 15.0D) * 14.0D + Math.sin((double) Static1.anInt6 / 16.0D) * 12.0D); Static1.anInt6++; } Static226.anInt5084 += arg0; @@ -86,7 +82,7 @@ public final class Static267 { for (local89 = 0; local89 < Static226.anInt5084; local89++) { local117 = (int) (Math.random() * 124.0D) + 2; local125 = (int) (Math.random() * 128.0D) + 128; - Static216.anIntArray188[local117 + (local125 << 7)] = 192; + Static145.anIntArray188[local117 + (local125 << 7)] = 192; } Static226.anInt5084 = 0; @Pc(290) int local290; @@ -95,10 +91,10 @@ public final class Static267 { local117 = 0; for (local290 = -local60; local290 < 128; local290++) { if (local60 + local290 < 128) { - local117 += Static216.anIntArray188[local125 + local290 + local60]; + local117 += Static145.anIntArray188[local125 + local290 + local60]; } if (local290 - local60 - 1 >= 0) { - local117 -= Static216.anIntArray188[local290 + local125 - local60 - 1]; + local117 -= Static145.anIntArray188[local290 + local125 - local60 - 1]; } if (local290 >= 0) { Static103.anIntArray254[local290 + local125] = local117 / (local60 * 2 + 1); @@ -116,7 +112,7 @@ public final class Static267 { local117 -= Static103.anIntArray254[local89 + local290 - (local60 + 1) * 128]; } if (local125 >= 0) { - Static216.anIntArray188[local290 + local89] = local117 / (local60 * 2 + 1); + Static145.anIntArray188[local290 + local89] = local117 / (local60 * 2 + 1); } } } diff --git a/client/src/main/java/rt4/Static269.java b/client/src/main/java/rt4/Static269.java index 1c7c586..988437e 100644 --- a/client/src/main/java/rt4/Static269.java +++ b/client/src/main/java/rt4/Static269.java @@ -6,213 +6,6 @@ import org.openrs2.deob.annotation.Pc; public final class Static269 { - @OriginalMember(owner = "client!wa", name = "pb", descriptor = "Lclient!na;") - public static final JagString aClass100_556 = JagString.parse("
"); - - @OriginalMember(owner = "client!wa", name = "a", descriptor = "([Lclient!mj;ZIIIII[B)V") - public static void method2203(@OriginalArg(0) CollisionMap[] arg0, @OriginalArg(1) boolean arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5, @OriginalArg(7) byte[] arg6) { - @Pc(14) int local14; - @Pc(21) int local21; - if (!arg1) { - for (@Pc(9) int local9 = 0; local9 < 4; local9++) { - for (local14 = 0; local14 < 64; local14++) { - for (local21 = 0; local21 < 64; local21++) { - if (arg4 + local14 > 0 && local14 + arg4 < 103 && arg3 + local21 > 0 && local21 + arg3 < 103) { - arg0[local9].flags[local14 + arg4][arg3 + local21] &= 0xFEFFFFFF; - } - } - } - } - } - @Pc(95) Buffer local95 = new Buffer(arg6); - @Pc(99) byte local99; - if (arg1) { - local99 = 1; - } else { - local99 = 4; - } - @Pc(117) int local117; - for (local14 = 0; local14 < local99; local14++) { - for (local21 = 0; local21 < 64; local21++) { - for (local117 = 0; local117 < 64; local117++) { - SceneGraph.readTile(arg2, arg5, arg1, local95, local117 + arg3, arg4 + local21, 0, local14); - } - } - } - @Pc(146) boolean local146 = false; - @Pc(243) int local243; - @Pc(188) int local188; - @Pc(190) int local190; - @Pc(194) int local194; - while (local95.offset < local95.data.length) { - local21 = local95.g1(); - if (local21 != 129) { - local95.offset--; - break; - } - for (local117 = 0; local117 < 4; local117++) { - @Pc(168) byte local168 = local95.g1b(); - if (local168 == 0) { - local243 = arg4; - if (arg4 < 0) { - local243 = 0; - } else if (arg4 >= 104) { - local243 = 104; - } - local190 = arg3; - if (arg3 < 0) { - local190 = 0; - } else if (arg3 >= 104) { - local190 = 104; - } - local188 = arg4 + 64; - local194 = arg3 + 64; - if (local194 < 0) { - local194 = 0; - } else if (local194 >= 104) { - local194 = 104; - } - if (local188 < 0) { - local188 = 0; - } else if (local188 >= 104) { - local188 = 104; - } - while (local243 < local188) { - while (local190 < local194) { - SceneGraph.aByteArrayArrayArray13[local117][local243][local190] = 0; - local190++; - } - local243++; - } - } else if (local168 == 1) { - for (local243 = 0; local243 < 64; local243 += 4) { - for (local188 = 0; local188 < 64; local188 += 4) { - @Pc(305) byte local305 = local95.g1b(); - for (local194 = local243 + arg4; local194 < arg4 + local243 + 4; local194++) { - for (@Pc(320) int local320 = arg3 + local188; local320 < arg3 + local188 + 4; local320++) { - if (local194 >= 0 && local194 < 104 && local320 >= 0 && local320 < 104) { - SceneGraph.aByteArrayArrayArray13[local117][local194][local320] = local305; - } - } - } - } - } - } else if (local168 == 2 && local117 > 0) { - local188 = arg4 + 64; - local190 = arg3; - local194 = arg3 + 64; - if (local188 < 0) { - local188 = 0; - } else if (local188 >= 104) { - local188 = 104; - } - if (arg3 < 0) { - local190 = 0; - } else if (arg3 >= 104) { - local190 = 104; - } - if (local194 < 0) { - local194 = 0; - } else if (local194 >= 104) { - local194 = 104; - } - local243 = arg4; - if (arg4 < 0) { - local243 = 0; - } else if (arg4 >= 104) { - local243 = 104; - } - while (local188 > local243) { - while (local190 < local194) { - SceneGraph.aByteArrayArrayArray13[local117][local243][local190] = SceneGraph.aByteArrayArrayArray13[local117 - 1][local243][local190]; - local190++; - } - local243++; - } - } - } - local146 = true; - } - @Pc(515) int local515; - if (GlRenderer.enabled && !arg1) { - @Pc(490) Environment local490 = null; - label270: while (true) { - label263: do { - while (local95.offset < local95.data.length) { - local117 = local95.g1(); - if (local117 != 0) { - if (local117 != 1) { - throw new IllegalStateException(); - } - local515 = local95.g1(); - continue label263; - } - local490 = new Environment(local95); - } - if (local490 == null) { - local490 = new Environment(); - } - for (local117 = 0; local117 < 8; local117++) { - for (local515 = 0; local515 < 8; local515++) { - local243 = local117 + (arg4 >> 3); - local188 = (arg3 >> 3) + local515; - if (local243 >= 0 && local243 < 13 && local188 >= 0 && local188 < 13) { - Static103.aClass92ArrayArray1[local243][local188] = local490; - } - } - } - break label270; - } while (local515 <= 0); - for (local243 = 0; local243 < local515; local243++) { - @Pc(529) Light local529 = new Light(local95); - if (local529.anInt2243 == 31) { - @Pc(541) LightType local541 = LightTypeList.get(local95.g2()); - local529.method1762(local541.anInt2865, local541.anInt2873, local541.anInt2867, local541.anInt2872); - } - local529.anInt2245 += arg3 << 7; - local529.anInt2240 += arg4 << 7; - local194 = local529.anInt2245 >> 7; - local190 = local529.anInt2240 >> 7; - if (local190 >= 0 && local194 >= 0 && local190 < 104 && local194 < 104) { - local529.aBoolean125 = (SceneGraph.tileFlags[1][local190][local194] & 0x2) != 0; - local529.anInt2235 = SceneGraph.tileHeights[local529.anInt2241][local190][local194] - local529.anInt2235; - LightingManager.method2389(local529); - } - } - } - } - if (local146) { - return; - } - for (local21 = 0; local21 < 4; local21++) { - for (local117 = 0; local117 < 16; local117++) { - for (local515 = 0; local515 < 16; local515++) { - local243 = (arg4 >> 2) + local117; - local188 = local515 + (arg3 >> 2); - if (local243 >= 0 && local243 < 26 && local188 >= 0 && local188 < 26) { - SceneGraph.aByteArrayArrayArray13[local21][local243][local188] = 0; - } - } - } - } - } - - @OriginalMember(owner = "client!wa", name = "o", descriptor = "(I)V") - public static void method2218() { - @Pc(8) int local8 = Static236.method4047(); - if (local8 == 0) { - Static266.aByteArrayArrayArray15 = null; - Static232.method3993(0); - } else if (local8 == 1) { - Static38.method960((byte) 0); - Static232.method3993(512); - Static132.method2608(); - } else { - Static38.method960((byte) (Static253.anInt3325 - 4 & 0xFF)); - Static232.method3993(2); - } - } - @OriginalMember(owner = "client!wa", name = "a", descriptor = "(IIIII)V") public static void method2225(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3) { if (WorldMap.loadPercentage < 100) { @@ -245,10 +38,10 @@ public final class Static269 { return; } WorldMap.anInt1176 = (int) ((float) (arg2 * 2) / WorldMap.zoom); - Static109.anInt2882 = WorldMap.anInt435 - (int) ((float) arg3 / WorldMap.zoom); + Static1.anInt2882 = WorldMap.anInt435 - (int) ((float) arg3 / WorldMap.zoom); @Pc(211) int local211 = WorldMap.anInt435 - (int) ((float) arg3 / WorldMap.zoom); local50 = WorldMap.anInt919 - (int) ((float) arg2 / WorldMap.zoom); - Static109.anInt2884 = WorldMap.anInt919 - (int) ((float) arg2 / WorldMap.zoom); + Static1.anInt2884 = WorldMap.anInt919 - (int) ((float) arg2 / WorldMap.zoom); @Pc(236) int local236 = WorldMap.anInt919 + (int) ((float) arg2 / WorldMap.zoom); local61 = (int) ((float) arg3 / WorldMap.zoom) + WorldMap.anInt435; WorldMap.anInt2387 = (int) ((float) (arg3 * 2) / WorldMap.zoom); @@ -258,21 +51,21 @@ public final class Static269 { WorldMap.aClass3_Sub2_Sub1_Sub1_2 = new SoftwareSprite(arg3, arg2); } SoftwareRaster.setSize(WorldMap.aClass3_Sub2_Sub1_Sub1_2.pixels, arg3, arg2); - Static214.method4364(arg3, 0, local61, local50, 0, local236, arg2, local211); + WorldMap.method4364(arg3, 0, local61, local50, 0, local236, arg2, local211); method1195(arg3, 0, local61, local236, arg2, 0, local211, local50); Static38.method959(0, 0, local211, arg3, local236, local50, local61, arg2); GlRaster.method1178(WorldMap.aClass3_Sub2_Sub1_Sub1_2.pixels, arg0, arg1, arg3, arg2); SoftwareRaster.pixels = null; } else { - Static214.method4364(arg3 + arg0, arg1, local61, local50, arg0, local236, arg1 + arg2, local211); + WorldMap.method4364(arg3 + arg0, arg1, local61, local50, arg0, local236, arg1 + arg2, local211); method1195(arg0 + arg3, arg0, local61, local236, arg2 + arg1, arg1, local211, local50); Static38.method959(arg0, arg1, local211, arg0 + arg3, local236, local50, local61, arg2 + arg1); } - if (Static201.anInt1864 > 0) { - Static91.anInt2428--; - if (Static91.anInt2428 == 0) { - Static91.anInt2428 = 20; - Static201.anInt1864--; + if (WorldMap.anInt1864 > 0) { + Static1.anInt2428--; + if (Static1.anInt2428 == 0) { + Static1.anInt2428 = 20; + WorldMap.anInt1864--; } } diff --git a/client/src/main/java/rt4/Static270.java b/client/src/main/java/rt4/Static270.java deleted file mode 100644 index fbae261..0000000 --- a/client/src/main/java/rt4/Static270.java +++ /dev/null @@ -1,62 +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 Static270 { - - @OriginalMember(owner = "client!ii", name = "e", descriptor = "Lclient!na;") - public static final JagString aClass100_570 = JagString.parse(")2"); - @OriginalMember(owner = "client!wb", name = "b", descriptor = "[I") - public static int[] anIntArray562; - - @OriginalMember(owner = "client!wb", name = "a", descriptor = "Lclient!na;") - public static final JagString aClass100_1089 = JagString.parse(")2"); - - @OriginalMember(owner = "client!wb", name = "c", descriptor = "I") - public static int anInt5794 = -1; - - @OriginalMember(owner = "client!wb", name = "a", descriptor = "(Lclient!ba;IILclient!ba;Z)I") - public static int method4595(@OriginalArg(0) World arg0, @OriginalArg(1) int arg1, @OriginalArg(3) World arg2, @OriginalArg(4) boolean arg3) { - if (arg1 == 1) { - @Pc(11) int local11 = arg0.players; - @Pc(14) int local14 = arg2.players; - if (!arg3) { - if (local14 == -1) { - local14 = 2001; - } - if (local11 == -1) { - local11 = 2001; - } - } - return local11 - local14; - } else if (arg1 == 2) { - return arg0.getWorldInfo().name.compare(arg2.getWorldInfo().name); - } else if (arg1 == 3) { - if (arg0.activity.strEquals(aClass100_570)) { - if (arg2.activity.strEquals(aClass100_570)) { - return 0; - } else if (arg3) { - return -1; - } else { - return 1; - } - } else if (arg2.activity.strEquals(aClass100_570)) { - return arg3 ? 1 : -1; - } else { - return arg0.activity.compare(arg2.activity); - } - } else if (arg1 == 4) { - return arg0.isLootShare() ? (arg2.isLootShare() ? 0 : 1) : arg2.isLootShare() ? -1 : 0; - } else if (arg1 == 5) { - return arg0.isQuickChat() ? (arg2.isQuickChat() ? 0 : 1) : (arg2.isQuickChat() ? -1 : 0); - } else if (arg1 == 6) { - return arg0.isPvp() ? (arg2.isPvp() ? 0 : 1) : (arg2.isPvp() ? -1 : 0); - } else if (arg1 == 7) { - return arg0.isMembers() ? (arg2.isMembers() ? 0 : 1) : (arg2.isMembers() ? -1 : 0); - } else { - return arg0.id - arg2.id; - } - } -} diff --git a/client/src/main/java/rt4/Static280.java b/client/src/main/java/rt4/Static280.java deleted file mode 100644 index c34cd7d..0000000 --- a/client/src/main/java/rt4/Static280.java +++ /dev/null @@ -1,13 +0,0 @@ -package rt4; - -import org.openrs2.deob.annotation.OriginalMember; - -public final class Static280 { - - @OriginalMember(owner = "client!wl", name = "h", descriptor = "Lclient!be;") - public static Component aClass13_26 = null; - - @OriginalMember(owner = "client!wl", name = "u", descriptor = "I") - public static int anInt5895 = 0; - -} diff --git a/client/src/main/java/rt4/Static31.java b/client/src/main/java/rt4/Static31.java deleted file mode 100644 index 2d5687f..0000000 --- a/client/src/main/java/rt4/Static31.java +++ /dev/null @@ -1,26 +0,0 @@ -package rt4; - -import org.openrs2.deob.annotation.OriginalMember; - -public final class Static31 { - - @OriginalMember(owner = "client!ch", name = "w", descriptor = "I") - public static int anInt987; - - @OriginalMember(owner = "client!ch", name = "z", descriptor = "[I") - public static final int[] anIntArray76 = new int[5]; - - @OriginalMember(owner = "client!ch", name = "C", descriptor = "[[I") - public static final int[][] anIntArrayArray6 = new int[104][104]; - - @OriginalMember(owner = "client!ch", name = "c", descriptor = "(I)V") - public static void method846() { - if (!SceneGraph.allLevelsAreVisible() && LoginManager.centralPlane != Player.level) { - LoginManager.method2463(Player.level, LoginManager.centralZoneZ, LoginManager.centralZoneX, PlayerList.self.movementQueueZ[0], false, PlayerList.self.movementQueueX[0]); - } else if (Player.level != Static107.anInt2875 && MiniMap.renderMap(Player.level)) { - Static107.anInt2875 = Player.level; - Static269.method2218(); - } - } - -} diff --git a/client/src/main/java/rt4/Static33.java b/client/src/main/java/rt4/Static33.java index 72160f1..4ebcd24 100644 --- a/client/src/main/java/rt4/Static33.java +++ b/client/src/main/java/rt4/Static33.java @@ -1,19 +1,11 @@ package rt4; -import java.util.Calendar; -import java.util.Date; import org.openrs2.deob.annotation.OriginalArg; import org.openrs2.deob.annotation.OriginalMember; import org.openrs2.deob.annotation.Pc; public final class Static33 { - @OriginalMember(owner = "client!dm", name = "j", descriptor = "Lclient!na;") - public static final JagString aClass100_351 = JagString.parse(" "); - @OriginalMember(owner = "client!fn", name = "Z", descriptor = "Lclient!na;") - public static final JagString aClass100_461 = JagString.parse(")1 "); - @OriginalMember(owner = "client!ee", name = "a", descriptor = "Lclient!na;") - public static final JagString aClass100_376 = JagString.parse(" GMT"); @OriginalMember(owner = "client!cj", name = "n", descriptor = "Lsignlink!im;") public static PrivilegedRequest openUrlRequest; @@ -53,19 +45,6 @@ public final class Static33 { return true; } - @OriginalMember(owner = "client!cj", name = "a", descriptor = "(JB)Lclient!na;") - public static JagString method873(@OriginalArg(0) long arg0) { - Static35.aCalendar1.setTime(new Date(arg0)); - @Pc(13) int local13 = Static35.aCalendar1.get(Calendar.DAY_OF_WEEK); - @Pc(17) int local17 = Static35.aCalendar1.get(Calendar.DATE); - @Pc(21) int local21 = Static35.aCalendar1.get(Calendar.MONTH); - @Pc(32) int local32 = Static35.aCalendar1.get(Calendar.YEAR); - @Pc(36) int local36 = Static35.aCalendar1.get(Calendar.HOUR_OF_DAY); - @Pc(40) int local40 = Static35.aCalendar1.get(Calendar.MINUTE); - @Pc(44) int local44 = Static35.aCalendar1.get(Calendar.SECOND); - return JagString.concatenate(new JagString[] { Static219.aClass100Array149[local13 - 1], aClass100_461, JagString.parseInt(local17 / 10), JagString.parseInt(local17 % 10), Static270.aClass100_1089, Static138.aClass100Array102[local21], Static270.aClass100_1089, JagString.parseInt(local32), aClass100_351, JagString.parseInt(local36 / 10), JagString.parseInt(local36 % 10), Static264.COLON, JagString.parseInt(local40 / 10), JagString.parseInt(local40 % 10), Static264.COLON, JagString.parseInt(local44 / 10), JagString.parseInt(local44 % 10), aClass100_376 }); - } - @OriginalMember(owner = "client!cj", name = "a", descriptor = "(ZIIIIIIFB)[[I") public static int[][] method874(@OriginalArg(7) float arg0) { @Pc(15) int[][] local15 = new int[256][64]; diff --git a/client/src/main/java/rt4/Static34.java b/client/src/main/java/rt4/Static34.java index 489cef9..62eedf4 100644 --- a/client/src/main/java/rt4/Static34.java +++ b/client/src/main/java/rt4/Static34.java @@ -7,9 +7,6 @@ public final class Static34 { @OriginalMember(owner = "client!ck", name = "X", descriptor = "I") public static int anInt1060; - @OriginalMember(owner = "client!ck", name = "b", descriptor = "Lclient!na;") - private static final JagString aClass100_195 = JagString.parse("Discard"); - @OriginalMember(owner = "client!ck", name = "d", descriptor = "[I") public static final int[] anIntArray80 = new int[] { 1, 0, -1, 0 }; diff --git a/client/src/main/java/rt4/Static35.java b/client/src/main/java/rt4/Static35.java deleted file mode 100644 index 4ec8099..0000000 --- a/client/src/main/java/rt4/Static35.java +++ /dev/null @@ -1,19 +0,0 @@ -package rt4; - -import java.util.Calendar; -import java.util.TimeZone; - -import org.openrs2.deob.annotation.OriginalMember; - -public final class Static35 { - - @OriginalMember(owner = "client!cl", name = "K", descriptor = "Ljava/util/Calendar;") - public static final Calendar aCalendar1 = Calendar.getInstance(TimeZone.getTimeZone("GMT")); - - @OriginalMember(owner = "client!cl", name = "Y", descriptor = "I") - public static int anInt1092 = -1; - - @OriginalMember(owner = "client!cl", name = "ab", descriptor = "[I") - public static final int[] anIntArray83 = new int[256]; - -} diff --git a/client/src/main/java/rt4/Static36.java b/client/src/main/java/rt4/Static36.java index 030223c..ff6d6ef 100644 --- a/client/src/main/java/rt4/Static36.java +++ b/client/src/main/java/rt4/Static36.java @@ -14,8 +14,14 @@ public final class Static36 { public static int anInt3337 = 0; @OriginalMember(owner = "client!jk", name = "p", descriptor = "I") public static int anInt3075 = -1; + @OriginalMember(owner = "client!df", name = "n", descriptor = "I") + public static int anInt1396 = 0; + @OriginalMember(owner = "client!di", name = "H", descriptor = "Z") + public static boolean aBoolean84 = false; + @OriginalMember(owner = "client!pm", name = "hb", descriptor = "I") + public static int anInt4620; - @OriginalMember(owner = "client!client", name = "a", descriptor = "(Lclient!be;)Lclient!be;") + @OriginalMember(owner = "client!client", name = "a", descriptor = "(Lclient!be;)Lclient!be;") public static Component method938(@OriginalArg(0) Component arg0) { @Pc(4) int local4 = InterfaceList.getServerActiveProperties(arg0).method505(); if (local4 == 0) { @@ -30,458 +36,6 @@ public final class Static36 { return arg0; } - @OriginalMember(owner = "client!client", name = "a", descriptor = "([Lclient!be;IIIIIII)V") - public static void method946(@OriginalArg(0) Component[] arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7) { - for (@Pc(1) int local1 = 0; local1 < arg0.length; local1++) { - @Pc(9) Component component = arg0[local1]; - if (component != null && component.layer == arg1 && (!component.if3 || component.type == 0 || component.aBoolean25 || InterfaceList.getServerActiveProperties(component).events != 0 || component == Static40.aClass13_1 || component.clientCode == 1338) && (!component.if3 || !method947(component))) { - @Pc(50) int local50 = component.x + arg6; - @Pc(55) int local55 = component.y + arg7; - @Pc(61) int local61; - @Pc(63) int local63; - @Pc(65) int local65; - @Pc(67) int local67; - if (component.type == 2) { - local61 = arg2; - local63 = arg3; - local65 = arg4; - local67 = arg5; - } else { - @Pc(73) int local73 = local50 + component.width; - @Pc(78) int local78 = local55 + component.height; - if (component.type == 9) { - local73++; - local78++; - } - local61 = local50 > arg2 ? local50 : arg2; - local63 = local55 > arg3 ? local55 : arg3; - local65 = local73 < arg4 ? local73 : arg4; - local67 = local78 < arg5 ? local78 : arg5; - } - if (component == Static40.aClass13_14) { - Static44.aBoolean83 = true; - anInt3075 = local50; - anInt660 = local55; - } - if (!component.if3 || local61 < local65 && local63 < local67) { - if (component.type == 0) { - if (!component.if3 && method947(component) && Static180.aClass13_22 != component) { - continue; - } - if (component.noClickThrough && Mouse.lastMouseX >= local61 && Mouse.lastMouseY >= local63 && Mouse.lastMouseX < local65 && Mouse.lastMouseY < local67) { - for (@Pc(164) HookRequest local164 = (HookRequest) InterfaceList.lowPriorityRequests.head(); local164 != null; local164 = (HookRequest) InterfaceList.lowPriorityRequests.next()) { - if (local164.aBoolean158) { - local164.unlink(); - local164.source.aBoolean19 = false; - } - } - if (Static40.anInt4851 == 0) { - Static40.aClass13_14 = null; - Static40.aClass13_1 = null; - } - anInt3337 = 0; - } - } - if (component.if3) { - @Pc(207) boolean local207; - if (Mouse.lastMouseX >= local61 && Mouse.lastMouseY >= local63 && Mouse.lastMouseX < local65 && Mouse.lastMouseY < local67) { - local207 = true; - } else { - local207 = false; - } - @Pc(212) boolean local212 = false; - if (Mouse.pressedButton == 1 && local207) { - local212 = true; - } - @Pc(221) boolean local221 = false; - if (Mouse.clickButton == 1 && Mouse.clickX >= local61 && Mouse.clickY >= local63 && Mouse.clickX < local65 && Mouse.clickY < local67) { - local221 = true; - } - @Pc(243) int i; - @Pc(322) int k; - if (component.aByteArray8 != null) { - for (i = 0; i < component.aByteArray8.length; i++) { - if (Keyboard.pressedKeys[component.aByteArray8[i]]) { - if (component.anIntArray49 == null || client.loop >= component.anIntArray49[i]) { - @Pc(279) byte local279 = component.aByteArray7[i]; - if (local279 == 0 || ((local279 & 0x2) == 0 || Keyboard.pressedKeys[Keyboard.KEY_ALT]) && ((local279 & 0x1) == 0 || Keyboard.pressedKeys[Keyboard.KEY_CTRL]) && ((local279 & 0x4) == 0 || Keyboard.pressedKeys[Keyboard.KEY_SHIFT])) { - ClientProt.method4512(JagString.EMPTY, -1, i + 1, component.id); - k = component.anIntArray46[i]; - if (component.anIntArray49 == null) { - component.anIntArray49 = new int[component.aByteArray8.length]; - } - if (k == 0) { - component.anIntArray49[i] = Integer.MAX_VALUE; - } else { - component.anIntArray49[i] = client.loop + k; - } - } - } - } else if (component.anIntArray49 != null) { - component.anIntArray49[i] = 0; - } - } - } - if (local221) { - Static40.method1015(Mouse.clickY - local55, Mouse.clickX - local50, component); - } - if (Static40.aClass13_14 != null && Static40.aClass13_14 != component && local207 && InterfaceList.getServerActiveProperties(component).method509()) { - Static56.aClass13_12 = component; - } - if (component == Static40.aClass13_1) { - Static146.aBoolean174 = true; - Static81.anInt2225 = local50; - Static228.anInt5103 = local55; - } - if (component.aBoolean25 || component.clientCode != 0) { - @Pc(399) HookRequest request; - if (local207 && MouseWheel.wheelRotation != 0 && component.onScroll != null) { - request = new HookRequest(); - request.aBoolean158 = true; - request.source = component; - request.mouseY = MouseWheel.wheelRotation; - request.arguments = component.onScroll; - InterfaceList.lowPriorityRequests.addTail(request); - } - if (Static40.aClass13_14 != null || Static118.clickedInventoryComponent != null || Static40.aBoolean108 || component.clientCode != 1400 && anInt3337 > 0) { - local221 = false; - local212 = false; - local207 = false; - } - @Pc(508) int skill; - if (component.clientCode != 0) { - if (component.clientCode == 1337) { - Static280.aClass13_26 = component; - InterfaceList.redraw(component); - continue; - } - if (component.clientCode == 1338) { - if (local221) { - Static1.anInt5 = Mouse.clickX - local50; - MiniMenu.anInt2878 = Mouse.clickY - local55; - } - continue; - } - if (component.clientCode == 1400) { - WorldMap.component = component; - if (local221) { - if (Keyboard.pressedKeys[Keyboard.KEY_CTRL] && LoginManager.staffModLevel > 0) { - i = (int) ((double) (Mouse.clickX - local50 - component.width / 2) * 2.0D / (double) WorldMap.zoom); - skill = (int) ((double) (Mouse.clickY - local55 - component.height / 2) * 2.0D / (double) WorldMap.zoom); - k = WorldMap.anInt435 + i; - @Pc(516) int local516 = WorldMap.anInt919 + skill; - @Pc(520) int local520 = k + WorldMap.originX; - @Pc(528) int local528 = WorldMap.length + WorldMap.originZ - local516 - 1; - Cheat.teleport(local520, local528, 0); - ClientProt.closeWidget(); - continue; - } - anInt3337 = 1; - Static40.anInt5388 = Mouse.lastMouseX; - Static40.anInt4035 = Mouse.lastMouseY; - continue; - } - if (local212 && anInt3337 > 0) { - if (anInt3337 == 1 && (Static40.anInt5388 != Mouse.lastMouseX || Static40.anInt4035 != Mouse.lastMouseY)) { - Static197.anInt4620 = WorldMap.anInt435; - anInt1885 = WorldMap.anInt919; - anInt3337 = 2; - } - if (anInt3337 == 2) { - WorldMap.method1964(Static197.anInt4620 + (int) ((double) (Static40.anInt5388 - Mouse.lastMouseX) * 2.0D / (double) WorldMap.targetZoom)); - WorldMap.method4641(anInt1885 + (int) ((double) (Static40.anInt4035 - Mouse.lastMouseY) * 2.0D / (double) WorldMap.targetZoom)); - } - continue; - } - anInt3337 = 0; - continue; - } - if (component.clientCode == 1401) { - if (local212) { - WorldMap.method2387(component.width, Mouse.lastMouseY - local55, Mouse.lastMouseX - local50, component.height); - } - continue; - } - if (component.clientCode == 1402) { - if (!GlRenderer.enabled) { - InterfaceList.redraw(component); - } - continue; - } - } - if (!component.aBoolean24 && local221) { - component.aBoolean24 = true; - if (component.onClickRepeat != null) { - request = new HookRequest(); - request.aBoolean158 = true; - request.source = component; - request.mouseX = Mouse.clickX - local50; - request.mouseY = Mouse.clickY - local55; - request.arguments = component.onClickRepeat; - InterfaceList.lowPriorityRequests.addTail(request); - } - } - if (component.aBoolean24 && local212 && component.onDrag != null) { - request = new HookRequest(); - request.aBoolean158 = true; - request.source = component; - request.mouseX = Mouse.lastMouseX - local50; - request.mouseY = Mouse.lastMouseY - local55; - request.arguments = component.onDrag; - InterfaceList.lowPriorityRequests.addTail(request); - } - if (component.aBoolean24 && !local212) { - component.aBoolean24 = false; - if (component.onRelease != null) { - request = new HookRequest(); - request.aBoolean158 = true; - request.source = component; - request.mouseX = Mouse.lastMouseX - local50; - request.mouseY = Mouse.lastMouseY - local55; - request.arguments = component.onRelease; - Static115.mediumPriorityRequests.addTail(request); - } - } - if (local212 && component.onHold != null) { - request = new HookRequest(); - request.aBoolean158 = true; - request.source = component; - request.mouseX = Mouse.lastMouseX - local50; - request.mouseY = Mouse.lastMouseY - local55; - request.arguments = component.onHold; - InterfaceList.lowPriorityRequests.addTail(request); - } - if (!component.aBoolean19 && local207) { - component.aBoolean19 = true; - if (component.onMouseOver != null) { - request = new HookRequest(); - request.aBoolean158 = true; - request.source = component; - request.mouseX = Mouse.lastMouseX - local50; - request.mouseY = Mouse.lastMouseY - local55; - request.arguments = component.onMouseOver; - InterfaceList.lowPriorityRequests.addTail(request); - } - } - if (component.aBoolean19 && local207 && component.onMouseRepeat != null) { - request = new HookRequest(); - request.aBoolean158 = true; - request.source = component; - request.mouseX = Mouse.lastMouseX - local50; - request.mouseY = Mouse.lastMouseY - local55; - request.arguments = component.onMouseRepeat; - InterfaceList.lowPriorityRequests.addTail(request); - } - if (component.aBoolean19 && !local207) { - component.aBoolean19 = false; - if (component.onMouseLeave != null) { - request = new HookRequest(); - request.aBoolean158 = true; - request.source = component; - request.mouseX = Mouse.lastMouseX - local50; - request.mouseY = Mouse.lastMouseY - local55; - request.arguments = component.onMouseLeave; - Static115.mediumPriorityRequests.addTail(request); - } - } - if (component.onTimer != null) { - request = new HookRequest(); - request.source = component; - request.arguments = component.onTimer; - Static4.highPriorityRequests.addTail(request); - } - @Pc(966) HookRequest request2; - if (component.onVarcTransmit != null && VarcDomain.updatedVarcsWriterIndex > component.updatedVarcsReaderIndex) { - if (component.varcTriggers == null || VarcDomain.updatedVarcsWriterIndex - component.updatedVarcsReaderIndex > 32) { - request = new HookRequest(); - request.source = component; - request.arguments = component.onVarcTransmit; - InterfaceList.lowPriorityRequests.addTail(request); - } else { - label563: for (i = component.updatedVarcsReaderIndex; i < VarcDomain.updatedVarcsWriterIndex; i++) { - skill = VarcDomain.updatedVarcs[i & 0x1F]; - for (k = 0; k < component.varcTriggers.length; k++) { - if (component.varcTriggers[k] == skill) { - request2 = new HookRequest(); - request2.source = component; - request2.arguments = component.onVarcTransmit; - InterfaceList.lowPriorityRequests.addTail(request2); - break label563; - } - } - } - } - component.updatedVarcsReaderIndex = VarcDomain.updatedVarcsWriterIndex; - } - if (component.onVarcstrTransmit != null && VarcDomain.updatedVarcstrsWriterIndex > component.updatedVarcstrsReaderIndex) { - if (component.varcstrTriggers == null || VarcDomain.updatedVarcstrsWriterIndex - component.updatedVarcstrsReaderIndex > 32) { - request = new HookRequest(); - request.source = component; - request.arguments = component.onVarcstrTransmit; - InterfaceList.lowPriorityRequests.addTail(request); - } else { - label539: for (i = component.updatedVarcstrsReaderIndex; i < VarcDomain.updatedVarcstrsWriterIndex; i++) { - skill = VarcDomain.updatedVarcstrs[i & 0x1F]; - for (k = 0; k < component.varcstrTriggers.length; k++) { - if (component.varcstrTriggers[k] == skill) { - request2 = new HookRequest(); - request2.source = component; - request2.arguments = component.onVarcstrTransmit; - InterfaceList.lowPriorityRequests.addTail(request2); - break label539; - } - } - } - } - component.updatedVarcstrsReaderIndex = VarcDomain.updatedVarcstrsWriterIndex; - } - if (component.onVarpTransmit != null && VarpDomain.updatedVarpsWriterIndex > component.updatedVarpsReaderIndex) { - if (component.varpTriggers == null || VarpDomain.updatedVarpsWriterIndex - component.updatedVarpsReaderIndex > 32) { - request = new HookRequest(); - request.source = component; - request.arguments = component.onVarpTransmit; - InterfaceList.lowPriorityRequests.addTail(request); - } else { - label515: for (i = component.updatedVarpsReaderIndex; i < VarpDomain.updatedVarpsWriterIndex; i++) { - skill = VarpDomain.updatedVarps[i & 0x1F]; - for (k = 0; k < component.varpTriggers.length; k++) { - if (component.varpTriggers[k] == skill) { - request2 = new HookRequest(); - request2.source = component; - request2.arguments = component.onVarpTransmit; - InterfaceList.lowPriorityRequests.addTail(request2); - break label515; - } - } - } - } - component.updatedVarpsReaderIndex = VarpDomain.updatedVarpsWriterIndex; - } - if (component.onInvTransmit != null && Inv.updatedInventoriesWriterIndex > component.updatedInventoriesReaderIndex) { - if (component.inventoryTriggers == null || Inv.updatedInventoriesWriterIndex - component.updatedInventoriesReaderIndex > 32) { - request = new HookRequest(); - request.source = component; - request.arguments = component.onInvTransmit; - InterfaceList.lowPriorityRequests.addTail(request); - } else { - outer: - for (i = component.updatedInventoriesReaderIndex; i < Inv.updatedInventoriesWriterIndex; i++) { - skill = Inv.updatedInventories[i & 0x1F]; - for (k = 0; k < component.inventoryTriggers.length; k++) { - if (component.inventoryTriggers[k] == skill) { - request2 = new HookRequest(); - request2.source = component; - request2.arguments = component.onInvTransmit; - InterfaceList.lowPriorityRequests.addTail(request2); - break outer; - } - } - } - } - component.updatedInventoriesReaderIndex = Inv.updatedInventoriesWriterIndex; - } - if (component.onStatTransmit != null && PlayerSkillXpTable.updatedStatsWriterIndex > component.updatedStatsReaderIndex) { - if (component.statTriggers == null || PlayerSkillXpTable.updatedStatsWriterIndex - component.updatedStatsReaderIndex > 32) { - request = new HookRequest(); - request.source = component; - request.arguments = component.onStatTransmit; - InterfaceList.lowPriorityRequests.addTail(request); - } else { - outer: - for (i = component.updatedStatsReaderIndex; i < PlayerSkillXpTable.updatedStatsWriterIndex; i++) { - skill = PlayerSkillXpTable.updatedStats[i & 0x1F]; - for (k = 0; k < component.statTriggers.length; k++) { - if (component.statTriggers[k] == skill) { - request2 = new HookRequest(); - request2.source = component; - request2.arguments = component.onStatTransmit; - InterfaceList.lowPriorityRequests.addTail(request2); - break outer; - } - } - } - } - component.updatedStatsReaderIndex = PlayerSkillXpTable.updatedStatsWriterIndex; - } - if (Chat.transmitAt > component.lastTransmitTimer && component.onMsg != null) { - request = new HookRequest(); - request.source = component; - request.arguments = component.onMsg; - InterfaceList.lowPriorityRequests.addTail(request); - } - if (FriendsList.transmitAt > component.lastTransmitTimer && component.onFriendTransmit != null) { - request = new HookRequest(); - request.source = component; - request.arguments = component.onFriendTransmit; - InterfaceList.lowPriorityRequests.addTail(request); - } - if (ClanChat.transmitAt > component.lastTransmitTimer && component.onClanTransmit != null) { - request = new HookRequest(); - request.source = component; - request.arguments = component.onClanTransmit; - InterfaceList.lowPriorityRequests.addTail(request); - } - if (StockMarketManager.transmitAt > component.lastTransmitTimer && component.onStockTransmit != null) { - request = new HookRequest(); - request.source = component; - request.arguments = component.onStockTransmit; - InterfaceList.lowPriorityRequests.addTail(request); - } - if (InterfaceList.miscTransmitAt > component.lastTransmitTimer && component.onMiscTransmit != null) { - request = new HookRequest(); - request.source = component; - request.arguments = component.onMiscTransmit; - InterfaceList.lowPriorityRequests.addTail(request); - } - component.lastTransmitTimer = InterfaceList.transmitTimer; - if (component.onKey != null) { - for (i = 0; i < InterfaceList.keyQueueSize; i++) { - @Pc(1430) HookRequest local1430 = new HookRequest(); - local1430.source = component; - local1430.keyCode = InterfaceList.keyCodes[i]; - local1430.keyChar = InterfaceList.keyChars[i]; - local1430.arguments = component.onKey; - InterfaceList.lowPriorityRequests.addTail(local1430); - } - } - if (Camera.aBoolean16 && component.onMinimapUnlock != null) { - request = new HookRequest(); - request.source = component; - request.arguments = component.onMinimapUnlock; - InterfaceList.lowPriorityRequests.addTail(request); - } - } - } - if (!component.if3 && Static40.aClass13_14 == null && Static118.clickedInventoryComponent == null && !Static40.aBoolean108) { - if ((component.anInt470 >= 0 || component.anInt480 != 0) && Mouse.lastMouseX >= local61 && Mouse.lastMouseY >= local63 && Mouse.lastMouseX < local65 && Mouse.lastMouseY < local67) { - if (component.anInt470 >= 0) { - Static180.aClass13_22 = arg0[component.anInt470]; - } else { - Static180.aClass13_22 = component; - } - } - if (component.type == 8 && Mouse.lastMouseX >= local61 && Mouse.lastMouseY >= local63 && Mouse.lastMouseX < local65 && Mouse.lastMouseY < local67) { - Static43.aClass13_11 = component; - } - if (component.scrollMaxV > component.height) { - Static236.method4049(Mouse.lastMouseY, component.height, component, Mouse.lastMouseX, local50 + component.width, local55, component.scrollMaxV); - } - } - if (component.type == 0) { - method946(arg0, component.id, local61, local63, local65, local67, local50 - component.scrollX, local55 - component.scrollY); - if (component.createdComponents != null) { - method946(component.createdComponents, component.id, local61, local63, local65, local67, local50 - component.scrollX, local55 - component.scrollY); - } - @Pc(1595) ComponentPointer local1595 = (ComponentPointer) InterfaceList.openInterfaces.get((long) component.id); - if (local1595 != null) { - Static57.method1320(local50, local63, local55, local65, local1595.anInt5878, local61, local67); - } - } - } - } - } - } - @OriginalMember(owner = "client!client", name = "c", descriptor = "(Lclient!be;)Z") public static boolean method947(@OriginalArg(0) Component arg0) { if (Static121.qaOpTest) { @@ -494,4 +48,42 @@ public final class Static36 { } return arg0.hidden; } + + @OriginalMember(owner = "client!tc", name = "a", descriptor = "(IILclient!be;BIIII)V") + public static void method4049(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) Component arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5, @OriginalArg(7) int arg6) { + if (aBoolean84) { + anInt1396 = 32; + } else { + anInt1396 = 0; + } + aBoolean84 = false; + @Pc(139) int local139; + if (Mouse.pressedButton != 0) { + if (arg4 <= arg3 && arg4 + 16 > arg3 && arg0 >= arg5 && arg5 + 16 > arg0) { + arg2.scrollY -= 4; + InterfaceList.redraw(arg2); + } else if (arg3 >= arg4 && arg3 < arg4 + 16 && arg0 >= arg1 + arg5 - 16 && arg1 + arg5 > arg0) { + arg2.scrollY += 4; + InterfaceList.redraw(arg2); + } else if (arg3 >= arg4 - anInt1396 && arg3 < arg4 + anInt1396 + 16 && arg0 >= arg5 + 16 && arg1 + arg5 - 16 > arg0) { + local139 = arg1 * (arg1 - 32) / arg6; + if (local139 < 8) { + local139 = 8; + } + @Pc(150) int local150 = arg1 - local139 - 32; + @Pc(162) int local162 = arg0 - local139 / 2 - arg5 - 16; + arg2.scrollY = (arg6 - arg1) * local162 / local150; + InterfaceList.redraw(arg2); + aBoolean84 = true; + } + } + if (MouseWheel.wheelRotation == 0) { + return; + } + local139 = arg2.width; + if (arg4 - local139 <= arg3 && arg5 <= arg0 && arg3 < arg4 + 16 && arg1 + arg5 >= arg0) { + arg2.scrollY += MouseWheel.wheelRotation * 45; + InterfaceList.redraw(arg2); + } + } } diff --git a/client/src/main/java/rt4/Static38.java b/client/src/main/java/rt4/Static38.java index 0c70b3b..6337afd 100644 --- a/client/src/main/java/rt4/Static38.java +++ b/client/src/main/java/rt4/Static38.java @@ -88,21 +88,7 @@ public final class Static38 { } } - @OriginalMember(owner = "client!cn", name = "a", descriptor = "(BB)V") - public static void method960(@OriginalArg(0) byte arg0) { - if (Static266.aByteArrayArrayArray15 == null) { - Static266.aByteArrayArrayArray15 = new byte[4][104][104]; - } - for (@Pc(20) int local20 = 0; local20 < 4; local20++) { - for (@Pc(25) int local25 = 0; local25 < 104; local25++) { - for (@Pc(32) int local32 = 0; local32 < 104; local32++) { - Static266.aByteArrayArrayArray15[local20][local25][local32] = arg0; - } - } - } - } - - @OriginalMember(owner = "client!cn", name = "a", descriptor = "(IIIIIIIIII)V") + @OriginalMember(owner = "client!cn", name = "a", descriptor = "(IIIIIIIIII)V") public static void method962(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5, @OriginalArg(7) int arg6, @OriginalArg(8) int arg7, @OriginalArg(9) int arg8) { if (arg8 == arg7 && arg2 == arg6 && arg4 == arg3 && arg0 == arg5) { Static241.method4547(arg1, arg5, arg6, arg4, arg8); diff --git a/client/src/main/java/rt4/Static39.java b/client/src/main/java/rt4/Static39.java deleted file mode 100644 index 0d48b2f..0000000 --- a/client/src/main/java/rt4/Static39.java +++ /dev/null @@ -1,23 +0,0 @@ -package rt4; - -import org.openrs2.deob.annotation.OriginalArg; -import org.openrs2.deob.annotation.OriginalMember; -import org.openrs2.deob.annotation.Pc; - -public final class Static39 { - - @OriginalMember(owner = "client!d", name = "ib", descriptor = "Lclient!qf;") - public static Sprite aClass3_Sub2_Sub1_1; - - @OriginalMember(owner = "client!d", name = "R", descriptor = "Lclient!be;") - public static Component aClass13_10 = null; - - @OriginalMember(owner = "client!d", name = "db", descriptor = "Z") - public static boolean aBoolean77 = false; - - @OriginalMember(owner = "client!d", name = "c", descriptor = "(III)I") - public static int method990(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) { - @Pc(11) int local11 = arg1 - 1 & arg0 >> 31; - return local11 + (arg0 + (arg0 >>> 31)) % arg1; - } -} diff --git a/client/src/main/java/rt4/Static4.java b/client/src/main/java/rt4/Static4.java index 82b2831..dcecd32 100644 --- a/client/src/main/java/rt4/Static4.java +++ b/client/src/main/java/rt4/Static4.java @@ -2,6 +2,7 @@ package rt4; import org.openrs2.deob.annotation.OriginalArg; import org.openrs2.deob.annotation.OriginalMember; +import org.openrs2.deob.annotation.Pc; public final class Static4 { @@ -22,7 +23,37 @@ public final class Static4 { @OriginalMember(owner = "client!ac", name = "a", descriptor = "([J[Ljava/lang/Object;I)V") public static void method23(@OriginalArg(0) long[] arg0, @OriginalArg(1) Object[] arg1) { - Static228.method3909(arg0.length - 1, arg0, 0, arg1); + method3909(arg0.length - 1, arg0, 0, arg1); } + @OriginalMember(owner = "client!sh", name = "a", descriptor = "(I[JII[Ljava/lang/Object;)V") + public static void method3909(@OriginalArg(0) int arg0, @OriginalArg(1) long[] arg1, @OriginalArg(3) int arg2, @OriginalArg(4) Object[] arg3) { + if (arg2 >= arg0) { + return; + } + @Pc(16) int local16 = arg2; + @Pc(23) int local23 = (arg2 + arg0) / 2; + @Pc(27) long local27 = arg1[local23]; + arg1[local23] = arg1[arg0]; + arg1[arg0] = local27; + @Pc(41) Object local41 = arg3[local23]; + arg3[local23] = arg3[arg0]; + arg3[arg0] = local41; + for (@Pc(53) int local53 = arg2; local53 < arg0; local53++) { + if (local27 + (long) (local53 & 0x1) > arg1[local53]) { + @Pc(72) long local72 = arg1[local53]; + arg1[local53] = arg1[local16]; + arg1[local16] = local72; + @Pc(86) Object local86 = arg3[local53]; + arg3[local53] = arg3[local16]; + arg3[local16++] = local86; + } + } + arg1[arg0] = arg1[local16]; + arg1[local16] = local27; + arg3[arg0] = arg3[local16]; + arg3[local16] = local41; + method3909(local16 - 1, arg1, arg2, arg3); + method3909(arg0, arg1, local16 + 1, arg3); + } } diff --git a/client/src/main/java/rt4/Static40.java b/client/src/main/java/rt4/Static40.java index 031c6c6..bc60a8b 100644 --- a/client/src/main/java/rt4/Static40.java +++ b/client/src/main/java/rt4/Static40.java @@ -85,9 +85,9 @@ public final class Static40 { @OriginalMember(owner = "client!j", name = "g", descriptor = "(I)V") public static void method4637() { Static165.aClass3_Sub2_Sub1_8 = null; - Static39.aClass3_Sub2_Sub1_1 = null; + Static112.aClass3_Sub2_Sub1_1 = null; Static112.aClass3_Sub2_Sub1_6 = null; - Static181.aClass3_Sub2_Sub1_9 = null; - Static204.aClass3_Sub2_Sub1_10 = null; + Static112.aClass3_Sub2_Sub1_9 = null; + Static112.aClass3_Sub2_Sub1_10 = null; } } diff --git a/client/src/main/java/rt4/Static43.java b/client/src/main/java/rt4/Static43.java deleted file mode 100644 index a93de82..0000000 --- a/client/src/main/java/rt4/Static43.java +++ /dev/null @@ -1,153 +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 Static43 { - - @OriginalMember(owner = "client!dg", name = "h", descriptor = "Lclient!be;") - public static Component aClass13_11; - - @OriginalMember(owner = "client!dg", name = "a", descriptor = "(IIIIILclient!th;IJZ)Z") - public static boolean method1141(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) Entity arg5, @OriginalArg(6) int arg6, @OriginalArg(7) long arg7, @OriginalArg(8) boolean arg8) { - if (arg5 == null) { - return true; - } - @Pc(7) int local7 = arg1 - arg4; - @Pc(11) int local11 = arg2 - arg4; - @Pc(15) int local15 = arg1 + arg4; - @Pc(19) int local19 = arg2 + arg4; - if (arg8) { - if (arg6 > 640 && arg6 < 1408) { - local19 += 128; - } - if (arg6 > 1152 && arg6 < 1920) { - local15 += 128; - } - if (arg6 > 1664 || arg6 < 384) { - local11 -= 128; - } - if (arg6 > 128 && arg6 < 896) { - local7 -= 128; - } - } - local7 /= 128; - local11 /= 128; - local15 /= 128; - local19 /= 128; - return Static105.method2256(arg0, local7, local11, local15 + 1 - local7, local19 - local11 + 1, arg1, arg2, arg3, arg5, arg6, true, arg7); - } - - @OriginalMember(owner = "client!dg", name = "a", descriptor = "(IIIIIILclient!mj;)V") - public static void method1144(@OriginalArg(1) int z, @OriginalArg(2) int x, @OriginalArg(3) int level, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) CollisionMap collision) { - @Pc(9) long key = 0L; - if (arg3 == 0) { - key = SceneGraph.getWallKey(level, x, z); - } else if (arg3 == 1) { - key = SceneGraph.getWallDecorKey(level, x, z); - } else if (arg3 == 2) { - key = SceneGraph.getSceneryKey(level, x, z); - } else if (arg3 == 3) { - key = SceneGraph.getGroundDecorKey(level, x, z); - } - @Pc(57) int shape = (int) key >> 14 & 0x1F; - @Pc(70) int id = (int) (key >>> 32) & Integer.MAX_VALUE; - @Pc(74) LocType type = LocTypeList.get(id); - if (type.hasAreaSound()) { - AreaSoundManager.remove(x, type, z, level); - } - @Pc(92) int angle = (int) key >> 20 & 0x3; - if (key == 0L) { - return; - } - @Pc(100) Entity local100 = null; - @Pc(102) Entity local102 = null; - if (arg3 == 0) { - @Pc(110) Wall wall = SceneGraph.removeWall(level, x, z); - if (wall != null) { - local100 = wall.primary; - local102 = wall.secondary; - } - if (type.anInt4435 != 0) { - collision.unflagWall(angle, type.aBoolean207, z, shape, x); - } - } else if (arg3 == 1) { - @Pc(233) WallDecor wallDecor = SceneGraph.removeWallDecor(level, x, z); - if (wallDecor != null) { - local100 = wallDecor.primary; - local102 = wallDecor.secondary; - } - } else if (arg3 == 2) { - @Pc(148) Scenery scenery = SceneGraph.removeScenery(level, x, z); - if (scenery != null) { - local100 = scenery.entity; - } - if (type.anInt4435 != 0 && type.width + x < 104 && type.width + z < 104 && x + type.length < 104 && z + type.length < 104) { - collision.unflagScenery(x, type.width, type.aBoolean207, angle, type.length, z); - } - } else if (arg3 == 3) { - @Pc(211) GroundDecor groundDecor = SceneGraph.removeGroundDecor(level, x, z); - if (groundDecor != null) { - local100 = groundDecor.entity; - } - if (type.anInt4435 == 1) { - collision.unflagGroundDecor(z, x); - } - } - if (!GlRenderer.enabled || !type.aBoolean212) { - return; - } - if (shape == 2) { - if (local100 instanceof Loc) { - ((Loc) local100).method1046(); - } else { - Loc.method181(type, 0, angle + 4, 0, shape, x, z, arg4); - } - if (local102 instanceof Loc) { - ((Loc) local102).method1046(); - } else { - Loc.method181(type, 0, angle + 1 & 0x3, 0, shape, x, z, arg4); - } - } else if (shape == 5) { - if (local100 instanceof Loc) { - ((Loc) local100).method1046(); - } else { - Loc.method181(type, Static238.anIntArray469[angle] * 8, angle, Static34.anIntArray80[angle] * 8, 4, x, z, arg4); - } - } else if (shape == 6) { - if (local100 instanceof Loc) { - ((Loc) local100).method1046(); - } else { - Loc.method181(type, Static64.anIntArray154[angle] * 8, angle + 4, Static114.anIntArray565[angle] * 8, 4, x, z, arg4); - } - } else if (shape == 7) { - if (local100 instanceof Loc) { - ((Loc) local100).method1046(); - } else { - Loc.method181(type, 0, (angle + 2 & 0x3) + 4, 0, 4, x, z, arg4); - } - } else if (shape == 8) { - if (local100 instanceof Loc) { - ((Loc) local100).method1046(); - } else { - Loc.method181(type, Static64.anIntArray154[angle] * 8, angle + 4, Static114.anIntArray565[angle] * 8, 4, x, z, arg4); - } - if (local102 instanceof Loc) { - ((Loc) local102).method1046(); - } else { - Loc.method181(type, Static64.anIntArray154[angle] * 8, (angle + 2 & 0x3) + 4, Static114.anIntArray565[angle] * 8, 4, x, z, arg4); - } - } else if (shape == 11) { - if (local100 instanceof Loc) { - ((Loc) local100).method1046(); - } else { - Loc.method181(type, 0, angle + 4, 0, 10, x, z, arg4); - } - } else if (local100 instanceof Loc) { - ((Loc) local100).method1046(); - } else { - Loc.method181(type, 0, angle, 0, shape, x, z, arg4); - } - } -} diff --git a/client/src/main/java/rt4/Static44.java b/client/src/main/java/rt4/Static44.java index d82a992..3092fe2 100644 --- a/client/src/main/java/rt4/Static44.java +++ b/client/src/main/java/rt4/Static44.java @@ -11,6 +11,8 @@ public final class Static44 { @OriginalMember(owner = "client!dh", name = "i", descriptor = "Lclient!na;") public static final JagString IMG1 = JagString.parse(""); + @OriginalMember(owner = "client!d", name = "R", descriptor = "Lclient!be;") + public static Component aClass13_10 = null; @OriginalMember(owner = "client!dh", name = "a", descriptor = "(IIII)Lclient!wk;") public static ComponentPointer method1148(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2) { @@ -23,22 +25,22 @@ public final class Static44 { if (local28 != null) { InterfaceList.redraw(local28); } - if (Static39.aClass13_10 != null) { - InterfaceList.redraw(Static39.aClass13_10); - Static39.aClass13_10 = null; + if (aClass13_10 != null) { + InterfaceList.redraw(aClass13_10); + aClass13_10 = null; } @Pc(45) int local45 = MiniMenu.size; @Pc(53) int local53; for (local53 = 0; local53 < local45; local53++) { - if (Static2.method5(MiniMenu.actions[local53])) { + if (InterfaceList.method5(MiniMenu.actions[local53])) { MiniMenu.remove(local53); } } if (MiniMenu.size == 1) { Static40.aBoolean108 = false; - Static133.method4012(Static183.anInt4271, Static24.anInt761, Static229.anInt5138, Static13.anInt436); + InterfaceList.method4012(InterfaceList.anInt4271, InterfaceList.anInt761, InterfaceList.anInt5138, InterfaceList.anInt436); } else { - Static133.method4012(Static183.anInt4271, Static24.anInt761, Static229.anInt5138, Static13.anInt436); + InterfaceList.method4012(InterfaceList.anInt4271, InterfaceList.anInt761, InterfaceList.anInt5138, InterfaceList.anInt436); local53 = Fonts.b12Full.getStringWidth(LocalizedText.CHOOSE_OPTION); for (@Pc(95) int local95 = 0; local95 < MiniMenu.size; local95++) { @Pc(104) int local104 = Fonts.b12Full.getStringWidth(MiniMenu.getOp(local95)); @@ -46,15 +48,15 @@ public final class Static44 { local53 = local104; } } - Static24.anInt761 = local53 + 8; - Static13.anInt436 = MiniMenu.size * 15 + (Static40.aBoolean298 ? 26 : 22); + InterfaceList.anInt761 = local53 + 8; + InterfaceList.anInt436 = MiniMenu.size * 15 + (Static40.aBoolean298 ? 26 : 22); } if (local28 != null) { InterfaceList.method531(local28, false); } InterfaceList.method1626(arg0); if (InterfaceList.topLevelInterface != -1) { - Static54.runScripts(1, InterfaceList.topLevelInterface); + InterfaceList.runScripts(1, InterfaceList.topLevelInterface); } return local9; } diff --git a/client/src/main/java/rt4/Static48.java b/client/src/main/java/rt4/Static48.java deleted file mode 100644 index 09ba6d9..0000000 --- a/client/src/main/java/rt4/Static48.java +++ /dev/null @@ -1,5 +0,0 @@ -package rt4; - -public final class Static48 { - -} diff --git a/client/src/main/java/rt4/Static49.java b/client/src/main/java/rt4/Static49.java index 56e3217..ed82110 100644 --- a/client/src/main/java/rt4/Static49.java +++ b/client/src/main/java/rt4/Static49.java @@ -6,6 +6,11 @@ import org.openrs2.deob.annotation.Pc; public final class Static49 { + @OriginalMember(owner = "client!e", name = "pc", descriptor = "[I") + public static final int[] anIntArray132 = new int[4]; + @OriginalMember(owner = "client!em", name = "D", descriptor = "I") + public static int gregorianDateSeed; + @OriginalMember(owner = "client!dm", name = "a", descriptor = "(BII[B)Z") public static boolean method1201(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) byte[] arg2) { @Pc(15) boolean local15 = true; @@ -65,7 +70,7 @@ public final class Static49 { @OriginalMember(owner = "client!dm", name = "a", descriptor = "(IBIII)V") public static void method1206(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3) { @Pc(15) int local15 = 0; - Static131.method2576(Static71.anIntArrayArray10[arg3], arg0 - arg1, arg0 - -arg1, arg2); + TextureOp29SubOp4.method2576(TextureOp29SubOp4.anIntArrayArray10[arg3], arg0 - arg1, arg0 - -arg1, arg2); @Pc(32) int local32 = -arg1; @Pc(34) int local34 = arg1; @Pc(36) int local36 = -1; @@ -76,19 +81,19 @@ public final class Static49 { if (local32 >= 0) { local34--; local32 -= local34 << 1; - @Pc(65) int[] local65 = Static71.anIntArrayArray10[arg3 + local34]; - @Pc(71) int[] local71 = Static71.anIntArrayArray10[arg3 - local34]; + @Pc(65) int[] local65 = TextureOp29SubOp4.anIntArrayArray10[arg3 + local34]; + @Pc(71) int[] local71 = TextureOp29SubOp4.anIntArrayArray10[arg3 - local34]; @Pc(76) int local76 = arg0 + local15; @Pc(81) int local81 = arg0 - local15; - Static131.method2576(local65, local81, local76, arg2); - Static131.method2576(local71, local81, local76, arg2); + TextureOp29SubOp4.method2576(local65, local81, local76, arg2); + TextureOp29SubOp4.method2576(local71, local81, local76, arg2); } @Pc(97) int local97 = local34 + arg0; @Pc(102) int local102 = arg0 - local34; - @Pc(109) int[] local109 = Static71.anIntArrayArray10[arg3 + local15]; - @Pc(116) int[] local116 = Static71.anIntArrayArray10[arg3 - local15]; - Static131.method2576(local109, local102, local97, arg2); - Static131.method2576(local116, local102, local97, arg2); + @Pc(109) int[] local109 = TextureOp29SubOp4.anIntArrayArray10[arg3 + local15]; + @Pc(116) int[] local116 = TextureOp29SubOp4.anIntArrayArray10[arg3 - local15]; + TextureOp29SubOp4.method2576(local109, local102, local97, arg2); + TextureOp29SubOp4.method2576(local116, local102, local97, arg2); } } @@ -99,16 +104,16 @@ public final class Static49 { } @Pc(24) JagString local24 = MiniMenu.method471(); if (arg0 == null) { - @Pc(40) int local40 = Fonts.b12Full.method2859(local24, arg2 + 4, arg1 - -15, client.aRandom1, Static60.gregorianDateSeed); - Static133.method4012(arg2 + 4, Fonts.b12Full.getStringWidth(local24) + local40, arg1, 15); + @Pc(40) int local40 = Fonts.b12Full.method2859(local24, arg2 + 4, arg1 - -15, client.aRandom1, gregorianDateSeed); + InterfaceList.method4012(arg2 + 4, Fonts.b12Full.getStringWidth(local24) + local40, arg1, 15); return; } @Pc(59) Font local59 = arg0.method491(Sprites.nameIcons); if (local59 == null) { local59 = Fonts.b12Full; } - local59.method2878(local24, arg2, arg1, arg0.width, arg0.height, arg0.color, arg0.shadowColor, arg0.anInt460, arg0.anInt478, client.aRandom1, Static60.gregorianDateSeed, Static50.anIntArray132); - Static133.method4012(Static50.anIntArray132[0], Static50.anIntArray132[2], Static50.anIntArray132[1], Static50.anIntArray132[3]); + local59.method2878(local24, arg2, arg1, arg0.width, arg0.height, arg0.color, arg0.shadowColor, arg0.anInt460, arg0.anInt478, client.aRandom1, gregorianDateSeed, anIntArray132); + InterfaceList.method4012(anIntArray132[0], anIntArray132[2], anIntArray132[1], anIntArray132[3]); } } diff --git a/client/src/main/java/rt4/Static5.java b/client/src/main/java/rt4/Static5.java index 92d6cac..f4b38e8 100644 --- a/client/src/main/java/rt4/Static5.java +++ b/client/src/main/java/rt4/Static5.java @@ -22,7 +22,7 @@ public final class Static5 { } else { @Pc(11) int local11 = arg1 * 128 + arg4 * 64; @Pc(19) int local19 = arg2 * 128 + arg5 * 64; - return Static105.method2256(arg0, arg1, arg2, arg4, arg5, local11, local19, arg3, arg6, 0, false, arg7); + return SceneGraph.method2256(arg0, arg1, arg2, arg4, arg5, local11, local19, arg3, arg6, 0, false, arg7); } } } diff --git a/client/src/main/java/rt4/Static50.java b/client/src/main/java/rt4/Static50.java deleted file mode 100644 index b79a7a4..0000000 --- a/client/src/main/java/rt4/Static50.java +++ /dev/null @@ -1,16 +0,0 @@ -package rt4; - -import org.openrs2.deob.annotation.OriginalMember; - -public final class Static50 { - - @OriginalMember(owner = "client!e", name = "pc", descriptor = "[I") - public static final int[] anIntArray132 = new int[4]; - - @OriginalMember(owner = "client!e", name = "xc", descriptor = "[I") - public static int[] anIntArray134 = new int[2]; - - @OriginalMember(owner = "client!e", name = "Dc", descriptor = "Lclient!na;") - public static final JagString aClass100_363 = JagString.parse("_labels"); - -} diff --git a/client/src/main/java/rt4/Static51.java b/client/src/main/java/rt4/Static51.java deleted file mode 100644 index b3d7ea3..0000000 --- a/client/src/main/java/rt4/Static51.java +++ /dev/null @@ -1,12 +0,0 @@ -package rt4; - -import org.openrs2.deob.annotation.OriginalMember; - -public final class Static51 { - - @OriginalMember(owner = "client!ea", name = "r", descriptor = "[[B") - public static byte[][] aByteArrayArray8; - - @OriginalMember(owner = "client!ea", name = "w", descriptor = "I") - public static int worldPos = 1; -} diff --git a/client/src/main/java/rt4/Static52.java b/client/src/main/java/rt4/Static52.java deleted file mode 100644 index 7b89f99..0000000 --- a/client/src/main/java/rt4/Static52.java +++ /dev/null @@ -1,37 +0,0 @@ -package rt4; - -import org.openrs2.deob.annotation.OriginalArg; -import org.openrs2.deob.annotation.OriginalMember; -import org.openrs2.deob.annotation.Pc; - -public final class Static52 { - - @OriginalMember(owner = "client!kl", name = "u", descriptor = "Lclient!na;") - public static final JagString aClass100_637 = JagString.parse(""); - @OriginalMember(owner = "client!ol", name = "Y", descriptor = "Lclient!na;") - public static final JagString aClass100_819 = JagString.parse(""); - @OriginalMember(owner = "client!ib", name = "g", descriptor = "Lclient!na;") - public static final JagString aClass100_559 = JagString.parse(""); - @OriginalMember(owner = "client!jj", name = "m", descriptor = "Lclient!na;") - public static final JagString aClass100_594 = JagString.parse("<)4col>"); - - @OriginalMember(owner = "client!eb", name = "a", descriptor = "(IIIIIII)I") - public static int method1286(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(6) int arg5) { - if ((arg2 & 0x1) == 1) { - @Pc(10) int local10 = arg4; - arg4 = arg3; - arg3 = local10; - } - @Pc(18) int local18 = arg1 & 0x3; - if (local18 == 0) { - return arg5; - } else if (local18 == 1) { - return arg0; - } else if (local18 == 2) { - return 7 + 1 - arg5 - arg4; - } else { - return 7 + 1 - arg0 - arg3; - } - } - -} diff --git a/client/src/main/java/rt4/Static53.java b/client/src/main/java/rt4/Static53.java deleted file mode 100644 index 9365873..0000000 --- a/client/src/main/java/rt4/Static53.java +++ /dev/null @@ -1,79 +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 Static53 { - - @OriginalMember(owner = "client!ec", name = "d", descriptor = "Lclient!gn;") - public static final LruHashTable aClass54_5 = new LruHashTable(16); - - @OriginalMember(owner = "client!ec", name = "B", descriptor = "[[I") - public static final int[][] anIntArrayArray8 = new int[][] { new int[0], { 128, 0, 128, 128, 0, 128 }, { 0, 0, 128, 0, 128, 128, 64, 128 }, { 0, 128, 0, 0, 128, 0, 64, 128 }, { 0, 0, 64, 128, 0, 128 }, { 128, 128, 64, 128, 128, 0 }, { 64, 0, 128, 0, 128, 128, 64, 128 }, { 128, 0, 128, 128, 0, 128, 0, 64, 64, 0 }, { 0, 0, 64, 0, 0, 64 }, { 0, 0, 128, 0, 128, 128, 64, 96, 32, 64 }, { 0, 128, 0, 0, 32, 64, 64, 96, 128, 128 }, { 0, 128, 0, 0, 32, 32, 96, 32, 128, 0, 128, 128 } }; - - @OriginalMember(owner = "client!ec", name = "a", descriptor = "([[IZILclient!hg;[IIIIZ[[FZI[[FIIIZ[[I[[FBI[Z)V") - public static void method1291(@OriginalArg(0) int[][] arg0, @OriginalArg(1) boolean arg1, @OriginalArg(2) int arg2, @OriginalArg(3) GlTile arg3, @OriginalArg(4) int[] arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7, @OriginalArg(8) boolean arg8, @OriginalArg(9) float[][] arg9, @OriginalArg(10) boolean arg10, @OriginalArg(12) float[][] arg11, @OriginalArg(13) int arg12, @OriginalArg(14) int arg13, @OriginalArg(15) int arg14, @OriginalArg(16) boolean arg15, @OriginalArg(17) int[][] arg16, @OriginalArg(18) float[][] arg17, @OriginalArg(19) byte arg18, @OriginalArg(20) int arg19, @OriginalArg(21) boolean[] arg20) { - @Pc(11) int local11 = (arg2 << 8) + (arg1 ? 255 : 0); - @Pc(25) int local25 = (arg8 ? 255 : 0) + (arg14 << 8); - @Pc(31) int[] local31 = new int[arg4.length / 2]; - @Pc(41) int local41 = (arg10 ? 255 : 0) + (arg13 << 8); - @Pc(51) int local51 = (arg19 << 8) + (arg15 ? 255 : 0); - for (@Pc(53) int local53 = 0; local53 < local31.length; local53++) { - @Pc(67) int local67 = arg4[local53 + local53]; - @Pc(80) int[][] local80 = arg0 == null || arg20 == null || !arg20[local53] ? arg16 : arg0; - @Pc(88) int local88 = arg4[local53 + local53 + 1]; - local31[local53] = Static207.method3683(local41, (float) arg12, local11, local51, arg0, local80, arg7, arg17, local25, arg18, false, arg3, arg9, arg5, local67, arg11, local88); - } - arg3.method1945(arg6, arg7, arg5, local31, null, false); - } - - @OriginalMember(owner = "client!ec", name = "a", descriptor = "([Ljava/lang/Object;I[III)V") - public static void method1292(@OriginalArg(0) Object[] arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int[] arg2, @OriginalArg(4) int arg3) { - if (arg3 >= arg1) { - return; - } - @Pc(11) int local11 = (arg3 + arg1) / 2; - @Pc(15) int local15 = arg2[local11]; - @Pc(17) int local17 = arg3; - arg2[local11] = arg2[arg1]; - arg2[arg1] = local15; - @Pc(31) Object local31 = arg0[local11]; - arg0[local11] = arg0[arg1]; - arg0[arg1] = local31; - for (@Pc(43) int local43 = arg3; local43 < arg1; local43++) { - if ((local43 & 0x1) + local15 > arg2[local43]) { - @Pc(67) int local67 = arg2[local43]; - arg2[local43] = arg2[local17]; - arg2[local17] = local67; - @Pc(81) Object local81 = arg0[local43]; - arg0[local43] = arg0[local17]; - arg0[local17++] = local81; - } - } - arg2[arg1] = arg2[local17]; - arg2[local17] = local15; - arg0[arg1] = arg0[local17]; - arg0[local17] = local31; - method1292(arg0, local17 - 1, arg2, arg3); - method1292(arg0, arg1, arg2, local17 + 1); - } - - @OriginalMember(owner = "client!ec", name = "a", descriptor = "(B)V") - public static void method1294() { - if (!Static241.aBoolean302) { - return; - } - @Pc(19) Component local19 = InterfaceList.method1418(MiniMenu.anInt2512, MiniMenu.anInt506); - if (local19 != null && local19.onUseWith != null) { - @Pc(29) HookRequest local29 = new HookRequest(); - local29.arguments = local19.onUseWith; - local29.source = local19; - ScriptRunner.run(local29); - } - Static241.aBoolean302 = false; - Static35.anInt1092 = -1; - InterfaceList.redraw(local19); - } - -} diff --git a/client/src/main/java/rt4/Static54.java b/client/src/main/java/rt4/Static54.java index 9dec128..ad966d3 100644 --- a/client/src/main/java/rt4/Static54.java +++ b/client/src/main/java/rt4/Static54.java @@ -1,81 +1,5 @@ package rt4; -import org.openrs2.deob.annotation.OriginalArg; -import org.openrs2.deob.annotation.OriginalMember; -import org.openrs2.deob.annotation.Pc; - public final class Static54 { - @OriginalMember(owner = "client!ed", name = "D", descriptor = "Lclient!na;") - public static final JagString aClass100_374 = JagString.parse("details"); - - @OriginalMember(owner = "client!ed", name = "H", descriptor = "Lclient!na;") - public static final JagString aClass100_375 = JagString.parse("<)4col> x"); - - @OriginalMember(owner = "client!ed", name = "a", descriptor = "(III)V") - public static void runScripts(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) { - if (InterfaceList.load(arg1)) { - Static2.method7(InterfaceList.components[arg1], arg0); - } - } - - @OriginalMember(owner = "client!ed", name = "a", descriptor = "(ZIIII)V") - public static void method1306(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3) { - if (arg3 >= TextureOp29.anInt4164 && arg3 <= TextureOp29.anInt5063) { - @Pc(22) int local22 = Static78.method1690(TextureOp29.anInt2869, arg1, TextureOp29.anInt5773); - @Pc(28) int local28 = Static78.method1690(TextureOp29.anInt2869, arg0, TextureOp29.anInt5773); - Static101.method2054(local22, arg3, local28, arg2); - } - } - - @OriginalMember(owner = "client!ed", name = "a", descriptor = "([SI[Lclient!na;II)V") - public static void method1307(@OriginalArg(0) short[] arg0, @OriginalArg(1) int arg1, @OriginalArg(2) JagString[] arg2, @OriginalArg(4) int arg3) { - if (arg1 <= arg3) { - return; - } - @Pc(14) int local14 = arg3; - @Pc(21) int local21 = (arg3 + arg1) / 2; - @Pc(25) JagString local25 = arg2[local21]; - arg2[local21] = arg2[arg1]; - arg2[arg1] = local25; - @Pc(39) short local39 = arg0[local21]; - arg0[local21] = arg0[arg1]; - arg0[arg1] = local39; - for (@Pc(51) int local51 = arg3; local51 < arg1; local51++) { - if (local25 == null || arg2[local51] != null && arg2[local51].method3139(local25) < (local51 & 0x1)) { - @Pc(80) JagString local80 = arg2[local51]; - arg2[local51] = arg2[local14]; - arg2[local14] = local80; - @Pc(94) short local94 = arg0[local51]; - arg0[local51] = arg0[local14]; - arg0[local14++] = local94; - } - } - arg2[arg1] = arg2[local14]; - arg2[local14] = local25; - arg0[arg1] = arg0[local14]; - arg0[local14] = local39; - method1307(arg0, local14 - 1, arg2, arg3); - method1307(arg0, arg1, arg2, local14 + 1); - } - - @OriginalMember(owner = "client!ed", name = "a", descriptor = "(IIII)I") - public static int method1309(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2) { - if (arg0 > 243) { - arg1 >>= 0x4; - } else if (arg0 > 217) { - arg1 >>= 0x3; - } else if (arg0 > 192) { - arg1 >>= 0x2; - } else if (arg0 > 179) { - arg1 >>= 0x1; - } - return (arg0 >> 1) + (arg1 >> 5 << 7) + (arg2 >> 2 << 10); - } - - @OriginalMember(owner = "client!ed", name = "b", descriptor = "(II)Lclient!ba;") - public static World getWorld(@OriginalArg(1) int arg0) { - return WorldList.loaded && arg0 >= WorldList.minId && arg0 <= WorldList.maxId ? WorldList.worlds[arg0 - WorldList.minId] : null; - } - } diff --git a/client/src/main/java/rt4/Static56.java b/client/src/main/java/rt4/Static56.java deleted file mode 100644 index 91f78ef..0000000 --- a/client/src/main/java/rt4/Static56.java +++ /dev/null @@ -1,13 +0,0 @@ -package rt4; - -import org.openrs2.deob.annotation.OriginalMember; - -public final class Static56 { - - @OriginalMember(owner = "client!ef", name = "f", descriptor = "Lclient!na;") - public static final JagString DUELSTAKE = JagString.parse(":duelstake:"); - - @OriginalMember(owner = "client!ef", name = "r", descriptor = "Lclient!be;") - public static Component aClass13_12 = null; - -} diff --git a/client/src/main/java/rt4/Static57.java b/client/src/main/java/rt4/Static57.java deleted file mode 100644 index 8ee227e..0000000 --- a/client/src/main/java/rt4/Static57.java +++ /dev/null @@ -1,14 +0,0 @@ -package rt4; - -import org.openrs2.deob.annotation.OriginalArg; -import org.openrs2.deob.annotation.OriginalMember; - -public final class Static57 { - - @OriginalMember(owner = "client!eg", name = "a", descriptor = "(IIIIIIII)V") - public static void method1320(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5, @OriginalArg(7) int arg6) { - if (InterfaceList.load(arg4)) { - Static36.method946(InterfaceList.components[arg4], -1, arg5, arg1, arg3, arg6, arg0, arg2); - } - } -} diff --git a/client/src/main/java/rt4/Static58.java b/client/src/main/java/rt4/Static58.java deleted file mode 100644 index 96707e1..0000000 --- a/client/src/main/java/rt4/Static58.java +++ /dev/null @@ -1,123 +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 Static58 { - - @OriginalMember(owner = "client!eh", name = "a", descriptor = "(I[[I[[FI[[FIBIIBZBI[[FILclient!hg;)V") - public static void method1324(@OriginalArg(0) int arg0, @OriginalArg(1) int[][] arg1, @OriginalArg(2) float[][] arg2, @OriginalArg(3) int arg3, @OriginalArg(4) float[][] arg4, @OriginalArg(5) int arg5, @OriginalArg(6) byte arg6, @OriginalArg(7) int arg7, @OriginalArg(8) int arg8, @OriginalArg(10) boolean arg9, @OriginalArg(11) byte arg10, @OriginalArg(12) int arg11, @OriginalArg(13) float[][] arg12, @OriginalArg(14) int arg13, @OriginalArg(15) GlTile arg14) { - @Pc(11) int local11 = (arg0 << 8) + 255; - @Pc(17) int local17 = (arg5 << 8) + 255; - @Pc(23) int local23 = (arg8 << 8) + 255; - @Pc(29) int local29 = (arg13 << 8) + 255; - @Pc(33) int[] local33 = Static228.anIntArrayArray35[arg10]; - @Pc(39) int[] local39 = new int[local33.length >> 1]; - @Pc(41) int local41; - for (local41 = 0; local41 < local39.length; local41++) { - local39[local41] = Static207.method3683(local29, 0.0F, local11, local17, null, arg1, arg3, arg12, local23, arg6, false, arg14, arg2, arg11, local33[local41 + local41], arg4, local33[local41 + local41 + 1]); - } - @Pc(87) int[] local87 = null; - if (arg9) { - @Pc(191) int local191; - if (arg10 == 1) { - local41 = Static207.method3683(local29, 0.0F, local11, local17, null, arg1, arg3, arg12, local23, arg6, true, arg14, arg2, arg11, 64, arg4, 128); - local191 = Static207.method3683(local29, 0.0F, local11, local17, null, arg1, arg3, arg12, local23, arg6, true, arg14, arg2, arg11, 128, arg4, 64); - local87 = new int[] { local191, local41, local39[2], local41, local39[0], local39[2] }; - } else if (arg10 == 2) { - local87 = new int[6]; - local41 = Static207.method3683(local29, 0.0F, local11, local17, null, arg1, arg3, arg12, local23, arg6, true, arg14, arg2, arg11, 128, arg4, 128); - local191 = Static207.method3683(local29, 0.0F, local11, local17, null, arg1, arg3, arg12, local23, arg6, true, arg14, arg2, arg11, 64, arg4, 0); - local87[2] = local41; - local87[0] = local39[0]; - local87[5] = local39[0]; - local87[3] = local41; - local87[1] = local191; - local87[4] = local39[1]; - } else if (arg10 == 3) { - local87 = new int[6]; - local41 = Static207.method3683(local29, 0.0F, local11, local17, null, arg1, arg3, arg12, local23, arg6, true, arg14, arg2, arg11, 0, arg4, 128); - local191 = Static207.method3683(local29, 0.0F, local11, local17, null, arg1, arg3, arg12, local23, arg6, true, arg14, arg2, arg11, 64, arg4, 0); - local87[4] = local191; - local87[1] = local39[1]; - local87[0] = local39[2]; - local87[3] = local41; - local87[2] = local41; - local87[5] = local39[2]; - } else if (arg10 == 4) { - local87 = new int[3]; - local41 = Static207.method3683(local29, 0.0F, local11, local17, null, arg1, arg3, arg12, local23, arg6, true, arg14, arg2, arg11, 0, arg4, 128); - local87[0] = local39[3]; - local87[2] = local39[0]; - local87[1] = local41; - } else if (arg10 == 5) { - local87 = new int[3]; - local41 = Static207.method3683(local29, 0.0F, local11, local17, null, arg1, arg3, arg12, local23, arg6, true, arg14, arg2, arg11, 128, arg4, 128); - local87[1] = local41; - local87[0] = local39[2]; - local87[2] = local39[3]; - } else if (arg10 == 6) { - local87 = new int[6]; - local41 = Static207.method3683(local29, 0.0F, local11, local17, null, arg1, arg3, arg12, local23, arg6, true, arg14, arg2, arg11, 128, arg4, 0); - local191 = Static207.method3683(local29, 0.0F, local11, local17, null, arg1, arg3, arg12, local23, arg6, true, arg14, arg2, arg11, 128, arg4, 128); - local87[1] = local41; - local87[0] = local39[3]; - local87[2] = local191; - local87[4] = local39[0]; - local87[3] = local191; - local87[5] = local39[3]; - } else if (arg10 == 7) { - local87 = new int[6]; - local41 = Static207.method3683(local29, 0.0F, local11, local17, null, arg1, arg3, arg12, local23, arg6, true, arg14, arg2, arg11, 0, arg4, 128); - local191 = Static207.method3683(local29, 0.0F, local11, local17, null, arg1, arg3, arg12, local23, arg6, true, arg14, arg2, arg11, 128, arg4, 0); - local87[3] = local41; - local87[2] = local41; - local87[0] = local39[1]; - local87[4] = local39[2]; - local87[1] = local191; - local87[5] = local39[1]; - } else if (arg10 == 8) { - local87 = new int[3]; - local41 = Static207.method3683(local29, 0.0F, local11, local17, null, arg1, arg3, arg12, local23, arg6, true, arg14, arg2, arg11, 0, arg4, 0); - local87[2] = local39[4]; - local87[0] = local39[3]; - local87[1] = local41; - } else if (arg10 == 9) { - local41 = Static207.method3683(local29, 0.0F, local11, local17, null, arg1, arg3, arg12, local23, arg6, true, arg14, arg2, arg11, 128, arg4, 64); - local191 = Static207.method3683(local29, 0.0F, local11, local17, null, arg1, arg3, arg12, local23, arg6, true, arg14, arg2, arg11, 96, arg4, 32); - @Pc(715) int local715 = Static207.method3683(local29, 0.0F, local11, local17, null, arg1, arg3, arg12, local23, arg6, true, arg14, arg2, arg11, 64, arg4, 0); - local87 = new int[] { local191, local41, local39[4], local191, local39[4], local39[3], local191, local39[3], local39[2], local191, local39[2], local39[1], local191, local39[1], local715 }; - } else if (arg10 == 10) { - local87 = new int[9]; - local41 = Static207.method3683(local29, 0.0F, local11, local17, null, arg1, arg3, arg12, local23, arg6, true, arg14, arg2, arg11, 0, arg4, 128); - local87[0] = local39[2]; - local87[8] = local39[0]; - local87[1] = local41; - local87[4] = local41; - local87[2] = local39[3]; - local87[7] = local41; - local87[3] = local39[3]; - local87[5] = local39[4]; - local87[6] = local39[4]; - } else if (arg10 == 11) { - local87 = new int[12]; - local41 = Static207.method3683(local29, 0.0F, local11, local17, null, arg1, arg3, arg12, local23, arg6, true, arg14, arg2, arg11, 0, arg4, 64); - local191 = Static207.method3683(local29, 0.0F, local11, local17, null, arg1, arg3, arg12, local23, arg6, true, arg14, arg2, arg11, 128, arg4, 64); - local87[5] = local41; - local87[1] = local41; - local87[8] = local41; - local87[0] = local39[3]; - local87[2] = local39[0]; - local87[11] = local191; - local87[6] = local39[2]; - local87[7] = local191; - local87[10] = local39[1]; - local87[3] = local39[3]; - local87[4] = local39[2]; - local87[9] = local39[2]; - } - } - arg14.method1945(arg7, arg3, arg11, local39, local87, false); - } -} diff --git a/client/src/main/java/rt4/Static59.java b/client/src/main/java/rt4/Static59.java index 223172c..5a2b982 100644 --- a/client/src/main/java/rt4/Static59.java +++ b/client/src/main/java/rt4/Static59.java @@ -1,15 +1,13 @@ package rt4; -import org.openrs2.deob.annotation.OriginalArg; import org.openrs2.deob.annotation.OriginalMember; -import org.openrs2.deob.annotation.Pc; public final class Static59 { @OriginalMember(owner = "client!ej", name = "h", descriptor = "(I)V") public static void method1372() { if (Static226.anInt3953 == 2) { - if (Static155.anInt3751 == Mouse.anInt5850 && Static60.anInt1892 == Static280.anInt5895) { + if (ScriptRunner.anInt3751 == Mouse.anInt5850 && ScriptRunner.anInt1892 == Static226.anInt5895) { Static226.anInt3953 = 0; if (Cheat.shiftClick && Keyboard.pressedKeys[Keyboard.KEY_SHIFT] && MiniMenu.size > 2) { MiniMenu.doAction(MiniMenu.size - 2); @@ -17,7 +15,7 @@ public final class Static59 { MiniMenu.doAction(MiniMenu.size - 1); } } - } else if (Static155.anInt3751 == Mouse.clickX && Static60.anInt1892 == Mouse.clickY) { + } else if (ScriptRunner.anInt3751 == Mouse.clickX && ScriptRunner.anInt1892 == Mouse.clickY) { Static226.anInt3953 = 0; if (Cheat.shiftClick && Keyboard.pressedKeys[Keyboard.KEY_SHIFT] && MiniMenu.size > 2) { MiniMenu.doAction(MiniMenu.size - 2); @@ -25,42 +23,10 @@ public final class Static59 { MiniMenu.doAction(MiniMenu.size - 1); } } else { - Static280.anInt5895 = Mouse.clickY; + Static226.anInt5895 = Mouse.clickY; Static226.anInt3953 = 2; Mouse.anInt5850 = Mouse.clickX; } } - @OriginalMember(owner = "client!ej", name = "a", descriptor = "(IZIJ)Lclient!na;") - public static JagString method1376(@OriginalArg(3) long arg0) { - @Pc(35) long local35 = arg0 / (long) 10; - @Pc(37) int local37 = 1; - while (local35 != 0L) { - local37++; - local35 /= 10; - } - @Pc(51) int local51 = local37; - if (arg0 < 0L) { - local51 = local37 + 1; - } - @Pc(61) byte[] local61 = new byte[local51]; - if (arg0 < 0L) { - local61[0] = 45; - } - for (@Pc(79) int local79 = 0; local79 < local37; local79++) { - @Pc(92) int local92 = (int) (arg0 % (long) 10); - arg0 /= 10; - if (local92 < 0) { - local92 = -local92; - } - if (local92 > 9) { - local92 += 39; - } - local61[local51 - local79 - 1] = (byte) (local92 + 48); - } - @Pc(126) JagString local126 = new JagString(); - local126.chars = local61; - local126.length = local51; - return local126; - } } diff --git a/client/src/main/java/rt4/Static6.java b/client/src/main/java/rt4/Static6.java deleted file mode 100644 index 488d7c1..0000000 --- a/client/src/main/java/rt4/Static6.java +++ /dev/null @@ -1,56 +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 Static6 { - - @OriginalMember(owner = "client!ag", name = "ab", descriptor = "Lclient!na;") - public static final JagString aClass100_17 = JagString.parse("0"); - - @OriginalMember(owner = "client!ag", name = "j", descriptor = "(I)V") - public static void method84() { - SceneGraph.clear(); - for (@Pc(9) int local9 = 0; local9 < 4; local9++) { - PathFinder.collisionMaps[local9].clear(); - } - System.gc(); - } - - @OriginalMember(owner = "client!ag", name = "a", descriptor = "(ILjava/lang/String;)Ljava/lang/Class;") - public static Class method85(@OriginalArg(1) String arg0) throws ClassNotFoundException { - if (arg0.equals("B")) { - return Byte.TYPE; - } else if (arg0.equals("I")) { - return Integer.TYPE; - } else if (arg0.equals("S")) { - return Short.TYPE; - } else if (arg0.equals("J")) { - return Long.TYPE; - } else if (arg0.equals("Z")) { - return Boolean.TYPE; - } else if (arg0.equals("F")) { - return Float.TYPE; - } else if (arg0.equals("D")) { - return Double.TYPE; - } else if (arg0.equals("C")) { - return Character.TYPE; - } else { - return Class.forName(arg0); - } - } - - @OriginalMember(owner = "client!ag", name = "a", descriptor = "(IIIIIIIII)V") - public static void method86(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5, @OriginalArg(7) int arg6, @OriginalArg(8) int arg7) { - if (InterfaceList.load(arg0)) { - Static87.method1809(arg1, arg7, arg3, InterfaceList.components[arg0], arg2, -1, arg6, arg5, arg4); - } else if (arg4 == -1) { - for (@Pc(27) int local27 = 0; local27 < 100; local27++) { - InterfaceList.aBooleanArray100[local27] = true; - } - } else { - InterfaceList.aBooleanArray100[arg4] = true; - } - } -} diff --git a/client/src/main/java/rt4/Static60.java b/client/src/main/java/rt4/Static60.java deleted file mode 100644 index 25e1341..0000000 --- a/client/src/main/java/rt4/Static60.java +++ /dev/null @@ -1,13 +0,0 @@ -package rt4; - -import org.openrs2.deob.annotation.OriginalMember; - -public final class Static60 { - - @OriginalMember(owner = "client!em", name = "w", descriptor = "I") - public static int anInt1892; - - @OriginalMember(owner = "client!em", name = "D", descriptor = "I") - public static int gregorianDateSeed; - -} diff --git a/client/src/main/java/rt4/Static61.java b/client/src/main/java/rt4/Static61.java deleted file mode 100644 index e05546b..0000000 --- a/client/src/main/java/rt4/Static61.java +++ /dev/null @@ -1,10 +0,0 @@ -package rt4; - -import org.openrs2.deob.annotation.OriginalMember; - -public final class Static61 { - - @OriginalMember(owner = "client!en", name = "h", descriptor = "Lclient!na;") - public static final JagString CHALREQ = JagString.parse(":chalreq:"); - -} diff --git a/client/src/main/java/rt4/Static62.java b/client/src/main/java/rt4/Static62.java deleted file mode 100644 index a282fdf..0000000 --- a/client/src/main/java/rt4/Static62.java +++ /dev/null @@ -1,10 +0,0 @@ -package rt4; - -import org.openrs2.deob.annotation.OriginalMember; - -public final class Static62 { - - @OriginalMember(owner = "client!f", name = "V", descriptor = "I") - public static int anInt1938 = 0; - -} diff --git a/client/src/main/java/rt4/Static64.java b/client/src/main/java/rt4/Static64.java deleted file mode 100644 index 8aeb249..0000000 --- a/client/src/main/java/rt4/Static64.java +++ /dev/null @@ -1,13 +0,0 @@ -package rt4; - -import org.openrs2.deob.annotation.OriginalMember; - -public final class Static64 { - - @OriginalMember(owner = "client!fb", name = "h", descriptor = "[I") - public static int[] anIntArray153; - - @OriginalMember(owner = "client!fb", name = "q", descriptor = "[I") - public static final int[] anIntArray154 = new int[] { -1, -1, 1, 1 }; - -} diff --git a/client/src/main/java/rt4/Static65.java b/client/src/main/java/rt4/Static65.java deleted file mode 100644 index e3380ad..0000000 --- a/client/src/main/java/rt4/Static65.java +++ /dev/null @@ -1,19 +0,0 @@ -package rt4; - -import org.openrs2.deob.annotation.OriginalArg; -import org.openrs2.deob.annotation.OriginalMember; - -public final class Static65 { - - @OriginalMember(owner = "client!fc", name = "a", descriptor = "I") - public static int anInt1951 = -1; - - @OriginalMember(owner = "client!fc", name = "f", descriptor = "Lclient!na;") - public static final JagString IMG0 = JagString.parse(""); - - @OriginalMember(owner = "client!fc", name = "a", descriptor = "(Lclient!wa;I)Lclient!na;") - public static JagString formatChatMessage(@OriginalArg(0) Buffer arg0) { - return Static254.method4350(arg0); - } - -} diff --git a/client/src/main/java/rt4/Static67.java b/client/src/main/java/rt4/Static67.java deleted file mode 100644 index dfe318b..0000000 --- a/client/src/main/java/rt4/Static67.java +++ /dev/null @@ -1,13 +0,0 @@ -package rt4; - -import org.openrs2.deob.annotation.OriginalMember; - -public final class Static67 { - - @OriginalMember(owner = "client!fe", name = "I", descriptor = "Lclient!na;") - public static final JagString aClass100_639 = JagString.parse(" "); - - @OriginalMember(owner = "client!fe", name = "R", descriptor = "Z") - public static boolean prevFocus = true; - -} diff --git a/client/src/main/java/rt4/Static68.java b/client/src/main/java/rt4/Static68.java deleted file mode 100644 index f3a2cc9..0000000 --- a/client/src/main/java/rt4/Static68.java +++ /dev/null @@ -1,21 +0,0 @@ -package rt4; - -import org.openrs2.deob.annotation.OriginalMember; - -public final class Static68 { - - @OriginalMember(owner = "client!fg", name = "d", descriptor = "[I") - public static final int[] anIntArray159 = new int[6]; - - @OriginalMember(owner = "client!fg", name = "l", descriptor = "[I") - public static final int[] anIntArray164 = new int[6]; - - @OriginalMember(owner = "client!fg", name = "m", descriptor = "[I") - public static final int[] anIntArray165 = new int[6]; - - @OriginalMember(owner = "client!fg", name = "r", descriptor = "[I") - public static final int[] anIntArray169 = new int[6]; - - @OriginalMember(owner = "client!fg", name = "t", descriptor = "[I") - public static final int[] anIntArray170 = new int[6]; -} diff --git a/client/src/main/java/rt4/Static69.java b/client/src/main/java/rt4/Static69.java index 39f5c3e..20eceae 100644 --- a/client/src/main/java/rt4/Static69.java +++ b/client/src/main/java/rt4/Static69.java @@ -101,13 +101,13 @@ public final class Static69 { @OriginalMember(owner = "client!fh", name = "a", descriptor = "(BLclient!ek;)V") public static void method1545(@OriginalArg(1) SoftwareIndexedSprite arg0) { @Pc(5) int local5; - for (local5 = 0; local5 < Static270.anIntArray562.length; local5++) { - Static270.anIntArray562[local5] = 0; + for (local5 = 0; local5 < Static267.anIntArray562.length; local5++) { + Static267.anIntArray562[local5] = 0; } @Pc(36) int local36; for (local5 = 0; local5 < 5000; local5++) { local36 = (int) ((double) 256 * Math.random() * 128.0D); - Static270.anIntArray562[local36] = (int) (Math.random() * 284.0D); + Static267.anIntArray562[local36] = (int) (Math.random() * 284.0D); } @Pc(66) int local66; @Pc(76) int local76; @@ -115,12 +115,12 @@ public final class Static69 { for (local36 = 1; local36 < 255; local36++) { for (local66 = 1; local66 < 127; local66++) { local76 = local66 + (local36 << 7); - Static263.anIntArray516[local76] = (Static270.anIntArray562[local76 + 128] + Static270.anIntArray562[local76 - 1] + Static270.anIntArray562[local76 + 1] + Static270.anIntArray562[local76 + -128]) / 4; + Static145.anIntArray516[local76] = (Static267.anIntArray562[local76 + 128] + Static267.anIntArray562[local76 - 1] + Static267.anIntArray562[local76 + 1] + Static267.anIntArray562[local76 + -128]) / 4; } } - @Pc(113) int[] local113 = Static270.anIntArray562; - Static270.anIntArray562 = Static263.anIntArray516; - Static263.anIntArray516 = local113; + @Pc(113) int[] local113 = Static267.anIntArray562; + Static267.anIntArray562 = Static145.anIntArray516; + Static145.anIntArray516 = local113; } if (arg0 == null) { return; @@ -132,7 +132,7 @@ public final class Static69 { local76 = arg0.anInt4280 + local66 + 16; @Pc(162) int local162 = arg0.anInt4273 + local36 + 16; @Pc(169) int local169 = local76 + (local162 << 7); - Static270.anIntArray562[local169] = 0; + Static267.anIntArray562[local169] = 0; } } } diff --git a/client/src/main/java/rt4/Static7.java b/client/src/main/java/rt4/Static7.java index ddf2c23..61401c1 100644 --- a/client/src/main/java/rt4/Static7.java +++ b/client/src/main/java/rt4/Static7.java @@ -13,7 +13,7 @@ public final class Static7 { @OriginalMember(owner = "client!ah", name = "b", descriptor = "(I)V") public static void method843() { - if (Static118.clickedInventoryComponent != null || Static40.aClass13_14 != null) { + if (InterfaceList.clickedInventoryComponent != null || Static40.aClass13_14 != null) { return; } @Pc(20) int local20 = Mouse.clickButton; @@ -28,16 +28,16 @@ public final class Static7 { @Pc(103) Component local103 = InterfaceList.getComponent(local99); @Pc(106) ServerActiveProperties local106 = InterfaceList.getServerActiveProperties(local103); if (local106.method511() || local106.isObjReplaceEnabled()) { - Static78.clickedInventoryComponentCycle = 0; + InterfaceList.clickedInventoryComponentCycle = 0; Static123.draggingClickedInventoryObject = false; - if (Static118.clickedInventoryComponent != null) { - InterfaceList.redraw(Static118.clickedInventoryComponent); + if (InterfaceList.clickedInventoryComponent != null) { + InterfaceList.redraw(InterfaceList.clickedInventoryComponent); } - Static118.clickedInventoryComponent = InterfaceList.getComponent(local99); - Static149.clickedInventoryComponentX = Mouse.clickX; - Static206.clickedInventoryComponentY = Mouse.clickY; + InterfaceList.clickedInventoryComponent = InterfaceList.getComponent(local99); + InterfaceList.clickedInventoryComponentX = Mouse.clickX; + InterfaceList.clickedInventoryComponentY = Mouse.clickY; Static4.mouseOverInventoryObjectIndex = local93; - InterfaceList.redraw(Static118.clickedInventoryComponent); + InterfaceList.redraw(InterfaceList.clickedInventoryComponent); return; } } @@ -57,17 +57,17 @@ public final class Static7 { if (local20 != 1) { local93 = Mouse.lastMouseY; local204 = Mouse.lastMouseX; - if (local204 < Static183.anInt4271 - 10 || local204 > Static24.anInt761 + Static183.anInt4271 + 10 || Static229.anInt5138 - 10 > local93 || local93 > Static13.anInt436 + Static229.anInt5138 + 10) { + if (local204 < InterfaceList.anInt4271 - 10 || local204 > InterfaceList.anInt761 + InterfaceList.anInt4271 + 10 || InterfaceList.anInt5138 - 10 > local93 || local93 > InterfaceList.anInt436 + InterfaceList.anInt5138 + 10) { Static40.aBoolean108 = false; - Static133.method4012(Static183.anInt4271, Static24.anInt761, Static229.anInt5138, Static13.anInt436); + InterfaceList.method4012(InterfaceList.anInt4271, InterfaceList.anInt761, InterfaceList.anInt5138, InterfaceList.anInt436); } } if (local20 != 1) { return; } - local204 = Static183.anInt4271; - local93 = Static229.anInt5138; - local99 = Static24.anInt761; + local204 = InterfaceList.anInt4271; + local93 = InterfaceList.anInt5138; + local99 = InterfaceList.anInt761; @Pc(265) int local265 = Mouse.clickX; @Pc(267) int local267 = Mouse.clickY; @Pc(269) int local269 = -1; @@ -86,6 +86,6 @@ public final class Static7 { MiniMenu.doAction(local269); } Static40.aBoolean108 = false; - Static133.method4012(Static183.anInt4271, Static24.anInt761, Static229.anInt5138, Static13.anInt436); + InterfaceList.method4012(InterfaceList.anInt4271, InterfaceList.anInt761, InterfaceList.anInt5138, InterfaceList.anInt436); } } diff --git a/client/src/main/java/rt4/Static71.java b/client/src/main/java/rt4/Static71.java deleted file mode 100644 index 9c6fe44..0000000 --- a/client/src/main/java/rt4/Static71.java +++ /dev/null @@ -1,27 +0,0 @@ -package rt4; - -import org.openrs2.deob.annotation.OriginalMember; -import org.openrs2.deob.annotation.Pc; - -public final class Static71 { - - @OriginalMember(owner = "client!fk", name = "j", descriptor = "[[I") - public static int[][] anIntArrayArray10; - - @OriginalMember(owner = "client!fk", name = "b", descriptor = "(I)V") - public static void method1444() { - for (@Pc(7) int local7 = -1; local7 < PlayerList.size; local7++) { - @Pc(21) int local21; - if (local7 == -1) { - local21 = 2047; - } else { - local21 = PlayerList.ids[local7]; - } - @Pc(31) Player local31 = PlayerList.players[local21]; - if (local31 != null) { - NpcList.method4514(local31.getSize(), local31); - } - } - } - -} diff --git a/client/src/main/java/rt4/Static73.java b/client/src/main/java/rt4/Static73.java index e9a8ee5..fb2b14c 100644 --- a/client/src/main/java/rt4/Static73.java +++ b/client/src/main/java/rt4/Static73.java @@ -11,6 +11,10 @@ public final class Static73 { @OriginalMember(owner = "client!fm", name = "fb", descriptor = "[I") public static final int[] anIntArray183 = new int[14]; + @OriginalMember(owner = "client!li", name = "t", descriptor = "I") + public static int anInt3534; + @OriginalMember(owner = "client!mi", name = "Z", descriptor = "I") + public static int anInt3893; @OriginalMember(owner = "client!fm", name = "a", descriptor = "(ZI)V") public static void method1596(@OriginalArg(0) boolean arg0) { @@ -29,8 +33,8 @@ public final class Static73 { Static87.method1807(); InterfaceList.method1626(InterfaceList.topLevelInterface); } - Static35.anInt1092 = -1; - Static81.method1750(Static270.anInt5794); + MiniMenu.anInt1092 = -1; + Static81.method1750(ScriptRunner.anInt5794); PlayerList.self = new Player(); PlayerList.self.zFine = 3000; PlayerList.self.xFine = 3000; @@ -52,10 +56,10 @@ public final class Static73 { @OriginalMember(owner = "client!fm", name = "a", descriptor = "(ZII)V") public static void setLightPosition(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) { - Static85.anInt2263 = Static103.aClass92ArrayArray1[arg1][arg0].anInt3530; - Static159.anInt3893 = Static103.aClass92ArrayArray1[arg1][arg0].anInt3528; - Static148.anInt3534 = Static103.aClass92ArrayArray1[arg1][arg0].anInt3527; - FogManager.method3063((float) Static85.anInt2263, (float) Static159.anInt3893, (float) Static148.anInt3534); + Static103.anInt2263 = Static103.aClass92ArrayArray1[arg1][arg0].anInt3530; + anInt3893 = Static103.aClass92ArrayArray1[arg1][arg0].anInt3528; + anInt3534 = Static103.aClass92ArrayArray1[arg1][arg0].anInt3527; + FogManager.method3063((float) Static103.anInt2263, (float) anInt3893, (float) anInt3534); } @OriginalMember(owner = "client!fm", name = "a", descriptor = "(ILclient!na;Lclient!na;Lclient!na;I)V") @@ -70,7 +74,7 @@ public final class Static73 { if (arg1 != arg2 || arg3 != arg4) { for (local16 = arg1; local16 <= arg2; local16++) { for (local20 = arg3; local20 <= arg4; local20++) { - if (SceneGraph.anIntArrayArrayArray12[arg0][local16][local20] == -Static13.anInt437) { + if (SceneGraph.anIntArrayArrayArray12[arg0][local16][local20] == -Static156.anInt437) { return false; } } diff --git a/client/src/main/java/rt4/Static74.java b/client/src/main/java/rt4/Static74.java index 3f44406..62ba725 100644 --- a/client/src/main/java/rt4/Static74.java +++ b/client/src/main/java/rt4/Static74.java @@ -17,37 +17,6 @@ public final class Static74 { } } - @OriginalMember(owner = "client!fn", name = "a", descriptor = "(ILclient!be;)V") - public static void update(@OriginalArg(1) Component arg0) { - @Pc(7) Component local7 = method4668(arg0); - @Pc(19) int local19; - @Pc(17) int local17; - if (local7 == null) { - local17 = GameShell.canvasHeight; - local19 = GameShell.canvasWidth; - } else { - local17 = local7.height; - local19 = local7.width; - } - Static150.method2801(local17, local19, arg0, false); - Static111.method2291(arg0, local17, local19); - } - - @OriginalMember(owner = "client!wl", name = "a", descriptor = "(Lclient!be;I)Lclient!be;") - public static Component method4668(@OriginalArg(0) Component arg0) { - if (arg0.layer != -1) { - return InterfaceList.getComponent(arg0.layer); - } - @Pc(28) int local28 = arg0.id >>> 16; - @Pc(33) HashTableIterator local33 = new HashTableIterator(InterfaceList.openInterfaces); - for (@Pc(38) ComponentPointer local38 = (ComponentPointer) local33.method2701(); local38 != null; local38 = (ComponentPointer) local33.method2700()) { - if (local28 == local38.anInt5878) { - return InterfaceList.getComponent((int) local38.key); - } - } - return null; - } - @OriginalMember(owner = "client!wb", name = "a", descriptor = "(IIIIIIII)V") public static void method4594(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(6) int arg5, @OriginalArg(7) int arg6) { @Pc(7) int local7 = 0; @@ -81,10 +50,10 @@ public final class Static74 { @Pc(138) int local138 = local114; @Pc(144) int local144 = (local25 - 1) * local106; @Pc(162) int local162 = (arg5 - 1) * local93; - @Pc(166) int[] local166 = Static71.anIntArrayArray10[arg2]; - Static131.method2576(local166, arg1 - arg4, -local16 + arg1, arg3); - Static131.method2576(local166, arg1 - local16, arg1 - -local16, arg0); - Static131.method2576(local166, arg1 + local16, arg4 + arg1, arg3); + @Pc(166) int[] local166 = TextureOp29SubOp4.anIntArrayArray10[arg2]; + TextureOp29SubOp4.method2576(local166, arg1 - arg4, -local16 + arg1, arg3); + TextureOp29SubOp4.method2576(local166, arg1 - local16, arg1 - -local16, arg0); + TextureOp29SubOp4.method2576(local166, arg1 + local16, arg4 + arg1, arg3); while (local9 > 0) { if (local89 < 0) { while (local89 < 0) { @@ -137,15 +106,15 @@ public final class Static74 { if (local258) { @Pc(371) int local371 = arg1 + local11; @Pc(376) int local376 = arg1 - local11; - Static131.method2576(Static71.anIntArrayArray10[local348], local365, local376, arg3); - Static131.method2576(Static71.anIntArrayArray10[local348], local376, local371, arg0); - Static131.method2576(Static71.anIntArrayArray10[local348], local371, local352, arg3); - Static131.method2576(Static71.anIntArrayArray10[local360], local365, local376, arg3); - Static131.method2576(Static71.anIntArrayArray10[local360], local376, local371, arg0); - Static131.method2576(Static71.anIntArrayArray10[local360], local371, local352, arg3); + TextureOp29SubOp4.method2576(TextureOp29SubOp4.anIntArrayArray10[local348], local365, local376, arg3); + TextureOp29SubOp4.method2576(TextureOp29SubOp4.anIntArrayArray10[local348], local376, local371, arg0); + TextureOp29SubOp4.method2576(TextureOp29SubOp4.anIntArrayArray10[local348], local371, local352, arg3); + TextureOp29SubOp4.method2576(TextureOp29SubOp4.anIntArrayArray10[local360], local365, local376, arg3); + TextureOp29SubOp4.method2576(TextureOp29SubOp4.anIntArrayArray10[local360], local376, local371, arg0); + TextureOp29SubOp4.method2576(TextureOp29SubOp4.anIntArrayArray10[local360], local371, local352, arg3); } else { - Static131.method2576(Static71.anIntArrayArray10[local348], local365, local352, arg3); - Static131.method2576(Static71.anIntArrayArray10[local360], local365, local352, arg3); + TextureOp29SubOp4.method2576(TextureOp29SubOp4.anIntArrayArray10[local348], local365, local352, arg3); + TextureOp29SubOp4.method2576(TextureOp29SubOp4.anIntArrayArray10[local360], local365, local352, arg3); } } } @@ -197,14 +166,14 @@ public final class Static74 { @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); + @Pc(166) int[] local166 = TextureOp29SubOp4.anIntArrayArray10[arg4]; + local174 = Static231.method1690(TextureOp29.anInt5063, arg5 - arg0, TextureOp29.anInt4164); + local183 = Static231.method1690(TextureOp29.anInt5063, arg5 + arg0, TextureOp29.anInt4164); + local192 = Static231.method1690(TextureOp29.anInt5063, arg5 - local12, TextureOp29.anInt4164); + local201 = Static231.method1690(TextureOp29.anInt5063, arg5 + local12, TextureOp29.anInt4164); + TextureOp29SubOp4.method2576(local166, local174, local192, arg2); + TextureOp29SubOp4.method2576(local166, local192, local201, arg1); + TextureOp29SubOp4.method2576(local166, local201, local183, arg2); } while (local16 > 0) { if (local70 < 0) { @@ -254,30 +223,30 @@ public final class Static74 { 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); + local192 = Static231.method1690(TextureOp29.anInt5063, arg5 + local7, TextureOp29.anInt4164); + local201 = Static231.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(404) int local404 = Static231.method1690(TextureOp29.anInt5063, arg5 + local14, TextureOp29.anInt4164); + @Pc(412) int local412 = Static231.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); + local420 = TextureOp29SubOp4.anIntArrayArray10[local174]; + TextureOp29SubOp4.method2576(local420, local201, local412, arg2); + TextureOp29SubOp4.method2576(local420, local412, local404, arg1); + TextureOp29SubOp4.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); + local420 = TextureOp29SubOp4.anIntArrayArray10[local183]; + TextureOp29SubOp4.method2576(local420, local201, local412, arg2); + TextureOp29SubOp4.method2576(local420, local412, local404, arg1); + TextureOp29SubOp4.method2576(local420, local404, local192, arg2); } } else { if (TextureOp29.anInt5773 <= local174) { - Static131.method2576(Static71.anIntArrayArray10[local174], local201, local192, arg2); + TextureOp29SubOp4.method2576(TextureOp29SubOp4.anIntArrayArray10[local174], local201, local192, arg2); } if (TextureOp29.anInt2869 >= local183) { - Static131.method2576(Static71.anIntArrayArray10[local183], local201, local192, arg2); + TextureOp29SubOp4.method2576(TextureOp29SubOp4.anIntArrayArray10[local183], local201, local192, arg2); } } } diff --git a/client/src/main/java/rt4/Static75.java b/client/src/main/java/rt4/Static75.java deleted file mode 100644 index f73d475..0000000 --- a/client/src/main/java/rt4/Static75.java +++ /dev/null @@ -1,18 +0,0 @@ -package rt4; - -import org.openrs2.deob.annotation.OriginalMember; -import org.openrs2.deob.annotation.Pc; - -public final class Static75 { - - @OriginalMember(owner = "client!g", name = "b", descriptor = "(I)V") - public static void setDefaultChunksAtmosphere() { - @Pc(9) Environment local9 = new Environment(); - for (@Pc(18) int local18 = 0; local18 < 13; local18++) { - for (@Pc(25) int local25 = 0; local25 < 13; local25++) { - Static103.aClass92ArrayArray1[local18][local25] = local9; - } - } - } - -} diff --git a/client/src/main/java/rt4/Static76.java b/client/src/main/java/rt4/Static76.java deleted file mode 100644 index 923fac5..0000000 --- a/client/src/main/java/rt4/Static76.java +++ /dev/null @@ -1,33 +0,0 @@ -package rt4; - -import java.nio.FloatBuffer; -import com.jogamp.opengl.*; -import org.openrs2.deob.annotation.OriginalMember; -import org.openrs2.deob.annotation.Pc; - -public final class Static76 { - - @OriginalMember(owner = "client!ga", name = "a", descriptor = "()V") - public static void method1642() { - @Pc(1) GL2 local1 = GlRenderer.gl; - if (local1.isExtensionAvailable("GL_ARB_point_parameters")) { - @Pc(20) float[] local20 = new float[] { 1.0F, 0.0F, 5.0E-4F }; - local1.glPointParameterfv(GL2.GL_POINT_DISTANCE_ATTENUATION, local20, 0); - @Pc(28) FloatBuffer local28 = FloatBuffer.allocate(1); - local1.glGetFloatv(GL2.GL_POINT_SIZE_MAX, local28); - @Pc(36) float local36 = local28.get(0); - if (local36 > 1024.0F) { - local36 = 1024.0F; - } - local1.glPointParameterf(GL2.GL_POINT_SIZE_MIN, 1.0F); - local1.glPointParameterf(GL2.GL_POINT_SIZE_MAX, local36); - } - if (local1.isExtensionAvailable("GL_ARB_point_sprite")) { - } - } - - @OriginalMember(owner = "client!ga", name = "b", descriptor = "()V") - public static void method1643() { - } - -} diff --git a/client/src/main/java/rt4/Static78.java b/client/src/main/java/rt4/Static78.java deleted file mode 100644 index 0d96a4b..0000000 --- a/client/src/main/java/rt4/Static78.java +++ /dev/null @@ -1,22 +0,0 @@ -package rt4; - -import org.openrs2.deob.annotation.OriginalArg; -import org.openrs2.deob.annotation.OriginalMember; - -public final class Static78 { - - @OriginalMember(owner = "client!gd", name = "b", descriptor = "Lclient!na;") - public static final JagString aClass100_464 = JagString.parse("null"); - - @OriginalMember(owner = "client!gd", name = "h", descriptor = "[I") - public static final int[] anIntArray204 = new int[] { 16, 32, 64, 128 }; - - @OriginalMember(owner = "client!gd", name = "j", descriptor = "I") - public static int clickedInventoryComponentCycle = 0; - - @OriginalMember(owner = "client!gd", name = "a", descriptor = "(IIBI)I") - public static int method1690(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2) { - return arg2 > arg1 ? arg2 : arg1 > arg0 ? arg0 : arg1; - } - -} diff --git a/client/src/main/java/rt4/Static79.java b/client/src/main/java/rt4/Static79.java index c19a7e6..901a18c 100644 --- a/client/src/main/java/rt4/Static79.java +++ b/client/src/main/java/rt4/Static79.java @@ -6,33 +6,7 @@ import org.openrs2.deob.annotation.Pc; public final class Static79 { - @OriginalMember(owner = "client!ge", name = "k", descriptor = "[I") - public static int[] anIntArray205 = new int[2]; - - @OriginalMember(owner = "client!ge", name = "a", descriptor = "(IIIZIZZ)V") - public static void method1697(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) boolean arg3, @OriginalArg(4) int arg4, @OriginalArg(5) boolean arg5) { - if (arg2 <= arg4) { - return; - } - @Pc(13) int local13 = (arg2 + arg4) / 2; - @Pc(15) int local15 = arg4; - @Pc(19) World local19 = WorldList.sorted[local13]; - WorldList.sorted[local13] = WorldList.sorted[arg2]; - WorldList.sorted[arg2] = local19; - for (@Pc(31) int local31 = arg4; local31 < arg2; local31++) { - if (Static164.method3115(local19, WorldList.sorted[local31], arg0, arg1, arg3, arg5) <= 0) { - @Pc(53) World local53 = WorldList.sorted[local31]; - WorldList.sorted[local31] = WorldList.sorted[local15]; - WorldList.sorted[local15++] = local53; - } - } - WorldList.sorted[arg2] = WorldList.sorted[local15]; - WorldList.sorted[local15] = local19; - method1697(arg0, arg1, local15 - 1, arg3, arg4, arg5); - method1697(arg0, arg1, arg2, arg3, local15 + 1, arg5); - } - - @OriginalMember(owner = "client!ge", name = "a", descriptor = "(IIIIIIII)V") + @OriginalMember(owner = "client!ge", name = "a", descriptor = "(IIIIIIII)V") public static void method1698(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(6) int arg5, @OriginalArg(7) int arg6) { if (arg1 < 1 || arg4 < 1 || arg1 > 102 || arg4 > 102) { return; @@ -51,11 +25,11 @@ public final class Static79 { if (arg2 < 3 && (SceneGraph.tileFlags[1][arg1][arg4] & 0x2) == 2) { local39 = arg2 + 1; } - Static43.method1144(arg4, arg1, arg2, arg6, local39, PathFinder.collisionMaps[arg2]); + SceneGraph.method1144(arg4, arg1, arg2, arg6, local39, PathFinder.collisionMaps[arg2]); if (arg0 >= 0) { @Pc(92) boolean local92 = Preferences.showGroundDecorations; Preferences.showGroundDecorations = true; - Static185.method3397(local39, false, arg2, false, PathFinder.collisionMaps[arg2], arg0, arg5, arg1, arg4, arg3); + LoginManager.method3397(local39, false, arg2, false, PathFinder.collisionMaps[arg2], arg0, arg5, arg1, arg4, arg3); Preferences.showGroundDecorations = local92; } } diff --git a/client/src/main/java/rt4/Static8.java b/client/src/main/java/rt4/Static8.java index 54857e5..fc3ffba 100644 --- a/client/src/main/java/rt4/Static8.java +++ b/client/src/main/java/rt4/Static8.java @@ -11,7 +11,7 @@ public final class Static8 { @OriginalMember(owner = "client!aj", name = "a", descriptor = "(IIIZIII)V") public static void method120(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5) { - Static251.method4278(arg4); + Static241.method4278(arg4); @Pc(8) int local8 = arg4 - arg1; @Pc(10) int local10 = 0; if (local8 < 0) { @@ -22,13 +22,13 @@ public final class Static8 { @Pc(25) int local25 = local8; @Pc(28) int local28 = -local8; @Pc(30) int local30 = -1; - @Pc(34) int[] local34 = Static71.anIntArrayArray10[arg2]; + @Pc(34) int[] local34 = TextureOp29SubOp4.anIntArrayArray10[arg2]; @Pc(39) int local39 = arg5 + local8; @Pc(41) int local41 = -1; @Pc(46) int local46 = arg5 - local8; - Static131.method2576(local34, arg5 - arg4, local46, arg0); - Static131.method2576(local34, local46, local39, arg3); - Static131.method2576(local34, local39, arg5 + arg4, arg0); + TextureOp29SubOp4.method2576(local34, arg5 - arg4, local46, arg0); + TextureOp29SubOp4.method2576(local34, local46, local39, arg3); + TextureOp29SubOp4.method2576(local34, local39, arg5 + arg4, arg0); while (local10 < local23) { local30 += 2; local28 += local30; @@ -51,45 +51,45 @@ public final class Static8 { local23--; local21 -= local23 << 1; if (local8 > local23) { - local142 = Static71.anIntArrayArray10[local23 + arg2]; - local149 = Static71.anIntArrayArray10[arg2 - local23]; + local142 = TextureOp29SubOp4.anIntArrayArray10[local23 + arg2]; + local149 = TextureOp29SubOp4.anIntArrayArray10[arg2 - local23]; local154 = arg5 - local10; local158 = local10 + arg5; local162 = Static241.anIntArray522[local23]; local167 = arg5 - local162; local171 = local162 + arg5; - Static131.method2576(local142, local154, local167, arg0); - Static131.method2576(local142, local167, local171, arg3); - Static131.method2576(local142, local171, local158, arg0); - Static131.method2576(local149, local154, local167, arg0); - Static131.method2576(local149, local167, local171, arg3); - Static131.method2576(local149, local171, local158, arg0); + TextureOp29SubOp4.method2576(local142, local154, local167, arg0); + TextureOp29SubOp4.method2576(local142, local167, local171, arg3); + TextureOp29SubOp4.method2576(local142, local171, local158, arg0); + TextureOp29SubOp4.method2576(local149, local154, local167, arg0); + TextureOp29SubOp4.method2576(local149, local167, local171, arg3); + TextureOp29SubOp4.method2576(local149, local171, local158, arg0); } else { - local142 = Static71.anIntArrayArray10[arg2 + local23]; - local149 = Static71.anIntArrayArray10[arg2 - local23]; + local142 = TextureOp29SubOp4.anIntArrayArray10[arg2 + local23]; + local149 = TextureOp29SubOp4.anIntArrayArray10[arg2 - local23]; local162 = local10 + arg5; local158 = arg5 - local10; - Static131.method2576(local142, local158, local162, arg0); - Static131.method2576(local149, local158, local162, arg0); + TextureOp29SubOp4.method2576(local142, local158, local162, arg0); + TextureOp29SubOp4.method2576(local149, local158, local162, arg0); } } - local142 = Static71.anIntArrayArray10[arg2 + local10]; - local149 = Static71.anIntArrayArray10[arg2 - local10]; + local142 = TextureOp29SubOp4.anIntArrayArray10[arg2 + local10]; + local149 = TextureOp29SubOp4.anIntArrayArray10[arg2 - local10]; local162 = local23 + arg5; local158 = arg5 - local23; if (local8 <= local10) { - Static131.method2576(local142, local158, local162, arg0); - Static131.method2576(local149, local158, local162, arg0); + TextureOp29SubOp4.method2576(local142, local158, local162, arg0); + TextureOp29SubOp4.method2576(local149, local158, local162, arg0); } else { local154 = local10 <= local25 ? local25 : Static241.anIntArray522[local10]; local171 = local154 + arg5; local167 = arg5 - local154; - Static131.method2576(local142, local158, local167, arg0); - Static131.method2576(local142, local167, local171, arg3); - Static131.method2576(local142, local171, local162, arg0); - Static131.method2576(local149, local158, local167, arg0); - Static131.method2576(local149, local167, local171, arg3); - Static131.method2576(local149, local171, local162, arg0); + TextureOp29SubOp4.method2576(local142, local158, local167, arg0); + TextureOp29SubOp4.method2576(local142, local167, local171, arg3); + TextureOp29SubOp4.method2576(local142, local171, local162, arg0); + TextureOp29SubOp4.method2576(local149, local158, local167, arg0); + TextureOp29SubOp4.method2576(local149, local167, local171, arg3); + TextureOp29SubOp4.method2576(local149, local171, local162, arg0); } } } diff --git a/client/src/main/java/rt4/Static80.java b/client/src/main/java/rt4/Static80.java deleted file mode 100644 index 304a06d..0000000 --- a/client/src/main/java/rt4/Static80.java +++ /dev/null @@ -1,16 +0,0 @@ -package rt4; - -import org.openrs2.deob.annotation.OriginalMember; - -public final class Static80 { - - @OriginalMember(owner = "client!gf", name = "K", descriptor = "I") - public static int anInt4696; - - @OriginalMember(owner = "client!gf", name = "M", descriptor = "I") - public static int anInt4698; - - @OriginalMember(owner = "client!gf", name = "S", descriptor = "[I") - public static final int[] anIntArray419 = new int[] { 0, 2, 2, 2, 1, 1, 2, 2, 1, 3, 1, 1 }; - -} diff --git a/client/src/main/java/rt4/Static81.java b/client/src/main/java/rt4/Static81.java index 6e93915..25a32fb 100644 --- a/client/src/main/java/rt4/Static81.java +++ b/client/src/main/java/rt4/Static81.java @@ -13,13 +13,15 @@ public final class Static81 { @OriginalMember(owner = "client!gg", name = "db", descriptor = "I") public static int anInt2225 = -1; + @OriginalMember(owner = "client!ja", name = "r", descriptor = "I") + public static int anInt2941 = -1; - @OriginalMember(owner = "client!gg", name = "c", descriptor = "(II)V") + @OriginalMember(owner = "client!gg", name = "c", descriptor = "(II)V") public static void method1750(@OriginalArg(0) int arg0) { if (!Preferences.cursorsEnabled) { arg0 = -1; } - if (arg0 == Static115.anInt2941) { + if (arg0 == anInt2941) { return; } if (arg0 != -1) { @@ -29,18 +31,18 @@ public final class Static81 { arg0 = -1; } else { GameShell.signLink.setCursor(local28.method301(), local28.anInt1860, GameShell.canvas, new Point(local24.hotSpotX, local24.hotSpotY), local28.anInt1866); - Static115.anInt2941 = arg0; + anInt2941 = arg0; } } - if (arg0 == -1 && Static115.anInt2941 != -1) { + if (arg0 == -1 && anInt2941 != -1) { GameShell.signLink.setCursor(null, -1, GameShell.canvas, new Point(), -1); - Static115.anInt2941 = -1; + anInt2941 = -1; } } @OriginalMember(owner = "client!gg", name = "a", descriptor = "([[IZ)V") public static void method1751(@OriginalArg(0) int[][] arg0) { - Static71.anIntArrayArray10 = arg0; + TextureOp29SubOp4.anIntArrayArray10 = arg0; } } diff --git a/client/src/main/java/rt4/Static83.java b/client/src/main/java/rt4/Static83.java deleted file mode 100644 index 0ec413c..0000000 --- a/client/src/main/java/rt4/Static83.java +++ /dev/null @@ -1,40 +0,0 @@ -package rt4; - -import org.openrs2.deob.annotation.OriginalArg; -import org.openrs2.deob.annotation.OriginalMember; -import org.openrs2.deob.annotation.Pc; - -public final class Static83 { - - @OriginalMember(owner = "client!gj", name = "a", descriptor = "([JII[II)V") - public static void method436(@OriginalArg(0) long[] arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int[] arg3) { - if (arg1 >= arg2) { - return; - } - @Pc(20) int local20 = arg1; - @Pc(26) int local26 = (arg2 + arg1) / 2; - @Pc(30) long local30 = arg0[local26]; - arg0[local26] = arg0[arg2]; - arg0[arg2] = local30; - @Pc(44) int local44 = arg3[local26]; - arg3[local26] = arg3[arg2]; - arg3[arg2] = local44; - for (@Pc(56) int local56 = arg1; local56 < arg2; local56++) { - if (arg0[local56] < local30 + (long) (local56 & 0x1)) { - @Pc(76) long local76 = arg0[local56]; - arg0[local56] = arg0[local20]; - arg0[local20] = local76; - @Pc(90) int local90 = arg3[local56]; - arg3[local56] = arg3[local20]; - arg3[local20++] = local90; - } - } - arg0[arg2] = arg0[local20]; - arg0[local20] = local30; - arg3[arg2] = arg3[local20]; - arg3[local20] = local44; - method436(arg0, arg1, local20 - 1, arg3); - method436(arg0, local20 + 1, arg2, arg3); - } - -} diff --git a/client/src/main/java/rt4/Static85.java b/client/src/main/java/rt4/Static85.java deleted file mode 100644 index b065ff7..0000000 --- a/client/src/main/java/rt4/Static85.java +++ /dev/null @@ -1,10 +0,0 @@ -package rt4; - -import org.openrs2.deob.annotation.OriginalMember; - -public final class Static85 { - - @OriginalMember(owner = "client!gl", name = "f", descriptor = "I") - public static int anInt2263; - -} diff --git a/client/src/main/java/rt4/Static87.java b/client/src/main/java/rt4/Static87.java index a8b2a1c..ebb08f7 100644 --- a/client/src/main/java/rt4/Static87.java +++ b/client/src/main/java/rt4/Static87.java @@ -17,14 +17,30 @@ public final class Static87 { @OriginalMember(owner = "client!oj", name = "p", descriptor = "I") public static final int anInt4306 = 0x23201b; + @OriginalMember(owner = "client!wa", name = "pb", descriptor = "Lclient!na;") + public static final JagString aClass100_556 = JagString.parse("
"); + @OriginalMember(owner = "client!ed", name = "H", descriptor = "Lclient!na;") + public static final JagString aClass100_375 = JagString.parse("<)4col> x"); + @OriginalMember(owner = "client!bd", name = "b", descriptor = "Lclient!na;") + public static final JagString aClass100_80 = JagString.parse("(U(Y"); - @OriginalMember(owner = "client!gn", name = "d", descriptor = "Z") + @OriginalMember(owner = "client!gn", name = "d", descriptor = "Z") public static boolean aBoolean130 = false; @OriginalMember(owner = "client!gn", name = "v", descriptor = "Lclient!na;") public static final JagString NULL = JagString.parse("null"); + @OriginalMember(owner = "client!k", name = "j", descriptor = "I") + public static int anInt3126; + @OriginalMember(owner = "client!ld", name = "c", descriptor = "I") + public static int anInt3484 = -1; + @OriginalMember(owner = "client!qf", name = "X", descriptor = "Lclient!be;") + public static Component aClass13_13 = null; + @OriginalMember(owner = "client!gf", name = "K", descriptor = "I") + public static int anInt4696; + @OriginalMember(owner = "client!hi", name = "a", descriptor = "I") + public static int anInt2503 = -1; - @OriginalMember(owner = "client!gn", name = "a", descriptor = "(Z)Z") + @OriginalMember(owner = "client!gn", name = "a", descriptor = "(Z)Z") public static boolean showVideoAd() { if (client.objectTag) { try { @@ -66,7 +82,7 @@ public final class Static87 { local53 = local9[local20]; if (local53 != null) { client.audioLoop(); - Static269.method2203(PathFinder.collisionMaps, arg0, LoginManager.centralZoneX * 8 - 48, local49, local38, (LoginManager.centralZoneZ - 6) * 8, local53); + method2203(PathFinder.collisionMaps, arg0, LoginManager.centralZoneX * 8 - 48, local49, local38, (LoginManager.centralZoneZ - 6) * 8, local53); } } for (local20 = 0; local20 < local18; local20++) { @@ -76,7 +92,7 @@ public final class Static87 { if (local53 == null && LoginManager.centralZoneZ < 800) { client.audioLoop(); for (@Pc(130) int local130 = 0; local130 < local7; local130++) { - Static23.method645(local130, local49, local38, 64, 64); + method645(local130, local49, local38, 64, 64); } } } @@ -114,7 +130,7 @@ public final class Static87 { component.rectangle = rectangle; if (!component.if3 || !Static36.method947(component)) { if (component.clientCode > 0) { - Static2.method13(component); + method13(component); } @Pc(114) int local114 = arg1 + component.y; @Pc(117) int alpha = component.alpha; @@ -126,8 +142,8 @@ public final class Static87 { @Pc(164) int local164; if (component == Static40.aClass13_14) { if (layer != 0xabcdabcd && !component.dragRenderBehavior) { - Static80.anInt4696 = arg2; - Static127.anInt3126 = arg1; + anInt4696 = arg2; + anInt3126 = arg1; Static241.aClass13Array13 = components; continue; } @@ -135,11 +151,11 @@ public final class Static87 { local164 = Mouse.lastMouseY; local166 = Mouse.lastMouseX; local164 -= Static40.anInt4035; - if (local164 < Static228.anInt5103) { - local164 = Static228.anInt5103; + if (local164 < InterfaceList.anInt5103) { + local164 = InterfaceList.anInt5103; } - if (local164 + component.height > Static40.aClass13_1.height + Static228.anInt5103) { - local164 = Static40.aClass13_1.height + Static228.anInt5103 - component.height; + if (local164 + component.height > Static40.aClass13_1.height + InterfaceList.anInt5103) { + local164 = Static40.aClass13_1.height + InterfaceList.anInt5103 - component.height; } local114 = local164; local166 -= Static40.anInt5388; @@ -187,10 +203,10 @@ public final class Static87 { @Pc(545) int objId; if (component.clientCode != 0) { if (component.clientCode == 1337 || component.clientCode == 1403 && GlRenderer.enabled) { - Static280.aClass13_26 = component; - Static214.anInt5574 = local114; - Static97.anInt2503 = local123; - Static253.method4326(component.height, component.clientCode == 1403, local123, component.width, local114); + InterfaceList.aClass13_26 = component; + Static126.anInt5574 = local114; + anInt2503 = local123; + ScriptRunner.method4326(component.height, component.clientCode == 1403, local123, component.width, local114); if (GlRenderer.enabled) { GlRaster.setClip(arg0, arg6, arg4, arg7); } else { @@ -208,11 +224,11 @@ public final class Static87 { } else { SoftwareRaster.setClip(arg0, arg6, arg4, arg7); } - if (MiniMap.state != 0 && MiniMap.state != 3 || Static40.aBoolean108 || local166 > Static155.anInt3751 || Static60.anInt1892 < local164 || Static155.anInt3751 >= local302 || local291 <= Static60.anInt1892) { + if (MiniMap.state != 0 && MiniMap.state != 3 || Static40.aBoolean108 || local166 > ScriptRunner.anInt3751 || ScriptRunner.anInt1892 < local164 || ScriptRunner.anInt3751 >= local302 || local291 <= ScriptRunner.anInt1892) { continue; } - local270 = Static155.anInt3751 - local123; - local276 = Static60.anInt1892 - local114; + local270 = ScriptRunner.anInt3751 - local123; + local276 = ScriptRunner.anInt1892 - local114; local468 = component.anIntArray37[local276]; if (local270 < local468 || local270 > local468 + component.anIntArray45[local276]) { continue; @@ -231,7 +247,7 @@ public final class Static87 { if (Static241.aBoolean302 && (MiniMenu.anInt4999 & 0x40) != 0) { @Pc(583) Component local583 = InterfaceList.method1418(MiniMenu.anInt2512, MiniMenu.anInt506); if (local583 == null) { - Static53.method1294(); + MiniMenu.method1294(); } else { MiniMenu.add(MiniMenu.anInt5393, 1L, MiniMenu.aClass100_961, local563, (short) 11, MiniMenu.aClass100_545, local571); } @@ -319,7 +335,7 @@ public final class Static87 { } local571 = local556 * 10000 / cardMemory; local563 = objId * 100 / cardMemory; - @Pc(968) JagString local968 = JagString.concatenate(new JagString[] { Cheat.DEBUG_CAHE, StringUtils.formatNumber(0, true, 2, (long) local571), Static147.aClass100_672, JagString.parseInt(local563), Static14.aClass100_80 }); + @Pc(968) JagString local968 = JagString.concatenate(new JagString[] { Cheat.DEBUG_CAHE, StringUtils.formatNumber(0, true, 2, (long) local571), Static147.aClass100_672, JagString.parseInt(local563), aClass100_80 }); Fonts.p11Full.renderRight(local968, local270, local276, 16776960, 0); local276 += 12; InterfaceList.aBooleanArray100[rectangle] = true; @@ -327,26 +343,26 @@ public final class Static87 { continue; } if (component.clientCode == 1406) { - Static143.anInt3484 = local114; - Static201.aClass13_13 = component; + anInt3484 = local114; + aClass13_13 = component; Static131.anInt3260 = local123; continue; } } if (!Static40.aBoolean108) { - if (component.type == 0 && component.noClickThrough && Static155.anInt3751 >= local166 && Static60.anInt1892 >= local164 && Static155.anInt3751 < local302 && local291 > Static60.anInt1892 && !Static121.qaOpTest) { + if (component.type == 0 && component.noClickThrough && ScriptRunner.anInt3751 >= local166 && ScriptRunner.anInt1892 >= local164 && ScriptRunner.anInt3751 < local302 && local291 > ScriptRunner.anInt1892 && !Static121.qaOpTest) { MiniMenu.size = 1; - MiniMenu.cursors[0] = Static35.anInt1092; + MiniMenu.cursors[0] = MiniMenu.anInt1092; MiniMenu.ops[0] = LocalizedText.CANCEL; MiniMenu.opBases[0] = JagString.EMPTY; MiniMenu.actions[0] = 1005; } - if (local166 <= Static155.anInt3751 && local164 <= Static60.anInt1892 && local302 > Static155.anInt3751 && local291 > Static60.anInt1892) { - MiniMenu.addComponentEntries(Static60.anInt1892 - local114, -local123 + Static155.anInt3751, component); + if (local166 <= ScriptRunner.anInt3751 && local164 <= ScriptRunner.anInt1892 && local302 > ScriptRunner.anInt3751 && local291 > ScriptRunner.anInt1892) { + MiniMenu.addComponentEntries(ScriptRunner.anInt1892 - local114, -local123 + ScriptRunner.anInt3751, component); } } if (component.type == 0) { - if (!component.if3 && Static36.method947(component) && Static180.aClass13_22 != component) { + if (!component.if3 && Static36.method947(component) && InterfaceList.aClass13_22 != component) { continue; } if (!component.if3) { @@ -363,14 +379,14 @@ public final class Static87 { } @Pc(1186) ComponentPointer local1186 = (ComponentPointer) InterfaceList.openInterfaces.get((long) component.id); if (local1186 != null) { - if (local1186.anInt5879 == 0 && !Static40.aBoolean108 && Static155.anInt3751 >= local166 && local164 <= Static60.anInt1892 && local302 > Static155.anInt3751 && Static60.anInt1892 < local291 && !Static121.qaOpTest) { + if (local1186.anInt5879 == 0 && !Static40.aBoolean108 && ScriptRunner.anInt3751 >= local166 && local164 <= ScriptRunner.anInt1892 && local302 > ScriptRunner.anInt3751 && ScriptRunner.anInt1892 < local291 && !Static121.qaOpTest) { MiniMenu.ops[0] = LocalizedText.CANCEL; MiniMenu.size = 1; - MiniMenu.cursors[0] = Static35.anInt1092; + MiniMenu.cursors[0] = MiniMenu.anInt1092; MiniMenu.actions[0] = 1005; MiniMenu.opBases[0] = JagString.EMPTY; } - Static6.method86(local1186.anInt5878, local166, local302, local123, rectangle, local291, local164, local114); + method86(local1186.anInt5878, local166, local302, local123, rectangle, local291, local164, local114); } if (GlRenderer.enabled) { GlRaster.setClip(arg0, arg6, arg4, arg7); @@ -379,7 +395,7 @@ public final class Static87 { Rasteriser.prepare(); } } - if (Static223.aBooleanArray116[rectangle] || Cheat.rectDebug > 1) { + if (Static126.aBooleanArray116[rectangle] || Cheat.rectDebug > 1) { if (component.type == 0 && !component.if3 && component.scrollMaxV > component.height) { method1624(component.scrollY, component.scrollMaxV, component.width + local123, local114, component.height); } @@ -397,10 +413,10 @@ public final class Static87 { } if (component.objTypes[local270] > 0) { objId = component.objTypes[local270] - 1; - if (arg0 < x + 32 && x < arg4 && arg6 < y + 32 && y < arg7 || component == Static118.clickedInventoryComponent && Static4.mouseOverInventoryObjectIndex == local270) { + if (arg0 < x + 32 && x < arg4 && arg6 < y + 32 && y < arg7 || component == InterfaceList.clickedInventoryComponent && Static4.mouseOverInventoryObjectIndex == local270) { @Pc(1476) Sprite sprite; - if (MiniMenu.anInt5014 == 1 && Static185.anInt4370 == local270 && component.id == Static224.anInt5062) { + if (MiniMenu.anInt5014 == 1 && Static185.anInt4370 == local270 && component.id == MiniMap.anInt5062) { sprite = Inv.getObjectSprite(2, objId, component.objDrawText, component.objCounts[local270], 0); } else { sprite = Inv.getObjectSprite(1, objId, component.objDrawText, component.objCounts[local270], 3153952); @@ -412,9 +428,9 @@ public final class Static87 { if (sprite == null) { InterfaceList.redraw(component); - } else if (Static118.clickedInventoryComponent == component && local270 == Static4.mouseOverInventoryObjectIndex) { - int dragX = Mouse.lastMouseX - Static149.clickedInventoryComponentX; - int dragY = Mouse.lastMouseY - Static206.clickedInventoryComponentY; + } else if (InterfaceList.clickedInventoryComponent == component && local270 == Static4.mouseOverInventoryObjectIndex) { + int dragX = Mouse.lastMouseX - InterfaceList.clickedInventoryComponentX; + int dragY = Mouse.lastMouseY - InterfaceList.clickedInventoryComponentY; if (dragY < 5 && dragY > -5) { dragY = 0; @@ -424,7 +440,7 @@ public final class Static87 { dragX = 0; } - if (Static78.clickedInventoryComponentCycle < 5) { + if (InterfaceList.clickedInventoryComponentCycle < 5) { dragX = 0; dragY = 0; } @@ -447,9 +463,9 @@ public final class Static87 { @Pc(1611) int local1611; if (top > dragY + y && local1571.scrollY > 0) { - local1611 = Static178.anInt4247 * (top - dragY - y) / 3; - if (local1611 > Static178.anInt4247 * 10) { - local1611 = Static178.anInt4247 * 10; + local1611 = Protocol.anInt4247 * (top - dragY - y) / 3; + if (local1611 > Protocol.anInt4247 * 10) { + local1611 = Protocol.anInt4247 * 10; } if (local1611 > local1571.scrollY) { @@ -457,14 +473,14 @@ public final class Static87 { } local1571.scrollY -= local1611; - Static206.clickedInventoryComponentY += local1611; + InterfaceList.clickedInventoryComponentY += local1611; InterfaceList.redraw(local1571); } if (bottom < dragY + y + 32 && local1571.scrollY < local1571.scrollMaxV - local1571.height) { - local1611 = (y + dragY + 32 - bottom) * Static178.anInt4247 / 3; - if (local1611 > Static178.anInt4247 * 10) { - local1611 = Static178.anInt4247 * 10; + local1611 = (y + dragY + 32 - bottom) * Protocol.anInt4247 / 3; + if (local1611 > Protocol.anInt4247 * 10) { + local1611 = Protocol.anInt4247 * 10; } if (local1571.scrollMaxV - local1571.scrollY - local1571.height < local1611) { @@ -472,7 +488,7 @@ public final class Static87 { } local1571.scrollY += local1611; - Static206.clickedInventoryComponentY -= local1611; + InterfaceList.clickedInventoryComponentY -= local1611; InterfaceList.redraw(local1571); } } @@ -497,14 +513,14 @@ public final class Static87 { } } } else if (component.type == 3) { - if (Static154.method2926(component)) { + if (method2926(component)) { local270 = component.anInt492; - if (Static180.aClass13_22 == component && component.anInt475 != 0) { + if (InterfaceList.aClass13_22 == component && component.anInt475 != 0) { local270 = component.anInt475; } } else { local270 = component.color; - if (component == Static180.aClass13_22 && component.anInt480 != 0) { + if (component == InterfaceList.aClass13_22 && component.anInt480 != 0) { local270 = component.anInt480; } } @@ -537,9 +553,9 @@ public final class Static87 { local1921 = component.method491(Sprites.nameIcons); if (local1921 != null) { @Pc(1934) JagString local1934 = component.text; - if (Static154.method2926(component)) { + if (method2926(component)) { local276 = component.anInt492; - if (Static180.aClass13_22 == component && component.anInt475 != 0) { + if (InterfaceList.aClass13_22 == component && component.anInt475 != 0) { local276 = component.anInt475; } if (component.aClass100_82.length() > 0) { @@ -547,7 +563,7 @@ public final class Static87 { } } else { local276 = component.color; - if (Static180.aClass13_22 == component && component.anInt480 != 0) { + if (InterfaceList.aClass13_22 == component && component.anInt480 != 0) { local276 = component.anInt480; } } @@ -558,10 +574,10 @@ public final class Static87 { local1934 = MiniMenu.NULL; } if ((local1989.stackable == 1 || component.objCount != 1) && component.objCount != -1) { - local1934 = JagString.concatenate(new JagString[] { MiniMenu.aClass100_32, local1934, Static54.aClass100_375, Static70.method1548(component.objCount) }); + local1934 = JagString.concatenate(new JagString[] { MiniMenu.aClass100_32, local1934, aClass100_375, Static70.method1548(component.objCount) }); } } - if (Static39.aClass13_10 == component) { + if (Static44.aClass13_10 == component) { local276 = component.color; local1934 = LocalizedText.PLEASEWAIT; } @@ -592,8 +608,8 @@ public final class Static87 { if (GlRenderer.enabled) { GlRaster.method1183(local123, local114, component.width + local123, component.height + local114); - @Pc(2274) boolean local2274 = Static209.method3702(sprite.width); - @Pc(2279) boolean local2279 = Static209.method3702(sprite.height); + @Pc(2274) boolean local2274 = Static171.method3702(sprite.width); + @Pc(2279) boolean local2279 = Static171.method3702(sprite.height); @Pc(2282) GlSprite local2282 = (GlSprite) sprite; if (local2274 && local2279) { if (alpha == 0) { @@ -663,7 +679,7 @@ public final class Static87 { InterfaceList.redraw(component); } } else { - sprite = component.method489(Static154.method2926(component)); + sprite = component.method489(method2926(component)); if (sprite != null) { sprite.render(local123, local114); } else if (Component.aBoolean72) { @@ -673,7 +689,7 @@ public final class Static87 { } else { @Pc(2611) ObjType local2611; if (component.type == 6) { - @Pc(2587) boolean local2587 = Static154.method2926(component); + @Pc(2587) boolean local2587 = method2926(component); @Pc(2589) Model local2589 = null; if (local2587) { local276 = component.anInt462; @@ -743,11 +759,11 @@ public final class Static87 { GlRenderer.setDepthTestEnabled(true); GlRenderer.setFogEnabled(false); FogManager.method3935(Preferences.brightness); - if (Static263.aBoolean299) { + if (ScriptRunner.aBoolean299) { GlRaster.method1177(); GlRenderer.clearDepthBuffer(); GlRaster.setClip(arg0, arg6, arg4, arg7); - Static263.aBoolean299 = false; + ScriptRunner.aBoolean299 = false; } if (component.aBoolean34) { GlRenderer.disableDepthMask(); @@ -794,7 +810,7 @@ public final class Static87 { if (local2611.stackable != 1 && component.objCounts[local276] == 1) { local3159 = JagString.concatenate(new JagString[] { MiniMenu.aClass100_32, local2611.name, Static70.aClass100_978 }); } else { - local3159 = JagString.concatenate(new JagString[] { MiniMenu.aClass100_32, local2611.name, Static54.aClass100_375, Static70.method1548(component.objCounts[local276]) }); + local3159 = JagString.concatenate(new JagString[] { MiniMenu.aClass100_32, local2611.name, aClass100_375, Static70.method1548(component.objCounts[local276]) }); } local556 = local123 + memory * (component.anInt512 + 115); objId = (component.anInt516 + 12) * local468 + local114; @@ -810,7 +826,7 @@ public final class Static87 { } } } - if (component.type == 8 && Static43.aClass13_11 == component && Static133.anInt5235 == Static191.anInt4504) { + if (component.type == 8 && Protocol.aClass13_11 == component && Protocol.anInt5235 == Static191.anInt4504) { local276 = 0; local270 = 0; @Pc(3297) JagString local3297 = component.text; @@ -818,7 +834,7 @@ public final class Static87 { local3297 = JagString.method2465(component, local3297); @Pc(3325) JagString local3325; while (local3297.length() > 0) { - cardMemory = local3297.indexOf(Static269.aClass100_556); + cardMemory = local3297.indexOf(aClass100_556); if (cardMemory == -1) { local3325 = local3297; local3297 = JagString.EMPTY; @@ -856,7 +872,7 @@ public final class Static87 { objId = local556 + local3299.lineHeight + 2; local3297 = JagString.method2465(component, local3297); while (local3297.length() > 0) { - local563 = local3297.indexOf(Static269.aClass100_556); + local563 = local3297.indexOf(aClass100_556); if (local563 == -1) { local3325 = local3297; local3297 = JagString.EMPTY; @@ -934,4 +950,328 @@ public final class Static87 { GlRaster.method1174(arg2, local35 + arg3 + local54 + 15, 16, anInt671); GlRaster.method1174(arg2 + 1, arg3 + 14 - -local54 + local35, 15, anInt671); } + + @OriginalMember(owner = "client!wa", name = "a", descriptor = "([Lclient!mj;ZIIIII[B)V") + public static void method2203(@OriginalArg(0) CollisionMap[] arg0, @OriginalArg(1) boolean arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5, @OriginalArg(7) byte[] arg6) { + @Pc(14) int local14; + @Pc(21) int local21; + if (!arg1) { + for (@Pc(9) int local9 = 0; local9 < 4; local9++) { + for (local14 = 0; local14 < 64; local14++) { + for (local21 = 0; local21 < 64; local21++) { + if (arg4 + local14 > 0 && local14 + arg4 < 103 && arg3 + local21 > 0 && local21 + arg3 < 103) { + arg0[local9].flags[local14 + arg4][arg3 + local21] &= 0xFEFFFFFF; + } + } + } + } + } + @Pc(95) Buffer local95 = new Buffer(arg6); + @Pc(99) byte local99; + if (arg1) { + local99 = 1; + } else { + local99 = 4; + } + @Pc(117) int local117; + for (local14 = 0; local14 < local99; local14++) { + for (local21 = 0; local21 < 64; local21++) { + for (local117 = 0; local117 < 64; local117++) { + SceneGraph.readTile(arg2, arg5, arg1, local95, local117 + arg3, arg4 + local21, 0, local14); + } + } + } + @Pc(146) boolean local146 = false; + @Pc(243) int local243; + @Pc(188) int local188; + @Pc(190) int local190; + @Pc(194) int local194; + while (local95.offset < local95.data.length) { + local21 = local95.g1(); + if (local21 != 129) { + local95.offset--; + break; + } + for (local117 = 0; local117 < 4; local117++) { + @Pc(168) byte local168 = local95.g1b(); + if (local168 == 0) { + local243 = arg4; + if (arg4 < 0) { + local243 = 0; + } else if (arg4 >= 104) { + local243 = 104; + } + local190 = arg3; + if (arg3 < 0) { + local190 = 0; + } else if (arg3 >= 104) { + local190 = 104; + } + local188 = arg4 + 64; + local194 = arg3 + 64; + if (local194 < 0) { + local194 = 0; + } else if (local194 >= 104) { + local194 = 104; + } + if (local188 < 0) { + local188 = 0; + } else if (local188 >= 104) { + local188 = 104; + } + while (local243 < local188) { + while (local190 < local194) { + SceneGraph.aByteArrayArrayArray13[local117][local243][local190] = 0; + local190++; + } + local243++; + } + } else if (local168 == 1) { + for (local243 = 0; local243 < 64; local243 += 4) { + for (local188 = 0; local188 < 64; local188 += 4) { + @Pc(305) byte local305 = local95.g1b(); + for (local194 = local243 + arg4; local194 < arg4 + local243 + 4; local194++) { + for (@Pc(320) int local320 = arg3 + local188; local320 < arg3 + local188 + 4; local320++) { + if (local194 >= 0 && local194 < 104 && local320 >= 0 && local320 < 104) { + SceneGraph.aByteArrayArrayArray13[local117][local194][local320] = local305; + } + } + } + } + } + } else if (local168 == 2 && local117 > 0) { + local188 = arg4 + 64; + local190 = arg3; + local194 = arg3 + 64; + if (local188 < 0) { + local188 = 0; + } else if (local188 >= 104) { + local188 = 104; + } + if (arg3 < 0) { + local190 = 0; + } else if (arg3 >= 104) { + local190 = 104; + } + if (local194 < 0) { + local194 = 0; + } else if (local194 >= 104) { + local194 = 104; + } + local243 = arg4; + if (arg4 < 0) { + local243 = 0; + } else if (arg4 >= 104) { + local243 = 104; + } + while (local188 > local243) { + while (local190 < local194) { + SceneGraph.aByteArrayArrayArray13[local117][local243][local190] = SceneGraph.aByteArrayArrayArray13[local117 - 1][local243][local190]; + local190++; + } + local243++; + } + } + } + local146 = true; + } + @Pc(515) int local515; + if (GlRenderer.enabled && !arg1) { + @Pc(490) Environment local490 = null; + label270: while (true) { + label263: do { + while (local95.offset < local95.data.length) { + local117 = local95.g1(); + if (local117 != 0) { + if (local117 != 1) { + throw new IllegalStateException(); + } + local515 = local95.g1(); + continue label263; + } + local490 = new Environment(local95); + } + if (local490 == null) { + local490 = new Environment(); + } + for (local117 = 0; local117 < 8; local117++) { + for (local515 = 0; local515 < 8; local515++) { + local243 = local117 + (arg4 >> 3); + local188 = (arg3 >> 3) + local515; + if (local243 >= 0 && local243 < 13 && local188 >= 0 && local188 < 13) { + Static103.aClass92ArrayArray1[local243][local188] = local490; + } + } + } + break label270; + } while (local515 <= 0); + for (local243 = 0; local243 < local515; local243++) { + @Pc(529) Light local529 = new Light(local95); + if (local529.anInt2243 == 31) { + @Pc(541) LightType local541 = LightTypeList.get(local95.g2()); + local529.method1762(local541.anInt2865, local541.anInt2873, local541.anInt2867, local541.anInt2872); + } + local529.anInt2245 += arg3 << 7; + local529.anInt2240 += arg4 << 7; + local194 = local529.anInt2245 >> 7; + local190 = local529.anInt2240 >> 7; + if (local190 >= 0 && local194 >= 0 && local190 < 104 && local194 < 104) { + local529.aBoolean125 = (SceneGraph.tileFlags[1][local190][local194] & 0x2) != 0; + local529.anInt2235 = SceneGraph.tileHeights[local529.anInt2241][local190][local194] - local529.anInt2235; + LightingManager.method2389(local529); + } + } + } + } + if (local146) { + return; + } + for (local21 = 0; local21 < 4; local21++) { + for (local117 = 0; local117 < 16; local117++) { + for (local515 = 0; local515 < 16; local515++) { + local243 = (arg4 >> 2) + local117; + local188 = local515 + (arg3 >> 2); + if (local243 >= 0 && local243 < 26 && local188 >= 0 && local188 < 26) { + SceneGraph.aByteArrayArrayArray13[local21][local243][local188] = 0; + } + } + } + } + } + + @OriginalMember(owner = "client!ag", name = "a", descriptor = "(IIIIIIIII)V") + public static void method86(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5, @OriginalArg(7) int arg6, @OriginalArg(8) int arg7) { + if (InterfaceList.load(arg0)) { + method1809(arg1, arg7, arg3, InterfaceList.components[arg0], arg2, -1, arg6, arg5, arg4); + } else if (arg4 == -1) { + for (@Pc(27) int local27 = 0; local27 < 100; local27++) { + InterfaceList.aBooleanArray100[local27] = true; + } + } else { + InterfaceList.aBooleanArray100[arg4] = true; + } + } + + @OriginalMember(owner = "client!bm", name = "a", descriptor = "(IBIIII)V") + public static void method645(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4) { + @Pc(3) int local3; + @Pc(10) int local10; + for (local3 = arg1; local3 <= arg3 + arg1; local3++) { + for (local10 = arg2; local10 <= arg4 + arg2; local10++) { + if (local10 >= 0 && local10 < 104 && local3 >= 0 && local3 < 104) { + SceneGraph.aByteArrayArrayArray9[arg0][local10][local3] = 127; + } + } + } + for (local3 = arg1; local3 < arg3 + arg1; local3++) { + for (local10 = arg2; local10 < arg2 + arg4; local10++) { + if (local10 >= 0 && local10 < 104 && local3 >= 0 && local3 < 104) { + SceneGraph.tileHeights[arg0][local10][local3] = arg0 <= 0 ? 0 : SceneGraph.tileHeights[arg0 - 1][local10][local3]; + } + } + } + if (arg2 > 0 && arg2 < 104) { + for (local3 = arg1 + 1; local3 < arg1 + arg3; local3++) { + if (local3 >= 0 && local3 < 104) { + SceneGraph.tileHeights[arg0][arg2][local3] = SceneGraph.tileHeights[arg0][arg2 - 1][local3]; + } + } + } + if (arg1 > 0 && arg1 < 104) { + for (local3 = arg2 + 1; local3 < arg2 + arg4; local3++) { + if (local3 >= 0 && local3 < 104) { + SceneGraph.tileHeights[arg0][local3][arg1] = SceneGraph.tileHeights[arg0][local3][arg1 - 1]; + } + } + } + if (arg2 < 0 || arg1 < 0 || arg2 >= 104 || arg1 >= 104) { + return; + } + if (arg0 == 0) { + if (arg2 > 0 && SceneGraph.tileHeights[arg0][arg2 - 1][arg1] != 0) { + SceneGraph.tileHeights[arg0][arg2][arg1] = SceneGraph.tileHeights[arg0][arg2 - 1][arg1]; + } else if (arg1 > 0 && SceneGraph.tileHeights[arg0][arg2][arg1 - 1] != 0) { + SceneGraph.tileHeights[arg0][arg2][arg1] = SceneGraph.tileHeights[arg0][arg2][arg1 - 1]; + } else if (arg2 > 0 && arg1 > 0 && SceneGraph.tileHeights[arg0][arg2 - 1][arg1 - 1] != 0) { + SceneGraph.tileHeights[arg0][arg2][arg1] = SceneGraph.tileHeights[arg0][arg2 - 1][arg1 - 1]; + } + } else if (arg2 > 0 && SceneGraph.tileHeights[arg0 - 1][arg2 - 1][arg1] != SceneGraph.tileHeights[arg0][arg2 - 1][arg1]) { + SceneGraph.tileHeights[arg0][arg2][arg1] = SceneGraph.tileHeights[arg0][arg2 - 1][arg1]; + } else if (arg1 > 0 && SceneGraph.tileHeights[arg0][arg2][arg1 - 1] != SceneGraph.tileHeights[arg0 - 1][arg2][arg1 - 1]) { + SceneGraph.tileHeights[arg0][arg2][arg1] = SceneGraph.tileHeights[arg0][arg2][arg1 - 1]; + } else if (arg2 > 0 && arg1 > 0 && SceneGraph.tileHeights[arg0][arg2 - 1][arg1 - 1] != SceneGraph.tileHeights[arg0 - 1][arg2 - 1][arg1 - 1]) { + SceneGraph.tileHeights[arg0][arg2][arg1] = SceneGraph.tileHeights[arg0][arg2 - 1][arg1 - 1]; + } + } + + @OriginalMember(owner = "client!aa", name = "a", descriptor = "(BLclient!be;)V") + public static void method13(@OriginalArg(1) Component arg0) { + @Pc(16) int local16 = arg0.clientCode; + if (local16 == 324) { + if (Static158.anInt3851 == -1) { + Static158.anInt3851 = arg0.spriteId; + Static145.anInt3502 = arg0.anInt519; + } + if (PlayerAppearance.DEFAULT.gender) { + arg0.spriteId = Static158.anInt3851; + } else { + arg0.spriteId = Static145.anInt3502; + } + } else if (local16 == 325) { + if (Static158.anInt3851 == -1) { + Static145.anInt3502 = arg0.anInt519; + Static158.anInt3851 = arg0.spriteId; + } + if (PlayerAppearance.DEFAULT.gender) { + arg0.spriteId = Static145.anInt3502; + } else { + arg0.spriteId = Static158.anInt3851; + } + } else if (local16 == 327) { + arg0.modelXAngle = 150; + arg0.modelYAngle = (int) (Math.sin((double) client.loop / 40.0D) * 256.0D) & 0x7FF; + arg0.modelType = 5; + arg0.modelId = -1; + } else if (local16 == 328) { + if (PlayerList.self.username == null) { + arg0.modelId = 0; + } else { + arg0.modelXAngle = 150; + arg0.modelYAngle = (int) (Math.sin((double) client.loop / 40.0D) * 256.0D) & 0x7FF; + arg0.modelType = 5; + arg0.modelId = ((int) PlayerList.self.username.encode37() << 11) + 2047; + arg0.anInt496 = PlayerList.self.anInt3388; + arg0.anInt500 = 0; + arg0.modelSeqId = PlayerList.self.movementSeqId; + arg0.anInt510 = PlayerList.self.anInt3407; + } + } + } + + @OriginalMember(owner = "client!md", name = "a", descriptor = "(Lclient!be;I)Z") + public static boolean method2926(@OriginalArg(0) Component arg0) { + if (arg0.anIntArray43 == null) { + return false; + } + for (@Pc(14) int local14 = 0; local14 < arg0.anIntArray43.length; local14++) { + @Pc(34) int local34 = JagString.method3212(local14, arg0); + @Pc(39) int local39 = arg0.anIntArray48[local14]; + if (arg0.anIntArray43[local14] == 2) { + if (local39 <= local34) { + return false; + } + } else if (arg0.anIntArray43[local14] == 3) { + if (local34 <= local39) { + return false; + } + } else if (arg0.anIntArray43[local14] == 4) { + if (local34 == local39) { + return false; + } + } else if (local39 != local34) { + return false; + } + } + return true; + } } diff --git a/client/src/main/java/rt4/Static89.java b/client/src/main/java/rt4/Static89.java index 2c62282..b53d116 100644 --- a/client/src/main/java/rt4/Static89.java +++ b/client/src/main/java/rt4/Static89.java @@ -7,7 +7,10 @@ import org.openrs2.deob.annotation.Pc; public final class Static89 { - @OriginalMember(owner = "client!ha", name = "a", descriptor = "(ZB)V") + @OriginalMember(owner = "client!ec", name = "d", descriptor = "Lclient!gn;") + public static final LruHashTable aClass54_5 = new LruHashTable(16); + + @OriginalMember(owner = "client!ha", name = "a", descriptor = "(ZB)V") public static void method1835(@OriginalArg(0) boolean arg0) { @Pc(11) byte local11; @Pc(13) byte[][] local13; @@ -22,7 +25,7 @@ public final class Static89 { client.audioLoop(); for (@Pc(32) int local32 = 0; local32 < 13; local32++) { for (@Pc(39) int local39 = 0; local39 < 13; local39++) { - @Pc(52) int local52 = Static187.anIntArrayArrayArray18[local21][local32][local39]; + @Pc(52) int local52 = Protocol.anIntArrayArrayArray18[local21][local32][local39]; @Pc(54) boolean local54 = false; if (local52 != -1) { @Pc(65) int local65 = local52 >> 24 & 0x3; @@ -33,7 +36,7 @@ public final class Static89 { @Pc(98) int local98 = (local88 / 8 << 8) + local76 / 8; for (@Pc(100) int local100 = 0; local100 < LoginManager.regionBitPacked.length; local100++) { if (LoginManager.regionBitPacked[local100] == local98 && local13[local100] != null) { - Static245.method4228(local82, local32 * 8, local21, PathFinder.collisionMaps, local39 * 8, local13[local100], local65, (local76 & 0x7) * 8, (local88 & 0x7) * 8, arg0); + method4228(local82, local32 * 8, local21, PathFinder.collisionMaps, local39 * 8, local13[local100], local65, (local76 & 0x7) * 8, (local88 & 0x7) * 8, arg0); local54 = true; break; } @@ -41,7 +44,7 @@ public final class Static89 { } } if (!local54) { - Static23.method645(local21, local39 * 8, local32 * 8, 8, 8); + Static87.method645(local21, local39 * 8, local32 * 8, 8, 8); } } } @@ -50,7 +53,7 @@ public final class Static89 { @OriginalMember(owner = "client!ha", name = "a", descriptor = "(II)[B") public static byte[] method1837(@OriginalArg(1) int arg0) { - @Pc(10) ByteArrayNodeSecondary local10 = (ByteArrayNodeSecondary) Static53.aClass54_5.get((long) arg0); + @Pc(10) ByteArrayNodeSecondary local10 = (ByteArrayNodeSecondary) aClass54_5.get((long) arg0); if (local10 == null) { @Pc(24) Random local24 = new Random((long) arg0); @Pc(27) byte[] local27 = new byte[512]; @@ -66,7 +69,7 @@ public final class Static89 { local27[local53] = local27[511 - local29] = local62; } local10 = new ByteArrayNodeSecondary(local27); - Static53.aClass54_5.put(local10, (long) arg0); + aClass54_5.put(local10, (long) arg0); } return local10.value; } @@ -79,27 +82,27 @@ public final class Static89 { return local17; } } - return Static154.method2929(arg1); + return Protocol.method2929(arg1); } @OriginalMember(owner = "client!ha", name = "a", descriptor = "(I)V") public static void method1841() { if (!Static40.aBoolean108) { if (Static226.anInt3953 != 0) { - Static155.anInt3751 = Mouse.anInt5850; - Static60.anInt1892 = Static280.anInt5895; + ScriptRunner.anInt3751 = Mouse.anInt5850; + ScriptRunner.anInt1892 = Static226.anInt5895; } else if (Mouse.clickButton == 0) { - Static155.anInt3751 = Mouse.lastMouseX; - Static60.anInt1892 = Mouse.lastMouseY; + ScriptRunner.anInt3751 = Mouse.lastMouseX; + ScriptRunner.anInt1892 = Mouse.lastMouseY; } else { - Static155.anInt3751 = Mouse.clickX; - Static60.anInt1892 = Mouse.clickY; + ScriptRunner.anInt3751 = Mouse.clickX; + ScriptRunner.anInt1892 = Mouse.clickY; } MiniMenu.size = 1; MiniMenu.ops[0] = LocalizedText.CANCEL; MiniMenu.opBases[0] = JagString.EMPTY; MiniMenu.actions[0] = 1005; - MiniMenu.cursors[0] = Static35.anInt1092; + MiniMenu.cursors[0] = MiniMenu.anInt1092; } if (InterfaceList.topLevelInterface != -1) { Static96.method1949(InterfaceList.topLevelInterface); @@ -109,15 +112,15 @@ public final class Static89 { if (InterfaceList.aBooleanArray100[local60]) { InterfaceList.rectangleRedraw[local60] = true; } - Static223.aBooleanArray116[local60] = InterfaceList.aBooleanArray100[local60]; + Static126.aBooleanArray116[local60] = InterfaceList.aBooleanArray100[local60]; InterfaceList.aBooleanArray100[local60] = false; } - Static201.aClass13_13 = null; - Static97.anInt2503 = -1; - Static214.anInt5574 = -1; - Static169.mouseOverInventoryInterface = null; + Static87.aClass13_13 = null; + Static87.anInt2503 = -1; + Static126.anInt5574 = -1; + InterfaceList.mouseOverInventoryInterface = null; if (GlRenderer.enabled) { - Static263.aBoolean299 = true; + ScriptRunner.aBoolean299 = true; } Static182.anInt4311 = client.loop; if (InterfaceList.topLevelInterface != -1) { @@ -136,25 +139,25 @@ public final class Static89 { } else { Static145.method2744(); } - } else if (Static201.aClass13_13 != null) { - Static49.method1207(Static201.aClass13_13, Static143.anInt3484, Static131.anInt3260); - } else if (Static97.anInt2503 != -1) { - Static49.method1207(null, Static214.anInt5574, Static97.anInt2503); + } else if (Static87.aClass13_13 != null) { + Static49.method1207(Static87.aClass13_13, Static87.anInt3484, Static131.anInt3260); + } else if (Static87.anInt2503 != -1) { + Static49.method1207(null, Static126.anInt5574, Static87.anInt2503); } - local60 = Static40.aBoolean108 ? -1 : Static235.method4044(); + local60 = Static40.aBoolean108 ? -1 : method4044(); if (local60 == -1) { - local60 = Static270.anInt5794; + local60 = ScriptRunner.anInt5794; } Static81.method1750(local60); if (MiniMenu.anInt3096 == 1) { MiniMenu.anInt3096 = 2; } - if (Static187.anInt4422 == 1) { - Static187.anInt4422 = 2; + if (Protocol.anInt4422 == 1) { + Protocol.anInt4422 = 2; } if (Cheat.rectDebug == 3) { for (@Pc(189) int local189 = 0; local189 < InterfaceList.rectangles; local189++) { - if (Static223.aBooleanArray116[local189]) { + if (Static126.aBooleanArray116[local189]) { if (GlRenderer.enabled) { GlRaster.fillRectAlpha(InterfaceList.rectangleX[local189], InterfaceList.rectangleY[local189], InterfaceList.rectangleWidth[local189], InterfaceList.rectangleHeight[local189], 16711935, 128); } else { @@ -169,8 +172,8 @@ public final class Static89 { } } } - AreaSoundManager.redraw(Static178.anInt4247, PlayerList.self.xFine, PlayerList.self.zFine, Player.level); - Static178.anInt4247 = 0; + AreaSoundManager.redraw(Protocol.anInt4247, PlayerList.self.xFine, PlayerList.self.zFine, Player.level); + Protocol.anInt4247 = 0; } @OriginalMember(owner = "client!ha", name = "a", descriptor = "(IIIII)V") @@ -179,9 +182,9 @@ public final class Static89 { @Pc(9) int local9 = arg2; @Pc(12) int local12 = -arg2; @Pc(14) int local14 = -1; - @Pc(22) int local22 = Static78.method1690(TextureOp29.anInt5063, arg2 + arg3, TextureOp29.anInt4164); - @Pc(30) int local30 = Static78.method1690(TextureOp29.anInt5063, arg3 - arg2, TextureOp29.anInt4164); - Static131.method2576(Static71.anIntArrayArray10[arg1], local30, local22, arg0); + @Pc(22) int local22 = Static231.method1690(TextureOp29.anInt5063, arg2 + arg3, TextureOp29.anInt4164); + @Pc(30) int local30 = Static231.method1690(TextureOp29.anInt5063, arg3 - arg2, TextureOp29.anInt4164); + TextureOp29SubOp4.method2576(TextureOp29SubOp4.anIntArrayArray10[arg1], local30, local22, arg0); while (local7 < local9) { local14 += 2; local12 += local14; @@ -195,13 +198,13 @@ public final class Static89 { local12 -= local9 << 1; local68 = arg1 + local9; if (local68 >= TextureOp29.anInt5773 && local58 <= TextureOp29.anInt2869) { - local84 = Static78.method1690(TextureOp29.anInt5063, arg3 + local7, TextureOp29.anInt4164); - local93 = Static78.method1690(TextureOp29.anInt5063, arg3 - local7, TextureOp29.anInt4164); + local84 = Static231.method1690(TextureOp29.anInt5063, arg3 + local7, TextureOp29.anInt4164); + local93 = Static231.method1690(TextureOp29.anInt5063, arg3 - local7, TextureOp29.anInt4164); if (TextureOp29.anInt2869 >= local68) { - Static131.method2576(Static71.anIntArrayArray10[local68], local93, local84, arg0); + TextureOp29SubOp4.method2576(TextureOp29SubOp4.anIntArrayArray10[local68], local93, local84, arg0); } if (TextureOp29.anInt5773 <= local58) { - Static131.method2576(Static71.anIntArrayArray10[local58], local93, local84, arg0); + TextureOp29SubOp4.method2576(TextureOp29SubOp4.anIntArrayArray10[local58], local93, local84, arg0); } } } @@ -209,15 +212,234 @@ public final class Static89 { local58 = arg1 - local7; local68 = local7 + arg1; if (local68 >= TextureOp29.anInt5773 && TextureOp29.anInt2869 >= local58) { - local84 = Static78.method1690(TextureOp29.anInt5063, arg3 + local9, TextureOp29.anInt4164); - local93 = Static78.method1690(TextureOp29.anInt5063, arg3 - local9, TextureOp29.anInt4164); + local84 = Static231.method1690(TextureOp29.anInt5063, arg3 + local9, TextureOp29.anInt4164); + local93 = Static231.method1690(TextureOp29.anInt5063, arg3 - local9, TextureOp29.anInt4164); if (local68 <= TextureOp29.anInt2869) { - Static131.method2576(Static71.anIntArrayArray10[local68], local93, local84, arg0); + TextureOp29SubOp4.method2576(TextureOp29SubOp4.anIntArrayArray10[local68], local93, local84, arg0); } if (local58 >= TextureOp29.anInt5773) { - Static131.method2576(Static71.anIntArrayArray10[local58], local93, local84, arg0); + TextureOp29SubOp4.method2576(TextureOp29SubOp4.anIntArrayArray10[local58], local93, local84, arg0); } } } } + + @OriginalMember(owner = "client!tm", name = "a", descriptor = "(III[Lclient!mj;IB[BIIIZ)V") + public static void method4228(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) CollisionMap[] arg3, @OriginalArg(4) int arg4, @OriginalArg(6) byte[] arg5, @OriginalArg(7) int arg6, @OriginalArg(8) int arg7, @OriginalArg(9) int arg8, @OriginalArg(10) boolean arg9) { + @Pc(17) int local17; + if (!arg9) { + for (@Pc(10) int local10 = 0; local10 < 8; local10++) { + for (local17 = 0; local17 < 8; local17++) { + if (arg1 + local10 > 0 && local10 + arg1 < 103 && local17 + arg4 > 0 && arg4 + local17 < 103) { + arg3[arg2].flags[local10 + arg1][local17 + arg4] &= 0xFEFFFFFF; + } + } + } + } + @Pc(87) byte local87; + if (arg9) { + local87 = 1; + } else { + local87 = 4; + } + @Pc(96) Buffer local96 = new Buffer(arg5); + @Pc(103) int local103; + @Pc(108) int local108; + for (local17 = 0; local17 < local87; local17++) { + for (local103 = 0; local103 < 64; local103++) { + for (local108 = 0; local108 < 64; local108++) { + if (arg6 == local17 && arg8 <= local103 && arg8 + 8 > local103 && arg7 <= local108 && local108 < arg7 + 8) { + SceneGraph.readTile(0, 0, arg9, local96, method3659(arg0, local103 & 0x7, local108 & 0x7) + arg4, method4360(arg0, local108 & 0x7, local103 & 0x7) + arg1, arg0, arg2); + } else { + SceneGraph.readTile(0, 0, arg9, local96, -1, -1, 0, 0); + } + } + } + } + @Pc(232) int local232; + @Pc(417) int local417; + @Pc(255) int local255; + @Pc(266) int local266; + @Pc(316) int local316; + while (local96.data.length > local96.offset) { + local103 = local96.g1(); + if (local103 != 129) { + local96.offset--; + break; + } + for (local108 = 0; local108 < 4; local108++) { + @Pc(223) byte local223 = local96.g1b(); + @Pc(237) int local237; + if (local223 == 0) { + if (local108 <= arg6) { + local237 = arg1 + 7; + local232 = arg1; + local255 = arg4 + 7; + if (local255 < 0) { + local255 = 0; + } else if (local255 >= 104) { + local255 = 104; + } + if (local237 < 0) { + local237 = 0; + } else if (local237 >= 104) { + local237 = 104; + } + local417 = arg4; + if (arg4 < 0) { + local417 = 0; + } else if (arg4 >= 104) { + local417 = 104; + } + if (arg1 < 0) { + local232 = 0; + } else if (arg1 >= 104) { + local232 = 104; + } + while (local237 > local232) { + while (local417 < local255) { + SceneGraph.aByteArrayArrayArray13[arg2][local232][local417] = 0; + local417++; + } + local232++; + } + } + } else if (local223 == 1) { + for (local232 = 0; local232 < 64; local232 += 4) { + for (local237 = 0; local237 < 64; local237 += 4) { + @Pc(246) byte local246 = local96.g1b(); + if (local108 <= arg6) { + for (local255 = local232; local255 < local232 + 4; local255++) { + for (local266 = local237; local266 < local237 + 4; local266++) { + if (local255 >= arg8 && local255 < arg8 + 8 && local266 >= arg7 && arg7 + 8 > arg7) { + local316 = arg1 + method4360(arg0, local266 & 0x7, local255 & 0x7); + @Pc(328) int local328 = method3659(arg0, local255 & 0x7, local266 & 0x7) + arg4; + if (local316 >= 0 && local316 < 104 && local328 >= 0 && local328 < 104) { + SceneGraph.aByteArrayArrayArray13[arg2][local316][local328] = local246; + } + } + } + } + } + } + } + } else if (local223 == 2) { + } + } + } + @Pc(497) int local497; + if (GlRenderer.enabled && !arg9) { + @Pc(472) Environment local472 = null; + label207: while (true) { + label200: do { + while (local96.data.length > local96.offset) { + local108 = local96.g1(); + if (local108 != 0) { + if (local108 != 1) { + throw new IllegalStateException(); + } + local497 = local96.g1(); + continue label200; + } + local472 = new Environment(local96); + } + if (local472 == null) { + local472 = new Environment(); + } + Static103.aClass92ArrayArray1[arg1 >> 3][arg4 >> 3] = local472; + break label207; + } while (local497 <= 0); + for (local232 = 0; local232 < local497; local232++) { + @Pc(517) Light local517 = new Light(local96); + if (local517.anInt2243 == 31) { + @Pc(529) LightType local529 = LightTypeList.get(local96.g2()); + local517.method1762(local529.anInt2865, local529.anInt2873, local529.anInt2867, local529.anInt2872); + } + local417 = local517.anInt2240 >> 7; + local255 = local517.anInt2245 >> 7; + if (arg6 == local517.anInt2241 && local417 >= arg8 && arg8 + 8 > local417 && arg7 <= local255 && arg7 + 8 > local255) { + local266 = method3675(arg0, local517.anInt2240 & 0x3FF, local517.anInt2245 & 0x3FF) + (arg1 << 7); + local316 = method3388(local517.anInt2240 & 0x3FF, arg0, local517.anInt2245 & 0x3FF) + (arg4 << 7); + local517.anInt2240 = local266; + local517.anInt2245 = local316; + local417 = local517.anInt2240 >> 7; + local255 = local517.anInt2245 >> 7; + if (local417 >= 0 && local255 >= 0 && local417 < 104 && local255 < 104) { + local517.aBoolean125 = (SceneGraph.tileFlags[1][local417][local255] & 0x2) != 0; + local517.anInt2235 = SceneGraph.tileHeights[local517.anInt2241][local417][local255] - local517.anInt2235; + LightingManager.method2389(local517); + } + } + } + } + } + local103 = arg1 + 7; + local108 = arg4 + 7; + for (local497 = arg1; local497 < local103; local497++) { + for (local232 = arg4; local232 < local108; local232++) { + SceneGraph.aByteArrayArrayArray13[arg2][local497][local232] = 0; + } + } + } + + @OriginalMember(owner = "client!tb", name = "h", descriptor = "(I)I") + public static int method4044() { + return Cheat.shiftClick && Keyboard.pressedKeys[Keyboard.KEY_SHIFT] && MiniMenu.size > 2 ? MiniMenu.cursors[MiniMenu.size - 2] : MiniMenu.cursors[MiniMenu.size - 1]; + } + + @OriginalMember(owner = "client!rg", name = "a", descriptor = "(IZII)I") + public static int method4360(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2) { + @Pc(3) int local3 = arg0 & 0x3; + if (local3 == 0) { + return arg2; + } else if (local3 == 1) { + return arg1; + } else if (local3 == 2) { + return 7 - arg2; + } else { + return 7 - arg1; + } + } + + @OriginalMember(owner = "client!qg", name = "a", descriptor = "(IBII)I") + public static int method3659(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2) { + @Pc(3) int local3 = arg0 & 0x3; + if (local3 == 0) { + return arg2; + } else if (local3 == 1) { + return 7 - arg1; + } else if (local3 == 2) { + return 7 - arg2; + } else { + return arg1; + } + } + + @OriginalMember(owner = "client!qi", name = "a", descriptor = "(IIBI)I") + public static int method3675(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2) { + @Pc(3) int local3 = arg0 & 0x3; + if (local3 == 0) { + return arg1; + } else if (local3 == 1) { + return arg2; + } else if (local3 == 2) { + return 1023 - arg1; + } else { + return 1023 - arg2; + } + } + + @OriginalMember(owner = "client!ol", name = "a", descriptor = "(IIZI)I") + public static int method3388(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2) { + @Pc(3) int local3 = arg1 & 0x3; + if (local3 == 0) { + return arg2; + } else if (local3 == 1) { + return 1023 - arg0; + } else if (local3 == 2) { + return 1023 - arg2; + } else { + return arg0; + } + } } diff --git a/client/src/main/java/rt4/Static9.java b/client/src/main/java/rt4/Static9.java index dc2b58a..10003e9 100644 --- a/client/src/main/java/rt4/Static9.java +++ b/client/src/main/java/rt4/Static9.java @@ -11,13 +11,17 @@ public final class Static9 { @OriginalMember(owner = "client!al", name = "r", descriptor = "Lclient!na;") public static final JagString aClass100_35 = JagString.parse("showVideoAd"); + @OriginalMember(owner = "client!kc", name = "p", descriptor = "[I") + public static int[] anIntArray299; + @OriginalMember(owner = "client!je", name = "eb", descriptor = "[I") + public static int[] anIntArray282; - @OriginalMember(owner = "client!al", name = "a", descriptor = "(Z)V") + @OriginalMember(owner = "client!al", name = "a", descriptor = "(Z)V") public static void method182() { Static241.aClass13Array13 = null; - Static6.method86(InterfaceList.topLevelInterface, 0, GameShell.canvasWidth, 0, -1, GameShell.canvasHeight, 0, 0); + Static87.method86(InterfaceList.topLevelInterface, 0, GameShell.canvasWidth, 0, -1, GameShell.canvasHeight, 0, 0); if (Static241.aClass13Array13 != null) { - Static87.method1809(0, Static127.anInt3126, Static80.anInt4696, Static241.aClass13Array13, GameShell.canvasWidth, -1412584499, 0, GameShell.canvasHeight, Static40.aClass13_1.rectangle); + Static87.method1809(0, Static87.anInt3126, Static87.anInt4696, Static241.aClass13Array13, GameShell.canvasWidth, -1412584499, 0, GameShell.canvasHeight, Static40.aClass13_1.rectangle); Static241.aClass13Array13 = null; } } @@ -29,33 +33,33 @@ public final class Static9 { @OriginalMember(owner = "client!al", name = "b", descriptor = "(B)V") public static void method185() { - if (Static119.anIntArray282 != null && Static130.anIntArray299 != null) { + if (anIntArray282 != null && anIntArray299 != null) { return; } - Static119.anIntArray282 = new int[256]; - Static130.anIntArray299 = new int[256]; + anIntArray282 = new int[256]; + anIntArray299 = new int[256]; for (@Pc(26) int local26 = 0; local26 < 256; local26++) { @Pc(36) double local36 = (double) local26 / 255.0D * 6.283185307179586D; - Static119.anIntArray282[local26] = (int) (Math.sin(local36) * 4096.0D); - Static130.anIntArray299[local26] = (int) (Math.cos(local36) * 4096.0D); + anIntArray282[local26] = (int) (Math.sin(local36) * 4096.0D); + anIntArray299[local26] = (int) (Math.cos(local36) * 4096.0D); } } @OriginalMember(owner = "client!al", name = "a", descriptor = "(III)Z") public static boolean method187(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) { @Pc(7) int local7 = SceneGraph.anIntArrayArrayArray12[arg0][arg1][arg2]; - if (local7 == -Static13.anInt437) { + if (local7 == -Static156.anInt437) { return false; - } else if (local7 == Static13.anInt437) { + } else if (local7 == Static156.anInt437) { return true; } else { @Pc(22) int local22 = arg1 << 7; @Pc(26) int local26 = arg2 << 7; if (SceneGraph.method4394(local22 + 1, SceneGraph.tileHeights[arg0][arg1][arg2], local26 + 1) && SceneGraph.method4394(local22 + 128 - 1, SceneGraph.tileHeights[arg0][arg1 + 1][arg2], local26 + 1) && SceneGraph.method4394(local22 + 128 - 1, SceneGraph.tileHeights[arg0][arg1 + 1][arg2 + 1], local26 + 128 - 1) && SceneGraph.method4394(local22 + 1, SceneGraph.tileHeights[arg0][arg1][arg2 + 1], local26 + 128 - 1)) { - SceneGraph.anIntArrayArrayArray12[arg0][arg1][arg2] = Static13.anInt437; + SceneGraph.anIntArrayArrayArray12[arg0][arg1][arg2] = Static156.anInt437; return true; } else { - SceneGraph.anIntArrayArrayArray12[arg0][arg1][arg2] = -Static13.anInt437; + SceneGraph.anIntArrayArrayArray12[arg0][arg1][arg2] = -Static156.anInt437; return false; } } diff --git a/client/src/main/java/rt4/Static91.java b/client/src/main/java/rt4/Static91.java deleted file mode 100644 index 8682d72..0000000 --- a/client/src/main/java/rt4/Static91.java +++ /dev/null @@ -1,35 +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 Static91 { - - @OriginalMember(owner = "client!hc", name = "P", descriptor = "I") - public static int anInt2428; - - @OriginalMember(owner = "client!hc", name = "a", descriptor = "(IIIILclient!th;Lclient!th;IIIIJ)V") - public static void method1880(@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) int arg8, @OriginalArg(9) int arg9, @OriginalArg(10) long arg10) { - if (arg4 == null) { - return; - } - @Pc(6) WallDecor local6 = new WallDecor(); - local6.key = arg10; - local6.anInt1390 = arg1 * 128 + 64; - local6.anInt1393 = arg2 * 128 + 64; - local6.anInt1391 = arg3; - local6.primary = arg4; - local6.secondary = arg5; - local6.anInt1395 = arg6; - local6.anInt1388 = arg7; - local6.anInt1394 = arg8; - local6.anInt1392 = arg9; - for (@Pc(46) int local46 = arg0; local46 >= 0; local46--) { - if (SceneGraph.tiles[local46][arg1][arg2] == null) { - SceneGraph.tiles[local46][arg1][arg2] = new Tile(local46, arg1, arg2); - } - } - SceneGraph.tiles[arg0][arg1][arg2].wallDecor = local6; - } -} diff --git a/client/src/main/java/rt4/Static96.java b/client/src/main/java/rt4/Static96.java index 1b6d9db..2f6ebdc 100644 --- a/client/src/main/java/rt4/Static96.java +++ b/client/src/main/java/rt4/Static96.java @@ -2,6 +2,7 @@ package rt4; import org.openrs2.deob.annotation.OriginalArg; import org.openrs2.deob.annotation.OriginalMember; +import org.openrs2.deob.annotation.Pc; public final class Static96 { @@ -11,8 +12,73 @@ public final class Static96 { @OriginalMember(owner = "client!hh", name = "a", descriptor = "(II)V") public static void method1949(@OriginalArg(1) int arg0) { if (InterfaceList.load(arg0)) { - Static118.method2354(-1, InterfaceList.components[arg0]); + method2354(-1, InterfaceList.components[arg0]); } } + @OriginalMember(owner = "client!jd", name = "a", descriptor = "(II[Lclient!be;)V") + public static void method2354(@OriginalArg(1) int arg0, @OriginalArg(2) Component[] arg1) { + for (@Pc(7) int local7 = 0; local7 < arg1.length; local7++) { + @Pc(15) Component local15 = arg1[local7]; + if (local15 != null && local15.layer == arg0 && (!local15.if3 || !Static36.method947(local15))) { + if (local15.type == 0) { + if (!local15.if3 && Static36.method947(local15) && local15 != InterfaceList.aClass13_22) { + continue; + } + method2354(local15.id, arg1); + if (local15.createdComponents != null) { + method2354(local15.id, local15.createdComponents); + } + @Pc(73) ComponentPointer local73 = (ComponentPointer) InterfaceList.openInterfaces.get((long) local15.id); + if (local73 != null) { + method1949(local73.anInt5878); + } + } + if (local15.type == 6) { + @Pc(105) int local105; + if (local15.modelSeqId != -1 || local15.anInt462 != -1) { + @Pc(100) boolean local100 = Static87.method2926(local15); + if (local100) { + local105 = local15.anInt462; + } else { + local105 = local15.modelSeqId; + } + if (local105 != -1) { + @Pc(118) SeqType local118 = SeqTypeList.get(local105); + if (local118 != null) { + local15.anInt500 += Protocol.anInt4247; + while (local15.anInt500 > local118.anIntArray474[local15.anInt510]) { + local15.anInt500 -= local118.anIntArray474[local15.anInt510]; + local15.anInt510++; + if (local118.frames.length <= local15.anInt510) { + local15.anInt510 -= local118.anInt5362; + if (local15.anInt510 < 0 || local118.frames.length <= local15.anInt510) { + local15.anInt510 = 0; + } + } + local15.anInt496 = local15.anInt510 + 1; + if (local118.frames.length <= local15.anInt496) { + local15.anInt496 -= local118.anInt5362; + if (local15.anInt496 < 0 || local118.frames.length <= local15.anInt496) { + local15.anInt496 = -1; + } + } + InterfaceList.redraw(local15); + } + } + } + } + if (local15.modelRotationSpeed != 0 && !local15.if3) { + @Pc(239) int local239 = local15.modelRotationSpeed >> 16; + @Pc(243) int local243 = local239 * Protocol.anInt4247; + local105 = local15.modelRotationSpeed << 16 >> 16; + local15.modelXAngle = local243 + local15.modelXAngle & 0x7FF; + local105 *= Protocol.anInt4247; + local15.modelYAngle = local15.modelYAngle + local105 & 0x7FF; + InterfaceList.redraw(local15); + } + } + } + } + } } diff --git a/client/src/main/java/rt4/Static97.java b/client/src/main/java/rt4/Static97.java deleted file mode 100644 index b36ea59..0000000 --- a/client/src/main/java/rt4/Static97.java +++ /dev/null @@ -1,108 +0,0 @@ -package rt4; - -import java.io.BufferedReader; -import java.io.IOException; -import java.io.PrintWriter; -import java.io.StringReader; -import java.io.StringWriter; -import org.openrs2.deob.annotation.OriginalArg; -import org.openrs2.deob.annotation.OriginalMember; -import org.openrs2.deob.annotation.Pc; - -public final class Static97 { - - @OriginalMember(owner = "client!hi", name = "a", descriptor = "I") - public static int anInt2503 = -1; - - @OriginalMember(owner = "client!hi", name = "f", descriptor = "J") - public static long aLong89 = 0L; - - @OriginalMember(owner = "client!hi", name = "a", descriptor = "(BI)I") - public static int method1959(@OriginalArg(1) int arg0) { - return arg0 >>> 8; - } - - @OriginalMember(owner = "client!hi", name = "a", descriptor = "(IIIIILclient!be;Z)V") - public static void method1960(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) Component arg5) { - @Pc(13) int local13 = arg3 * arg3 + arg4 * arg4; - if (local13 > 360000) { - return; - } - @Pc(30) int local30 = Math.min(arg5.width / 2, arg5.height / 2); - if (local30 * local30 >= local13) { - MiniMap.method1446(arg5, Sprites.mapmarkhints[arg0], arg4, arg3, arg1, arg2); - return; - } - local30 -= 10; - @Pc(58) int local58 = MiniMap.anInt1814 + (int)Camera.yawTarget & 0x7FF; - @Pc(62) int local62 = MathUtils.cos[local58]; - @Pc(66) int local66 = MathUtils.sin[local58]; - @Pc(74) int local74 = local66 * 256 / (MiniMap.anInt4130 + 256); - @Pc(82) int local82 = local62 * 256 / (MiniMap.anInt4130 + 256); - @Pc(93) int local93 = arg4 * local74 + local82 * arg3 >> 16; - @Pc(104) int local104 = arg4 * local82 - local74 * arg3 >> 16; - @Pc(110) double local110 = Math.atan2((double) local93, (double) local104); - @Pc(117) int local117 = (int) (Math.sin(local110) * (double) local30); - @Pc(124) int local124 = (int) (Math.cos(local110) * (double) local30); - if (GlRenderer.enabled) { - ((GlSprite) Sprites.hintMapEdge[arg0]).method1428((arg5.width / 2 + arg2 + local117) * 16, (arg5.height / 2 + arg1 - local124) * 16, (int) (local110 * 10430.378D)); - } else { - ((SoftwareSprite) Sprites.hintMapEdge[arg0]).method306(local117 + arg5.width / 2 + arg2 - 10, arg5.height / 2 + -10 + arg1 + -local124, local110); - } - } - - @OriginalMember(owner = "client!hi", name = "a", descriptor = "(ILjava/lang/Throwable;)Ljava/lang/String;") - public static String method1961(@OriginalArg(1) Throwable arg0) throws IOException { - @Pc(24) String local24; - if (arg0 instanceof TracingException) { - @Pc(11) TracingException local11 = (TracingException) arg0; - arg0 = local11.aThrowable1; - local24 = local11.aString3 + " | "; - } else { - local24 = ""; - } - @Pc(32) StringWriter local32 = new StringWriter(); - @Pc(37) PrintWriter local37 = new PrintWriter(local32); - arg0.printStackTrace(local37); - local37.close(); - @Pc(45) String local45 = local32.toString(); - @Pc(53) BufferedReader local53 = new BufferedReader(new StringReader(local45)); - @Pc(56) String local56 = local53.readLine(); - while (true) { - @Pc(59) String local59 = local53.readLine(); - if (local59 == null) { - return local24 + "| " + local56; - } - @Pc(65) int local65 = local59.indexOf(40); - @Pc(72) int local72 = local59.indexOf(41, local65 + 1); - @Pc(79) String local79; - if (local65 == -1) { - local79 = local59; - } else { - local79 = local59.substring(0, local65); - } - local79 = local79.trim(); - local79 = local79.substring(local79.lastIndexOf(32) + 1); - local79 = local79.substring(local79.lastIndexOf(9) + 1); - local24 = local24 + local79; - if (local65 != -1 && local72 != -1) { - @Pc(126) int local126 = local59.indexOf(".java:", local65); - if (local126 >= 0) { - local24 = local24 + local59.substring(local126 + 5, local72); - } - } - local24 = local24 + ' '; - } - } - - @OriginalMember(owner = "client!hi", name = "a", descriptor = "(Lclient!be;B)Lclient!na;") - public static JagString getTargetVerb(@OriginalArg(0) Component arg0) { - if (InterfaceList.getServerActiveProperties(arg0).getTargetMask() == 0) { - return null; - } else if (arg0.targetVerb == null || arg0.targetVerb.trim().length() == 0) { - return Static121.qaOpTest ? Static143.aClass100_668 : null; - } else { - return arg0.targetVerb; - } - } -} diff --git a/client/src/main/java/rt4/Static99.java b/client/src/main/java/rt4/Static99.java deleted file mode 100644 index e6e1223..0000000 --- a/client/src/main/java/rt4/Static99.java +++ /dev/null @@ -1,10 +0,0 @@ -package rt4; - -import org.openrs2.deob.annotation.OriginalMember; - -public final class Static99 { - - @OriginalMember(owner = "client!hk", name = "W", descriptor = "Lclient!ih;") - public static final LinkedList aClass69_64 = new LinkedList(); - -} diff --git a/client/src/main/java/rt4/StringUtils.java b/client/src/main/java/rt4/StringUtils.java index 6092357..c5958a5 100644 --- a/client/src/main/java/rt4/StringUtils.java +++ b/client/src/main/java/rt4/StringUtils.java @@ -5,7 +5,12 @@ import org.openrs2.deob.annotation.OriginalMember; import org.openrs2.deob.annotation.Pc; public class StringUtils { - @OriginalMember(owner = "client!gj", name = "a", descriptor = "(II)Z") + @OriginalMember(owner = "client!ag", name = "ab", descriptor = "Lclient!na;") + public static final JagString aClass100_17 = JagString.parse("0"); + @OriginalMember(owner = "client!ca", name = "cb", descriptor = "Lclient!na;") + public static final JagString nonBreakingSpace = JagString.getNbsp(); + + @OriginalMember(owner = "client!gj", name = "a", descriptor = "(II)Z") public static boolean isAlphaNumeric(@OriginalArg(0) int arg0) { if (arg0 >= 97 && arg0 <= 122) { return true; @@ -83,7 +88,7 @@ public class StringUtils { } if (arg0 == 2) { local28 = Static182.aClass100_1017; - local26 = Static26.aClass100_160; + local26 = nonBreakingSpace; } if (arg0 == 3) { local26 = Static182.aClass100_185; @@ -98,7 +103,7 @@ public class StringUtils { local61 = 0; @Pc(137) JagString local137; if (arg3 == 0L) { - local137 = Static6.aClass100_17; + local137 = aClass100_17; } else { @Pc(95) JagString local95 = Static87.allocate(0); while (arg3 > 0L) { diff --git a/client/src/main/java/rt4/Texture.java b/client/src/main/java/rt4/Texture.java index b59bfbd..388eaf1 100644 --- a/client/src/main/java/rt4/Texture.java +++ b/client/src/main/java/rt4/Texture.java @@ -10,7 +10,9 @@ public final class Texture { @OriginalMember(owner = "client!i", name = "ac", descriptor = "[I") public static final int[] brightnessMap = new int[256]; - @OriginalMember(owner = "client!jh", name = "f", descriptor = "D") + @OriginalMember(owner = "client!rh", name = "g", descriptor = "I") + public static final int anInt4868 = -1; + @OriginalMember(owner = "client!jh", name = "f", descriptor = "D") public static double brightness = -1.0D; @OriginalMember(owner = "client!cm", name = "a", descriptor = "Lclient!m;") public static TextureProvider anInterface1_1; @@ -41,7 +43,7 @@ public final class Texture { @Pc(45) int local45; @Pc(52) int local52; for (local20 = 0; local20 < local7; local20++) { - local27 = Static206.method3680(arg0); + local27 = method3680(arg0); if (local27.method4631() >= 0) { local18++; } @@ -92,6 +94,108 @@ public final class Texture { brightness = arg0; } + @OriginalMember(owner = "client!qk", name = "a", descriptor = "(BLclient!wa;)Lclient!j;") + public static TextureOp method3680(@OriginalArg(1) Buffer arg0) { + arg0.g1(); + @Pc(13) int local13 = arg0.g1(); + @Pc(17) TextureOp local17 = method3860(local13); + local17.anInt5840 = arg0.g1(); + @Pc(26) int local26 = arg0.g1(); + for (@Pc(34) int local34 = 0; local34 < local26; local34++) { + @Pc(41) int local41 = arg0.g1(); + local17.method4629(local41, arg0); + } + local17.method4630(); + return local17; + } + + @OriginalMember(owner = "client!sc", name = "a", descriptor = "(IZ)Lclient!j;") + public static TextureOp method3860(@OriginalArg(0) int arg0) { + if (arg0 == 0) { + return new TextureOp20(); + } else if (arg0 == 1) { + return new TextureOpColorFill(); + } else if (arg0 == 2) { + return new TextureOp27(); + } else if (arg0 == 3) { + return new TextureOp25(); + } else if (arg0 == 4) { + return new TextureOp17(); + } else if (arg0 == 5) { + return new TextureOp21(); + } else if (arg0 == 6) { + return new TextureOp2(); + } else if (arg0 == 7) { + return new TextureOpCombine(); + } else if (arg0 == 8) { + return new TextureOpCurve(); + } else if (arg0 == 9) { + return new TextureOp7(); + } else if (arg0 == 10) { + return new TextureOpColorGradient(); + } else if (arg0 == 11) { + return new TextureOp18(); + } else if (arg0 == 12) { + return new TextureOp1(); + } else if (arg0 == 13) { + return new TextureOp26(); + } else if (arg0 == 14) { + return new TextureOp28(); + } else if (arg0 == 15) { + return new TextureOp14(); + } else if (arg0 == 16) { + return new TextureOp8(); + } else if (arg0 == 17) { + return new TextureOp13(); + } else if (arg0 == 18) { + return new TextureOpTiledSprite(); + } else if (arg0 == 19) { + return new TextureOp16(); + } else if (arg0 == 20) { + return new TextureOp11(); + } else if (arg0 == 21) { + return new TextureOp5(); + } else if (arg0 == 22) { + return new TextureOp31(); + } else if (arg0 == 23) { + return new TextureOp15(); + } else if (arg0 == 24) { + return new TextureOp10(); + } else if (arg0 == 25) { + return new TextureOp30(); + } else if (arg0 == 26) { + return new TextureOpBinary(); + } else if (arg0 == 27) { + return new TextureOp6(); + } else if (arg0 == 28) { + return new TextureOp22(); + } else if (arg0 == 29) { + return new TextureOp29(); + } else if (arg0 == 30) { + return new TextureOp9(); + } else if (arg0 == 31) { + return new TextureOp12(); + } else if (arg0 == 32) { + return new TextureOp24(); + } else if (arg0 == 33) { + return new TextureOp3(); + } else if (arg0 == 34) { + return new TextureOp4(); + } else if (arg0 == 35) { + return new TextureOp23(); + } else if (arg0 == 36) { + return new TextureOp32(); + } else if (arg0 == 37) { + return new TextureOp19(); + } else if (arg0 == 38) { + return new TextureOp33(); + } else if (arg0 == 39) { + return new TextureOpSprite(); + } else { + return null; + } + } + @OriginalMember(owner = "client!lc", name = "a", descriptor = "(IZIDILclient!ve;Lclient!m;Z)[I") public final int[] method2725(@OriginalArg(0) int arg0, @OriginalArg(1) boolean arg1, @OriginalArg(2) int arg2, @OriginalArg(3) double arg3, @OriginalArg(5) Js5 arg4, @OriginalArg(6) TextureProvider arg5, @OriginalArg(7) boolean arg6) { setBrightness(arg3); @@ -263,9 +367,9 @@ public final class Texture { @OriginalMember(owner = "client!lc", name = "a", descriptor = "(ZLclient!m;Lclient!ve;)Z") public final boolean method2729(@OriginalArg(1) TextureProvider arg0, @OriginalArg(2) Js5 arg1) { @Pc(10) int local10; - if (Static215.anInt4868 > 0) { + if (anInt4868 > 0) { for (local10 = 0; local10 < this.anIntArray327.length; local10++) { - if (!arg1.isFileReady(this.anIntArray327[local10], Static215.anInt4868)) { + if (!arg1.isFileReady(this.anIntArray327[local10], anInt4868)) { return false; } } diff --git a/client/src/main/java/rt4/TextureOp1.java b/client/src/main/java/rt4/TextureOp1.java index 722db56..376c2b5 100644 --- a/client/src/main/java/rt4/TextureOp1.java +++ b/client/src/main/java/rt4/TextureOp1.java @@ -27,9 +27,9 @@ public final class TextureOp1 extends TextureOp { public final int[] method4626(@OriginalArg(0) int arg0) { @Pc(11) int[] local11 = this.aClass121_41.method3445(arg0); if (this.aClass121_41.invalid) { - @Pc(20) int local20 = Static64.anIntArray153[arg0]; + @Pc(20) int local20 = Static10.anIntArray153[arg0]; @Pc(26) int local26 = local20 - 2048 >> 1; - for (@Pc(28) int local28 = 0; local28 < Static189.anInt4457; local28++) { + for (@Pc(28) int local28 = 0; local28 < Static10.anInt4457; local28++) { @Pc(35) int local35 = Static173.anIntArray367[local28]; @Pc(41) int local41 = local35 - 2048 >> 1; @Pc(68) int local68; @@ -42,7 +42,7 @@ public final class TextureOp1 extends TextureOp { } local68 -= local68 & 0xFFFFF000; if (this.anInt100 == 0) { - local68 = Static119.anIntArray282[local68 >> 4 & 0xFF] + 4096 >> 1; + local68 = Static9.anIntArray282[local68 >> 4 & 0xFF] + 4096 >> 1; } else if (this.anInt100 == 2) { local68 -= 2048; if (local68 < 0) { diff --git a/client/src/main/java/rt4/TextureOp10.java b/client/src/main/java/rt4/TextureOp10.java index 6f86cb3..2b36839 100644 --- a/client/src/main/java/rt4/TextureOp10.java +++ b/client/src/main/java/rt4/TextureOp10.java @@ -22,7 +22,7 @@ public final class TextureOp10 extends TextureOp { @Pc(34) int[] local34 = local30[0]; @Pc(38) int[] local38 = local30[2]; @Pc(42) int[] local42 = local30[1]; - for (@Pc(44) int local44 = 0; local44 < Static189.anInt4457; local44++) { + for (@Pc(44) int local44 = 0; local44 < Static10.anInt4457; local44++) { local19[local44] = (local38[local44] + local34[local44] + local42[local44]) / 3; } } diff --git a/client/src/main/java/rt4/TextureOp11.java b/client/src/main/java/rt4/TextureOp11.java index cfc3f6f..c764768 100644 --- a/client/src/main/java/rt4/TextureOp11.java +++ b/client/src/main/java/rt4/TextureOp11.java @@ -34,22 +34,22 @@ public final class TextureOp11 extends TextureOp { public final int[] method4626(@OriginalArg(0) int arg0) { @Pc(19) int[] local19 = this.aClass121_41.method3445(arg0); if (this.aClass121_41.invalid) { - @Pc(28) int local28 = Static189.anInt4457 / this.anInt2220; - @Pc(33) int local33 = Static172.anInt4165 / this.anInt2216; + @Pc(28) int local28 = Static10.anInt4457 / this.anInt2220; + @Pc(33) int local33 = Static10.anInt4165 / this.anInt2216; @Pc(44) int[] local44; @Pc(50) int local50; if (local33 <= 0) { local44 = this.method4624(0, 0); } else { local50 = arg0 % local33; - local44 = this.method4624(0, Static172.anInt4165 * local50 / local33); + local44 = this.method4624(0, Static10.anInt4165 * local50 / local33); } - for (local50 = 0; local50 < Static189.anInt4457; local50++) { + for (local50 = 0; local50 < Static10.anInt4457; local50++) { if (local28 <= 0) { local19[local50] = local44[0]; } else { @Pc(80) int local80 = local50 % local28; - local19[local50] = local44[Static189.anInt4457 * local80 / local28]; + local19[local50] = local44[Static10.anInt4457 * local80 / local28]; } } } @@ -61,12 +61,12 @@ public final class TextureOp11 extends TextureOp { public final int[][] method4638(@OriginalArg(1) int arg0) { @Pc(18) int[][] local18 = this.aClass103_41.method3173(arg0); if (this.aClass103_41.aBoolean195) { - @Pc(28) int local28 = Static189.anInt4457 / this.anInt2220; - @Pc(33) int local33 = Static172.anInt4165 / this.anInt2216; + @Pc(28) int local28 = Static10.anInt4457 / this.anInt2220; + @Pc(33) int local33 = Static10.anInt4165 / this.anInt2216; @Pc(49) int[][] local49; if (local33 > 0) { @Pc(39) int local39 = arg0 % local33; - local49 = this.method4634(local39 * Static172.anInt4165 / local33, 0); + local49 = this.method4634(local39 * Static10.anInt4165 / local33, 0); } else { local49 = this.method4634(0, 0); } @@ -76,13 +76,13 @@ public final class TextureOp11 extends TextureOp { @Pc(73) int[] local73 = local49[1]; @Pc(77) int[] local77 = local18[1]; @Pc(81) int[] local81 = local18[2]; - for (@Pc(83) int local83 = 0; local83 < Static189.anInt4457; local83++) { + for (@Pc(83) int local83 = 0; local83 < Static10.anInt4457; local83++) { @Pc(94) int local94; if (local28 <= 0) { local94 = 0; } else { @Pc(100) int local100 = local83 % local28; - local94 = local100 * Static189.anInt4457 / local28; + local94 = local100 * Static10.anInt4457 / local28; } local69[local83] = local61[local94]; local77[local83] = local73[local94]; diff --git a/client/src/main/java/rt4/TextureOp12.java b/client/src/main/java/rt4/TextureOp12.java index 23cd34c..09644c8 100644 --- a/client/src/main/java/rt4/TextureOp12.java +++ b/client/src/main/java/rt4/TextureOp12.java @@ -44,8 +44,8 @@ public final class TextureOp12 extends TextureOp { public final int[] method4626(@OriginalArg(0) int arg0) { @Pc(19) int[] local19 = this.aClass121_41.method3445(arg0); if (this.aClass121_41.invalid) { - for (@Pc(26) int local26 = 0; local26 < Static189.anInt4457; local26++) { - @Pc(45) int local45 = this.anInt2299 + (Static64.anIntArray153[arg0] << 12) / this.anInt2298; + for (@Pc(26) int local26 = 0; local26 < Static10.anInt4457; local26++) { + @Pc(45) int local45 = this.anInt2299 + (Static10.anIntArray153[arg0] << 12) / this.anInt2298; @Pc(57) int local57 = this.anInt2296 + (Static173.anIntArray367[local26] << 12) / this.anInt2298; @Pc(61) int local61 = local57; @Pc(65) int local65 = local45; diff --git a/client/src/main/java/rt4/TextureOp13.java b/client/src/main/java/rt4/TextureOp13.java index 780d78f..98633f3 100644 --- a/client/src/main/java/rt4/TextureOp13.java +++ b/client/src/main/java/rt4/TextureOp13.java @@ -137,7 +137,7 @@ public final class TextureOp13 extends TextureOp { @Pc(44) int[] local44 = local17[1]; @Pc(48) int[] local48 = local17[2]; @Pc(52) int[] local52 = local17[0]; - for (@Pc(54) int local54 = 0; local54 < Static189.anInt4457; local54++) { + for (@Pc(54) int local54 = 0; local54 < Static10.anInt4457; local54++) { this.method1992(local32[local54], local36[local54], local40[local54]); this.anInt2556 += this.anInt2547; if (this.anInt2556 < 0) { diff --git a/client/src/main/java/rt4/TextureOp14.java b/client/src/main/java/rt4/TextureOp14.java index d212463..ad8a85d 100644 --- a/client/src/main/java/rt4/TextureOp14.java +++ b/client/src/main/java/rt4/TextureOp14.java @@ -69,10 +69,10 @@ public final class TextureOp14 extends TextureOp { public final int[] method4626(@OriginalArg(0) int arg0) { @Pc(19) int[] local19 = this.aClass121_41.method3445(arg0); if (this.aClass121_41.invalid) { - @Pc(32) int local32 = this.anInt2646 * Static64.anIntArray153[arg0] + 2048; + @Pc(32) int local32 = this.anInt2646 * Static10.anIntArray153[arg0] + 2048; @Pc(36) int local36 = local32 >> 12; @Pc(40) int local40 = local36 + 1; - for (@Pc(42) int local42 = 0; local42 < Static189.anInt4457; local42++) { + for (@Pc(42) int local42 = 0; local42 < Static10.anInt4457; local42++) { anInt5526 = Integer.MAX_VALUE; anInt5443 = Integer.MAX_VALUE; anInt3041 = Integer.MAX_VALUE; diff --git a/client/src/main/java/rt4/TextureOp15.java b/client/src/main/java/rt4/TextureOp15.java index a73ff54..318c9e6 100644 --- a/client/src/main/java/rt4/TextureOp15.java +++ b/client/src/main/java/rt4/TextureOp15.java @@ -19,7 +19,7 @@ public final class TextureOp15 extends TextureOp { @OriginalMember(owner = "client!je", name = "a", descriptor = "(IBI)V") private void method2382(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) { @Pc(13) int local13 = Static173.anIntArray367[arg1]; - @Pc(17) int local17 = Static64.anIntArray153[arg0]; + @Pc(17) int local17 = Static10.anIntArray153[arg0]; @Pc(28) float local28 = (float) Math.atan2((double) (local13 - 2048), (double) (local17 - 2048)); if ((double) local28 >= -3.141592653589793D && -2.356194490192345D >= (double) local28) { anInt2433 = arg0; @@ -28,26 +28,26 @@ public final class TextureOp15 extends TextureOp { Static267.anInt5776 = arg0; anInt2433 = arg1; } else if ((double) local28 <= -0.7853981633974483D && (double) local28 >= -1.5707963267948966D) { - Static267.anInt5776 = Static189.anInt4457 - arg0; + Static267.anInt5776 = Static10.anInt4457 - arg0; anInt2433 = arg1; } else if (local28 <= 0.0F && (double) local28 >= -0.7853981633974483D) { Static267.anInt5776 = arg1; - anInt2433 = Static172.anInt4165 - arg0; + anInt2433 = Static10.anInt4165 - arg0; } else if (local28 >= 0.0F && (double) local28 <= 0.7853981633974483D) { - Static267.anInt5776 = Static189.anInt4457 - arg1; - anInt2433 = Static172.anInt4165 - arg0; + Static267.anInt5776 = Static10.anInt4457 - arg1; + anInt2433 = Static10.anInt4165 - arg0; } else if ((double) local28 >= 0.7853981633974483D && (double) local28 <= 1.5707963267948966D) { - Static267.anInt5776 = Static189.anInt4457 - arg0; - anInt2433 = Static172.anInt4165 - arg1; + Static267.anInt5776 = Static10.anInt4457 - arg0; + anInt2433 = Static10.anInt4165 - arg1; } else if ((double) local28 >= 1.5707963267948966D && (double) local28 <= 2.356194490192345D) { - anInt2433 = Static172.anInt4165 - arg1; + anInt2433 = Static10.anInt4165 - arg1; Static267.anInt5776 = arg0; } else if ((double) local28 >= 2.356194490192345D && (double) local28 <= 3.141592653589793D) { - Static267.anInt5776 = Static189.anInt4457 - arg1; + Static267.anInt5776 = Static10.anInt4457 - arg1; anInt2433 = arg0; } Static267.anInt5776 &= Static34.anInt1060; - anInt2433 &= Static141.anInt3473; + anInt2433 &= Static10.anInt3473; } @OriginalMember(owner = "client!je", name = "a", descriptor = "(ILclient!wa;Z)V") @@ -63,7 +63,7 @@ public final class TextureOp15 extends TextureOp { public final int[] method4626(@OriginalArg(0) int arg0) { @Pc(19) int[] local19 = this.aClass121_41.method3445(arg0); if (this.aClass121_41.invalid) { - for (@Pc(26) int local26 = 0; local26 < Static189.anInt4457; local26++) { + for (@Pc(26) int local26 = 0; local26 < Static10.anInt4457; local26++) { this.method2382(arg0, local26); @Pc(40) int[] local40 = this.method4624(0, anInt2433); local19[local26] = local40[Static267.anInt5776]; @@ -80,7 +80,7 @@ public final class TextureOp15 extends TextureOp { @Pc(28) int[] local28 = local15[0]; @Pc(32) int[] local32 = local15[2]; @Pc(36) int[] local36 = local15[1]; - for (@Pc(38) int local38 = 0; local38 < Static189.anInt4457; local38++) { + for (@Pc(38) int local38 = 0; local38 < Static10.anInt4457; local38++) { this.method2382(arg0, local38); @Pc(52) int[][] local52 = this.method4634(anInt2433, 0); local28[local38] = local52[0][Static267.anInt5776]; diff --git a/client/src/main/java/rt4/TextureOp16.java b/client/src/main/java/rt4/TextureOp16.java index 711be43..8536ed0 100644 --- a/client/src/main/java/rt4/TextureOp16.java +++ b/client/src/main/java/rt4/TextureOp16.java @@ -26,13 +26,13 @@ public final class TextureOp16 extends TextureOp { @Pc(38) int[] local38 = local17[2]; @Pc(42) int[] local42 = local17[1]; @Pc(46) int[] local46 = local17[0]; - for (@Pc(48) int local48 = 0; local48 < Static189.anInt4457; local48++) { + for (@Pc(48) int local48 = 0; local48 < Static10.anInt4457; local48++) { @Pc(61) int local61 = local28[local48] * 255 >> 12 & 0xFF; @Pc(70) int local70 = local34[local48] * this.anInt3292 >> 12; - @Pc(78) int local78 = local70 * Static130.anIntArray299[local61] >> 12; - @Pc(86) int local86 = Static119.anIntArray282[local61] * local70 >> 12; + @Pc(78) int local78 = local70 * Static9.anIntArray299[local61] >> 12; + @Pc(86) int local86 = Static9.anIntArray282[local61] * local70 >> 12; @Pc(94) int local94 = (local78 >> 12) + local48 & Static34.anInt1060; - @Pc(103) int local103 = Static141.anInt3473 & arg0 + (local86 >> 12); + @Pc(103) int local103 = Static10.anInt3473 & arg0 + (local86 >> 12); @Pc(109) int[][] local109 = this.method4634(local103, 0); local46[local48] = local109[0][local94]; local42[local48] = local109[1][local94]; @@ -49,13 +49,13 @@ public final class TextureOp16 extends TextureOp { if (this.aClass121_41.invalid) { @Pc(29) int[] local29 = this.method4624(1, arg0); @Pc(35) int[] local35 = this.method4624(2, arg0); - for (@Pc(37) int local37 = 0; local37 < Static189.anInt4457; local37++) { + for (@Pc(37) int local37 = 0; local37 < Static10.anInt4457; local37++) { @Pc(49) int local49 = this.anInt3292 * local35[local37] >> 12; @Pc(57) int local57 = local29[local37] >> 4 & 0xFF; - @Pc(65) int local65 = Static130.anIntArray299[local57] * local49 >> 12; - @Pc(73) int local73 = Static119.anIntArray282[local57] * local49 >> 12; + @Pc(65) int local65 = Static9.anIntArray299[local57] * local49 >> 12; + @Pc(73) int local73 = Static9.anIntArray282[local57] * local49 >> 12; @Pc(81) int local81 = Static34.anInt1060 & (local65 >> 12) + local37; - @Pc(89) int local89 = Static141.anInt3473 & (local73 >> 12) + arg0; + @Pc(89) int local89 = Static10.anInt3473 & (local73 >> 12) + arg0; @Pc(95) int[] local95 = this.method4624(0, local89); local19[local37] = local95[local81]; } diff --git a/client/src/main/java/rt4/TextureOp17.java b/client/src/main/java/rt4/TextureOp17.java index 27c9581..f469f78 100644 --- a/client/src/main/java/rt4/TextureOp17.java +++ b/client/src/main/java/rt4/TextureOp17.java @@ -127,7 +127,7 @@ public final class TextureOp17 extends TextureOp { if (this.aClass121_41.invalid) { @Pc(18) int local18 = 0; @Pc(25) int local25; - for (local25 = Static64.anIntArray153[arg0] + this.anInt3675; local25 < 0; local25 += 4096) { + for (local25 = Static10.anIntArray153[arg0] + this.anInt3675; local25 < 0; local25 += 4096) { } while (local25 > 4096) { local25 -= 4096; @@ -140,7 +140,7 @@ public final class TextureOp17 extends TextureOp { @Pc(74) boolean local74 = (local18 & 0x1) == 0; @Pc(81) int local81 = this.anIntArray352[local18 - 1]; if (local81 + this.anInt3671 < local25 && local65 - this.anInt3671 > local25) { - for (@Pc(100) int local100 = 0; local100 < Static189.anInt4457; local100++) { + for (@Pc(100) int local100 = 0; local100 < Static10.anInt4457; local100++) { @Pc(105) int local105 = 0; @Pc(114) int local114 = local74 ? this.anInt3678 : -this.anInt3678; @Pc(126) int local126; @@ -162,7 +162,7 @@ public final class TextureOp17 extends TextureOp { } } } else { - ArrayUtils.fill(local11, 0, Static189.anInt4457, 0); + ArrayUtils.fill(local11, 0, Static10.anInt4457, 0); } } return local11; diff --git a/client/src/main/java/rt4/TextureOp18.java b/client/src/main/java/rt4/TextureOp18.java index 6555214..85a15ff 100644 --- a/client/src/main/java/rt4/TextureOp18.java +++ b/client/src/main/java/rt4/TextureOp18.java @@ -46,7 +46,7 @@ public final class TextureOp18 extends TextureOp { @Pc(43) int[] local43 = local16[1]; @Pc(47) int[] local47 = local16[0]; @Pc(51) int[] local51 = local16[2]; - for (@Pc(53) int local53 = 0; local53 < Static189.anInt4457; local53++) { + for (@Pc(53) int local53 = 0; local53 < Static10.anInt4457; local53++) { @Pc(64) int local64 = local31[local53]; @Pc(68) int local68 = local35[local53]; @Pc(72) int local72 = local39[local53]; diff --git a/client/src/main/java/rt4/TextureOp19.java b/client/src/main/java/rt4/TextureOp19.java index d81a7a7..87d68d5 100644 --- a/client/src/main/java/rt4/TextureOp19.java +++ b/client/src/main/java/rt4/TextureOp19.java @@ -59,8 +59,8 @@ public final class TextureOp19 extends TextureOp { public final int[] method4626(@OriginalArg(0) int arg0) { @Pc(19) int[] local19 = this.aClass121_41.method3445(arg0); if (this.aClass121_41.invalid) { - @Pc(30) int local30 = Static64.anIntArray153[arg0] - 2048; - for (@Pc(32) int local32 = 0; local32 < Static189.anInt4457; local32++) { + @Pc(30) int local30 = Static10.anIntArray153[arg0] - 2048; + for (@Pc(32) int local32 = 0; local32 < Static10.anInt4457; local32++) { @Pc(40) int local40 = local30 + this.anInt3843; @Pc(46) int local46 = Static173.anIntArray367[local32] - 2048; @Pc(51) int local51 = this.anInt3860 + local46; @@ -83,7 +83,7 @@ public final class TextureOp19 extends TextureOp { @OriginalMember(owner = "client!mh", name = "a", descriptor = "(BII)Z") private boolean method3011(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) { @Pc(12) int local12 = this.anInt3847 * (arg0 + arg1) >> 12; - @Pc(27) int local27 = Static130.anIntArray299[local12 * 255 >> 12 & 0xFF]; + @Pc(27) int local27 = Static9.anIntArray299[local12 * 255 >> 12 & 0xFF]; @Pc(34) int local34 = (local27 << 12) / this.anInt3847; @Pc(41) int local41 = (local34 << 12) / this.anInt3862; @Pc(48) int local48 = local41 * this.anInt3844 >> 12; @@ -99,7 +99,7 @@ public final class TextureOp19 extends TextureOp { @OriginalMember(owner = "client!mh", name = "b", descriptor = "(IIB)Z") private boolean method3012(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) { @Pc(8) int local8 = (arg1 - arg0) * this.anInt3847 >> 12; - @Pc(31) int local31 = Static130.anIntArray299[local8 * 255 >> 12 & 0xFF]; + @Pc(31) int local31 = Static9.anIntArray299[local8 * 255 >> 12 & 0xFF]; @Pc(38) int local38 = (local31 << 12) / this.anInt3847; @Pc(45) int local45 = (local38 << 12) / this.anInt3862; @Pc(52) int local52 = local45 * this.anInt3844 >> 12; diff --git a/client/src/main/java/rt4/TextureOp2.java b/client/src/main/java/rt4/TextureOp2.java index 9946c9f..db7d783 100644 --- a/client/src/main/java/rt4/TextureOp2.java +++ b/client/src/main/java/rt4/TextureOp2.java @@ -43,7 +43,7 @@ public final class TextureOp2 extends TextureOp { @Pc(48) int[] local48 = local22[0]; @Pc(52) int[] local52 = local22[1]; @Pc(56) int[] local56 = local22[2]; - for (@Pc(58) int local58 = 0; local58 < Static189.anInt4457; local58++) { + for (@Pc(58) int local58 = 0; local58 < Static10.anInt4457; local58++) { @Pc(69) int local69 = local36[local58]; @Pc(73) int local73 = local44[local58]; @Pc(77) int local77 = local40[local58]; @@ -79,7 +79,7 @@ public final class TextureOp2 extends TextureOp { @Pc(19) int[] local19 = this.aClass121_41.method3445(arg0); if (this.aClass121_41.invalid) { @Pc(29) int[] local29 = this.method4624(0, arg0); - for (@Pc(31) int local31 = 0; local31 < Static189.anInt4457; local31++) { + for (@Pc(31) int local31 = 0; local31 < Static10.anInt4457; local31++) { @Pc(38) int local38 = local29[local31]; if (this.anInt148 > local38) { local19[local31] = this.anInt148; diff --git a/client/src/main/java/rt4/TextureOp20.java b/client/src/main/java/rt4/TextureOp20.java index 468f024..7105733 100644 --- a/client/src/main/java/rt4/TextureOp20.java +++ b/client/src/main/java/rt4/TextureOp20.java @@ -36,7 +36,7 @@ public final class TextureOp20 extends TextureOp { public final int[] method4626(@OriginalArg(0) int arg0) { @Pc(17) int[] local17 = this.aClass121_41.method3445(arg0); if (this.aClass121_41.invalid) { - ArrayUtils.fill(local17, 0, Static189.anInt4457, this.anInt3894); + ArrayUtils.fill(local17, 0, Static10.anInt4457, this.anInt3894); } return local17; } diff --git a/client/src/main/java/rt4/TextureOp21.java b/client/src/main/java/rt4/TextureOp21.java index 46dcab1..1a77c1a 100644 --- a/client/src/main/java/rt4/TextureOp21.java +++ b/client/src/main/java/rt4/TextureOp21.java @@ -31,15 +31,15 @@ public final class TextureOp21 extends TextureOp { @Pc(50) int[][] local50 = new int[local31][]; @Pc(56) int local56; for (local56 = arg0 - this.anInt4223; local56 <= arg0 + this.anInt4223; local56++) { - @Pc(75) int[] local75 = this.method4624(0, local56 & Static141.anInt3473); - @Pc(78) int[] local78 = new int[Static189.anInt4457]; + @Pc(75) int[] local75 = this.method4624(0, local56 & Static10.anInt3473); + @Pc(78) int[] local78 = new int[Static10.anInt4457]; @Pc(80) int local80 = 0; @Pc(84) int local84; for (local84 = -this.anInt4221; local84 <= this.anInt4221; local84++) { local80 += local75[local84 & Static34.anInt1060]; } local84 = 0; - while (Static189.anInt4457 > local84) { + while (Static10.anInt4457 > local84) { local78[local84] = local47 * local80 >> 16; local80 -= local75[Static34.anInt1060 & local84 - this.anInt4221]; local84++; @@ -47,7 +47,7 @@ public final class TextureOp21 extends TextureOp { } local50[this.anInt4223 + local56 - arg0] = local78; } - for (local56 = 0; local56 < Static189.anInt4457; local56++) { + for (local56 = 0; local56 < Static10.anInt4457; local56++) { @Pc(169) int local169 = 0; for (@Pc(171) int local171 = 0; local171 < local31; local171++) { local169 += local50[local171][local56]; @@ -72,10 +72,10 @@ public final class TextureOp21 extends TextureOp { @Pc(72) int local72; @Pc(78) int local78; for (@Pc(54) int local54 = arg0 - this.anInt4223; local54 <= this.anInt4223 + arg0; local54++) { - @Pc(68) int[][] local68 = this.method4634(Static141.anInt3473 & local54, 0); + @Pc(68) int[][] local68 = this.method4634(Static10.anInt3473 & local54, 0); local70 = 0; local72 = 0; - @Pc(76) int[][] local76 = new int[3][Static189.anInt4457]; + @Pc(76) int[][] local76 = new int[3][Static10.anInt4457]; local78 = 0; @Pc(82) int[] local82 = local68[0]; @Pc(86) int[] local86 = local68[1]; @@ -90,7 +90,7 @@ public final class TextureOp21 extends TextureOp { @Pc(131) int[] local131 = local76[0]; @Pc(135) int[] local135 = local76[1]; @Pc(137) int local137 = 0; - while (Static189.anInt4457 > local137) { + while (Static10.anInt4457 > local137) { local131[local137] = local70 * local34 >> 16; local135[local137] = local72 * local34 >> 16; local127[local137] = local34 * local78 >> 16; @@ -109,7 +109,7 @@ public final class TextureOp21 extends TextureOp { @Pc(235) int[] local235 = local13[0]; @Pc(239) int[] local239 = local13[1]; @Pc(243) int[] local243 = local13[2]; - for (local70 = 0; local70 < Static189.anInt4457; local70++) { + for (local70 = 0; local70 < Static10.anInt4457; local70++) { local78 = 0; local72 = 0; @Pc(258) int local258 = 0; diff --git a/client/src/main/java/rt4/TextureOp22.java b/client/src/main/java/rt4/TextureOp22.java index b134335..d4fd74b 100644 --- a/client/src/main/java/rt4/TextureOp22.java +++ b/client/src/main/java/rt4/TextureOp22.java @@ -66,15 +66,15 @@ public final class TextureOp22 extends TextureOp { @Pc(43) boolean local43 = true; @Pc(45) int local45 = 0; @Pc(47) int local47 = 0; - @Pc(54) int local54 = Static189.anInt4457 * this.anInt4345 >> 12; - @Pc(61) int local61 = Static189.anInt4457 * this.anInt4350 >> 12; - @Pc(68) int local68 = this.anInt4346 * Static172.anInt4165 >> 12; - @Pc(75) int local75 = Static172.anInt4165 * this.anInt4353 >> 12; + @Pc(54) int local54 = Static10.anInt4457 * this.anInt4345 >> 12; + @Pc(61) int local61 = Static10.anInt4457 * this.anInt4350 >> 12; + @Pc(68) int local68 = this.anInt4346 * Static10.anInt4165 >> 12; + @Pc(75) int local75 = Static10.anInt4165 * this.anInt4353 >> 12; if (local68 <= 1) { return local29[arg0]; } - @Pc(88) int local88 = Static189.anInt4457 / local54 + 1; - this.anInt4356 = Static189.anInt4457 / 8 * this.anInt4347 >> 12; + @Pc(88) int local88 = Static10.anInt4457 / local54 + 1; + this.anInt4356 = Static10.anInt4457 / 8 * this.anInt4347 >> 12; @Pc(102) int[][] local102 = new int[local88][3]; @Pc(106) int[][] local106 = new int[local88][3]; @Pc(113) Random local113 = new Random((long) this.anInt4354); @@ -83,9 +83,9 @@ public final class TextureOp22 extends TextureOp { @Pc(123) int local123 = local54 + Static171.method3219(local61 - local54, local113); @Pc(133) int local133 = Static171.method3219(local68 - local75, local113) + local75; @Pc(137) int local137 = local31 + local123; - if (Static189.anInt4457 < local137) { - local137 = Static189.anInt4457; - local123 = Static189.anInt4457 - local31; + if (Static10.anInt4457 < local137) { + local137 = Static10.anInt4457; + local123 = Static10.anInt4457 - local31; } @Pc(158) int local158; @Pc(160) int local160; @@ -98,10 +98,10 @@ public final class TextureOp22 extends TextureOp { local160 = 0; @Pc(164) int local164 = local35 + local137; if (local164 < 0) { - local164 += Static189.anInt4457; + local164 += Static10.anInt4457; } - if (Static189.anInt4457 < local164) { - local164 -= Static189.anInt4457; + if (Static10.anInt4457 < local164) { + local164 -= Static10.anInt4457; } while (true) { @Pc(186) int[] local186 = local102[local150]; @@ -109,10 +109,10 @@ public final class TextureOp22 extends TextureOp { if (local39 != local150) { @Pc(224) int local224 = local35 + local31; if (local224 < 0) { - local224 += Static189.anInt4457; + local224 += Static10.anInt4457; } - if (local224 > Static189.anInt4457) { - local224 -= Static189.anInt4457; + if (local224 > Static10.anInt4457) { + local224 -= Static10.anInt4457; } @Pc(243) int local243; @Pc(258) int[] local258; @@ -136,7 +136,7 @@ public final class TextureOp22 extends TextureOp { local312 = 0; } else { local312 = Math.max(local224, local297); - local316 = Static189.anInt4457; + local316 = Static10.anInt4457; } this.method3386(local285, local113, local33 + local312, -local312 + local316, local158 - local285, local29); } @@ -152,13 +152,13 @@ public final class TextureOp22 extends TextureOp { } } } - if (Static172.anInt4165 >= local158 + local133) { + if (Static10.anInt4165 >= local158 + local133) { local41 = false; } else { - local133 = Static172.anInt4165 - local158; + local133 = Static10.anInt4165 - local158; } @Pc(407) int[] local407; - if (local137 == Static189.anInt4457) { + if (local137 == Static10.anInt4457) { this.method3386(local158, local113, local37 + local31, local123, local133, local29); if (local41) { return local19; @@ -173,18 +173,18 @@ public final class TextureOp22 extends TextureOp { local47 = 0; local407[2] = local133 + local158; local407[1] = local137; - local37 = Static171.method3219(Static189.anInt4457, local113); + local37 = Static171.method3219(Static10.anInt4457, local113); local35 = local37 - local33; @Pc(439) int[][] local439 = local102; local31 = 0; local102 = local106; local160 = local35; if (local35 < 0) { - local160 = local35 + Static189.anInt4457; + local160 = local35 + Static10.anInt4457; } local106 = local439; - if (Static189.anInt4457 < local160) { - local160 -= Static189.anInt4457; + if (Static10.anInt4457 < local160) { + local160 -= Static10.anInt4457; } while (true) { @Pc(469) int[] local469 = local102[local39]; @@ -213,8 +213,8 @@ public final class TextureOp22 extends TextureOp { @Pc(26) int local26 = this.anInt4360 > 0 ? 4096 - Static171.method3219(this.anInt4360, arg1) : 4096; @Pc(34) int local34 = this.anInt4344 * this.anInt4356 >> 12; @Pc(47) int local47 = this.anInt4356 - (local34 > 0 ? Static171.method3219(local34, arg1) : 0); - if (Static189.anInt4457 <= arg2) { - arg2 -= Static189.anInt4457; + if (Static10.anInt4457 <= arg2) { + arg2 -= Static10.anInt4457; } @Pc(68) int local68; @Pc(72) int local72; @@ -246,10 +246,10 @@ public final class TextureOp22 extends TextureOp { local112[Static34.anInt1060 & arg2 + local133] = local112[Static34.anInt1060 & arg3 + arg2 - local133 - 1] = local125 <= local142 ? local125 : local142; } } - if (Static189.anInt4457 >= local97 + local101) { + if (Static10.anInt4457 >= local97 + local101) { ArrayUtils.fill(local112, local101, local97, local125); } else { - local133 = Static189.anInt4457 - local101; + local133 = Static10.anInt4457 - local101; ArrayUtils.fill(local112, local101, local133, local125); ArrayUtils.fill(local112, 0, local97 - local133, local125); } @@ -259,8 +259,8 @@ public final class TextureOp22 extends TextureOp { for (local133 = 0; local133 < local79; local133++) { local112[Static34.anInt1060 & arg2 + local133] = local112[arg2 + arg3 - local133 - 1 & Static34.anInt1060] = local26 * local133 / local79; } - if (local101 + local97 > Static189.anInt4457) { - local133 = Static189.anInt4457 - local101; + if (local101 + local97 > Static10.anInt4457) { + local133 = Static10.anInt4457 - local101; ArrayUtils.fill(local112, local101, local133, local26); ArrayUtils.fill(local112, 0, local97 - local133, local26); } else { @@ -280,8 +280,8 @@ public final class TextureOp22 extends TextureOp { local112[arg2 + local142 & Static34.anInt1060] = local112[arg3 + arg2 - local142 - 1 & Static34.anInt1060] = local133 <= local288 ? local133 : local288; } } - if (local97 + local101 > Static189.anInt4457) { - local142 = Static189.anInt4457 - local101; + if (local97 + local101 > Static10.anInt4457) { + local142 = Static10.anInt4457 - local101; ArrayUtils.fill(local112, local101, local142, local133); ArrayUtils.fill(local112, 0, local97 - local142, local133); } else { @@ -290,12 +290,12 @@ public final class TextureOp22 extends TextureOp { } } } - } else if (Static189.anInt4457 >= arg2 + arg3) { + } else if (Static10.anInt4457 >= arg2 + arg3) { for (local68 = 0; local68 < arg4; local68++) { ArrayUtils.fill(arg5[arg0 + local68], arg2, arg3, local26); } } else { - local68 = Static189.anInt4457 - arg2; + local68 = Static10.anInt4457 - arg2; for (local72 = 0; local72 < arg4; local72++) { @Pc(522) int[] local522 = arg5[local72 + arg0]; ArrayUtils.fill(local522, arg2, local68, local26); diff --git a/client/src/main/java/rt4/TextureOp23.java b/client/src/main/java/rt4/TextureOp23.java index 4cf002c..f3941fb 100644 --- a/client/src/main/java/rt4/TextureOp23.java +++ b/client/src/main/java/rt4/TextureOp23.java @@ -21,10 +21,10 @@ public final class TextureOp23 extends TextureOp { public final int[] method4626(@OriginalArg(0) int arg0) { @Pc(19) int[] local19 = this.aClass121_41.method3445(arg0); if (this.aClass121_41.invalid) { - @Pc(34) int[] local34 = this.method4624(0, arg0 - 1 & Static141.anInt3473); + @Pc(34) int[] local34 = this.method4624(0, arg0 - 1 & Static10.anInt3473); @Pc(40) int[] local40 = this.method4624(0, arg0); - @Pc(50) int[] local50 = this.method4624(0, Static141.anInt3473 & arg0 + 1); - for (@Pc(52) int local52 = 0; local52 < Static189.anInt4457; local52++) { + @Pc(50) int[] local50 = this.method4624(0, Static10.anInt3473 & arg0 + 1); + for (@Pc(52) int local52 = 0; local52 < Static10.anInt4457; local52++) { @Pc(67) int local67 = (local50[local52] - local34[local52]) * this.anInt4503; @Pc(87) int local87 = this.anInt4503 * (local40[Static34.anInt1060 & local52 + 1] - local40[local52 - 1 & Static34.anInt1060]); @Pc(91) int local91 = local87 >> 12; diff --git a/client/src/main/java/rt4/TextureOp24.java b/client/src/main/java/rt4/TextureOp24.java index bc4b56c..eb4b9aa 100644 --- a/client/src/main/java/rt4/TextureOp24.java +++ b/client/src/main/java/rt4/TextureOp24.java @@ -49,10 +49,10 @@ public final class TextureOp24 extends TextureOp { @Pc(19) int[] local19 = this.aClass121_41.method3445(arg0); if (this.aClass121_41.invalid) { @Pc(30) int local30 = Static165.anInt4042 * this.anInt4580 >> 12; - @Pc(40) int[] local40 = this.method4624(0, Static141.anInt3473 & arg0 - 1); + @Pc(40) int[] local40 = this.method4624(0, Static10.anInt3473 & arg0 - 1); @Pc(46) int[] local46 = this.method4624(0, arg0); - @Pc(56) int[] local56 = this.method4624(0, arg0 + 1 & Static141.anInt3473); - for (@Pc(58) int local58 = 0; local58 < Static189.anInt4457; local58++) { + @Pc(56) int[] local56 = this.method4624(0, arg0 + 1 & Static10.anInt3473); + for (@Pc(58) int local58 = 0; local58 < Static10.anInt4457; local58++) { @Pc(81) int local81 = (local46[Static34.anInt1060 & local58 - 1] - local46[local58 + 1 & Static34.anInt1060]) * local30 >> 12; @Pc(94) int local94 = local30 * (local56[local58] - local40[local58]) >> 12; @Pc(98) int local98 = local81 >> 4; diff --git a/client/src/main/java/rt4/TextureOp25.java b/client/src/main/java/rt4/TextureOp25.java index 18112cd..ec60702 100644 --- a/client/src/main/java/rt4/TextureOp25.java +++ b/client/src/main/java/rt4/TextureOp25.java @@ -18,7 +18,7 @@ public final class TextureOp25 extends TextureOp { public final int[] method4626(@OriginalArg(0) int arg0) { @Pc(9) int[] local9 = this.aClass121_41.method3445(arg0); if (this.aClass121_41.invalid) { - ArrayUtils.fill(local9, 0, Static189.anInt4457, Static64.anIntArray153[arg0]); + ArrayUtils.fill(local9, 0, Static10.anInt4457, Static10.anIntArray153[arg0]); } return local9; } diff --git a/client/src/main/java/rt4/TextureOp26.java b/client/src/main/java/rt4/TextureOp26.java index 2653688..7437dc5 100644 --- a/client/src/main/java/rt4/TextureOp26.java +++ b/client/src/main/java/rt4/TextureOp26.java @@ -25,8 +25,8 @@ public final class TextureOp26 extends TextureOp { public final int[] method4626(@OriginalArg(0) int arg0) { @Pc(15) int[] local15 = this.aClass121_41.method3445(arg0); if (this.aClass121_41.invalid) { - @Pc(27) int local27 = Static64.anIntArray153[arg0]; - for (@Pc(29) int local29 = 0; local29 < Static189.anInt4457; local29++) { + @Pc(27) int local27 = Static10.anIntArray153[arg0]; + for (@Pc(29) int local29 = 0; local29 < Static10.anInt4457; local29++) { local15[local29] = this.method3769(local27, Static173.anIntArray367[local29]) % 4096; } } diff --git a/client/src/main/java/rt4/TextureOp28.java b/client/src/main/java/rt4/TextureOp28.java index c2eb3c7..98723f0 100644 --- a/client/src/main/java/rt4/TextureOp28.java +++ b/client/src/main/java/rt4/TextureOp28.java @@ -21,8 +21,8 @@ public final class TextureOp28 extends TextureOp { public final int[] method4626(@OriginalArg(0) int arg0) { @Pc(19) int[] local19 = this.aClass121_41.method3445(arg0); if (this.aClass121_41.invalid) { - @Pc(28) int local28 = Static64.anIntArray153[arg0]; - for (@Pc(30) int local30 = 0; local30 < Static189.anInt4457; local30++) { + @Pc(28) int local28 = Static10.anIntArray153[arg0]; + for (@Pc(30) int local30 = 0; local30 < Static10.anInt4457; local30++) { @Pc(41) int local41 = Static173.anIntArray367[local30]; @Pc(76) int local76; if (local41 > this.anInt4971 && 4096 - this.anInt4971 > local41 && 2048 - this.anInt4971 < local28 && local28 < this.anInt4971 + 2048) { diff --git a/client/src/main/java/rt4/TextureOp29.java b/client/src/main/java/rt4/TextureOp29.java index f7c7ef7..f103149 100644 --- a/client/src/main/java/rt4/TextureOp29.java +++ b/client/src/main/java/rt4/TextureOp29.java @@ -44,10 +44,10 @@ public final class TextureOp29 extends TextureOp { @OriginalMember(owner = "client!si", name = "a", descriptor = "(I[[I)V") private void method3934(@OriginalArg(1) int[][] arg0) { - @Pc(7) int local7 = Static172.anInt4165; - @Pc(9) int local9 = Static189.anInt4457; + @Pc(7) int local7 = Static10.anInt4165; + @Pc(9) int local9 = Static10.anInt4457; Static81.method1751(arg0); - method2263(Static141.anInt3473, Static34.anInt1060); + method2263(Static10.anInt3473, Static34.anInt1060); if (this.aClass18Array1 == null) { return; } @@ -94,18 +94,18 @@ public final class TextureOp29 extends TextureOp { public final int[][] method4638(@OriginalArg(1) int arg0) { @Pc(14) int[][] local14 = this.aClass103_41.method3173(arg0); if (this.aClass103_41.aBoolean195) { - @Pc(20) int local20 = Static189.anInt4457; - @Pc(22) int local22 = Static172.anInt4165; + @Pc(20) int local20 = Static10.anInt4457; + @Pc(22) int local22 = Static10.anInt4165; @Pc(26) int[][] local26 = new int[local22][local20]; @Pc(31) int[][][] local31 = this.aClass103_41.method3168(); this.method3934(local26); - for (@Pc(37) int local37 = 0; local37 < Static172.anInt4165; local37++) { + for (@Pc(37) int local37 = 0; local37 < Static10.anInt4165; local37++) { @Pc(44) int[] local44 = local26[local37]; @Pc(48) int[][] local48 = local31[local37]; @Pc(52) int[] local52 = local48[0]; @Pc(56) int[] local56 = local48[1]; @Pc(60) int[] local60 = local48[2]; - for (@Pc(62) int local62 = 0; local62 < Static189.anInt4457; local62++) { + for (@Pc(62) int local62 = 0; local62 < Static10.anInt4457; local62++) { @Pc(73) int local73 = local44[local62]; local60[local62] = (local73 & 0xFF) << 4; local56[local62] = local73 >> 4 & 0xFF0; diff --git a/client/src/main/java/rt4/TextureOp29SubOp3.java b/client/src/main/java/rt4/TextureOp29SubOp3.java index c5c1f05..59c4cfd 100644 --- a/client/src/main/java/rt4/TextureOp29SubOp3.java +++ b/client/src/main/java/rt4/TextureOp29SubOp3.java @@ -50,7 +50,16 @@ public final class TextureOp29SubOp3 extends TextureOp29SubOp { return new TextureOp29SubOp3(arg0.g2b(), arg0.g2b(), arg0.g2b(), arg0.g2b(), arg0.g2b(), arg0.g2b(), arg0.g2b(), arg0.g2b(), arg0.g3(), arg0.g1()); } - @OriginalMember(owner = "client!re", name = "a", descriptor = "(IZI)V") + @OriginalMember(owner = "client!oi", name = "a", descriptor = "(IIIIIIIIII)V") + public static void method3340(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7, @OriginalArg(8) int arg8) { + if (arg5 >= TextureOp29.anInt4164 && arg5 <= TextureOp29.anInt5063 && arg0 >= TextureOp29.anInt4164 && arg0 <= TextureOp29.anInt5063 && arg6 >= TextureOp29.anInt4164 && TextureOp29.anInt5063 >= arg6 && TextureOp29.anInt4164 <= arg1 && arg1 <= TextureOp29.anInt5063 && TextureOp29.anInt5773 <= arg4 && arg4 <= TextureOp29.anInt2869 && arg7 >= TextureOp29.anInt5773 && TextureOp29.anInt2869 >= arg7 && arg2 >= TextureOp29.anInt5773 && TextureOp29.anInt2869 >= arg2 && arg3 >= TextureOp29.anInt5773 && arg3 <= TextureOp29.anInt2869) { + Static38.method962(arg2, arg8, arg7, arg6, arg1, arg3, arg4, arg0, arg5); + } else { + Static165.method3162(arg5, arg0, arg7, arg8, arg3, arg2, arg1, arg6, arg4); + } + } + + @OriginalMember(owner = "client!re", name = "a", descriptor = "(IZI)V") @Override public final void method4009(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) { @Pc(6) int local6 = arg1 * this.anInt4846 >> 12; @@ -61,7 +70,7 @@ public final class TextureOp29SubOp3 extends TextureOp29SubOp { @Pc(45) int local45 = arg0 * this.anInt4845 >> 12; @Pc(52) int local52 = this.anInt4853 * arg1 >> 12; @Pc(65) int local65 = arg0 * this.anInt4842 >> 12; - Static181.method3340(local17, local52, local45, local65, local31, local6, local38, local24, this.anInt5229); + method3340(local17, local52, local45, local65, local31, local6, local38, local24, this.anInt5229); } @OriginalMember(owner = "client!re", name = "c", descriptor = "(III)V") diff --git a/client/src/main/java/rt4/TextureOp29SubOp4.java b/client/src/main/java/rt4/TextureOp29SubOp4.java index 38cbc85..b19ccfe 100644 --- a/client/src/main/java/rt4/TextureOp29SubOp4.java +++ b/client/src/main/java/rt4/TextureOp29SubOp4.java @@ -8,6 +8,8 @@ import org.openrs2.deob.annotation.Pc; @OriginalClass("client!ta") public final class TextureOp29SubOp4 extends TextureOp29SubOp { + @OriginalMember(owner = "client!fk", name = "j", descriptor = "[[I") + public static int[][] anIntArrayArray10; @OriginalMember(owner = "client!ta", name = "D", descriptor = "I") private final int anInt5247; @@ -44,43 +46,99 @@ public final class TextureOp29SubOp4 extends TextureOp29SubOp { @Pc(13) int local13 = arg4 + arg6; @Pc(15) int local15; for (local15 = arg1; local15 < local9; local15++) { - Static131.method2576(Static71.anIntArrayArray10[local15], arg6, arg5, arg0); + method2576(anIntArrayArray10[local15], arg6, arg5, arg0); } @Pc(34) int local34 = arg2 - arg4; @Pc(39) int local39 = arg5 - arg4; for (local15 = arg2; local15 > local34; local15--) { - Static131.method2576(Static71.anIntArrayArray10[local15], arg6, arg5, arg0); + method2576(anIntArrayArray10[local15], arg6, arg5, arg0); } for (local15 = local9; local15 <= local34; local15++) { - @Pc(72) int[] local72 = Static71.anIntArrayArray10[local15]; - Static131.method2576(local72, arg6, local13, arg0); - Static131.method2576(local72, local13, local39, arg3); - Static131.method2576(local72, local39, arg5, arg0); + @Pc(72) int[] local72 = anIntArrayArray10[local15]; + method2576(local72, arg6, local13, arg0); + method2576(local72, local13, local39, arg3); + method2576(local72, local39, arg5, arg0); } } @OriginalMember(owner = "client!tl", name = "a", descriptor = "(IIIIIIII)V") public static void method4222(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5, @OriginalArg(7) int arg6) { - @Pc(11) int local11 = Static78.method1690(TextureOp29.anInt2869, arg5, TextureOp29.anInt5773); - @Pc(17) int local17 = Static78.method1690(TextureOp29.anInt2869, arg2, TextureOp29.anInt5773); - @Pc(23) int local23 = Static78.method1690(TextureOp29.anInt5063, arg6, TextureOp29.anInt4164); - @Pc(29) int local29 = Static78.method1690(TextureOp29.anInt5063, arg0, TextureOp29.anInt4164); - @Pc(37) int local37 = Static78.method1690(TextureOp29.anInt2869, arg3 + arg5, TextureOp29.anInt5773); - @Pc(46) int local46 = Static78.method1690(TextureOp29.anInt2869, arg2 - arg3, TextureOp29.anInt5773); + @Pc(11) int local11 = Static231.method1690(TextureOp29.anInt2869, arg5, TextureOp29.anInt5773); + @Pc(17) int local17 = Static231.method1690(TextureOp29.anInt2869, arg2, TextureOp29.anInt5773); + @Pc(23) int local23 = Static231.method1690(TextureOp29.anInt5063, arg6, TextureOp29.anInt4164); + @Pc(29) int local29 = Static231.method1690(TextureOp29.anInt5063, arg0, TextureOp29.anInt4164); + @Pc(37) int local37 = Static231.method1690(TextureOp29.anInt2869, arg3 + arg5, TextureOp29.anInt5773); + @Pc(46) int local46 = Static231.method1690(TextureOp29.anInt2869, arg2 - arg3, TextureOp29.anInt5773); @Pc(48) int local48; for (local48 = local11; local48 < local37; local48++) { - Static131.method2576(Static71.anIntArrayArray10[local48], local23, local29, arg4); + method2576(anIntArrayArray10[local48], local23, local29, arg4); } for (local48 = local17; local48 > local46; local48--) { - Static131.method2576(Static71.anIntArrayArray10[local48], local23, local29, arg4); + method2576(anIntArrayArray10[local48], local23, local29, arg4); } - @Pc(94) int local94 = Static78.method1690(TextureOp29.anInt5063, arg3 + arg6, TextureOp29.anInt4164); - @Pc(103) int local103 = Static78.method1690(TextureOp29.anInt5063, arg0 - arg3, TextureOp29.anInt4164); + @Pc(94) int local94 = Static231.method1690(TextureOp29.anInt5063, arg3 + arg6, TextureOp29.anInt4164); + @Pc(103) int local103 = Static231.method1690(TextureOp29.anInt5063, arg0 - arg3, TextureOp29.anInt4164); for (local48 = local37; local48 <= local46; local48++) { - @Pc(122) int[] local122 = Static71.anIntArrayArray10[local48]; - Static131.method2576(local122, local23, local94, arg4); - Static131.method2576(local122, local94, local103, arg1); - Static131.method2576(local122, local103, local29, arg4); + @Pc(122) int[] local122 = anIntArrayArray10[local48]; + method2576(local122, local23, local94, arg4); + method2576(local122, local94, local103, arg1); + method2576(local122, local103, local29, arg4); + } + } + + @OriginalMember(owner = "client!sj", name = "a", descriptor = "(IIBIII)V") + public static void method3950(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4) { + if (arg0 >= TextureOp29.anInt4164 && arg3 <= TextureOp29.anInt5063 && TextureOp29.anInt5773 <= arg4 && TextureOp29.anInt2869 >= arg2) { + method3308(arg2, arg3, arg4, arg0, arg1); + } else { + method3105(arg1, arg3, arg4, arg0, arg2); + } + } + + @OriginalMember(owner = "client!ob", name = "a", descriptor = "(IIIIII)V") + public static void method3308(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4) { + for (@Pc(8) int local8 = arg2; local8 <= arg0; local8++) { + method2576(anIntArrayArray10[local8], arg3, arg1, arg4); + } + } + + @OriginalMember(owner = "client!kd", name = "a", descriptor = "([IIIII)V") + public static void method2576(@OriginalArg(0) int[] arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3) { + arg1--; + @Pc(14) int local14 = arg2 - 1; + @Pc(17) int local17 = local14 - 7; + while (local17 > arg1) { + @Pc(22) int local22 = arg1 + 1; + arg0[local22] = arg3; + @Pc(27) int local27 = local22 + 1; + arg0[local27] = arg3; + @Pc(32) int local32 = local27 + 1; + arg0[local32] = arg3; + @Pc(37) int local37 = local32 + 1; + arg0[local37] = arg3; + @Pc(42) int local42 = local37 + 1; + arg0[local42] = arg3; + @Pc(47) int local47 = local42 + 1; + arg0[local47] = arg3; + @Pc(52) int local52 = local47 + 1; + arg0[local52] = arg3; + arg1 = local52 + 1; + arg0[arg1] = arg3; + } + while (local14 > arg1) { + arg1++; + arg0[arg1] = arg3; + } + } + + @OriginalMember(owner = "client!n", name = "a", descriptor = "(IIIIII)V") + public static void method3105(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4) { + @Pc(11) int local11 = Static231.method1690(TextureOp29.anInt2869, arg2, TextureOp29.anInt5773); + @Pc(17) int local17 = Static231.method1690(TextureOp29.anInt2869, arg4, TextureOp29.anInt5773); + @Pc(23) int local23 = Static231.method1690(TextureOp29.anInt5063, arg3, TextureOp29.anInt4164); + @Pc(35) int local35 = Static231.method1690(TextureOp29.anInt5063, arg1, TextureOp29.anInt4164); + for (@Pc(37) int local37 = local11; local37 <= local17; local37++) { + method2576(anIntArrayArray10[local37], local23, local35, arg0); } } @@ -101,7 +159,7 @@ public final class TextureOp29SubOp4 extends TextureOp29SubOp { @Pc(17) int local17 = arg0 * this.anInt5238 >> 12; @Pc(24) int local24 = arg1 * this.anInt5247 >> 12; @Pc(31) int local31 = arg1 * this.anInt5244 >> 12; - Static230.method3950(local10, this.anInt5228, local31, local17, local24); + method3950(local10, this.anInt5228, local31, local17, local24); } @OriginalMember(owner = "client!ta", name = "a", descriptor = "(III)V") diff --git a/client/src/main/java/rt4/TextureOp3.java b/client/src/main/java/rt4/TextureOp3.java index 4766cdd..51d7fe6 100644 --- a/client/src/main/java/rt4/TextureOp3.java +++ b/client/src/main/java/rt4/TextureOp3.java @@ -34,13 +34,13 @@ public final class TextureOp3 extends TextureOp { public final int[][] method4638(@OriginalArg(1) int arg0) { @Pc(11) int[][] local11 = this.aClass103_41.method3173(arg0); if (this.aClass103_41.aBoolean195) { - @Pc(25) int[] local25 = this.method4624(0, Static141.anInt3473 & arg0 - 1); + @Pc(25) int[] local25 = this.method4624(0, Static10.anInt3473 & arg0 - 1); @Pc(31) int[] local31 = this.method4624(0, arg0); - @Pc(41) int[] local41 = this.method4624(0, arg0 + 1 & Static141.anInt3473); + @Pc(41) int[] local41 = this.method4624(0, arg0 + 1 & Static10.anInt3473); @Pc(45) int[] local45 = local11[0]; @Pc(49) int[] local49 = local11[1]; @Pc(53) int[] local53 = local11[2]; - for (@Pc(55) int local55 = 0; local55 < Static189.anInt4457; local55++) { + for (@Pc(55) int local55 = 0; local55 < Static10.anInt4457; local55++) { @Pc(70) int local70 = this.anInt316 * (local41[local55] - local25[local55]); @Pc(90) int local90 = this.anInt316 * (local31[local55 + 1 & Static34.anInt1060] - local31[Static34.anInt1060 & local55 - 1]); @Pc(94) int local94 = local70 >> 12; diff --git a/client/src/main/java/rt4/TextureOp30.java b/client/src/main/java/rt4/TextureOp30.java index 8dd13b6..365089f 100644 --- a/client/src/main/java/rt4/TextureOp30.java +++ b/client/src/main/java/rt4/TextureOp30.java @@ -59,7 +59,7 @@ public final class TextureOp30 extends TextureOp { @Pc(41) int[] local41 = local15[0]; @Pc(45) int[] local45 = local15[1]; @Pc(49) int[] local49 = local15[2]; - for (@Pc(51) int local51 = 0; local51 < Static189.anInt4457; local51++) { + for (@Pc(51) int local51 = 0; local51 < Static10.anInt4457; local51++) { @Pc(58) int local58 = local29[local51]; @Pc(66) int local66 = local58 - this.anIntArray450[0]; if (local66 < 0) { diff --git a/client/src/main/java/rt4/TextureOp31.java b/client/src/main/java/rt4/TextureOp31.java index 6765686..0bf854c 100644 --- a/client/src/main/java/rt4/TextureOp31.java +++ b/client/src/main/java/rt4/TextureOp31.java @@ -19,7 +19,7 @@ public final class TextureOp31 extends TextureOp { @Pc(7) int[] local7 = this.aClass121_41.method3445(arg0); if (this.aClass121_41.invalid) { @Pc(21) int[] local21 = this.method4624(0, arg0); - for (@Pc(23) int local23 = 0; local23 < Static189.anInt4457; local23++) { + for (@Pc(23) int local23 = 0; local23 < Static10.anInt4457; local23++) { local7[local23] = 4096 - local21[local23]; } } @@ -46,7 +46,7 @@ public final class TextureOp31 extends TextureOp { @Pc(44) int[] local44 = local18[0]; @Pc(48) int[] local48 = local18[1]; @Pc(52) int[] local52 = local18[2]; - for (@Pc(54) int local54 = 0; local54 < Static189.anInt4457; local54++) { + for (@Pc(54) int local54 = 0; local54 < Static10.anInt4457; local54++) { local44[local54] = 4096 - local36[local54]; local48[local54] = 4096 - local40[local54]; local52[local54] = 4096 - local32[local54]; diff --git a/client/src/main/java/rt4/TextureOp32.java b/client/src/main/java/rt4/TextureOp32.java index b4db7ea..311b614 100644 --- a/client/src/main/java/rt4/TextureOp32.java +++ b/client/src/main/java/rt4/TextureOp32.java @@ -30,22 +30,22 @@ public final class TextureOp32 extends TextureOp { public final int[][] method4638(@OriginalArg(1) int arg0) { @Pc(17) int[][] local17 = this.aClass103_41.method3173(arg0); if (this.aClass103_41.aBoolean195 && this.method4327()) { - @Pc(42) int local42 = (this.anInt5536 == Static172.anInt4165 ? arg0 : this.anInt5536 * arg0 / Static172.anInt4165) * this.anInt5535; + @Pc(42) int local42 = (this.anInt5536 == Static10.anInt4165 ? arg0 : this.anInt5536 * arg0 / Static10.anInt4165) * this.anInt5535; @Pc(46) int[] local46 = local17[0]; @Pc(50) int[] local50 = local17[1]; @Pc(54) int[] local54 = local17[2]; @Pc(64) int local64; @Pc(73) int local73; - if (Static189.anInt4457 == this.anInt5535) { - for (local64 = 0; local64 < Static189.anInt4457; local64++) { + if (Static10.anInt4457 == this.anInt5535) { + for (local64 = 0; local64 < Static10.anInt4457; local64++) { local73 = this.anIntArray483[local42++]; local54[local64] = (local73 & 0xFF) << 4; local50[local64] = local73 >> 4 & 0xFF0; local46[local64] = local73 >> 12 & 0xFF0; } } else { - for (local64 = 0; local64 < Static189.anInt4457; local64++) { - local73 = this.anInt5535 * local64 / Static189.anInt4457; + for (local64 = 0; local64 < Static10.anInt4457; local64++) { + local73 = this.anInt5535 * local64 / Static10.anInt4457; @Pc(122) int local122 = this.anIntArray483[local42 + local73]; local54[local64] = (local122 & 0xFF) << 4; local50[local64] = local122 >> 4 & 0xFF0; @@ -63,8 +63,8 @@ public final class TextureOp32 extends TextureOp { } else if (this.anInt5539 < 0) { return false; } else { - @Pc(22) int local22 = Static189.anInt4457; - @Pc(24) int local24 = Static172.anInt4165; + @Pc(22) int local22 = Static10.anInt4457; + @Pc(24) int local24 = Static10.anInt4165; @Pc(34) int local34 = Texture.anInterface1_1.isLowDetail(this.anInt5539) ? 64 : 128; this.anIntArray483 = Texture.anInterface1_1.method3235(this.anInt5539); this.anInt5536 = local34; diff --git a/client/src/main/java/rt4/TextureOp33.java b/client/src/main/java/rt4/TextureOp33.java index 8cd25b0..289ed9b 100644 --- a/client/src/main/java/rt4/TextureOp33.java +++ b/client/src/main/java/rt4/TextureOp33.java @@ -61,11 +61,11 @@ public final class TextureOp33 extends TextureOp { @Pc(40) Random local40 = new Random((long) this.anInt5716); for (@Pc(42) int local42 = 0; local42 < this.anInt5712; local42++) { @Pc(64) int local64 = this.anInt5714 > 0 ? this.anInt5709 + Static171.method3219(this.anInt5714, local40) - local28 : this.anInt5709; - @Pc(69) int local69 = Static171.method3219(Static189.anInt4457, local40); + @Pc(69) int local69 = Static171.method3219(Static10.anInt4457, local40); @Pc(75) int local75 = local64 >> 4 & 0xFF; - @Pc(80) int local80 = Static171.method3219(Static172.anInt4165, local40); - @Pc(92) int local92 = local69 + (this.anInt5715 * Static130.anIntArray299[local75] >> 12); - @Pc(103) int local103 = local80 + (Static119.anIntArray282[local75] * this.anInt5715 >> 12); + @Pc(80) int local80 = Static171.method3219(Static10.anInt4165, local40); + @Pc(92) int local92 = local69 + (this.anInt5715 * Static9.anIntArray299[local75] >> 12); + @Pc(103) int local103 = local80 + (Static9.anIntArray282[local75] * this.anInt5715 >> 12); @Pc(107) int local107 = local92 - local69; @Pc(112) int local112 = local103 - local80; if (local107 != 0 || local112 != 0) { @@ -107,7 +107,7 @@ public final class TextureOp33 extends TextureOp { for (@Pc(233) int local233 = local69; local233 < local92; local233++) { local206 += local190; @Pc(251) int local251 = local231 * (local233 - local69) + local216 + 1024; - @Pc(255) int local255 = local150 & Static141.anInt3473; + @Pc(255) int local255 = local150 & Static10.anInt3473; if (local206 > 0) { local206 += -local152; local150 += local227; diff --git a/client/src/main/java/rt4/TextureOp4.java b/client/src/main/java/rt4/TextureOp4.java index 14d8554..7f9aa64 100644 --- a/client/src/main/java/rt4/TextureOp4.java +++ b/client/src/main/java/rt4/TextureOp4.java @@ -42,7 +42,7 @@ public final class TextureOp4 extends TextureOp { @OriginalMember(owner = "client!bi", name = "a", descriptor = "(ZI[I)V") public final void method584(@OriginalArg(1) int arg0, @OriginalArg(2) int[] arg1) { - @Pc(12) int local12 = this.anInt641 * Static64.anIntArray153[arg0]; + @Pc(12) int local12 = this.anInt641 * Static10.anIntArray153[arg0]; @Pc(115) int local115; @Pc(129) int local129; @Pc(40) int local40; @@ -72,14 +72,14 @@ public final class TextureOp4 extends TextureOp { } local103 = this.aByteArray10[local68 & 0xFF] & 0xFF; if (this.aBoolean44) { - for (local105 = 0; local105 < Static189.anInt4457; local105++) { + for (local105 = 0; local105 < Static10.anInt4457; local105++) { local115 = this.anInt646 * Static173.anIntArray367[local105]; local129 = this.method590(local40 * local115 >> 12, local103, local77, local54, local60, local85); local129 = local27 * local129 >> 12; arg1[local105] = (local129 >> 1) + 2048; } } else { - for (local105 = 0; local105 < Static189.anInt4457; local105++) { + for (local105 = 0; local105 < Static10.anInt4457; local105++) { local115 = this.anInt646 * Static173.anIntArray367[local105]; local129 = this.method590(local40 * local115 >> 12, local103, local77, local54, local60, local85); arg1[local105] = local27 * local129 >> 12; @@ -102,7 +102,7 @@ public final class TextureOp4 extends TextureOp { local68 = 0; } local103 = this.aByteArray10[local68 & 0xFF] & 0xFF; - for (local105 = 0; local105 < Static189.anInt4457; local105++) { + for (local105 = 0; local105 < Static10.anInt4457; local105++) { local115 = Static173.anIntArray367[local105] * this.anInt646; local129 = this.method590(local115 * local40 >> 12, local103, local77, local54, local81, local85); arg1[local105] = local129 * local27 >> 12; @@ -125,14 +125,14 @@ public final class TextureOp4 extends TextureOp { } local103 = this.aByteArray10[local68 & 0xFF] & 0xFF; if (this.aBoolean44 && local142 == this.anInt642 - 1) { - for (local105 = 0; local105 < Static189.anInt4457; local105++) { + for (local105 = 0; local105 < Static10.anInt4457; local105++) { local115 = Static173.anIntArray367[local105] * this.anInt646; local129 = this.method590(local40 * local115 >> 12, local103, local77, local54, local60, local85); local129 = (local27 * local129 >> 12) + arg1[local105]; arg1[local105] = (local129 >> 1) + 2048; } } else { - for (local105 = 0; local105 < Static189.anInt4457; local105++) { + for (local105 = 0; local105 < Static10.anInt4457; local105++) { local115 = Static173.anIntArray367[local105] * this.anInt646; local129 = this.method590(local115 * local40 >> 12, local103, local77, local54, local60, local85); arg1[local105] += local129 * local27 >> 12; diff --git a/client/src/main/java/rt4/TextureOp5.java b/client/src/main/java/rt4/TextureOp5.java index e95d70d..ffbd630 100644 --- a/client/src/main/java/rt4/TextureOp5.java +++ b/client/src/main/java/rt4/TextureOp5.java @@ -30,7 +30,7 @@ public final class TextureOp5 extends TextureOp { @Pc(67) int[] local67 = local33[2]; @Pc(71) int[] local71 = local39[2]; @Pc(75) int[] local75 = local39[1]; - for (@Pc(77) int local77 = 0; local77 < Static189.anInt4457; local77++) { + for (@Pc(77) int local77 = 0; local77 < Static10.anInt4457; local77++) { @Pc(88) int local88 = local27[local77]; if (local88 == 4096) { local59[local77] = local51[local77]; @@ -67,7 +67,7 @@ public final class TextureOp5 extends TextureOp { @Pc(30) int[] local30 = this.method4624(0, arg0); @Pc(36) int[] local36 = this.method4624(1, arg0); @Pc(42) int[] local42 = this.method4624(2, arg0); - for (@Pc(44) int local44 = 0; local44 < Static189.anInt4457; local44++) { + for (@Pc(44) int local44 = 0; local44 < Static10.anInt4457; local44++) { @Pc(55) int local55 = local42[local44]; if (local55 == 4096) { local11[local44] = local30[local44]; diff --git a/client/src/main/java/rt4/TextureOp6.java b/client/src/main/java/rt4/TextureOp6.java index 6abcc92..d8915fe 100644 --- a/client/src/main/java/rt4/TextureOp6.java +++ b/client/src/main/java/rt4/TextureOp6.java @@ -67,7 +67,7 @@ public final class TextureOp6 extends TextureOp { public final int[] method4626(@OriginalArg(0) int arg0) { @Pc(19) int[] local19 = this.aClass121_41.method3445(arg0); if (this.aClass121_41.invalid) { - @Pc(28) int local28 = Static64.anIntArray153[arg0]; + @Pc(28) int local28 = Static10.anIntArray153[arg0]; @Pc(36) int local36; if (this.anInt1234 == 0) { @Pc(34) short local34 = 0; @@ -79,9 +79,9 @@ public final class TextureOp6 extends TextureOp { break; } } - ArrayUtils.fill(local19, 0, Static189.anInt4457, local34); + ArrayUtils.fill(local19, 0, Static10.anInt4457, local34); } else { - for (@Pc(85) int local85 = 0; local85 < Static189.anInt4457; local85++) { + for (@Pc(85) int local85 = 0; local85 < Static10.anInt4457; local85++) { @Pc(96) int local96 = Static173.anIntArray367[local85]; local36 = 0; @Pc(101) int local101 = this.anInt1234; diff --git a/client/src/main/java/rt4/TextureOp7.java b/client/src/main/java/rt4/TextureOp7.java index dc9b117..5e42aff 100644 --- a/client/src/main/java/rt4/TextureOp7.java +++ b/client/src/main/java/rt4/TextureOp7.java @@ -36,7 +36,7 @@ public final class TextureOp7 extends TextureOp { public final int[][] method4638(@OriginalArg(1) int arg0) { @Pc(20) int[][] local20 = this.aClass103_41.method3173(arg0); if (this.aClass103_41.aBoolean195) { - @Pc(39) int[][] local39 = this.method4634(this.aBoolean105 ? Static141.anInt3473 - arg0 : arg0, 0); + @Pc(39) int[][] local39 = this.method4634(this.aBoolean105 ? Static10.anInt3473 - arg0 : arg0, 0); @Pc(43) int[] local43 = local39[0]; @Pc(47) int[] local47 = local39[2]; @Pc(51) int[] local51 = local39[1]; @@ -45,13 +45,13 @@ public final class TextureOp7 extends TextureOp { @Pc(63) int[] local63 = local20[0]; @Pc(68) int local68; if (this.aBoolean104) { - for (local68 = 0; local68 < Static189.anInt4457; local68++) { + for (local68 = 0; local68 < Static10.anInt4457; local68++) { local63[local68] = local43[Static34.anInt1060 - local68]; local55[local68] = local51[Static34.anInt1060 - local68]; local59[local68] = local47[Static34.anInt1060 - local68]; } } else { - for (local68 = 0; local68 < Static189.anInt4457; local68++) { + for (local68 = 0; local68 < Static10.anInt4457; local68++) { local63[local68] = local43[local68]; local55[local68] = local51[local68]; local59[local68] = local47[local68]; @@ -66,13 +66,13 @@ public final class TextureOp7 extends TextureOp { public final int[] method4626(@OriginalArg(0) int arg0) { @Pc(15) int[] local15 = this.aClass121_41.method3445(arg0); if (this.aClass121_41.invalid) { - @Pc(38) int[] local38 = this.method4624(0, this.aBoolean105 ? Static141.anInt3473 - arg0 : arg0); + @Pc(38) int[] local38 = this.method4624(0, this.aBoolean105 ? Static10.anInt3473 - arg0 : arg0); if (this.aBoolean104) { - for (@Pc(51) int local51 = 0; local51 < Static189.anInt4457; local51++) { + for (@Pc(51) int local51 = 0; local51 < Static10.anInt4457; local51++) { local15[local51] = local38[Static34.anInt1060 - local51]; } } else { - ArrayUtils.copy(local38, 0, local15, 0, Static189.anInt4457); + ArrayUtils.copy(local38, 0, local15, 0, Static10.anInt4457); } } return local15; diff --git a/client/src/main/java/rt4/TextureOp8.java b/client/src/main/java/rt4/TextureOp8.java index 097c25c..f07975d 100644 --- a/client/src/main/java/rt4/TextureOp8.java +++ b/client/src/main/java/rt4/TextureOp8.java @@ -39,9 +39,9 @@ public final class TextureOp8 extends TextureOp { public final int[] method4626(@OriginalArg(0) int arg0) { @Pc(19) int[] local19 = this.aClass121_41.method3445(arg0); if (this.aClass121_41.invalid) { - for (@Pc(25) int local25 = 0; local25 < Static189.anInt4457; local25++) { + for (@Pc(25) int local25 = 0; local25 < Static10.anInt4457; local25++) { @Pc(32) int local32 = Static173.anIntArray367[local25]; - @Pc(36) int local36 = Static64.anIntArray153[arg0]; + @Pc(36) int local36 = Static10.anIntArray153[arg0]; @Pc(43) int local43 = this.anInt1934 * local32 >> 12; @Pc(50) int local50 = local36 * this.anInt1940 >> 12; @Pc(60) int local60 = this.anInt1934 * (local32 % (4096 / this.anInt1934)); diff --git a/client/src/main/java/rt4/TextureOp9.java b/client/src/main/java/rt4/TextureOp9.java index ca540e8..7b4e42d 100644 --- a/client/src/main/java/rt4/TextureOp9.java +++ b/client/src/main/java/rt4/TextureOp9.java @@ -40,7 +40,7 @@ public final class TextureOp9 extends TextureOp { @Pc(19) int[] local19 = this.aClass121_41.method3445(arg0); if (this.aClass121_41.invalid) { @Pc(30) int[] local30 = this.method4624(0, arg0); - for (@Pc(32) int local32 = 0; local32 < Static189.anInt4457; local32++) { + for (@Pc(32) int local32 = 0; local32 < Static10.anInt4457; local32++) { local19[local32] = this.anInt2007 + (local30[local32] * this.anInt2001 >> 12); } } @@ -59,7 +59,7 @@ public final class TextureOp9 extends TextureOp { @Pc(33) int[] local33 = local7[0]; @Pc(37) int[] local37 = local7[1]; @Pc(41) int[] local41 = local7[2]; - for (@Pc(43) int local43 = 0; local43 < Static189.anInt4457; local43++) { + for (@Pc(43) int local43 = 0; local43 < Static10.anInt4457; local43++) { local33[local43] = this.anInt2007 + (this.anInt2001 * local29[local43] >> 12); local37[local43] = (this.anInt2001 * local21[local43] >> 12) + this.anInt2007; local41[local43] = this.anInt2007 + (this.anInt2001 * local25[local43] >> 12); diff --git a/client/src/main/java/rt4/TextureOpBinary.java b/client/src/main/java/rt4/TextureOpBinary.java index 51cd725..024c043 100644 --- a/client/src/main/java/rt4/TextureOpBinary.java +++ b/client/src/main/java/rt4/TextureOpBinary.java @@ -25,7 +25,7 @@ public final class TextureOpBinary extends TextureOp { @Pc(19) int[] local19 = this.aClass121_41.method3445(arg0); if (this.aClass121_41.invalid) { @Pc(29) int[] local29 = this.method4624(0, arg0); - for (@Pc(31) int local31 = 0; local31 < Static189.anInt4457; local31++) { + for (@Pc(31) int local31 = 0; local31 < Static10.anInt4457; local31++) { @Pc(38) int local38 = local29[local31]; local19[local31] = this.anInt857 <= local38 && local38 <= this.anInt861 ? 4096 : 0; } diff --git a/client/src/main/java/rt4/TextureOpColorFill.java b/client/src/main/java/rt4/TextureOpColorFill.java index 695e131..8b5812b 100644 --- a/client/src/main/java/rt4/TextureOpColorFill.java +++ b/client/src/main/java/rt4/TextureOpColorFill.java @@ -43,7 +43,7 @@ public final class TextureOpColorFill extends TextureOp { @Pc(31) int[] local31 = local22[0]; @Pc(35) int[] local35 = local22[1]; @Pc(39) int[] local39 = local22[2]; - for (@Pc(41) int local41 = 0; local41 < Static189.anInt4457; local41++) { + for (@Pc(41) int local41 = 0; local41 < Static10.anInt4457; local41++) { local31[local41] = this.anInt2073; local35[local41] = this.anInt2078; local39[local41] = this.anInt2080; diff --git a/client/src/main/java/rt4/TextureOpColorGradient.java b/client/src/main/java/rt4/TextureOpColorGradient.java index 57785ab..062a37a 100644 --- a/client/src/main/java/rt4/TextureOpColorGradient.java +++ b/client/src/main/java/rt4/TextureOpColorGradient.java @@ -309,7 +309,7 @@ public final class TextureOpColorGradient extends TextureOp { @Pc(35) int[] local35 = local11[1]; @Pc(39) int[] local39 = local11[0]; @Pc(43) int[] local43 = local11[2]; - for (@Pc(45) int local45 = 0; local45 < Static189.anInt4457; local45++) { + for (@Pc(45) int local45 = 0; local45 < Static10.anInt4457; local45++) { @Pc(54) int local54 = local31[local45] >> 4; if (local54 < 0) { local54 = 0; diff --git a/client/src/main/java/rt4/TextureOpCombine.java b/client/src/main/java/rt4/TextureOpCombine.java index bbd8945..ff57790 100644 --- a/client/src/main/java/rt4/TextureOpCombine.java +++ b/client/src/main/java/rt4/TextureOpCombine.java @@ -25,65 +25,65 @@ public final class TextureOpCombine extends TextureOp { @Pc(28) int[] local28 = this.method4624(1, arg0); @Pc(31) int local31 = this.anInt4543; if (local31 == 1) { - for (local31 = 0; local31 < Static189.anInt4457; local31++) { + for (local31 = 0; local31 < Static10.anInt4457; local31++) { local11[local31] = local28[local31] + local22[local31]; } } else if (local31 == 2) { - for (local31 = 0; local31 < Static189.anInt4457; local31++) { + for (local31 = 0; local31 < Static10.anInt4457; local31++) { local11[local31] = local22[local31] - local28[local31]; } } else if (local31 == 3) { - for (local31 = 0; local31 < Static189.anInt4457; local31++) { + for (local31 = 0; local31 < Static10.anInt4457; local31++) { local11[local31] = local28[local31] * local22[local31] >> 12; } } else { @Pc(180) int local180; if (local31 == 4) { - for (local31 = 0; local31 < Static189.anInt4457; local31++) { + for (local31 = 0; local31 < Static10.anInt4457; local31++) { local180 = local28[local31]; local11[local31] = local180 == 0 ? 4096 : (local22[local31] << 12) / local180; } } else if (local31 == 5) { - for (local31 = 0; local31 < Static189.anInt4457; local31++) { + for (local31 = 0; local31 < Static10.anInt4457; local31++) { local11[local31] = 4096 - ((4096 - local22[local31]) * (-local28[local31] + 4096) >> 12); } } else if (local31 == 6) { - for (local31 = 0; local31 < Static189.anInt4457; local31++) { + for (local31 = 0; local31 < Static10.anInt4457; local31++) { local180 = local28[local31]; local11[local31] = local180 >= 2048 ? 4096 - ((4096 - local22[local31]) * (-local180 + 4096) >> 11) : local180 * local22[local31] >> 11; } } else { @Pc(295) int local295; if (local31 == 7) { - for (local31 = 0; local31 < Static189.anInt4457; local31++) { + for (local31 = 0; local31 < Static10.anInt4457; local31++) { local295 = local22[local31]; local11[local31] = local295 == 4096 ? 4096 : (local28[local31] << 12) / (4096 - local295); } } else if (local31 == 8) { - for (local31 = 0; local31 < Static189.anInt4457; local31++) { + for (local31 = 0; local31 < Static10.anInt4457; local31++) { local295 = local22[local31]; local11[local31] = local295 == 0 ? 0 : 4096 - (4096 - local28[local31] << 12) / local295; } } else if (local31 == 9) { - for (local31 = 0; local31 < Static189.anInt4457; local31++) { + for (local31 = 0; local31 < Static10.anInt4457; local31++) { local180 = local28[local31]; local295 = local22[local31]; local11[local31] = local295 < local180 ? local295 : local180; } } else if (local31 == 10) { - for (local31 = 0; local31 < Static189.anInt4457; local31++) { + for (local31 = 0; local31 < Static10.anInt4457; local31++) { local180 = local28[local31]; local295 = local22[local31]; local11[local31] = local295 > local180 ? local295 : local180; } } else if (local31 == 11) { - for (local31 = 0; local31 < Static189.anInt4457; local31++) { + for (local31 = 0; local31 < Static10.anInt4457; local31++) { local295 = local22[local31]; local180 = local28[local31]; local11[local31] = local180 < local295 ? local295 - local180 : local180 - local295; } } else if (local31 == 12) { - for (local31 = 0; local31 < Static189.anInt4457; local31++) { + for (local31 = 0; local31 < Static10.anInt4457; local31++) { local295 = local22[local31]; local180 = local28[local31]; local11[local31] = local180 + local295 - (local295 * local180 >> 11); @@ -113,19 +113,19 @@ public final class TextureOpCombine extends TextureOp { @Pc(72) int[] local72 = local36[2]; @Pc(75) int local75 = this.anInt4543; if (local75 == 1) { - for (local75 = 0; local75 < Static189.anInt4457; local75++) { + for (local75 = 0; local75 < Static10.anInt4457; local75++) { local40[local75] = local64[local75] + local52[local75]; local44[local75] = local68[local75] + local56[local75]; local48[local75] = local60[local75] + local72[local75]; } } else if (local75 == 2) { - for (local75 = 0; local75 < Static189.anInt4457; local75++) { + for (local75 = 0; local75 < Static10.anInt4457; local75++) { local40[local75] = local52[local75] - local64[local75]; local44[local75] = local56[local75] - local68[local75]; local48[local75] = local60[local75] - local72[local75]; } } else if (local75 == 3) { - for (local75 = 0; local75 < Static189.anInt4457; local75++) { + for (local75 = 0; local75 < Static10.anInt4457; local75++) { local40[local75] = local64[local75] * local52[local75] >> 12; local44[local75] = local56[local75] * local68[local75] >> 12; local48[local75] = local72[local75] * local60[local75] >> 12; @@ -135,7 +135,7 @@ public final class TextureOpCombine extends TextureOp { @Pc(282) int local282; @Pc(278) int local278; if (local75 == 4) { - for (local75 = 0; local75 < Static189.anInt4457; local75++) { + for (local75 = 0; local75 < Static10.anInt4457; local75++) { local278 = local72[local75]; local282 = local68[local75]; local286 = local64[local75]; @@ -144,13 +144,13 @@ public final class TextureOpCombine extends TextureOp { local48[local75] = local278 == 0 ? 4096 : (local60[local75] << 12) / local278; } } else if (local75 == 5) { - for (local75 = 0; local75 < Static189.anInt4457; local75++) { + for (local75 = 0; local75 < Static10.anInt4457; local75++) { local40[local75] = 4096 - ((4096 - local64[local75]) * (4096 - local52[local75]) >> 12); local44[local75] = 4096 - ((4096 - local68[local75]) * (-local56[local75] + 4096) >> 12); local48[local75] = 4096 - ((4096 - local72[local75]) * (-local60[local75] + 4096) >> 12); } } else if (local75 == 6) { - for (local75 = 0; local75 < Static189.anInt4457; local75++) { + for (local75 = 0; local75 < Static10.anInt4457; local75++) { local278 = local72[local75]; local286 = local64[local75]; local282 = local68[local75]; @@ -163,7 +163,7 @@ public final class TextureOpCombine extends TextureOp { @Pc(543) int local543; @Pc(535) int local535; if (local75 == 7) { - for (local75 = 0; local75 < Static189.anInt4457; local75++) { + for (local75 = 0; local75 < Static10.anInt4457; local75++) { local535 = local60[local75]; local539 = local52[local75]; local543 = local56[local75]; @@ -172,7 +172,7 @@ public final class TextureOpCombine extends TextureOp { local48[local75] = local535 == 4096 ? 4096 : (local72[local75] << 12) / (4096 - local535); } } else if (local75 == 8) { - for (local75 = 0; local75 < Static189.anInt4457; local75++) { + for (local75 = 0; local75 < Static10.anInt4457; local75++) { local539 = local52[local75]; local543 = local56[local75]; local535 = local60[local75]; @@ -181,7 +181,7 @@ public final class TextureOpCombine extends TextureOp { local48[local75] = local535 == 0 ? 0 : 4096 - (4096 - local72[local75] << 12) / local535; } } else if (local75 == 9) { - for (local75 = 0; local75 < Static189.anInt4457; local75++) { + for (local75 = 0; local75 < Static10.anInt4457; local75++) { local535 = local60[local75]; local278 = local72[local75]; local282 = local68[local75]; @@ -193,7 +193,7 @@ public final class TextureOpCombine extends TextureOp { local48[local75] = local535 < local278 ? local535 : local278; } } else if (local75 == 10) { - for (local75 = 0; local75 < Static189.anInt4457; local75++) { + for (local75 = 0; local75 < Static10.anInt4457; local75++) { local278 = local72[local75]; local535 = local60[local75]; local282 = local68[local75]; @@ -205,7 +205,7 @@ public final class TextureOpCombine extends TextureOp { local48[local75] = local278 < local535 ? local535 : local278; } } else if (local75 == 11) { - for (local75 = 0; local75 < Static189.anInt4457; local75++) { + for (local75 = 0; local75 < Static10.anInt4457; local75++) { local282 = local68[local75]; local286 = local64[local75]; local543 = local56[local75]; @@ -217,7 +217,7 @@ public final class TextureOpCombine extends TextureOp { local48[local75] = local278 < local535 ? local535 - local278 : -local535 + local278; } } else if (local75 == 12) { - for (local75 = 0; local75 < Static189.anInt4457; local75++) { + for (local75 = 0; local75 < Static10.anInt4457; local75++) { local539 = local52[local75]; local278 = local72[local75]; local286 = local64[local75]; diff --git a/client/src/main/java/rt4/TextureOpCurve.java b/client/src/main/java/rt4/TextureOpCurve.java index b024bd4..68504a7 100644 --- a/client/src/main/java/rt4/TextureOpCurve.java +++ b/client/src/main/java/rt4/TextureOpCurve.java @@ -75,7 +75,7 @@ public final class TextureOpCurve extends TextureOp { local59 = this.anIntArrayArray47[local29 - 1]; local52 = this.anIntArrayArray47[local29]; local68 = (local27 - local59[0] << 12) / (local52[0] - local59[0]); - local76 = 4096 - Static130.anIntArray299[local68 >> 5 & 0xFF] >> 1; + local76 = 4096 - Static9.anIntArray299[local68 >> 5 & 0xFF] >> 1; local72 = 4096 - local76; local89 = local76 * local52[1] + local59[1] * local72 >> 12; if (local89 <= -32768) { @@ -113,7 +113,7 @@ public final class TextureOpCurve extends TextureOp { @Pc(19) int[] local19 = this.aClass121_41.method3445(arg0); if (this.aClass121_41.invalid) { @Pc(29) int[] local29 = this.method4624(0, arg0); - for (@Pc(31) int local31 = 0; local31 < Static189.anInt4457; local31++) { + for (@Pc(31) int local31 = 0; local31 < Static10.anInt4457; local31++) { @Pc(44) int local44 = local29[local31] >> 4; if (local44 < 0) { local44 = 0; diff --git a/client/src/main/java/rt4/TextureOpSprite.java b/client/src/main/java/rt4/TextureOpSprite.java index eaed5b2..9a27d2d 100644 --- a/client/src/main/java/rt4/TextureOpSprite.java +++ b/client/src/main/java/rt4/TextureOpSprite.java @@ -32,7 +32,7 @@ public class TextureOpSprite extends TextureOp { } else if (this.anInt3235 < 0) { return false; } else { - @Pc(43) SoftwareSprite local43 = Static215.anInt4868 < 0 ? SpriteLoader.method3117(Static176.aClass153_76, this.anInt3235) : SpriteLoader.loadSoftwareSprite(this.anInt3235, Static176.aClass153_76, Static215.anInt4868); + @Pc(43) SoftwareSprite local43 = Texture.anInt4868 < 0 ? SpriteLoader.method3117(Static176.aClass153_76, this.anInt3235) : SpriteLoader.loadSoftwareSprite(this.anInt3235, Static176.aClass153_76, Texture.anInt4868); local43.trim(); this.anInt3240 = local43.height; this.anInt3239 = local43.width; @@ -55,19 +55,19 @@ public class TextureOpSprite extends TextureOp { @Pc(31) int[] local31 = local18[0]; @Pc(35) int[] local35 = local18[1]; @Pc(39) int[] local39 = local18[2]; - @Pc(59) int local59 = (this.anInt3240 == Static172.anInt4165 ? arg0 : this.anInt3240 * arg0 / Static172.anInt4165) * this.anInt3239; + @Pc(59) int local59 = (this.anInt3240 == Static10.anInt4165 ? arg0 : this.anInt3240 * arg0 / Static10.anInt4165) * this.anInt3239; @Pc(65) int local65; @Pc(78) int local78; - if (Static189.anInt4457 == this.anInt3239) { - for (local65 = 0; local65 < Static189.anInt4457; local65++) { + if (Static10.anInt4457 == this.anInt3239) { + for (local65 = 0; local65 < Static10.anInt4457; local65++) { local78 = this.anIntArray305[local59++]; local39[local65] = (local78 & 0xFF) << 4; local35[local65] = local78 >> 4 & 0xFF0; local31[local65] = local78 >> 12 & 0xFF0; } } else { - for (local65 = 0; local65 < Static189.anInt4457; local65++) { - local78 = this.anInt3239 * local65 / Static189.anInt4457; + for (local65 = 0; local65 < Static10.anInt4457; local65++) { + local78 = this.anInt3239 * local65 / Static10.anInt4457; @Pc(127) int local127 = this.anIntArray305[local59 + local78]; local39[local65] = (local127 & 0xFF) << 4; local35[local65] = local127 >> 4 & 0xFF0; diff --git a/client/src/main/java/rt4/TextureOpTiledSprite.java b/client/src/main/java/rt4/TextureOpTiledSprite.java index 98ebd5f..0ea6967 100644 --- a/client/src/main/java/rt4/TextureOpTiledSprite.java +++ b/client/src/main/java/rt4/TextureOpTiledSprite.java @@ -17,7 +17,7 @@ public final class TextureOpTiledSprite extends TextureOpSprite { @Pc(32) int local32 = arg0 % this.anInt3240 * this.anInt3240; @Pc(36) int[] local36 = local11[1]; @Pc(40) int[] local40 = local11[2]; - for (@Pc(42) int local42 = 0; local42 < Static189.anInt4457; local42++) { + for (@Pc(42) int local42 = 0; local42 < Static10.anInt4457; local42++) { @Pc(55) int local55 = this.anIntArray305[local32 + local42 % this.anInt3239]; local40[local42] = (local55 & 0xFF) << 4; local36[local42] = local55 >> 4 & 0xFF0; diff --git a/client/src/main/java/rt4/TracingException.java b/client/src/main/java/rt4/TracingException.java index bb35b14..f9e0f5c 100644 --- a/client/src/main/java/rt4/TracingException.java +++ b/client/src/main/java/rt4/TracingException.java @@ -5,7 +5,7 @@ import org.openrs2.deob.annotation.OriginalClass; import org.openrs2.deob.annotation.OriginalMember; import org.openrs2.deob.annotation.Pc; -import java.io.DataInputStream; +import java.io.*; import java.net.URL; @OriginalClass("client!ld") @@ -22,7 +22,7 @@ public final class TracingException extends RuntimeException { try { @Pc(13) String local13 = ""; if (arg1 != null) { - local13 = Static97.method1961(arg1); + local13 = method1961(arg1); } if (arg0 != null) { if (arg1 != null) { @@ -55,4 +55,48 @@ public final class TracingException extends RuntimeException { public static void method31(@OriginalArg(1) String arg0) { System.out.println("Error: " + Static40.method1014("%0a", "\n", arg0)); } + + @OriginalMember(owner = "client!hi", name = "a", descriptor = "(ILjava/lang/Throwable;)Ljava/lang/String;") + public static String method1961(@OriginalArg(1) Throwable arg0) throws IOException { + @Pc(24) String local24; + if (arg0 instanceof TracingException) { + @Pc(11) TracingException local11 = (TracingException) arg0; + arg0 = local11.aThrowable1; + local24 = local11.aString3 + " | "; + } else { + local24 = ""; + } + @Pc(32) StringWriter local32 = new StringWriter(); + @Pc(37) PrintWriter local37 = new PrintWriter(local32); + arg0.printStackTrace(local37); + local37.close(); + @Pc(45) String local45 = local32.toString(); + @Pc(53) BufferedReader local53 = new BufferedReader(new StringReader(local45)); + @Pc(56) String local56 = local53.readLine(); + while (true) { + @Pc(59) String local59 = local53.readLine(); + if (local59 == null) { + return local24 + "| " + local56; + } + @Pc(65) int local65 = local59.indexOf(40); + @Pc(72) int local72 = local59.indexOf(41, local65 + 1); + @Pc(79) String local79; + if (local65 == -1) { + local79 = local59; + } else { + local79 = local59.substring(0, local65); + } + local79 = local79.trim(); + local79 = local79.substring(local79.lastIndexOf(32) + 1); + local79 = local79.substring(local79.lastIndexOf(9) + 1); + local24 = local24 + local79; + if (local65 != -1 && local72 != -1) { + @Pc(126) int local126 = local59.indexOf(".java:", local65); + if (local126 >= 0) { + local24 = local24 + local59.substring(local126 + 5, local72); + } + } + local24 = local24 + ' '; + } + } } diff --git a/client/src/main/java/rt4/UnderwaterMaterialRenderer.java b/client/src/main/java/rt4/UnderwaterMaterialRenderer.java index 76e7fac..a6f076d 100644 --- a/client/src/main/java/rt4/UnderwaterMaterialRenderer.java +++ b/client/src/main/java/rt4/UnderwaterMaterialRenderer.java @@ -184,9 +184,9 @@ public final class UnderwaterMaterialRenderer implements MaterialRenderer { local1.glPushMatrix(); local1.glLoadIdentity(); local1.glRotatef(180.0F, 1.0F, 0.0F, 0.0F); - local1.glRotatef((float) Static253.anInt5559 * 360.0F / 2048.0F, 1.0F, 0.0F, 0.0F); - local1.glRotatef((float) Static253.anInt1815 * 360.0F / 2048.0F, 0.0F, 1.0F, 0.0F); - local1.glTranslatef((float) -Static253.anInt406, (float) -Static253.anInt4675, (float) -Static253.anInt5158); + local1.glRotatef((float) MaterialManager.anInt5559 * 360.0F / 2048.0F, 1.0F, 0.0F, 0.0F); + local1.glRotatef((float) MaterialManager.anInt1815 * 360.0F / 2048.0F, 0.0F, 1.0F, 0.0F); + local1.glTranslatef((float) -MaterialManager.anInt406, (float) -MaterialManager.anInt4675, (float) -MaterialManager.anInt5158); if (aBoolean308) { this.aFloatArray29[0] = 0.001F; this.aFloatArray29[1] = 9.0E-4F; diff --git a/client/src/main/java/rt4/VorbisCodebook.java b/client/src/main/java/rt4/VorbisCodebook.java index 2aef721..9c3d546 100644 --- a/client/src/main/java/rt4/VorbisCodebook.java +++ b/client/src/main/java/rt4/VorbisCodebook.java @@ -40,7 +40,7 @@ public final class VorbisCodebook { local27 = 0; local32 = VorbisSound.method2350(5) + 1; while (local27 < this.anInt3056) { - @Pc(44) int local44 = VorbisSound.method2350(Static204.method3674(this.anInt3056 - local27)); + @Pc(44) int local44 = VorbisSound.method2350(method3674(this.anInt3056 - local27)); for (local46 = 0; local46 < local44; local46++) { this.anIntArray286[local27++] = local32; } @@ -117,6 +117,32 @@ public final class VorbisCodebook { return returnValue; } + @OriginalMember(owner = "client!qi", name = "b", descriptor = "(II)I") + public static int method3674(@OriginalArg(0) int arg0) { + @Pc(5) int local5 = 0; + if (arg0 < 0 || arg0 >= 65536) { + local5 += 16; + arg0 >>>= 0x10; + } + if (arg0 >= 256) { + local5 += 8; + arg0 >>>= 0x8; + } + if (arg0 >= 16) { + local5 += 4; + arg0 >>>= 0x4; + } + if (arg0 >= 4) { + arg0 >>>= 0x2; + local5 += 2; + } + if (arg0 >= 1) { + arg0 >>>= 0x1; + local5++; + } + return arg0 + local5; + } + @OriginalMember(owner = "client!ji", name = "a", descriptor = "()[F") public final float[] method2413() { return this.aFloatArrayArray1[this.method2415()]; diff --git a/client/src/main/java/rt4/VorbisRange.java b/client/src/main/java/rt4/VorbisRange.java index f66a5e4..d565233 100644 --- a/client/src/main/java/rt4/VorbisRange.java +++ b/client/src/main/java/rt4/VorbisRange.java @@ -254,7 +254,7 @@ public final class VorbisRange { anIntArray264[local15] = this.anIntArray261[local15]; } local15 = anIntArray267[this.anInt2880 - 1]; - @Pc(40) int local40 = Static204.method3674(local15 - 1); + @Pc(40) int local40 = VorbisCodebook.method3674(local15 - 1); anIntArray266[0] = VorbisSound.method2350(local40); anIntArray266[1] = VorbisSound.method2350(local40); @Pc(52) int local52 = 2; diff --git a/client/src/main/java/rt4/VorbisSound.java b/client/src/main/java/rt4/VorbisSound.java index 561b10c..99e6155 100644 --- a/client/src/main/java/rt4/VorbisSound.java +++ b/client/src/main/java/rt4/VorbisSound.java @@ -177,7 +177,7 @@ public final class VorbisSound extends Node { local138[local140 * 2 + 1] = -((float) Math.sin((double) (local140 * 4 + 2) * 3.141592653589793D / (double) local26)); } @Pc(187) int[] local187 = new int[local38]; - @Pc(193) int local193 = Static204.method3674(local38 - 1); + @Pc(193) int local193 = VorbisCodebook.method3674(local38 - 1); for (@Pc(195) int local195 = 0; local195 < local38; local195++) { local187[local195] = method667(local193, local195); } @@ -334,7 +334,7 @@ public final class VorbisSound extends Node { private float[] method2348(@OriginalArg(0) int arg0) { method2347(this.aByteArrayArray10[arg0]); method2346(); - @Pc(15) int local15 = method2350(Static204.method3674(anIntArray278.length - 1)); + @Pc(15) int local15 = method2350(VorbisCodebook.method3674(anIntArray278.length - 1)); @Pc(19) boolean local19 = aBooleanArray63[local15]; @Pc(25) int local25 = local19 ? anInt2975 : anInt2978; @Pc(27) boolean local27 = false; @@ -431,7 +431,7 @@ public final class VorbisSound extends Node { local214[local272 * 4 + 3] = (local291 - local315) * local432 - (local309 - local323) * local442; local214[local272 * 4 + 1] = (local309 - local323) * local432 + (local291 - local315) * local442; } - local272 = Static204.method3674(local25 - 1); + local272 = VorbisCodebook.method3674(local25 - 1); @Pc(488) int local488; @Pc(499) int local499; @Pc(503) int local503; diff --git a/client/src/main/java/rt4/WaterMaterialRenderer.java b/client/src/main/java/rt4/WaterMaterialRenderer.java index 5dd2603..9f7677a 100644 --- a/client/src/main/java/rt4/WaterMaterialRenderer.java +++ b/client/src/main/java/rt4/WaterMaterialRenderer.java @@ -37,14 +37,14 @@ public final class WaterMaterialRenderer implements MaterialRenderer { @Pc(3) float local3 = FogManager.method3068() + FogManager.method3059(); @Pc(9) int local9 = FogManager.method3064(); @Pc(18) float local18 = (float) (local9 >> 16 & 0xFF) / 255.0F; - Static251.aFloatArray28[3] = 1.0F; + ColorUtils.aFloatArray28[3] = 1.0F; @Pc(37) float local37 = (float) (local9 >> 8 & 0xFF) / 255.0F; @Pc(39) float local39 = 0.58823526F; @Pc(46) float local46 = (float) (local9 & 0xFF) / 255.0F; - Static251.aFloatArray28[2] = aFloatArray2[2] * local46 * local39 * local3; - Static251.aFloatArray28[0] = aFloatArray2[0] * local18 * local39 * local3; - Static251.aFloatArray28[1] = local3 * local39 * local37 * aFloatArray2[1]; - return Static251.aFloatArray28; + ColorUtils.aFloatArray28[2] = aFloatArray2[2] * local46 * local39 * local3; + ColorUtils.aFloatArray28[0] = aFloatArray2[0] * local18 * local39 * local3; + ColorUtils.aFloatArray28[1] = local3 * local39 * local37 * aFloatArray2[1]; + return ColorUtils.aFloatArray28; } @OriginalMember(owner = "client!bk", name = "a", descriptor = "(BI)V") @@ -177,7 +177,7 @@ public final class WaterMaterialRenderer implements MaterialRenderer { GlRenderer.resetTextureMatrix(); local1.glCallList(this.anInt4440); @Pc(12) float local12 = 2662.4001F; - local12 += (float) (Static253.anInt5559 - 128) * 0.5F; + local12 += (float) (MaterialManager.anInt5559 - 128) * 0.5F; float max = (float) GlobalConfig.VIEW_DISTANCE - GlobalConfig.VIEW_FADE_DISTANCE; if (local12 >= max) { local12 = max - 1.0f; diff --git a/client/src/main/java/rt4/WaterfallMaterialRenderer.java b/client/src/main/java/rt4/WaterfallMaterialRenderer.java index 3070ab1..d1cffc2 100644 --- a/client/src/main/java/rt4/WaterfallMaterialRenderer.java +++ b/client/src/main/java/rt4/WaterfallMaterialRenderer.java @@ -50,9 +50,9 @@ public final class WaterfallMaterialRenderer implements MaterialRenderer { local7.glPushMatrix(); local7.glLoadIdentity(); local7.glRotatef(180.0F, 1.0F, 0.0F, 0.0F); - local7.glRotatef((float) Static253.anInt5559 * 360.0F / 2048.0F, 1.0F, 0.0F, 0.0F); - local7.glRotatef((float) Static253.anInt1815 * 360.0F / 2048.0F, 0.0F, 1.0F, 0.0F); - local7.glTranslatef((float) -Static253.anInt406, (float) -Static253.anInt4675, (float) -Static253.anInt5158); + local7.glRotatef((float) MaterialManager.anInt5559 * 360.0F / 2048.0F, 1.0F, 0.0F, 0.0F); + local7.glRotatef((float) MaterialManager.anInt1815 * 360.0F / 2048.0F, 0.0F, 1.0F, 0.0F); + local7.glTranslatef((float) -MaterialManager.anInt406, (float) -MaterialManager.anInt4675, (float) -MaterialManager.anInt5158); local7.glTexGenfv(GL2.GL_S, GL2.GL_EYE_PLANE, this.aFloatArray21, 0); this.aFloatArray21[3] = local27 * (float) GlRenderer.anInt5323; this.aFloatArray21[0] = 0.0F; diff --git a/client/src/main/java/rt4/WorldList.java b/client/src/main/java/rt4/WorldList.java index f563529..de00df1 100644 --- a/client/src/main/java/rt4/WorldList.java +++ b/client/src/main/java/rt4/WorldList.java @@ -38,6 +38,8 @@ public class WorldList { public static World[] worlds; @OriginalMember(owner = "client!k", name = "t", descriptor = "I") public static int errors = 0; + @OriginalMember(owner = "client!ea", name = "w", descriptor = "I") + public static int worldPos = 1; @OriginalMember(owner = "client!ql", name = "b", descriptor = "(I)I") public static int fetch() { @@ -123,7 +125,7 @@ public class WorldList { sorted = new World[size]; local124 = 0; for (@Pc(240) int local240 = minId; local240 <= maxId; local240++) { - @Pc(247) World local247 = Static54.getWorld(local240); + @Pc(247) World local247 = ScriptRunner.getWorld(local240); if (local247 != null) { sorted[local124++] = local247; } @@ -222,6 +224,34 @@ public class WorldList { @OriginalMember(owner = "client!h", name = "a", descriptor = "(I)Lclient!ba;") public static World getNextWorld() { - return sorted.length > Static51.worldPos ? sorted[Static51.worldPos++] : null; + return sorted.length > worldPos ? sorted[worldPos++] : null; } + + @OriginalMember(owner = "client!sh", name = "a", descriptor = "(IZBIZ)V") + public static void sortWorldList(@OriginalArg(0) int arg0, @OriginalArg(1) boolean arg1, @OriginalArg(3) int arg2, @OriginalArg(4) boolean arg3) { + method1697(arg0, arg2, sorted.length - 1, arg3, 0, arg1); + } + + @OriginalMember(owner = "client!ge", name = "a", descriptor = "(IIIZIZZ)V") + public static void method1697(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) boolean arg3, @OriginalArg(4) int arg4, @OriginalArg(5) boolean arg5) { + if (arg2 <= arg4) { + return; + } + @Pc(13) int local13 = (arg2 + arg4) / 2; + @Pc(15) int local15 = arg4; + @Pc(19) World local19 = sorted[local13]; + sorted[local13] = sorted[arg2]; + sorted[arg2] = local19; + for (@Pc(31) int local31 = arg4; local31 < arg2; local31++) { + if (Static164.method3115(local19, sorted[local31], arg0, arg1, arg3, arg5) <= 0) { + @Pc(53) World local53 = sorted[local31]; + sorted[local31] = sorted[local15]; + sorted[local15++] = local53; + } + } + sorted[arg2] = sorted[local15]; + sorted[local15] = local19; + method1697(arg0, arg1, local15 - 1, arg3, arg4, arg5); + method1697(arg0, arg1, arg2, arg3, local15 + 1, arg5); + } } diff --git a/client/src/main/java/rt4/WorldMap.java b/client/src/main/java/rt4/WorldMap.java index 0c89677..81bbb1a 100644 --- a/client/src/main/java/rt4/WorldMap.java +++ b/client/src/main/java/rt4/WorldMap.java @@ -23,6 +23,10 @@ public class WorldMap { public static final LinkedList mapElements = new LinkedList(); @OriginalMember(owner = "client!he", name = "db", descriptor = "Lclient!na;") public static final JagString aClass100_517 = JagString.parse(""); + @OriginalMember(owner = "client!hm", name = "T", descriptor = "Lclient!na;") + public static final JagString aClass100_538 = JagString.parse(" "); + @OriginalMember(owner = "client!pm", name = "Y", descriptor = "Lclient!na;") + public static final JagString aClass100_872 = JagString.parse("
"); @OriginalMember(owner = "client!wa", name = "ub", descriptor = "Lclient!bn;") public static Map currentMap; @OriginalMember(owner = "client!dc", name = "O", descriptor = "I") @@ -97,6 +101,8 @@ public class WorldMap { public static int anInt1176; @OriginalMember(owner = "client!sm", name = "m", descriptor = "I") public static int anInt5212; + @OriginalMember(owner = "client!qf", name = "S", descriptor = "I") + public static int anInt1864; @OriginalMember(owner = "client!pa", name = "d", descriptor = "(I)V") public static void method3413() { @@ -110,7 +116,7 @@ public class WorldMap { return; } - Static6.method84(); + client.method84(); loadPercentage = 10; } @@ -363,7 +369,7 @@ public class WorldMap { } if (local367 >= 0 && local363 > 0) { @Pc(462) int[] local462 = local355[local367 >> 6]; - @Pc(480) int local480 = local361 == 0 ? 0 : Static54.method1309(local293 / local363, local225 / local363, local114 * 256 / local361); + @Pc(480) int local480 = local361 == 0 ? 0 : SceneGraph.method1309(local293 / local363, local225 / local363, local114 * 256 / local361); if (underlays[local102][local367] != 0) { if (local462 == null) { local462 = local355[local367 >> 6] = new int[4096]; @@ -1010,8 +1016,8 @@ public class WorldMap { @OriginalMember(owner = "client!va", name = "c", descriptor = "(BI)V") public static void method4444(@OriginalArg(1) int arg0) { Static9.anInt172 = arg0; - Static91.anInt2428 = 20; - Static201.anInt1864 = 3; + Static1.anInt2428 = 20; + anInt1864 = 3; } @OriginalMember(owner = "client!ab", name = "a", descriptor = "(Lclient!na;I)V") @@ -1025,7 +1031,7 @@ public class WorldMap { @OriginalMember(owner = "client!rc", name = "a", descriptor = "(Lclient!na;Z)Lclient!na;") public static JagString method923(@OriginalArg(0) JagString arg0) { @Pc(12) int local12 = Static171.method3218(arg0); - return local12 == -1 ? aClass100_517 : labels.aClass100Array153[local12].method3140(Static101.aClass100_538, Static197.aClass100_872); + return local12 == -1 ? aClass100_517 : labels.aClass100Array153[local12].method3140(aClass100_538, aClass100_872); } @OriginalMember(owner = "client!rg", name = "d", descriptor = "(B)Lclient!bn;") @@ -1089,7 +1095,7 @@ public class WorldMap { return -1; } for (@Pc(20) int local20 = 0; local20 < labels.anInt5074; local20++) { - if (labels.aClass100Array153[local20].method3140(Static101.aClass100_538, Static197.aClass100_872).strEquals(arg0)) { + if (labels.aClass100Array153[local20].method3140(aClass100_538, aClass100_872).strEquals(arg0)) { return local20; } } @@ -1579,4 +1585,14 @@ public class WorldMap { } } } + + @OriginalMember(owner = "client!rg", name = "a", descriptor = "(IIIIIIIII)V") + public static void method4364(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5, @OriginalArg(7) int arg6, @OriginalArg(8) int arg7) { + @Pc(7) int local7 = arg2 - arg7; + @Pc(16) int local16 = (arg0 - arg4 << 16) / local7; + @Pc(21) int local21 = arg5 - arg3; + @Pc(30) int local30 = (arg6 - arg1 << 16) / local21; + method2735(arg1, arg5, arg3, arg2, arg4, arg7, local30, local16); + } + } diff --git a/client/src/main/java/rt4/client.java b/client/src/main/java/rt4/client.java index 41c878a..d33664c 100644 --- a/client/src/main/java/rt4/client.java +++ b/client/src/main/java/rt4/client.java @@ -30,6 +30,10 @@ public final class client extends GameShell { public static final JagString aClass100_974 = JagString.parse("
(X"); @OriginalMember(owner = "client!sg", name = "e", descriptor = "Lclient!na;") public static final JagString SETTINGS = JagString.parse("settings"); + @OriginalMember(owner = "client!km", name = "Mc", descriptor = "Lclient!na;") + public static final JagString LOGINSCREEN = JagString.parse("loginscreen"); + @OriginalMember(owner = "client!qk", name = "a", descriptor = "Lclient!na;") + public static final JagString aClass100_899 = JagString.parse("0(U"); @OriginalMember(owner = "client!jm", name = "A", descriptor = "Lclient!na;") static final JagString aClass100_603 = JagString.parse(""); @OriginalMember(owner = "client!jm", name = "z", descriptor = "Lclient!na;") @@ -194,6 +198,8 @@ public final class client extends GameShell { public static int loop = 0; @OriginalMember(owner = "client!wj", name = "e", descriptor = "Lclient!na;") public static JagString mainLoadPrimaryText = null; + @OriginalMember(owner = "client!sj", name = "p", descriptor = "I") + public static int anInt5150 = 1; @OriginalMember(owner = "client!client", name = "main", descriptor = "([Ljava/lang/String;)V") public static void main(@OriginalArg(0) String[] arg0) { @@ -229,7 +235,7 @@ public final class client extends GameShell { advertSuppressed = false; try { @Pc(63) byte[] local63 = arg0[2].getBytes(StandardCharsets.ISO_8859_1); - local15 = Static101.method2053(JagString.decodeString(local63, local63.length, 0)); + local15 = LangUtils.method2053(JagString.decodeString(local63, local63.length, 0)); } catch (@Pc(74) Exception local74) { } if (local15 != -1) { @@ -307,16 +313,16 @@ public final class client extends GameShell { LoginManager.clear(); } @Pc(37) boolean local37 = arg0 == 5 || arg0 == 10 || arg0 == 28; - if (arg0 != 40 && Static233.aClass95_4 != null) { - Static233.aClass95_4.close(); - Static233.aClass95_4 = null; + if (arg0 != 40 && Protocol.aClass95_4 != null) { + Protocol.aClass95_4.close(); + Protocol.aClass95_4 = null; } if (arg0 == 25 || arg0 == 28) { ClientProt.anInt5804 = 0; - Static230.anInt5150 = 1; + anInt5150 = 1; Static233.loadingScreenState = 0; Static38.anInt1196 = 1; - Static175.mapFilesMissingCount = 0; + ClientProt.mapFilesMissingCount = 0; WorldMap.clear(true); } if (arg0 == 25 || arg0 == 10) { @@ -401,11 +407,11 @@ public final class client extends GameShell { MsiTypeList.method3653(); LightTypeList.method1695(); CursorTypeList.method351(); - Static230.method3947(); + PlayerAppearance.method3947(); Static147.method2764(); if (modeWhat != 0) { - for (@Pc(54) int local54 = 0; local54 < Static51.aByteArrayArray8.length; local54++) { - Static51.aByteArrayArray8[local54] = null; + for (@Pc(54) int local54 = 0; local54 < Player.aByteArrayArray8.length; local54++) { + Player.aByteArrayArray8[local54] = null; } Player.anInt2863 = 0; } @@ -466,7 +472,7 @@ public final class client extends GameShell { public static void method2721() { SceneGraph.clear(); MiniMap.sprite = null; - Static107.anInt2875 = -1; + LightingManager.anInt2875 = -1; method3768(); DeadClass.cache.clear(); LocType.aClass139_1 = new Loc_Class139(); @@ -474,7 +480,7 @@ public final class client extends GameShell { LightingManager.lightCount = 0; LightingManager.lights = new Light[255]; GlModel.method4120(); - Static242.method4203(); + ShadowManager.method4203(); Sprites.clear(); WorldMap.clear(false); TitleScreen.clear(); @@ -485,16 +491,16 @@ public final class client extends GameShell { } } if (GlRenderer.enabled) { - Static242.method4201(); - Static76.method1642(); + ShadowManager.method4201(); + ParticleSystem.load(); } Fonts.load(js5Archive13, js5Archive8); Sprites.load(js5Archive8); - Static204.aClass3_Sub2_Sub1_10 = null; - Static39.aClass3_Sub2_Sub1_1 = null; + Static112.aClass3_Sub2_Sub1_10 = null; + Static112.aClass3_Sub2_Sub1_1 = null; Static112.aClass3_Sub2_Sub1_6 = null; Static165.aClass3_Sub2_Sub1_8 = null; - Static181.aClass3_Sub2_Sub1_9 = null; + Static112.aClass3_Sub2_Sub1_9 = null; if (gameState == 5) { TitleScreen.load(js5Archive8); } @@ -509,23 +515,23 @@ public final class client extends GameShell { @OriginalMember(owner = "client!tk", name = "a", descriptor = "(Z)V") public static void method4221() { Protocol.anInt4762 = 0; - Static67.prevFocus = true; - Static183.prevClickTime = 0L; + Protocol.prevFocus = true; + Mouse.prevClickTime = 0L; MouseRecorder.instance.samples = 0; focus = true; ReflectionCheck.method4625(); Protocol.opcode4 = -1; Protocol.opcode3 = -1; Protocol.opcode = -1; - Static267.anInt5775 = 0; + Protocol.anInt5775 = 0; Player.rebootTimer = 0; Protocol.outboundBuffer.offset = 0; Protocol.opcode2 = -1; - Static201.anInt1862 = 0; + LoginManager.anInt1862 = 0; Protocol.inboundBuffer.offset = 0; @Pc(3506) int local3506; - for (local3506 = 0; local3506 < Static143.hintMapMarkers.length; local3506++) { - Static143.hintMapMarkers[local3506] = null; + for (local3506 = 0; local3506 < MiniMap.hintMapMarkers.length; local3506++) { + MiniMap.hintMapMarkers[local3506] = null; } MiniMenu.size = 0; Static40.aBoolean108 = false; @@ -534,20 +540,20 @@ public final class client extends GameShell { Chat.messages[local3506] = null; } MiniMenu.anInt5014 = 0; - Static132.anInt3291 = (int) (Math.random() * 100.0D) - 50; + Camera.anInt3291 = (int) (Math.random() * 100.0D) - 50; LoginManager.mapFlagZ = 0; Camera.yawTarget = (int) (Math.random() * 20.0D) - 10 & 0x7FF; - Static107.anInt2875 = -1; + LightingManager.anInt2875 = -1; PlayerList.size = 0; MiniMap.state = 0; - Static206.anInt4774 = (int) (Math.random() * 110.0D) - 55; + Camera.anInt4774 = (int) (Math.random() * 110.0D) - 55; Static241.aBoolean302 = false; MiniMap.anInt4130 = (int) (Math.random() * 30.0D) - 20; SoundPlayer.size = 0; LoginManager.mapFlagX = 0; MiniMap.anInt1814 = (int) (Math.random() * 120.0D) - 60; Chat.size = 0; - Static230.anInt5161 = (int) (Math.random() * 80.0D) - 40; + Camera.anInt5161 = (int) (Math.random() * 80.0D) - 40; NpcList.size = 0; for (local3506 = 0; local3506 < 2048; local3506++) { PlayerList.players[local3506] = null; @@ -558,7 +564,7 @@ public final class client extends GameShell { } PlayerList.self = PlayerList.players[2047] = new Player(); Static217.aClass69_116.clear(); - Static99.aClass69_64.clear(); + LoginManager.aClass69_64.clear(); if (SceneGraph.objStacks != null) { for (local3506 = 0; local3506 < 4; local3506++) { for (@Pc(3663) int local3663 = 0; local3663 < 104; local3663++) { @@ -573,15 +579,15 @@ public final class client extends GameShell { FriendsList.size = 0; VarpDomain.reset(); DelayedStateChange.clear(); - Static133.anInt5230 = 0; + Camera.anInt5230 = 0; Static233.anInt5217 = 0; Camera.anInt5765 = 0; Static231.anInt5203 = 0; Camera.anInt4232 = 0; Camera.anInt5375 = 0; - Static260.anInt1744 = 0; + Camera.anInt1744 = 0; Camera.anInt5449 = 0; - Static113.anInt4612 = 0; + Camera.anInt4612 = 0; Static233.anInt5225 = 0; for (local3506 = 0; local3506 < VarcDomain.varcs.length; local3506++) { VarcDomain.varcs[local3506] = -1; @@ -595,7 +601,7 @@ public final class client extends GameShell { InterfaceList.topLevelInterface = -1; InterfaceList.openInterfaces = new HashTable(8); InterfaceList.method1287(); - Static39.aClass13_10 = null; + Static44.aClass13_10 = null; Static40.aBoolean108 = false; MiniMenu.size = 0; PlayerAppearance.DEFAULT.method1950(new int[] { 0, 0, 0, 0, 0 }, -1, false, null, -1); @@ -605,7 +611,7 @@ public final class client extends GameShell { Player.cursors[local3506] = -1; } Inv.method2073(); - Static253.aBoolean43 = true; + ScriptRunner.aBoolean43 = true; for (local3506 = 0; local3506 < 100; local3506++) { InterfaceList.aBooleanArray100[local3506] = true; } @@ -623,10 +629,10 @@ public final class client extends GameShell { if (GlRenderer.enabled) { Static103.setInstantFade(); } - Static197.aBoolean228 = true; + Protocol.aBoolean228 = true; Protocol.verifyId = 0; MiniMenu.walkText = LocalizedText.WALKHERE; - Static127.neverRemoveRoofs = false; + ScriptRunner.neverRemoveRoofs = false; aShortArray88 = aShortArray19 = aShortArray74 = aShortArray87 = new short[256]; Static40.method4637(); Static40.aBoolean298 = false; @@ -648,7 +654,16 @@ public final class client extends GameShell { soundChannel.setStream(soundStream); } - @OriginalMember(owner = "client!client", name = "f", descriptor = "(I)V") + @OriginalMember(owner = "client!ag", name = "j", descriptor = "(I)V") + public static void method84() { + SceneGraph.clear(); + for (@Pc(9) int local9 = 0; local9 < 4; local9++) { + PathFinder.collisionMaps[local9].clear(); + } + System.gc(); + } + + @OriginalMember(owner = "client!client", name = "f", descriptor = "(I)V") @Override protected final void mainRedraw() { if (gameState == 1000) { @@ -658,7 +673,7 @@ public final class client extends GameShell { if (local15 && MidiPlayer.jingle && musicChannel != null) { musicChannel.method3570(); } - if ((gameState == 30 || gameState == 10) && (GameShell.replaceCanvas || Static97.aLong89 != 0L && Static97.aLong89 < MonotonicClock.currentTimeMillis())) { + if ((gameState == 30 || gameState == 10) && (GameShell.replaceCanvas || DisplayMode.aLong89 != 0L && DisplayMode.aLong89 < MonotonicClock.currentTimeMillis())) { DisplayMode.setWindowMode(GameShell.replaceCanvas, DisplayMode.getWindowMode(), Preferences.fullScreenWidth, Preferences.fullScreenHeight); } @Pc(80) int local80; @@ -681,7 +696,7 @@ public final class client extends GameShell { } if (local80 != GameShell.frameWidth || local84 != GameShell.frameHeight) { GameShell.method3662(); - Static97.aLong89 = MonotonicClock.currentTimeMillis() + 500L; + DisplayMode.aLong89 = MonotonicClock.currentTimeMillis() + 500L; } } if (GameShell.fullScreenFrame != null && !GameShell.focus && (gameState == 30 || gameState == 10)) { @@ -708,24 +723,24 @@ public final class client extends GameShell { Static126.method2460(); } else if (gameState == 25 || gameState == 28) { if (Static233.loadingScreenState == 1) { - if (Static230.anInt5150 < Static175.mapFilesMissingCount) { - Static230.anInt5150 = Static175.mapFilesMissingCount; + if (anInt5150 < ClientProt.mapFilesMissingCount) { + anInt5150 = ClientProt.mapFilesMissingCount; } - local80 = (Static230.anInt5150 - Static175.mapFilesMissingCount) * 50 / Static230.anInt5150; - Static114.drawTextOnScreen(false, JagString.concatenate(new JagString[] { LocalizedText.LOADING, aClass100_974, JagString.parseInt(local80), Static14.aClass100_80 })); + local80 = (anInt5150 - ClientProt.mapFilesMissingCount) * 50 / anInt5150; + Static114.drawTextOnScreen(false, JagString.concatenate(new JagString[] { LocalizedText.LOADING, aClass100_974, JagString.parseInt(local80), Static87.aClass100_80 })); } else if (Static233.loadingScreenState == 2) { if (Static38.anInt1196 < ClientProt.anInt5804) { Static38.anInt1196 = ClientProt.anInt5804; } local80 = (Static38.anInt1196 - ClientProt.anInt5804) * 50 / Static38.anInt1196 + 50; - Static114.drawTextOnScreen(false, JagString.concatenate(new JagString[] { LocalizedText.LOADING, aClass100_974, JagString.parseInt(local80), Static14.aClass100_80 })); + Static114.drawTextOnScreen(false, JagString.concatenate(new JagString[] { LocalizedText.LOADING, aClass100_974, JagString.parseInt(local80), Static87.aClass100_80 })); } else { Static114.drawTextOnScreen(false, LocalizedText.LOADING); } } else if (gameState == 30) { Static89.method1841(); } else if (gameState == 40) { - Static114.drawTextOnScreen(false, JagString.concatenate(new JagString[] { LocalizedText.CONLOST, Static269.aClass100_556, LocalizedText.ATTEMPT_TO_REESTABLISH})); + Static114.drawTextOnScreen(false, JagString.concatenate(new JagString[] { LocalizedText.CONLOST, Static87.aClass100_556, LocalizedText.ATTEMPT_TO_REESTABLISH})); } if (GlRenderer.enabled && gameState != 0) { GlRenderer.swapBuffers(); @@ -905,7 +920,7 @@ public final class client extends GameShell { js5NetQueue = new Js5NetQueue(); if (modeWhat != 0) { - Static51.aByteArrayArray8 = new byte[50][]; + Player.aByteArrayArray8 = new byte[50][]; } Preferences.read(GameShell.signLink); @@ -1009,9 +1024,9 @@ public final class client extends GameShell { InterfaceList.keyCodes[InterfaceList.keyQueueSize] = Keyboard.keyCode; InterfaceList.keyChars[InterfaceList.keyQueueSize] = Keyboard.keyChar; } - Static178.anInt4247++; + Protocol.anInt4247++; if (InterfaceList.topLevelInterface != -1) { - Static57.method1320(0, 0, 0, GameShell.canvasWidth, InterfaceList.topLevelInterface, 0, GameShell.canvasHeight); + InterfaceList.method1320(0, 0, 0, GameShell.canvasWidth, InterfaceList.topLevelInterface, 0, GameShell.canvasHeight); } InterfaceList.transmitTimer++; if (GlRenderer.enabled) { @@ -1070,7 +1085,7 @@ public final class client extends GameShell { if (priorityRequest == null) { while (true) { do { - priorityRequest = (HookRequest) Static115.mediumPriorityRequests.removeHead(); + priorityRequest = (HookRequest) InterfaceList.mediumPriorityRequests.removeHead(); if (priorityRequest == null) { while (true) { do { @@ -1081,10 +1096,10 @@ public final class client extends GameShell { } if (Static33.openUrlRequest != null && Static33.openUrlRequest.status == 1) { if (Static33.openUrlRequest.result != null) { - Static169.openUrl(Static175.url, Static164.newTab); + ScriptRunner.openUrl(ScriptRunner.url, Static164.newTab); } Static164.newTab = false; - Static175.url = null; + ScriptRunner.url = null; Static33.openUrlRequest = null; } if (loop % 1500 == 0) { @@ -1317,7 +1332,7 @@ public final class client extends GameShell { mainLoadState = 45; } else { if (percentage != 0) { - mainLoadSecondaryText = JagString.concatenate(new JagString[] { LocalizedText.CHECKING_FOR_UPDATES, JagString.parseInt(percentage), Static127.PERCENT_SIGN}); + mainLoadSecondaryText = JagString.concatenate(new JagString[] { LocalizedText.CHECKING_FOR_UPDATES, JagString.parseInt(percentage), JagString.PERCENT_SIGN}); } mainLoadPercentage = 20; } @@ -1344,7 +1359,7 @@ public final class client extends GameShell { mainLoadPercentage = 35; mainLoadState = 60; } else { - mainLoadSecondaryText = JagString.concatenate(new JagString[] { LocalizedText.MAINLOAD50, JagString.parseInt(percentage * 100 / i), Static127.PERCENT_SIGN}); + mainLoadSecondaryText = JagString.concatenate(new JagString[] { LocalizedText.MAINLOAD50, JagString.parseInt(percentage * 100 / i), JagString.PERCENT_SIGN}); mainLoadPercentage = 35; } } else if (mainLoadState == 60) { @@ -1355,7 +1370,7 @@ public final class client extends GameShell { mainLoadState = 65; mainLoadPercentage = 40; } else { - mainLoadSecondaryText = JagString.concatenate(new JagString[] { LocalizedText.MAINLOAD60, JagString.parseInt(percentage * 100 / i), Static127.PERCENT_SIGN}); + mainLoadSecondaryText = JagString.concatenate(new JagString[] { LocalizedText.MAINLOAD60, JagString.parseInt(percentage * 100 / i), JagString.PERCENT_SIGN}); mainLoadPercentage = 40; } } else if (mainLoadState == 65) { @@ -1414,14 +1429,14 @@ public final class client extends GameShell { Equipment.init(); mainLoadState = 80; } else { - mainLoadSecondaryText = JagString.concatenate(new JagString[] { LocalizedText.MAINLOAD70, JagString.parseInt(percentage / 11), Static127.PERCENT_SIGN}); + mainLoadSecondaryText = JagString.concatenate(new JagString[] { LocalizedText.MAINLOAD70, JagString.parseInt(percentage / 11), JagString.PERCENT_SIGN}); mainLoadPercentage = 50; } } else if (mainLoadState == 80) { percentage = Sprites.getReady(js5Archive8); i = Sprites.total(); if (i > percentage) { - mainLoadSecondaryText = JagString.concatenate(new JagString[] { LocalizedText.MAINLOAD80, JagString.parseInt(percentage * 100 / i), Static127.PERCENT_SIGN}); + mainLoadSecondaryText = JagString.concatenate(new JagString[] { LocalizedText.MAINLOAD80, JagString.parseInt(percentage * 100 / i), JagString.PERCENT_SIGN}); mainLoadPercentage = 60; } else { Sprites.load(js5Archive8); @@ -1449,7 +1464,7 @@ public final class client extends GameShell { mainLoadState = 100; mainLoadPercentage = 70; } else { - mainLoadSecondaryText = JagString.concatenate(new JagString[] { LocalizedText.MAINLOAD90, JagString.parseInt(js5Archive26.getPercentageComplete()), Static127.PERCENT_SIGN}); + mainLoadSecondaryText = JagString.concatenate(new JagString[] { LocalizedText.MAINLOAD90, JagString.parseInt(js5Archive26.getPercentageComplete()), JagString.PERCENT_SIGN}); mainLoadPercentage = 70; } } else if (mainLoadState == 100) { @@ -1470,18 +1485,18 @@ public final class client extends GameShell { mainLoadState = 130; mainLoadPercentage = 80; } else { - mainLoadSecondaryText = JagString.concatenate(new JagString[] { LocalizedText.MAINLOAD120, Static206.aClass100_899 }); + mainLoadSecondaryText = JagString.concatenate(new JagString[] { LocalizedText.MAINLOAD120, aClass100_899 }); mainLoadPercentage = 80; } } else if (mainLoadState == 130) { if (!js5Archive3.fetchAll()) { - mainLoadSecondaryText = JagString.concatenate(new JagString[] { LocalizedText.MAINLOAD130, JagString.parseInt(js5Archive3.getPercentageComplete() * 3 / 4), Static127.PERCENT_SIGN}); + mainLoadSecondaryText = JagString.concatenate(new JagString[] { LocalizedText.MAINLOAD130, JagString.parseInt(js5Archive3.getPercentageComplete() * 3 / 4), JagString.PERCENT_SIGN}); mainLoadPercentage = 85; } else if (!js5Archive12.fetchAll()) { - mainLoadSecondaryText = JagString.concatenate(new JagString[] { LocalizedText.MAINLOAD130, JagString.parseInt(js5Archive12.getPercentageComplete() / 10 + 75), Static127.PERCENT_SIGN}); + mainLoadSecondaryText = JagString.concatenate(new JagString[] { LocalizedText.MAINLOAD130, JagString.parseInt(js5Archive12.getPercentageComplete() / 10 + 75), JagString.PERCENT_SIGN}); mainLoadPercentage = 85; } else if (!js5Archive13.fetchAll()) { - mainLoadSecondaryText = JagString.concatenate(new JagString[] { LocalizedText.MAINLOAD130, JagString.parseInt(js5Archive13.getPercentageComplete() / 20 + 85), Static127.PERCENT_SIGN}); + mainLoadSecondaryText = JagString.concatenate(new JagString[] { LocalizedText.MAINLOAD130, JagString.parseInt(js5Archive13.getPercentageComplete() / 20 + 85), JagString.PERCENT_SIGN}); mainLoadPercentage = 85; } else if (js5Archive23.isGroupReady(Static165.DETAILS)) { MapList.init(Sprites.mapfunctions, js5Archive23); @@ -1489,7 +1504,7 @@ public final class client extends GameShell { mainLoadSecondaryText = LocalizedText.MAINLOAD130B; mainLoadState = 135; } else { - mainLoadSecondaryText = JagString.concatenate(new JagString[] { LocalizedText.MAINLOAD130, JagString.parseInt(js5Archive23.getPercentageComplete(Static165.DETAILS) / 10 + 90), Static127.PERCENT_SIGN}); + mainLoadSecondaryText = JagString.concatenate(new JagString[] { LocalizedText.MAINLOAD130, JagString.parseInt(js5Archive23.getPercentageComplete(Static165.DETAILS) / 10 + 90), JagString.PERCENT_SIGN}); mainLoadPercentage = 85; } } else if (mainLoadState == 135) { @@ -1509,7 +1524,7 @@ public final class client extends GameShell { setGameState(1000); } } else if (mainLoadState == 140) { - Static156.loginScreenId = js5Archive3.getGroupId(Static138.LOGINSCREEN); + Static156.loginScreenId = js5Archive3.getGroupId(LOGINSCREEN); js5Archive5.discardNames(false); js5Archive6.discardNames(true); js5Archive8.discardNames(true); @@ -1548,8 +1563,8 @@ public final class client extends GameShell { loop++; if (loop % 1000 == 1) { @Pc(24) GregorianCalendar gregorianCalendar = new GregorianCalendar(); - Static60.gregorianDateSeed = gregorianCalendar.get(Calendar.HOUR_OF_DAY) * 600 + gregorianCalendar.get(Calendar.MINUTE) * 10 + gregorianCalendar.get(Calendar.SECOND) / 6; - aRandom1.setSeed(Static60.gregorianDateSeed); + Static49.gregorianDateSeed = gregorianCalendar.get(Calendar.HOUR_OF_DAY) * 600 + gregorianCalendar.get(Calendar.MINUTE) * 10 + gregorianCalendar.get(Calendar.SECOND) / 6; + aRandom1.setSeed(Static49.gregorianDateSeed); } this.js5NetworkLoop(); if (js5MasterIndex != null) {