ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Revert "Merge branch 'master' into master"

Browse Source 
This reverts commit 43520c1958, reversing
changes made to 2e7aea3c62.
This commit is contained in:
zeruth
2019-06-22 02:38:35 -04:00
parent 43520c1958
commit c655c9f542
224 changed files with 16901 additions and 17108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -12,3 +12,4 @@ runelite-client/src/main/resources/META-INF/MANIFEST.MF
git git
classes/artifacts/client_jar/run.bat classes/artifacts/client_jar/run.bat
classes/artifacts/client_jar/client.jar classes/artifacts/client_jar/client.jar
*.jar

24
README.md
View File

@@ -2,25 +2,23 @@
# RuneLitePlus-PS rev180 [![Build Status](https://travis-ci.org/zeruth/runeliteplus-ps.svg?branch=master)](https://travis-ci.org/zeruth/runeliteplus-ps) [![Discord](https://img.shields.io/discord/373382904769675265.svg)](https://discord.gg/HN5gf3m) # RuneLitePlus [![Build Status](https://travis-ci.org/runelite-extended/runelite.svg?branch=master)](https://travis-ci.org/runelite-extended/runelite) [![Discord](https://img.shields.io/discord/373382904769675265.svg)](https://discord.gg/HN5gf3m)
[RuneLitePlus-PS](https://runelitepl.us) is a fork of [RuneLite](https://github.com/runelite/runelite) that provides more functionality and less restrictions while staying open source. This is a specific version meant for rs-mod which can be found here: [RuneLitePlus](https://runelitepl.us) is a fork of [RuneLite](https://github.com/runelite/runelite) that provides more functionality and less restrictions while staying open source. This is meant to directly compete with 3rd party RL clients that are trying to sell their code.
https://www.rune-server.ee/runescape-development/rs2-server/downloads/684206-180-rs-mod-release.html
## Usage ## Project Layout
By default, this connects to our sandbox server, which is for client testing. - [cache](cache/src/main/java/net/runelite/cache) - Libraries used for reading/writing cache files, as well as the data in it
- [http-api](http-api/src/main/java/net/runelite/http/api) - API for api.runelite.net
To setup your rsa keys, navigate to runelite-mixins and go to RSBufferMixin and set modulus and exponent - [http-service](http-service/src/main/java/net/runelite/http/service) - Service for api.runelite.net
To setup your codebase, navigate to runelite-client/rs and go to Launcher and set codebase = new URL("http://IP_OR_URL_HERE/"); - [runelite-api](runelite-api/src/main/java/net/runelite/api) - RuneLite API, interfaces for accessing the client
- [runelite-mixins](runelite-mixins/src/main/java/net/runelite) - Mixins which are injected into the injected client's classes
After that it's ran much like RuneLite or RuneLitePlus, install then run RuneLite.main() - [runescape-api](runescape-api/src/main/java/net/runelite) - Mappings correspond to these interfaces, runelite-api is a subset of this
- [runelite-client](runelite-client/src/main/java/net/runelite/client) - Game client with plugins
To release the built jar publicly, you'd have to host your injected client remotely and make some small modifications to rs.ClientLoader
## License ## License
RuneLitePlus-PS is licensed under the BSD 2-clause license. See the license header in the respective file to be sure. RuneLitePlus is licensed under the BSD 2-clause license. See the license header in the respective file to be sure.
## Contribute and Develop ## Contribute and Develop

24
params.txt
View File

@@ -1,24 +0,0 @@
Created at Thu Jun 13 05:48:12 CDT 2019
codebase=http://oldschool7.runescape.com/
mainclass=client.class
param=1=1
param=2=https://payments.jagex.com/operator/v1/
param=3=true
param=4=7505
param=5=1
param=6=0
param=7=0
param=8=true
param=9=ElZAIrq5NpKN6D3mDdihco3oPeYN2KFy2DCquj7JMmECPmLrDP3Bnw
param=10=5
param=11=https://auth.jagex.com/
param=12=307
param=13=.runescape.com
param=14=0
param=15=0
param=16=false
param=17=http://www.runescape.com/g=oldscape/slr.ws?order=LPWM
param=18=
param=19=196515767263-1oo20deqm6edn7ujlihl6rpadk9drhva.apps.googleusercontent.com

143
runelite-client/src/main/java/net/runelite/client/rs/Launcher.java
View File

@@ -1,143 +0,0 @@
package net.runelite.client.rs;
import java.applet.AppletContext;
import java.applet.AppletStub;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.net.URL;
import java.util.HashMap;
import java.util.Map;
import java.util.logging.Logger;
public class Launcher implements AppletStub
{
public static final Logger logger = Logger.getLogger(Launcher.class.getSimpleName());
private static final HashMap<String, String> params = new HashMap<String, String>();
private static final HashMap<String, String> cfg = new HashMap<String, String>();
private static URL codebase;
static
{
cfg.put("privacyurl", "http://www.jagex.com/g=oldscape/privacy/privacy.ws");
cfg.put("window_preferredheight", "600");
cfg.put("msg", "new_version_link=http://oldschool.runescape.com/");
cfg.put("applet_minwidth", "765");
cfg.put("adverturl", "http://www.runescape.com/g=oldscape/bare_advert.ws");
cfg.put("cachedir", "oldschool");
cfg.put("window_preferredwidth", "800");
cfg.put("applet_maxheight", "2160");
cfg.put("win_sub_version", "1");
cfg.put("browsercontrol_win_x86_jar", "browsercontrol_0_-1928975093.jar");
cfg.put("other_sub_version", "2");
cfg.put("initial_jar", "gamepack_4840368.jar");
cfg.put("advert_height", "96");
cfg.put("title", "Old School RuneScape");
cfg.put("storebase", "0");
cfg.put("initial_class", "client.class");
cfg.put("applet_maxwidth", "5760");
cfg.put("download", "1230228");
cfg.put("termsurl", "http://www.jagex.com/g=oldscape/terms/terms.ws");
cfg.put("codebase", "http://oldschool1.runescape.com/");
cfg.put("mac_sub_version", "2");
cfg.put("browsercontrol_win_amd64_jar", "browsercontrol_1_1674545273.jar");
cfg.put("applet_minheight", "503");
cfg.put("viewerversion", "124");
}
public Launcher()
{
try
{
parseParams(new FileInputStream(new File("./params.txt")));
String worldListKey = null;
for (Map.Entry<String, String> paramEntry : params.entrySet())
{
String key = paramEntry.getKey();
String value = paramEntry.getValue();
if (value.contains("slr.ws"))
{
worldListKey = key;
break;
}
}
codebase = new URL("http://thatgamerblue.com/");
params.put(worldListKey, "http://" + codebase.getHost());
}
catch (IOException e)
{
e.printStackTrace();
}
}
private static void parseParams(InputStream stream) throws IOException
{
BufferedReader br = new BufferedReader(new InputStreamReader(stream));
String line;
while ((line = br.readLine()) != null)
{
int idx = line.indexOf('=');
if (idx != -1)
{
String key = line.substring(0, idx);
String val = line.substring(idx + 1);
if (key.equals("param"))
{
idx = val.indexOf('=');
key = val.substring(0, idx);
val = val.substring(idx + 1);
params.put(key, val);
}
else
{
cfg.put(key, val);
}
}
}
}
public static void log(String format, Object... params)
{
System.out.printf(format + "\n", params);
}
@Override
public boolean isActive()
{
return false;
}
@Override
public URL getDocumentBase()
{
return codebase;
}
@Override
public URL getCodeBase()
{
return codebase;
}
@Override
public String getParameter(String name)
{
return params.get(name);
}
@Override
public AppletContext getAppletContext()
{
return null;
}
@Override
public void appletResize(int width, int height)
{
}
}

53
runelite-mixins/src/main/java/net/runelite/mixins/RSBufferMixin.java
View File

@@ -1,53 +0,0 @@
/*
* Copyright (c) 2019, Null (zeruth)
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package net.runelite.mixins;
import java.math.BigInteger;
import net.runelite.api.mixins.Copy;
import net.runelite.api.mixins.Inject;
import net.runelite.api.mixins.Mixin;
import net.runelite.api.mixins.Replace;
import net.runelite.rs.api.RSBuffer;
@Mixin(RSBuffer.class)
public abstract class RSBufferMixin implements RSBuffer
{
@Inject
private static BigInteger modulus = new BigInteger("10001", 16);
@Inject
private static BigInteger exponent = new BigInteger("ab40c047a2e5c95d0356572420b7a9bd84965425d4ce15ad989b17a71b31db80682178a7285c0a2b427c311740dbc25fed84e0b63a95215056ae24e66a5eed1a7b153bc3caf7147c5746962251ca161b3c3f01366373a150cc3ba43c2c9f8be74663f81353ce3aef0a24ba2131112c7db1dfb27583255e8c36fb8c48b01aea0eb33300a53d8eb24be40651cf9e50e891148596acb13c120cf6194871b16d91e4af1a9e7be75e62b49a267ed800da0273d3945068011ea02f74c7a37098b5055a394625ecb23425bc33ee2d1e51f3d42b6380375e9369a55a45888e5a12d9475b851360492d22029f2ea48eaaf855965f9ebd3b2e2cf05c933a9bad80741187d5", 16);
@Copy("encryptRsa")
public void rs$encryptRsa(BigInteger var1, BigInteger var2)
{
}
@Replace("encryptRsa")
public void rl$encryptRsa(BigInteger var1, BigInteger var2)
{
rs$encryptRsa(modulus, exponent);
}
}

8
runelite-mixins/src/main/java/net/runelite/mixins/RSGameShellMixin.java
View File

@@ -31,7 +31,6 @@ import net.runelite.api.mixins.FieldHook;
import net.runelite.api.mixins.Inject; import net.runelite.api.mixins.Inject;
import net.runelite.api.mixins.MethodHook; import net.runelite.api.mixins.MethodHook;
import net.runelite.api.mixins.Mixin; import net.runelite.api.mixins.Mixin;
import net.runelite.api.mixins.Replace;
import net.runelite.api.mixins.Shadow; import net.runelite.api.mixins.Shadow;
import net.runelite.rs.api.RSClient; import net.runelite.rs.api.RSClient;
import net.runelite.rs.api.RSGameShell; import net.runelite.rs.api.RSGameShell;
@@ -98,11 +97,4 @@ public abstract class RSGameShellMixin implements RSGameShell
setResizeCanvasNextFrame(true); setResizeCanvasNextFrame(true);
} }
} }
@Replace("checkHost")
protected final boolean checkHost()
{
//Always allow host.
return true;
}
} }

41
runescape-client/src/main/java/AbstractByteArrayCopier.java
View File

@@ -16,6 +16,10 @@ public abstract class AbstractByteArrayCopier {
@Export("__gu_et") @Export("__gu_et")
static IndexCache __gu_et; static IndexCache __gu_et;
static {
directBufferUnavailable = false;
}
@ObfuscatedName("m") @ObfuscatedName("m")
@ObfuscatedSignature( @ObfuscatedSignature(
signature = "(I)[B", signature = "(I)[B",
@@ -59,29 +63,30 @@ public abstract class AbstractByteArrayCopier {
garbageValue = "-1941491045" garbageValue = "-1941491045"
) )
public static void method4023(int var0) { public static void method4023(int var0) {
if(var0 != -1 && Widget.loadedWidgetGroups[var0]) { if(var0 != -1) {
Widget.Widget_indexCache.__h_399(var0); if(Widget.loadedWidgetGroups[var0]) {
if(Widget.widgets[var0] != null) { Widget.Widget_indexCache.__h_399(var0);
boolean var1 = true; if(Widget.widgets[var0] != null) {
boolean var1 = true;
for(int var2 = 0; var2 < Widget.widgets[var0].length; ++var2) { for(int var2 = 0; var2 < Widget.widgets[var0].length; ++var2) {
if(Widget.widgets[var0][var2] != null) { if(Widget.widgets[var0][var2] != null) {
if(Widget.widgets[var0][var2].type != 2) { if(Widget.widgets[var0][var2].type != 2) {
Widget.widgets[var0][var2] = null; Widget.widgets[var0][var2] = null;
} else { } else {
var1 = false; var1 = false;
}
} }
} }
}
if(var1) { if(var1) {
Widget.widgets[var0] = null; Widget.widgets[var0] = null;
} }
Widget.loadedWidgetGroups[var0] = false; Widget.loadedWidgetGroups[var0] = false;
}
} }
} }
} }
@ObfuscatedName("gb") @ObfuscatedName("gb")
@@ -96,8 +101,4 @@ public abstract class AbstractByteArrayCopier {
var0.packetBuffer.writeShort(Huffman.canvasHeight); var0.packetBuffer.writeShort(Huffman.canvasHeight);
Client.packetWriter.__q_167(var0); Client.packetWriter.__q_167(var0);
} }
static {
directBufferUnavailable = false;
}
} }

192
runescape-client/src/main/java/AbstractFont.java
View File

@@ -77,6 +77,20 @@ public abstract class AbstractFont extends Rasterizer2D {
@Export("kerning") @Export("kerning")
byte[] kerning; byte[] kerning;
static {
AbstractFont_strike = -1;
AbstractFont_underline = -1;
AbstractFont_previousShadow = -1;
AbstractFont_shadow = -1;
AbstractFont_previousColor = 0;
AbstractFont_color = 0;
AbstractFont_alpha = 256;
AbstractFont_justificationTotal = 0;
AbstractFont_justificationCurrent = 0;
AbstractFont_random = new Random();
AbstractFont_lines = new String[100];
}
AbstractFont(byte[] var1, int[] var2, int[] var3, int[] var4, int[] var5, int[] var6, byte[][] var7) { AbstractFont(byte[] var1, int[] var2, int[] var3, int[] var4, int[] var5, int[] var6, byte[][] var7) {
this.pixels = new byte[256][]; this.pixels = new byte[256][];
this.ascent = 0; this.ascent = 0;
@@ -135,57 +149,57 @@ public abstract class AbstractFont extends Rasterizer2D {
this.advances[var3] = var1[var2++] & 255; this.advances[var3] = var1[var2++] & 255;
} }
int[] var12 = new int[256]; int[] var10 = new int[256];
int[] var4 = new int[256]; int[] var4 = new int[256];
int var5; int var5;
for(var5 = 0; var5 < 256; ++var5) { for(var5 = 0; var5 < 256; ++var5) {
var12[var5] = var1[var2++] & 255; var10[var5] = var1[var2++] & 255;
} }
for(var5 = 0; var5 < 256; ++var5) { for(var5 = 0; var5 < 256; ++var5) {
var4[var5] = var1[var2++] & 255; var4[var5] = var1[var2++] & 255;
} }
byte[][] var6 = new byte[256][]; byte[][] var11 = new byte[256][];
int var7; int var8;
for(int var8 = 0; var8 < 256; ++var8) { for(int var6 = 0; var6 < 256; ++var6) {
var6[var8] = new byte[var12[var8]]; var11[var6] = new byte[var10[var6]];
byte var9 = 0; byte var7 = 0;
for(var7 = 0; var7 < var6[var8].length; ++var7) { for(var8 = 0; var8 < var11[var6].length; ++var8) {
var9 += var1[var2++]; var7 += var1[var2++];
var6[var8][var7] = var9; var11[var6][var8] = var7;
} }
} }
byte[][] var13 = new byte[256][]; byte[][] var12 = new byte[256][];
int var14; int var13;
for(var14 = 0; var14 < 256; ++var14) { for(var13 = 0; var13 < 256; ++var13) {
var13[var14] = new byte[var12[var14]]; var12[var13] = new byte[var10[var13]];
byte var10 = 0; byte var14 = 0;
for(int var11 = 0; var11 < var13[var14].length; ++var11) { for(int var9 = 0; var9 < var12[var13].length; ++var9) {
var10 += var1[var2++]; var14 += var1[var2++];
var13[var14][var11] = var10; var12[var13][var9] = var14;
} }
} }
this.kerning = new byte[65536]; this.kerning = new byte[65536];
for(var14 = 0; var14 < 256; ++var14) { for(var13 = 0; var13 < 256; ++var13) {
if(var14 != 32 && var14 != 160) { if(var13 != 32 && var13 != 160) {
for(var7 = 0; var7 < 256; ++var7) { for(var8 = 0; var8 < 256; ++var8) {
if(var7 != 32 && var7 != 160) { if(var8 != 32 && var8 != 160) {
this.kerning[var7 + (var14 << 8)] = (byte)method5658(var6, var13, var4, this.advances, var12, var14, var7); this.kerning[var8 + (var13 << 8)] = (byte)method5658(var11, var12, var4, this.advances, var10, var13, var8);
} }
} }
} }
} }
this.ascent = var4[32] + var12[32]; this.ascent = var4[32] + var10[32];
} }
} }
@@ -227,7 +241,7 @@ public abstract class AbstractFont extends Rasterizer2D {
int var8 = MouseHandler.method1085(var7.substring(4)); int var8 = MouseHandler.method1085(var7.substring(4));
var4 += AbstractFont_modIconSprites[var8].width; var4 += AbstractFont_modIconSprites[var8].width;
var3 = -1; var3 = -1;
} catch (Exception var9) { } catch (Exception var10) {
; ;
} }
} }
@@ -311,7 +325,7 @@ public abstract class AbstractFont extends Rasterizer2D {
int var17 = MouseHandler.method1085(var16.substring(4)); int var17 = MouseHandler.method1085(var16.substring(4));
var4 += AbstractFont_modIconSprites[var17].width; var4 += AbstractFont_modIconSprites[var17].width;
var11 = 0; var11 = 0;
} catch (Exception var18) { } catch (Exception var20) {
; ;
} }
} }
@@ -392,7 +406,6 @@ public abstract class AbstractFont extends Rasterizer2D {
this.reset(var4, var5); this.reset(var4, var5);
this.draw0(var1, var2, var3); this.draw0(var1, var2, var3);
} }
} }
@ObfuscatedName("y") @ObfuscatedName("y")
@@ -403,7 +416,6 @@ public abstract class AbstractFont extends Rasterizer2D {
AbstractFont_alpha = var6; AbstractFont_alpha = var6;
this.draw0(var1, var2, var3); this.draw0(var1, var2, var3);
} }
} }
@ObfuscatedName("h") @ObfuscatedName("h")
@@ -413,7 +425,6 @@ public abstract class AbstractFont extends Rasterizer2D {
this.reset(var4, var5); this.reset(var4, var5);
this.draw0(var1, var2 - this.stringWidth(var1), var3); this.draw0(var1, var2 - this.stringWidth(var1), var3);
} }
} }
@ObfuscatedName("b") @ObfuscatedName("b")
@@ -423,7 +434,6 @@ public abstract class AbstractFont extends Rasterizer2D {
this.reset(var4, var5); this.reset(var4, var5);
this.draw0(var1, var2 - this.stringWidth(var1) / 2, var3); this.draw0(var1, var2 - this.stringWidth(var1) / 2, var3);
} }
} }
@ObfuscatedName("c") @ObfuscatedName("c")
@@ -500,7 +510,6 @@ public abstract class AbstractFont extends Rasterizer2D {
this.drawWithOffsets0(var1, var2 - this.stringWidth(var1) / 2, var3, (int[])null, var7); this.drawWithOffsets0(var1, var2 - this.stringWidth(var1) / 2, var3, (int[])null, var7);
} }
} }
@ObfuscatedName("v") @ObfuscatedName("v")
@@ -518,7 +527,6 @@ public abstract class AbstractFont extends Rasterizer2D {
this.drawWithOffsets0(var1, var2 - this.stringWidth(var1) / 2, var3, var7, var8); this.drawWithOffsets0(var1, var2 - this.stringWidth(var1) / 2, var3, var7, var8);
} }
} }
@ObfuscatedName("ag") @ObfuscatedName("ag")
@@ -539,7 +547,6 @@ public abstract class AbstractFont extends Rasterizer2D {
this.drawWithOffsets0(var1, var2 - this.stringWidth(var1) / 2, var3, (int[])null, var10); this.drawWithOffsets0(var1, var2 - this.stringWidth(var1) / 2, var3, (int[])null, var10);
} }
} }
@ObfuscatedName("aq") @ObfuscatedName("aq")
@@ -561,7 +568,6 @@ public abstract class AbstractFont extends Rasterizer2D {
this.drawWithOffsets0(var1, var2, var3, var7, (int[])null); this.drawWithOffsets0(var1, var2, var3, var7, (int[])null);
} }
} }
@ObfuscatedName("aj") @ObfuscatedName("aj")
@@ -649,26 +655,26 @@ public abstract class AbstractFont extends Rasterizer2D {
if(var7 == '<') { if(var7 == '<') {
var4 = var6; var4 = var6;
} else { } else {
int var8; int var9;
if(var7 == '>' && var4 != -1) { if(var7 == '>' && var4 != -1) {
String var9 = var1.substring(var4 + 1, var6); String var8 = var1.substring(var4 + 1, var6);
var4 = -1; var4 = -1;
if(var9.equals("lt")) { if(var8.equals("lt")) {
var7 = '<'; var7 = '<';
} else { } else {
if(!var9.equals("gt")) { if(!var8.equals("gt")) {
if(var9.startsWith("img=")) { if(var8.startsWith("img=")) {
try { try {
var8 = MouseHandler.method1085(var9.substring(4)); var9 = MouseHandler.method1085(var8.substring(4));
IndexedSprite var13 = AbstractFont_modIconSprites[var8]; IndexedSprite var10 = AbstractFont_modIconSprites[var9];
var13.__q_496(var2, var3 + this.ascent - var13.height); var10.__q_496(var2, var3 + this.ascent - var10.height);
var2 += var13.width; var2 += var10.width;
var5 = -1; var5 = -1;
} catch (Exception var11) { } catch (Exception var14) {
; ;
} }
} else { } else {
this.decodeTag(var9); this.decodeTag(var8);
} }
continue; continue;
} }
@@ -687,20 +693,20 @@ public abstract class AbstractFont extends Rasterizer2D {
} }
int var12 = this.widths[var7]; int var12 = this.widths[var7];
var8 = this.heights[var7]; var9 = this.heights[var7];
if(var7 != ' ') { if(var7 != ' ') {
if(AbstractFont_alpha == 256) { if(AbstractFont_alpha == 256) {
if(AbstractFont_shadow != -1) { if(AbstractFont_shadow != -1) {
AbstractFont_drawGlyph(this.pixels[var7], var2 + this.leftBearings[var7] + 1, var3 + this.topBearings[var7] + 1, var12, var8, AbstractFont_shadow); AbstractFont_drawGlyph(this.pixels[var7], var2 + this.leftBearings[var7] + 1, var3 + this.topBearings[var7] + 1, var12, var9, AbstractFont_shadow);
} }
this.drawGlyph(this.pixels[var7], var2 + this.leftBearings[var7], var3 + this.topBearings[var7], var12, var8, AbstractFont_color); this.drawGlyph(this.pixels[var7], var2 + this.leftBearings[var7], var3 + this.topBearings[var7], var12, var9, AbstractFont_color);
} else { } else {
if(AbstractFont_shadow != -1) { if(AbstractFont_shadow != -1) {
AbstractFont_drawGlyphAlpha(this.pixels[var7], var2 + this.leftBearings[var7] + 1, var3 + this.topBearings[var7] + 1, var12, var8, AbstractFont_shadow, AbstractFont_alpha); AbstractFont_drawGlyphAlpha(this.pixels[var7], var2 + this.leftBearings[var7] + 1, var3 + this.topBearings[var7] + 1, var12, var9, AbstractFont_shadow, AbstractFont_alpha);
} }
this.drawGlyphAlpha(this.pixels[var7], var2 + this.leftBearings[var7], var3 + this.topBearings[var7], var12, var8, AbstractFont_color, AbstractFont_alpha); this.drawGlyphAlpha(this.pixels[var7], var2 + this.leftBearings[var7], var3 + this.topBearings[var7], var12, var9, AbstractFont_color, AbstractFont_alpha);
} }
} else if(AbstractFont_justificationTotal > 0) { } else if(AbstractFont_justificationTotal > 0) {
AbstractFont_justificationCurrent += AbstractFont_justificationTotal; AbstractFont_justificationCurrent += AbstractFont_justificationTotal;
@@ -708,16 +714,16 @@ public abstract class AbstractFont extends Rasterizer2D {
AbstractFont_justificationCurrent &= 255; AbstractFont_justificationCurrent &= 255;
} }
int var10 = this.advances[var7]; int var13 = this.advances[var7];
if(AbstractFont_strike != -1) { if(AbstractFont_strike != -1) {
Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + (int)((double)this.ascent * 0.7D), var10, AbstractFont_strike); Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + (int)((double)this.ascent * 0.7D), var13, AbstractFont_strike);
} }
if(AbstractFont_underline != -1) { if(AbstractFont_underline != -1) {
Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + this.ascent + 1, var10, AbstractFont_underline); Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + this.ascent + 1, var13, AbstractFont_underline);
} }
var2 += var10; var2 += var13;
var5 = var7; var5 = var7;
} }
} }
@@ -740,41 +746,41 @@ public abstract class AbstractFont extends Rasterizer2D {
if(var10 == '<') { if(var10 == '<') {
var6 = var9; var6 = var9;
} else { } else {
int var11;
int var12; int var12;
int var13; int var13;
int var14;
if(var10 == '>' && var6 != -1) { if(var10 == '>' && var6 != -1) {
String var14 = var1.substring(var6 + 1, var9); String var11 = var1.substring(var6 + 1, var9);
var6 = -1; var6 = -1;
if(var14.equals("lt")) { if(var11.equals("lt")) {
var10 = '<'; var10 = '<';
} else { } else {
if(!var14.equals("gt")) { if(!var11.equals("gt")) {
if(var14.startsWith("img=")) { if(var11.startsWith("img=")) {
try { try {
if(var4 != null) { if(var4 != null) {
var11 = var4[var8]; var12 = var4[var8];
} else {
var11 = 0;
}
if(var5 != null) {
var12 = var5[var8];
} else { } else {
var12 = 0; var12 = 0;
} }
if(var5 != null) {
var13 = var5[var8];
} else {
var13 = 0;
}
++var8; ++var8;
var13 = MouseHandler.method1085(var14.substring(4)); var14 = MouseHandler.method1085(var11.substring(4));
IndexedSprite var18 = AbstractFont_modIconSprites[var13]; IndexedSprite var15 = AbstractFont_modIconSprites[var14];
var18.__q_496(var11 + var2, var12 + (var3 + this.ascent - var18.height)); var15.__q_496(var12 + var2, var13 + (var3 + this.ascent - var15.height));
var2 += var18.width; var2 += var15.width;
var7 = -1; var7 = -1;
} catch (Exception var16) { } catch (Exception var19) {
; ;
} }
} else { } else {
this.decodeTag(var14); this.decodeTag(var11);
} }
continue; continue;
} }
@@ -793,33 +799,33 @@ public abstract class AbstractFont extends Rasterizer2D {
} }
int var17 = this.widths[var10]; int var17 = this.widths[var10];
var11 = this.heights[var10]; var12 = this.heights[var10];
if(var4 != null) { if(var4 != null) {
var12 = var4[var8]; var13 = var4[var8];
} else { } else {
var12 = 0; var13 = 0;
} }
if(var5 != null) { if(var5 != null) {
var13 = var5[var8]; var14 = var5[var8];
} else { } else {
var13 = 0; var14 = 0;
} }
++var8; ++var8;
if(var10 != ' ') { if(var10 != ' ') {
if(AbstractFont_alpha == 256) { if(AbstractFont_alpha == 256) {
if(AbstractFont_shadow != -1) { if(AbstractFont_shadow != -1) {
AbstractFont_drawGlyph(this.pixels[var10], var12 + var2 + this.leftBearings[var10] + 1, var3 + var13 + this.topBearings[var10] + 1, var17, var11, AbstractFont_shadow); AbstractFont_drawGlyph(this.pixels[var10], var13 + var2 + this.leftBearings[var10] + 1, var3 + var14 + this.topBearings[var10] + 1, var17, var12, AbstractFont_shadow);
} }
this.drawGlyph(this.pixels[var10], var12 + var2 + this.leftBearings[var10], var3 + var13 + this.topBearings[var10], var17, var11, AbstractFont_color); this.drawGlyph(this.pixels[var10], var13 + var2 + this.leftBearings[var10], var3 + var14 + this.topBearings[var10], var17, var12, AbstractFont_color);
} else { } else {
if(AbstractFont_shadow != -1) { if(AbstractFont_shadow != -1) {
AbstractFont_drawGlyphAlpha(this.pixels[var10], var12 + var2 + this.leftBearings[var10] + 1, var3 + var13 + this.topBearings[var10] + 1, var17, var11, AbstractFont_shadow, AbstractFont_alpha); AbstractFont_drawGlyphAlpha(this.pixels[var10], var13 + var2 + this.leftBearings[var10] + 1, var3 + var14 + this.topBearings[var10] + 1, var17, var12, AbstractFont_shadow, AbstractFont_alpha);
} }
this.drawGlyphAlpha(this.pixels[var10], var12 + var2 + this.leftBearings[var10], var3 + var13 + this.topBearings[var10], var17, var11, AbstractFont_color, AbstractFont_alpha); this.drawGlyphAlpha(this.pixels[var10], var13 + var2 + this.leftBearings[var10], var3 + var14 + this.topBearings[var10], var17, var12, AbstractFont_color, AbstractFont_alpha);
} }
} else if(AbstractFont_justificationTotal > 0) { } else if(AbstractFont_justificationTotal > 0) {
AbstractFont_justificationCurrent += AbstractFont_justificationTotal; AbstractFont_justificationCurrent += AbstractFont_justificationTotal;
@@ -827,16 +833,16 @@ public abstract class AbstractFont extends Rasterizer2D {
AbstractFont_justificationCurrent &= 255; AbstractFont_justificationCurrent &= 255;
} }
int var15 = this.advances[var10]; int var18 = this.advances[var10];
if(AbstractFont_strike != -1) { if(AbstractFont_strike != -1) {
Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + (int)((double)this.ascent * 0.7D), var15, AbstractFont_strike); Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + (int)((double)this.ascent * 0.7D), var18, AbstractFont_strike);
} }
if(AbstractFont_underline != -1) { if(AbstractFont_underline != -1) {
Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + this.ascent, var15, AbstractFont_underline); Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + this.ascent, var18, AbstractFont_underline);
} }
var2 += var15; var2 += var18;
var7 = var10; var7 = var10;
} }
} }
@@ -950,7 +956,6 @@ public abstract class AbstractFont extends Rasterizer2D {
if(var3 > 0 && var4 > 0) { if(var3 > 0 && var4 > 0) {
AbstractFont_placeGlyph(Rasterizer2D.Rasterizer2D_pixels, var0, var5, var9, var6, var3, var4, var7, var8); AbstractFont_placeGlyph(Rasterizer2D.Rasterizer2D_pixels, var0, var5, var9, var6, var3, var4, var7, var8);
} }
} }
@ObfuscatedName("ak") @ObfuscatedName("ak")
@@ -1041,7 +1046,6 @@ public abstract class AbstractFont extends Rasterizer2D {
if(var3 > 0 && var4 > 0) { if(var3 > 0 && var4 > 0) {
AbstractFont_placeGlyphAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var5, var10, var7, var3, var4, var8, var9, var6); AbstractFont_placeGlyphAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var5, var10, var7, var3, var4, var8, var9, var6);
} }
} }
@ObfuscatedName("al") @ObfuscatedName("al")
@@ -1065,18 +1069,4 @@ public abstract class AbstractFont extends Rasterizer2D {
} }
} }
static {
AbstractFont_strike = -1;
AbstractFont_underline = -1;
AbstractFont_previousShadow = -1;
AbstractFont_shadow = -1;
AbstractFont_previousColor = 0;
AbstractFont_color = 0;
AbstractFont_alpha = 256;
AbstractFont_justificationTotal = 0;
AbstractFont_justificationCurrent = 0;
AbstractFont_random = new Random();
AbstractFont_lines = new String[100];
}
} }

57
runescape-client/src/main/java/AbstractIndexCache.java
View File

@@ -99,6 +99,11 @@ public abstract class AbstractIndexCache {
@Export("shallowRecords") @Export("shallowRecords")
boolean shallowRecords; boolean shallowRecords;
static {
gzipDecompressor = new GzipDecompressor();
__ir_s = 0;
}
AbstractIndexCache(boolean var1, boolean var2) { AbstractIndexCache(boolean var1, boolean var2) {
this.releaseArchives = var1; this.releaseArchives = var1;
this.shallowRecords = var2; this.shallowRecords = var2;
@@ -544,63 +549,63 @@ public abstract class AbstractIndexCache {
var8.xteaDecrypt(var2, 5, var8.array.length); var8.xteaDecrypt(var2, 5, var8.array.length);
} }
byte[] var19 = Strings.decompressBytes(var18); byte[] var20 = Strings.decompressBytes(var18);
if(this.releaseArchives) { if(this.releaseArchives) {
this.archives[var1] = null; this.archives[var1] = null;
} }
if(var3 > 1) { if(var3 > 1) {
int var9 = var19.length; int var9 = var20.length;
--var9; --var9;
int var10 = var19[var9] & 255; int var10 = var20[var9] & 255;
var9 -= var10 * var3 * 4; var9 -= var10 * var3 * 4;
Buffer var11 = new Buffer(var19); Buffer var11 = new Buffer(var20);
int[] var12 = new int[var3]; int[] var12 = new int[var3];
var11.index = var9; var11.index = var9;
int var13;
int var14; int var14;
for(int var15 = 0; var15 < var10; ++var15) { int var15;
var13 = 0; for(int var13 = 0; var13 < var10; ++var13) {
var14 = 0;
for(var14 = 0; var14 < var3; ++var14) { for(var15 = 0; var15 < var3; ++var15) {
var13 += var11.readInt(); var14 += var11.readInt();
var12[var14] += var13; var12[var15] += var14;
} }
} }
byte[][] var20 = new byte[var3][]; byte[][] var19 = new byte[var3][];
for(var13 = 0; var13 < var3; ++var13) { for(var14 = 0; var14 < var3; ++var14) {
var20[var13] = new byte[var12[var13]]; var19[var14] = new byte[var12[var14]];
var12[var13] = 0; var12[var14] = 0;
} }
var11.index = var9; var11.index = var9;
var13 = 0; var14 = 0;
for(var14 = 0; var14 < var10; ++var14) { for(var15 = 0; var15 < var10; ++var15) {
int var16 = 0; int var16 = 0;
for(int var17 = 0; var17 < var3; ++var17) { for(int var17 = 0; var17 < var3; ++var17) {
var16 += var11.readInt(); var16 += var11.readInt();
System.arraycopy(var19, var13, var20[var17], var12[var17], var16); System.arraycopy(var20, var14, var19[var17], var12[var17], var16);
var12[var17] += var16; var12[var17] += var16;
var13 += var16; var14 += var16;
} }
} }
for(var14 = 0; var14 < var3; ++var14) { for(var15 = 0; var15 < var3; ++var15) {
if(!this.shallowRecords) { if(!this.shallowRecords) {
var5[var4[var14]] = Projectile.byteArrayToObject(var20[var14], false); var5[var4[var15]] = Projectile.byteArrayToObject(var19[var15], false);
} else { } else {
var5[var4[var14]] = var20[var14]; var5[var4[var15]] = var19[var15];
} }
} }
} else if(!this.shallowRecords) { } else if(!this.shallowRecords) {
var5[var4[0]] = Projectile.byteArrayToObject(var19, false); var5[var4[0]] = Projectile.byteArrayToObject(var20, false);
} else { } else {
var5[var4[0]] = var19; var5[var4[0]] = var20;
} }
return true; return true;
@@ -700,7 +705,6 @@ public abstract class AbstractIndexCache {
if(var2 >= 0) { if(var2 >= 0) {
this.__f_392(var2); this.__f_392(var2);
} }
} }
@ObfuscatedName("ac") @ObfuscatedName("ac")
@@ -776,9 +780,4 @@ public abstract class AbstractIndexCache {
return true; return true;
} }
} }
static {
gzipDecompressor = new GzipDecompressor();
__ir_s = 0;
}
} }

7
runescape-client/src/main/java/AbstractWorldMapIcon.java
View File

@@ -115,11 +115,10 @@ public abstract class AbstractWorldMapIcon {
int var5 = this.__w_18(); int var5 = this.__w_18();
switch(var3.field3287.field3528) { switch(var3.field3287.field3528) {
case 0: case 0:
if(var1 >= this.__e - var4 / 2 && var1 <= var4 / 2 + this.__e) { if(var1 < this.__e - var4 / 2 || var1 > var4 / 2 + this.__e) {
break; return false;
} }
break;
return false;
case 1: case 1:
if(var1 >= this.__e && var1 < var4 + this.__e) { if(var1 >= this.__e && var1 < var4 + this.__e) {
break; break;

237
runescape-client/src/main/java/Actor.java
View File

@@ -480,7 +480,6 @@ public abstract class Actor extends Entity {
this.hitSplatValues2[var9] = var4; this.hitSplatValues2[var9] = var4;
this.hitSplatCycles[var9] = var5 + var11 + var6; this.hitSplatCycles[var9] = var5 + var11 + var6;
} }
} }
@ObfuscatedName("bq") @ObfuscatedName("bq")
@@ -490,36 +489,36 @@ public abstract class Actor extends Entity {
) )
@Export("addHealthBar") @Export("addHealthBar")
final void addHealthBar(int var1, int var2, int var3, int var4, int var5, int var6) { final void addHealthBar(int var1, int var2, int var3, int var4, int var5, int var6) {
HealthBarDefinition var7 = (HealthBarDefinition)HealthBarDefinition.HealthBarDefinition_cached.get((long)var1); HealthBarDefinition var8 = (HealthBarDefinition)HealthBarDefinition.HealthBarDefinition_cached.get((long)var1);
HealthBarDefinition var8; HealthBarDefinition var7;
if(var7 != null) { if(var8 != null) {
var8 = var7; var7 = var8;
} else { } else {
byte[] var9 = HealthBarDefinition.__ii_m.takeRecord(33, var1); byte[] var9 = HealthBarDefinition.__ii_m.takeRecord(33, var1);
var7 = new HealthBarDefinition(); var8 = new HealthBarDefinition();
if(var9 != null) { if(var9 != null) {
var7.read(new Buffer(var9)); var8.read(new Buffer(var9));
} }
HealthBarDefinition.HealthBarDefinition_cached.put(var7, (long)var1); HealthBarDefinition.HealthBarDefinition_cached.put(var8, (long)var1);
var8 = var7; var7 = var8;
} }
var7 = var8; var8 = var7;
HealthBar var14 = null; HealthBar var14 = null;
HealthBar var10 = null; HealthBar var10 = null;
int var11 = var8.int2; int var11 = var7.int2;
int var12 = 0; int var12 = 0;
HealthBar var13; HealthBar var13;
for(var13 = (HealthBar)this.healthBars.last(); var13 != null; var13 = (HealthBar)this.healthBars.previous()) { for(var13 = (HealthBar)this.healthBars.last(); var13 != null; var13 = (HealthBar)this.healthBars.previous()) {
++var12; ++var12;
if(var13.definition.__o == var7.__o) { if(var13.definition.__o == var8.__o) {
var13.put(var2 + var4, var5, var6, var3); var13.put(var2 + var4, var5, var6, var3);
return; return;
} }
if(var13.definition.int1 <= var7.int1) { if(var13.definition.int1 <= var8.int1) {
var14 = var13; var14 = var13;
} }
@@ -530,7 +529,7 @@ public abstract class Actor extends Entity {
} }
if(var10 != null || var12 < 4) { if(var10 != null || var12 < 4) {
var13 = new HealthBar(var7); var13 = new HealthBar(var8);
if(var14 == null) { if(var14 == null) {
this.healthBars.addLast(var13); this.healthBars.addLast(var13);
} else { } else {
@@ -541,8 +540,8 @@ public abstract class Actor extends Entity {
if(var12 >= 4) { if(var12 >= 4) {
var10.remove(); var10.remove();
} }
}
}
} }
@ObfuscatedName("bn") @ObfuscatedName("bn")
@@ -552,25 +551,25 @@ public abstract class Actor extends Entity {
) )
@Export("removeHealthBar") @Export("removeHealthBar")
final void removeHealthBar(int var1) { final void removeHealthBar(int var1) {
HealthBarDefinition var2 = (HealthBarDefinition)HealthBarDefinition.HealthBarDefinition_cached.get((long)var1); HealthBarDefinition var3 = (HealthBarDefinition)HealthBarDefinition.HealthBarDefinition_cached.get((long)var1);
HealthBarDefinition var3; HealthBarDefinition var2;
if(var2 != null) { if(var3 != null) {
var3 = var2; var2 = var3;
} else { } else {
byte[] var4 = HealthBarDefinition.__ii_m.takeRecord(33, var1); byte[] var4 = HealthBarDefinition.__ii_m.takeRecord(33, var1);
var2 = new HealthBarDefinition(); var3 = new HealthBarDefinition();
if(var4 != null) { if(var4 != null) {
var2.read(new Buffer(var4)); var3.read(new Buffer(var4));
} }
HealthBarDefinition.HealthBarDefinition_cached.put(var2, (long)var1); HealthBarDefinition.HealthBarDefinition_cached.put(var3, (long)var1);
var3 = var2; var2 = var3;
} }
var2 = var3; var3 = var2;
for(HealthBar var5 = (HealthBar)this.healthBars.last(); var5 != null; var5 = (HealthBar)this.healthBars.previous()) { for(HealthBar var5 = (HealthBar)this.healthBars.last(); var5 != null; var5 = (HealthBar)this.healthBars.previous()) {
if(var2 == var5.definition) { if(var3 == var5.definition) {
var5.remove(); var5.remove();
return; return;
} }
@@ -675,10 +674,10 @@ public abstract class Actor extends Entity {
Client.packetWriter.__q_167(var8); Client.packetWriter.__q_167(var8);
} else { } else {
PacketBufferNode var9; PacketBufferNode var9;
NPC var10; Npc var13;
if(var2 == 7) { if(var2 == 7) {
var10 = Client.npcs[var3]; var13 = Client.npcs[var3];
if(var10 != null) { if(var13 != null) {
Client.mouseCrossX = var6; Client.mouseCrossX = var6;
Client.mouseCrossY = var7; Client.mouseCrossY = var7;
Client.mouseCrossColor = 2; Client.mouseCrossColor = 2;
@@ -694,8 +693,8 @@ public abstract class Actor extends Entity {
Client.packetWriter.__q_167(var9); Client.packetWriter.__q_167(var9);
} }
} else if(var2 == 8) { } else if(var2 == 8) {
var10 = Client.npcs[var3]; var13 = Client.npcs[var3];
if(var10 != null) { if(var13 != null) {
Client.mouseCrossX = var6; Client.mouseCrossX = var6;
Client.mouseCrossY = var7; Client.mouseCrossY = var7;
Client.mouseCrossColor = 2; Client.mouseCrossColor = 2;
@@ -710,8 +709,8 @@ public abstract class Actor extends Entity {
Client.packetWriter.__q_167(var9); Client.packetWriter.__q_167(var9);
} }
} else if(var2 == 9) { } else if(var2 == 9) {
var10 = Client.npcs[var3]; var13 = Client.npcs[var3];
if(var10 != null) { if(var13 != null) {
Client.mouseCrossX = var6; Client.mouseCrossX = var6;
Client.mouseCrossY = var7; Client.mouseCrossY = var7;
Client.mouseCrossColor = 2; Client.mouseCrossColor = 2;
@@ -724,8 +723,8 @@ public abstract class Actor extends Entity {
Client.packetWriter.__q_167(var9); Client.packetWriter.__q_167(var9);
} }
} else if(var2 == 10) { } else if(var2 == 10) {
var10 = Client.npcs[var3]; var13 = Client.npcs[var3];
if(var10 != null) { if(var13 != null) {
Client.mouseCrossX = var6; Client.mouseCrossX = var6;
Client.mouseCrossY = var7; Client.mouseCrossY = var7;
Client.mouseCrossColor = 2; Client.mouseCrossColor = 2;
@@ -738,8 +737,8 @@ public abstract class Actor extends Entity {
Client.packetWriter.__q_167(var9); Client.packetWriter.__q_167(var9);
} }
} else if(var2 == 11) { } else if(var2 == 11) {
var10 = Client.npcs[var3]; var13 = Client.npcs[var3];
if(var10 != null) { if(var13 != null) {
Client.mouseCrossX = var6; Client.mouseCrossX = var6;
Client.mouseCrossY = var7; Client.mouseCrossY = var7;
Client.mouseCrossColor = 2; Client.mouseCrossColor = 2;
@@ -752,8 +751,8 @@ public abstract class Actor extends Entity {
Client.packetWriter.__q_167(var9); Client.packetWriter.__q_167(var9);
} }
} else if(var2 == 12) { } else if(var2 == 12) {
var10 = Client.npcs[var3]; var13 = Client.npcs[var3];
if(var10 != null) { if(var13 != null) {
Client.mouseCrossX = var6; Client.mouseCrossX = var6;
Client.mouseCrossY = var7; Client.mouseCrossY = var7;
Client.mouseCrossColor = 2; Client.mouseCrossColor = 2;
@@ -766,8 +765,8 @@ public abstract class Actor extends Entity {
Client.packetWriter.__q_167(var9); Client.packetWriter.__q_167(var9);
} }
} else if(var2 == 13) { } else if(var2 == 13) {
var10 = Client.npcs[var3]; var13 = Client.npcs[var3];
if(var10 != null) { if(var13 != null) {
Client.mouseCrossX = var6; Client.mouseCrossX = var6;
Client.mouseCrossY = var7; Client.mouseCrossY = var7;
Client.mouseCrossColor = 2; Client.mouseCrossColor = 2;
@@ -780,10 +779,10 @@ public abstract class Actor extends Entity {
Client.packetWriter.__q_167(var9); Client.packetWriter.__q_167(var9);
} }
} else { } else {
Player var11; Player var15;
if(var2 == 14) { if(var2 == 14) {
var11 = Client.players[var3]; var15 = Client.players[var3];
if(var11 != null) { if(var15 != null) {
Client.mouseCrossX = var6; Client.mouseCrossX = var6;
Client.mouseCrossY = var7; Client.mouseCrossY = var7;
Client.mouseCrossColor = 2; Client.mouseCrossColor = 2;
@@ -799,8 +798,8 @@ public abstract class Actor extends Entity {
Client.packetWriter.__q_167(var9); Client.packetWriter.__q_167(var9);
} }
} else if(var2 == 15) { } else if(var2 == 15) {
var11 = Client.players[var3]; var15 = Client.players[var3];
if(var11 != null) { if(var15 != null) {
Client.mouseCrossX = var6; Client.mouseCrossX = var6;
Client.mouseCrossY = var7; Client.mouseCrossY = var7;
Client.mouseCrossColor = 2; Client.mouseCrossColor = 2;
@@ -917,36 +916,36 @@ public abstract class Actor extends Entity {
class65.scene.menuOpen(SoundSystem.plane, var0, var1, true); class65.scene.menuOpen(SoundSystem.plane, var0, var1, true);
} }
} else { } else {
PacketBufferNode var12; PacketBufferNode var10;
Widget var13; Widget var16;
if(var2 == 24) { if(var2 == 24) {
var13 = Huffman.getWidget(var1); var16 = Huffman.getWidget(var1);
boolean var14 = true; boolean var12 = true;
if(var13.contentType > 0) { if(var16.contentType > 0) {
var14 = ViewportMouse.method2957(var13); var12 = ViewportMouse.method2957(var16);
} }
if(var14) { if(var12) {
var12 = Interpreter.method1915(ClientPacket.__gs_bz, Client.packetWriter.isaacCipher); var10 = Interpreter.method1915(ClientPacket.__gs_bz, Client.packetWriter.isaacCipher);
var12.packetBuffer.writeInt(var1); var10.packetBuffer.writeInt(var1);
Client.packetWriter.__q_167(var12); Client.packetWriter.__q_167(var10);
} }
} else { } else {
if(var2 == 25) { if(var2 == 25) {
var13 = class204.getWidgetChild(var1, var0); var16 = class204.getWidgetChild(var1, var0);
if(var13 != null) { if(var16 != null) {
Player.method1281(); Player.method1281();
class25.method350(var1, var0, class211.method4107(class1.getWidgetClickMask(var13)), var13.itemId); class25.method350(var1, var0, class211.method4107(class1.getWidgetClickMask(var16)), var16.itemId);
Client.isItemSelected = 0; Client.isItemSelected = 0;
Client.selectedSpellActionName = class198.method3745(var13); Client.selectedSpellActionName = class198.method3745(var16);
if(Client.selectedSpellActionName == null) { if(Client.selectedSpellActionName == null) {
Client.selectedSpellActionName = "null"; Client.selectedSpellActionName = "null";
} }
if(var13.isIf3) { if(var16.isIf3) {
Client.selectedSpellName = var13.dataText + BufferedFile.colorStartTag(16777215); Client.selectedSpellName = var16.dataText + BufferedFile.colorStartTag(16777215);
} else { } else {
Client.selectedSpellName = BufferedFile.colorStartTag(65280) + var13.spellName + BufferedFile.colorStartTag(16777215); Client.selectedSpellName = BufferedFile.colorStartTag(65280) + var16.spellName + BufferedFile.colorStartTag(16777215);
} }
} }
@@ -956,28 +955,28 @@ public abstract class Actor extends Entity {
if(var2 == 26) { if(var2 == 26) {
WorldMapLabelSize.method198(); WorldMapLabelSize.method198();
} else { } else {
Widget var15; int var11;
int var17; Widget var14;
if(var2 == 28) { if(var2 == 28) {
var8 = Interpreter.method1915(ClientPacket.__gs_bz, Client.packetWriter.isaacCipher); var8 = Interpreter.method1915(ClientPacket.__gs_bz, Client.packetWriter.isaacCipher);
var8.packetBuffer.writeInt(var1); var8.packetBuffer.writeInt(var1);
Client.packetWriter.__q_167(var8); Client.packetWriter.__q_167(var8);
var15 = Huffman.getWidget(var1); var14 = Huffman.getWidget(var1);
if(var15.cs1Instructions != null && var15.cs1Instructions[0][0] == 5) { if(var14.cs1Instructions != null && var14.cs1Instructions[0][0] == 5) {
var17 = var15.cs1Instructions[0][1]; var11 = var14.cs1Instructions[0][1];
Varps.Varps_main[var17] = 1 - Varps.Varps_main[var17]; Varps.Varps_main[var11] = 1 - Varps.Varps_main[var11];
IndexCache.method4703(var17); IndexCache.method4703(var11);
} }
} else if(var2 == 29) { } else if(var2 == 29) {
var8 = Interpreter.method1915(ClientPacket.__gs_bz, Client.packetWriter.isaacCipher); var8 = Interpreter.method1915(ClientPacket.__gs_bz, Client.packetWriter.isaacCipher);
var8.packetBuffer.writeInt(var1); var8.packetBuffer.writeInt(var1);
Client.packetWriter.__q_167(var8); Client.packetWriter.__q_167(var8);
var15 = Huffman.getWidget(var1); var14 = Huffman.getWidget(var1);
if(var15.cs1Instructions != null && var15.cs1Instructions[0][0] == 5) { if(var14.cs1Instructions != null && var14.cs1Instructions[0][0] == 5) {
var17 = var15.cs1Instructions[0][1]; var11 = var14.cs1Instructions[0][1];
if(Varps.Varps_main[var17] != var15.cs1ComparisonValues[0]) { if(Varps.Varps_main[var11] != var14.cs1ComparisonValues[0]) {
Varps.Varps_main[var17] = var15.cs1ComparisonValues[0]; Varps.Varps_main[var11] = var14.cs1ComparisonValues[0];
IndexCache.method4703(var17); IndexCache.method4703(var11);
} }
} }
} else if(var2 == 30) { } else if(var2 == 30) {
@@ -1057,12 +1056,12 @@ public abstract class Actor extends Entity {
} else { } else {
if(var2 == 38) { if(var2 == 38) {
Player.method1281(); Player.method1281();
var13 = Huffman.getWidget(var1); var16 = Huffman.getWidget(var1);
Client.isItemSelected = 1; Client.isItemSelected = 1;
HealthBarDefinition.selectedItemSlot = var0; HealthBarDefinition.selectedItemSlot = var0;
ServerPacket.selectedItemWidget = var1; ServerPacket.selectedItemWidget = var1;
MenuAction.selectedItemId = var3; MenuAction.selectedItemId = var3;
class22.method295(var13); class22.method295(var16);
Client.selectedItemName = BufferedFile.colorStartTag(16748608) + Skills.getItemDefinition(var3).name + BufferedFile.colorStartTag(16777215); Client.selectedItemName = BufferedFile.colorStartTag(16748608) + Skills.getItemDefinition(var3).name + BufferedFile.colorStartTag(16777215);
if(Client.selectedItemName == null) { if(Client.selectedItemName == null) {
Client.selectedItemName = "null"; Client.selectedItemName = "null";
@@ -1117,8 +1116,8 @@ public abstract class Actor extends Entity {
BoundaryObject.__ej_jv = Huffman.getWidget(var1); BoundaryObject.__ej_jv = Huffman.getWidget(var1);
Client.__client_jz = var0; Client.__client_jz = var0;
} else if(var2 == 44) { } else if(var2 == 44) {
var11 = Client.players[var3]; var15 = Client.players[var3];
if(var11 != null) { if(var15 != null) {
Client.mouseCrossX = var6; Client.mouseCrossX = var6;
Client.mouseCrossY = var7; Client.mouseCrossY = var7;
Client.mouseCrossColor = 2; Client.mouseCrossColor = 2;
@@ -1131,8 +1130,8 @@ public abstract class Actor extends Entity {
Client.packetWriter.__q_167(var9); Client.packetWriter.__q_167(var9);
} }
} else if(var2 == 45) { } else if(var2 == 45) {
var11 = Client.players[var3]; var15 = Client.players[var3];
if(var11 != null) { if(var15 != null) {
Client.mouseCrossX = var6; Client.mouseCrossX = var6;
Client.mouseCrossY = var7; Client.mouseCrossY = var7;
Client.mouseCrossColor = 2; Client.mouseCrossColor = 2;
@@ -1145,8 +1144,8 @@ public abstract class Actor extends Entity {
Client.packetWriter.__q_167(var9); Client.packetWriter.__q_167(var9);
} }
} else if(var2 == 46) { } else if(var2 == 46) {
var11 = Client.players[var3]; var15 = Client.players[var3];
if(var11 != null) { if(var15 != null) {
Client.mouseCrossX = var6; Client.mouseCrossX = var6;
Client.mouseCrossY = var7; Client.mouseCrossY = var7;
Client.mouseCrossColor = 2; Client.mouseCrossColor = 2;
@@ -1159,8 +1158,8 @@ public abstract class Actor extends Entity {
Client.packetWriter.__q_167(var9); Client.packetWriter.__q_167(var9);
} }
} else if(var2 == 47) { } else if(var2 == 47) {
var11 = Client.players[var3]; var15 = Client.players[var3];
if(var11 != null) { if(var15 != null) {
Client.mouseCrossX = var6; Client.mouseCrossX = var6;
Client.mouseCrossY = var7; Client.mouseCrossY = var7;
Client.mouseCrossColor = 2; Client.mouseCrossColor = 2;
@@ -1173,8 +1172,8 @@ public abstract class Actor extends Entity {
Client.packetWriter.__q_167(var9); Client.packetWriter.__q_167(var9);
} }
} else if(var2 == 48) { } else if(var2 == 48) {
var11 = Client.players[var3]; var15 = Client.players[var3];
if(var11 != null) { if(var15 != null) {
Client.mouseCrossX = var6; Client.mouseCrossX = var6;
Client.mouseCrossY = var7; Client.mouseCrossY = var7;
Client.mouseCrossColor = 2; Client.mouseCrossColor = 2;
@@ -1187,8 +1186,8 @@ public abstract class Actor extends Entity {
Client.packetWriter.__q_167(var9); Client.packetWriter.__q_167(var9);
} }
} else if(var2 == 49) { } else if(var2 == 49) {
var11 = Client.players[var3]; var15 = Client.players[var3];
if(var11 != null) { if(var15 != null) {
Client.mouseCrossX = var6; Client.mouseCrossX = var6;
Client.mouseCrossY = var7; Client.mouseCrossY = var7;
Client.mouseCrossColor = 2; Client.mouseCrossColor = 2;
@@ -1201,8 +1200,8 @@ public abstract class Actor extends Entity {
Client.packetWriter.__q_167(var9); Client.packetWriter.__q_167(var9);
} }
} else if(var2 == 50) { } else if(var2 == 50) {
var11 = Client.players[var3]; var15 = Client.players[var3];
if(var11 != null) { if(var15 != null) {
Client.mouseCrossX = var6; Client.mouseCrossX = var6;
Client.mouseCrossY = var7; Client.mouseCrossY = var7;
Client.mouseCrossColor = 2; Client.mouseCrossColor = 2;
@@ -1215,8 +1214,8 @@ public abstract class Actor extends Entity {
Client.packetWriter.__q_167(var9); Client.packetWriter.__q_167(var9);
} }
} else if(var2 == 51) { } else if(var2 == 51) {
var11 = Client.players[var3]; var15 = Client.players[var3];
if(var11 != null) { if(var15 != null) {
Client.mouseCrossX = var6; Client.mouseCrossX = var6;
Client.mouseCrossY = var7; Client.mouseCrossY = var7;
Client.mouseCrossColor = 2; Client.mouseCrossColor = 2;
@@ -1229,21 +1228,21 @@ public abstract class Actor extends Entity {
Client.packetWriter.__q_167(var9); Client.packetWriter.__q_167(var9);
} }
} else { } else {
label415: { label921: {
if(var2 != 57) { if(var2 != 57) {
if(var2 == 58) { if(var2 == 58) {
var13 = class204.getWidgetChild(var1, var0); var16 = class204.getWidgetChild(var1, var0);
if(var13 != null) { if(var16 != null) {
var9 = Interpreter.method1915(ClientPacket.__gs_cs, Client.packetWriter.isaacCipher); var9 = Interpreter.method1915(ClientPacket.__gs_cs, Client.packetWriter.isaacCipher);
var9.packetBuffer.writeShortLE(Client.__client_lc); var9.packetBuffer.writeShortLE(Client.__client_lc);
var9.packetBuffer.writeIntLE16(var1); var9.packetBuffer.writeIntLE16(var1);
var9.packetBuffer.writeShortLE(Client.__client_mh); var9.packetBuffer.writeShortLE(Client.__client_mh);
var9.packetBuffer.__bx_323(var0); var9.packetBuffer.__bx_323(var0);
var9.packetBuffer.writeInt(ServerBuild.__iy_lo); var9.packetBuffer.writeInt(ServerBuild.__iy_lo);
var9.packetBuffer.__bx_323(var13.itemId); var9.packetBuffer.__bx_323(var16.itemId);
Client.packetWriter.__q_167(var9); Client.packetWriter.__q_167(var9);
} }
break label415; break label921;
} }
if(var2 == 1001) { if(var2 == 1001) {
@@ -1259,7 +1258,7 @@ public abstract class Actor extends Entity {
var8.packetBuffer.__bo_322(var0 + class50.baseX); var8.packetBuffer.__bo_322(var0 + class50.baseX);
var8.packetBuffer.__bx_323(GraphicsObject.baseY + var1); var8.packetBuffer.__bx_323(GraphicsObject.baseY + var1);
Client.packetWriter.__q_167(var8); Client.packetWriter.__q_167(var8);
break label415; break label921;
} }
if(var2 == 1002) { if(var2 == 1002) {
@@ -1270,7 +1269,7 @@ public abstract class Actor extends Entity {
var8 = Interpreter.method1915(ClientPacket.__gs_al, Client.packetWriter.isaacCipher); var8 = Interpreter.method1915(ClientPacket.__gs_al, Client.packetWriter.isaacCipher);
var8.packetBuffer.__bo_322(var3); var8.packetBuffer.__bo_322(var3);
Client.packetWriter.__q_167(var8); Client.packetWriter.__q_167(var8);
break label415; break label921;
} }
if(var2 == 1003) { if(var2 == 1003) {
@@ -1278,20 +1277,20 @@ public abstract class Actor extends Entity {
Client.mouseCrossY = var7; Client.mouseCrossY = var7;
Client.mouseCrossColor = 2; Client.mouseCrossColor = 2;
Client.mouseCrossState = 0; Client.mouseCrossState = 0;
var10 = Client.npcs[var3]; var13 = Client.npcs[var3];
if(var10 != null) { if(var13 != null) {
NPCDefinition var16 = var10.definition; NpcDefinition var17 = var13.definition;
if(var16.transforms != null) { if(var17.transforms != null) {
var16 = var16.transform(); var17 = var17.transform();
} }
if(var16 != null) { if(var17 != null) {
var12 = Interpreter.method1915(ClientPacket.__gs_ar, Client.packetWriter.isaacCipher); var10 = Interpreter.method1915(ClientPacket.__gs_ar, Client.packetWriter.isaacCipher);
var12.packetBuffer.__bo_322(var16.id); var10.packetBuffer.__bo_322(var17.id);
Client.packetWriter.__q_167(var12); Client.packetWriter.__q_167(var10);
} }
} }
break label415; break label921;
} }
if(var2 == 1004) { if(var2 == 1004) {
@@ -1302,13 +1301,13 @@ public abstract class Actor extends Entity {
var8 = Interpreter.method1915(ClientPacket.__gs_p, Client.packetWriter.isaacCipher); var8 = Interpreter.method1915(ClientPacket.__gs_p, Client.packetWriter.isaacCipher);
var8.packetBuffer.writeShortLE(var3); var8.packetBuffer.writeShortLE(var3);
Client.packetWriter.__q_167(var8); Client.packetWriter.__q_167(var8);
break label415; break label921;
} }
if(var2 == 1005) { if(var2 == 1005) {
var13 = Huffman.getWidget(var1); var16 = Huffman.getWidget(var1);
if(var13 != null && var13.itemQuantities[var0] >= 100000) { if(var16 != null && var16.itemQuantities[var0] >= 100000) {
WorldMapIcon1.method219(27, "", var13.itemQuantities[var0] + " x " + Skills.getItemDefinition(var3).name); WorldMapIcon1.method219(27, "", var16.itemQuantities[var0] + " x " + Skills.getItemDefinition(var3).name);
} else { } else {
var9 = Interpreter.method1915(ClientPacket.__gs_p, Client.packetWriter.isaacCipher); var9 = Interpreter.method1915(ClientPacket.__gs_p, Client.packetWriter.isaacCipher);
var9.packetBuffer.writeShortLE(var3); var9.packetBuffer.writeShortLE(var3);
@@ -1318,20 +1317,20 @@ public abstract class Actor extends Entity {
Client.__client_ju = 0; Client.__client_ju = 0;
BoundaryObject.__ej_jv = Huffman.getWidget(var1); BoundaryObject.__ej_jv = Huffman.getWidget(var1);
Client.__client_jz = var0; Client.__client_jz = var0;
break label415; break label921;
} }
if(var2 != 1007) { if(var2 != 1007) {
if(var2 == 1008 || var2 == 1011 || var2 == 1010 || var2 == 1009 || var2 == 1012) { if(var2 == 1008 || var2 == 1011 || var2 == 1010 || var2 == 1009 || var2 == 1012) {
class60.worldMap0.menuAction(var2, var3, new TileLocation(var0), new TileLocation(var1)); class60.worldMap0.menuAction(var2, var3, new TileLocation(var0), new TileLocation(var1));
} }
break label415; break label921;
} }
} }
var13 = class204.getWidgetChild(var1, var0); var16 = class204.getWidgetChild(var1, var0);
if(var13 != null) { if(var16 != null) {
class171.method3494(var3, var1, var0, var13.itemId, var5); class171.method3494(var3, var1, var0, var16.itemId, var5);
} }
} }
} }

14
runescape-client/src/main/java/Animation.java
View File

@@ -43,6 +43,13 @@ public class Animation {
@Export("hasAlphaTransform") @Export("hasAlphaTransform")
boolean hasAlphaTransform; boolean hasAlphaTransform;
static {
__dz_m = new int[500];
__dz_f = new int[500];
__dz_q = new int[500];
__dz_w = new int[500];
}
@ObfuscatedSignature( @ObfuscatedSignature(
signature = "([BLek;)V" signature = "([BLek;)V"
) )
@@ -126,11 +133,4 @@ public class Animation {
} }
} }
static {
__dz_m = new int[500];
__dz_f = new int[500];
__dz_q = new int[500];
__dz_w = new int[500];
}
} }

79
runescape-client/src/main/java/AttackOption.java
View File

@@ -33,7 +33,6 @@ public enum AttackOption implements Enumerated {
) )
@Export("AttackOption_hidden") @Export("AttackOption_hidden")
AttackOption_hidden(3); AttackOption_hidden(3);
@ObfuscatedName("sp") @ObfuscatedName("sp")
@Export("__cj_sp") @Export("__cj_sp")
static short[] __cj_sp; static short[] __cj_sp;
@@ -53,7 +52,7 @@ public enum AttackOption implements Enumerated {
@Export("id") @Export("id")
final int id; final int id;
private AttackOption(int var3) { AttackOption(int var3) {
this.id = var3; this.id = var3;
} }
@@ -102,45 +101,45 @@ public enum AttackOption implements Enumerated {
char var9; char var9;
if(var7 != 0) { if(var7 != 0) {
var9 = (char)var7; var9 = (char)var7;
boolean var10 = false; boolean var14 = false;
} else { } else {
var9 = var0.charAt(var5++); var9 = var0.charAt(var5++);
} }
char var14; char var10;
if(var8 != 0) { if(var8 != 0) {
var14 = (char)var8; var10 = (char)var8;
boolean var11 = false; boolean var15 = false;
} else { } else {
var14 = var1.charAt(var6++); var10 = var1.charAt(var6++);
} }
byte var16; byte var11;
if(var9 == 198) { if(var9 == 198) {
var16 = 69; var11 = 69;
} else if(var9 == 230) { } else if(var9 == 230) {
var16 = 101; var11 = 101;
} else if(var9 == 223) { } else if(var9 == 223) {
var16 = 115; var11 = 115;
} else if(var9 == 338) { } else if(var9 == 338) {
var16 = 69; var11 = 69;
} else if(var9 == 339) { } else if(var9 == 339) {
var16 = 101; var11 = 101;
} else { } else {
var16 = 0; var11 = 0;
} }
var7 = var16; var7 = var11;
byte var12; byte var12;
if(var14 == 198) { if(var10 == 198) {
var12 = 69; var12 = 69;
} else if(var14 == 230) { } else if(var10 == 230) {
var12 = 101; var12 = 101;
} else if(var14 == 223) { } else if(var10 == 223) {
var12 = 115; var12 = 115;
} else if(var14 == 338) { } else if(var10 == 338) {
var12 = 69; var12 = 69;
} else if(var14 == 339) { } else if(var10 == 339) {
var12 = 101; var12 = 101;
} else { } else {
var12 = 0; var12 = 0;
@@ -148,28 +147,28 @@ public enum AttackOption implements Enumerated {
var8 = var12; var8 = var12;
var9 = class12.method155(var9, var2); var9 = class12.method155(var9, var2);
var14 = class12.method155(var14, var2); var10 = class12.method155(var10, var2);
if(var9 != var14 && Character.toUpperCase(var9) != Character.toUpperCase(var14)) { if(var9 != var10 && Character.toUpperCase(var9) != Character.toUpperCase(var10)) {
var9 = Character.toLowerCase(var9); var9 = Character.toLowerCase(var9);
var14 = Character.toLowerCase(var14); var10 = Character.toLowerCase(var10);
if(var14 != var9) { if(var10 != var9) {
return CollisionMap.method3631(var9, var2) - CollisionMap.method3631(var14, var2); return CollisionMap.method3631(var9, var2) - CollisionMap.method3631(var10, var2);
} }
} }
} }
int var15 = Math.min(var3, var4); int var16 = Math.min(var3, var4);
int var17; int var17;
char var18; char var20;
for(var17 = 0; var17 < var15; ++var17) { for(var17 = 0; var17 < var16; ++var17) {
char var19 = var0.charAt(var17); char var18 = var0.charAt(var17);
var18 = var1.charAt(var17); var20 = var1.charAt(var17);
if(var18 != var19 && Character.toUpperCase(var19) != Character.toUpperCase(var18)) { if(var20 != var18 && Character.toUpperCase(var18) != Character.toUpperCase(var20)) {
var19 = Character.toLowerCase(var19);
var18 = Character.toLowerCase(var18); var18 = Character.toLowerCase(var18);
if(var19 != var18) { var20 = Character.toLowerCase(var20);
return CollisionMap.method3631(var19, var2) - CollisionMap.method3631(var18, var2); if(var18 != var20) {
return CollisionMap.method3631(var18, var2) - CollisionMap.method3631(var20, var2);
} }
} }
} }
@@ -178,11 +177,11 @@ public enum AttackOption implements Enumerated {
if(var17 != 0) { if(var17 != 0) {
return var17; return var17;
} else { } else {
for(int var20 = 0; var20 < var15; ++var20) { for(int var19 = 0; var19 < var16; ++var19) {
var18 = var0.charAt(var20); var20 = var0.charAt(var19);
char var13 = var1.charAt(var20); char var13 = var1.charAt(var19);
if(var18 != var13) { if(var20 != var13) {
return CollisionMap.method3631(var18, var2) - CollisionMap.method3631(var13, var2); return CollisionMap.method3631(var20, var2) - CollisionMap.method3631(var13, var2);
} }
} }
@@ -210,7 +209,7 @@ public enum AttackOption implements Enumerated {
if(var1 >= 24) { if(var1 >= 24) {
throw new IOException(); throw new IOException();
} }
} catch (Exception var3) { } catch (Exception var4) {
for(int var2 = 0; var2 < 24; ++var2) { for(int var2 = 0; var2 < 24; ++var2) {
var0[var2] = -1; var0[var2] = -1;
} }

10
runescape-client/src/main/java/AudioFilter.java
View File

@@ -31,6 +31,11 @@ public class AudioFilter {
@Export("__o") @Export("__o")
int[] __o; int[] __o;
static {
__di_u = new float[2][8];
__di_g = new int[2][8];
}
AudioFilter() { AudioFilter() {
this.__m = new int[2]; this.__m = new int[2];
this.__q = new int[2][2][4]; this.__q = new int[2][2][4];
@@ -153,9 +158,4 @@ public class AudioFilter {
float var1 = 32.703197F * (float)Math.pow(2.0D, (double)var0); float var1 = 32.703197F * (float)Math.pow(2.0D, (double)var0);
return var1 * 3.1415927F / 11025.0F; return var1 * 3.1415927F / 11025.0F;
} }
static {
__di_u = new float[2][8];
__di_g = new int[2][8];
}
} }

8
runescape-client/src/main/java/Bounds.java
View File

@@ -159,10 +159,10 @@ public class Bounds {
int var7 = -var4; int var7 = -var4;
for(int var8 = 0; var7 <= var4; ++var8) { for(int var8 = 0; var7 <= var4; ++var8) {
double var9 = ((double)var7 - var0) / var2; double var15 = ((double)var7 - var0) / var2;
double var11 = Math.exp(-var9 * var9 / 2.0D) / Math.sqrt(6.283185307179586D); double var13 = Math.exp(-var15 * var15 / 2.0D) / Math.sqrt(6.283185307179586D);
double var13 = var11 / var2; double var11 = var13 / var2;
var6[var8] = var13; var6[var8] = var11;
++var7; ++var7;
} }

2
runescape-client/src/main/java/Buddy.java
View File

@@ -82,7 +82,7 @@ public class Buddy extends User {
for(var1 = 0; var1 < Client.npcCount; ++var1) { for(var1 = 0; var1 < Client.npcCount; ++var1) {
int var4 = Client.npcIndices[var1]; int var4 = Client.npcIndices[var1];
NPC var3 = Client.npcs[var4]; Npc var3 = Client.npcs[var4];
if(var3 != null && var3.overheadTextCyclesRemaining > 0) { if(var3 != null && var3.overheadTextCyclesRemaining > 0) {
--var3.overheadTextCyclesRemaining; --var3.overheadTextCyclesRemaining;
if(var3.overheadTextCyclesRemaining == 0) { if(var3.overheadTextCyclesRemaining == 0) {

197
runescape-client/src/main/java/Buffer.java
View File

@@ -1,5 +1,4 @@
import java.math.BigInteger; import java.math.BigInteger;
import java.util.logging.Logger;
import net.runelite.mapping.Export; import net.runelite.mapping.Export;
import net.runelite.mapping.Implements; import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedGetter;
@@ -25,6 +24,42 @@ public class Buffer extends Node {
@Export("index") @Export("index")
public int index; public int index;
static {
__gr_q = new int[256];
int var2;
for(int var1 = 0; var1 < 256; ++var1) {
int var0 = var1;
for(var2 = 0; var2 < 8; ++var2) {
if((var0 & 1) == 1) {
var0 = var0 >>> 1 ^ -306674912;
} else {
var0 >>>= 1;
}
}
__gr_q[var1] = var0;
}
__gr_o = new long[256];
for(var2 = 0; var2 < 256; ++var2) {
long var4 = (long)var2;
for(int var3 = 0; var3 < 8; ++var3) {
if((var4 & 1L) == 1L) {
var4 = var4 >>> 1 ^ -3932672073523589310L;
} else {
var4 >>>= 1;
}
}
__gr_o[var2] = var4;
}
}
public Buffer(int var1) { public Buffer(int var1) {
this.array = Canvas.method862(var1); this.array = Canvas.method862(var1);
this.index = 0; this.index = 0;
@@ -169,22 +204,22 @@ public class Buffer extends Node {
) )
@Export("__j_296") @Export("__j_296")
public void __j_296(CharSequence var1) { public void __j_296(CharSequence var1) {
int var2 = var1.length(); int var3 = var1.length();
int var3 = 0; int var4 = 0;
for(int var4 = 0; var4 < var2; ++var4) { for(int var5 = 0; var5 < var3; ++var5) {
char var5 = var1.charAt(var4); char var6 = var1.charAt(var5);
if(var5 <= 127) { if(var6 <= 127) {
++var3; ++var4;
} else if(var5 <= 2047) { } else if(var6 <= 2047) {
var3 += 2; var4 += 2;
} else { } else {
var3 += 3; var4 += 3;
} }
} }
this.array[++this.index - 1] = 0; this.array[++this.index - 1] = 0;
this.__c_301(var3); this.__c_301(var4);
this.index += class16.method190(this.array, this.index, var1); this.index += class16.method190(this.array, this.index, var1);
} }
@@ -244,14 +279,11 @@ public class Buffer extends Node {
public void writeSmartByteShort(int var1) { public void writeSmartByteShort(int var1) {
if(var1 >= 0 && var1 < 128) { if(var1 >= 0 && var1 < 128) {
this.writeByte(var1); this.writeByte(var1);
} else { } else if(var1 >= 0 && var1 < 32768) {
if(var1 < 0 || var1 >= 32768) {
throw new IllegalArgumentException();
}
this.writeShort(var1 + 32768); this.writeShort(var1 + 32768);
} else {
throw new IllegalArgumentException();
} }
} }
@ObfuscatedName("c") @ObfuscatedName("c")
@@ -440,60 +472,60 @@ public class Buffer extends Node {
if(var2 + this.index > this.array.length) { if(var2 + this.index > this.array.length) {
throw new IllegalStateException(""); throw new IllegalStateException("");
} else { } else {
byte[] var3 = this.array; byte[] var4 = this.array;
int var4 = this.index; int var5 = this.index;
char[] var5 = new char[var2]; char[] var6 = new char[var2];
int var6 = 0; int var7 = 0;
int var7 = var4; int var8 = var5;
int var8; int var11;
for(int var9 = var4 + var2; var7 < var9; var5[var6++] = (char)var8) { for(int var9 = var5 + var2; var8 < var9; var6[var7++] = (char)var11) {
int var10 = var3[var7++] & 255; int var10 = var4[var8++] & 255;
if(var10 < 128) { if(var10 < 128) {
if(var10 == 0) { if(var10 == 0) {
var8 = 65533; var11 = 65533;
} else { } else {
var8 = var10; var11 = var10;
} }
} else if(var10 < 192) { } else if(var10 < 192) {
var8 = 65533; var11 = 65533;
} else if(var10 < 224) { } else if(var10 < 224) {
if(var7 < var9 && (var3[var7] & 192) == 128) { if(var8 < var9 && (var4[var8] & 192) == 128) {
var8 = (var10 & 31) << 6 | var3[var7++] & 63; var11 = (var10 & 31) << 6 | var4[var8++] & 63;
if(var8 < 128) { if(var11 < 128) {
var8 = 65533; var11 = 65533;
} }
} else { } else {
var8 = 65533; var11 = 65533;
} }
} else if(var10 < 240) { } else if(var10 < 240) {
if(var7 + 1 < var9 && (var3[var7] & 192) == 128 && (var3[var7 + 1] & 192) == 128) { if(var8 + 1 < var9 && (var4[var8] & 192) == 128 && (var4[var8 + 1] & 192) == 128) {
var8 = (var10 & 15) << 12 | (var3[var7++] & 63) << 6 | var3[var7++] & 63; var11 = (var10 & 15) << 12 | (var4[var8++] & 63) << 6 | var4[var8++] & 63;
if(var8 < 2048) { if(var11 < 2048) {
var8 = 65533; var11 = 65533;
} }
} else { } else {
var8 = 65533; var11 = 65533;
} }
} else if(var10 < 248) { } else if(var10 < 248) {
if(var7 + 2 < var9 && (var3[var7] & 192) == 128 && (var3[var7 + 1] & 192) == 128 && (var3[var7 + 2] & 192) == 128) { if(var8 + 2 < var9 && (var4[var8] & 192) == 128 && (var4[var8 + 1] & 192) == 128 && (var4[var8 + 2] & 192) == 128) {
var8 = (var10 & 7) << 18 | (var3[var7++] & 63) << 12 | (var3[var7++] & 63) << 6 | var3[var7++] & 63; var11 = (var10 & 7) << 18 | (var4[var8++] & 63) << 12 | (var4[var8++] & 63) << 6 | var4[var8++] & 63;
if(var8 >= 65536 && var8 <= 1114111) { if(var11 >= 65536 && var11 <= 1114111) {
var8 = 65533; var11 = 65533;
} else { } else {
var8 = 65533; var11 = 65533;
} }
} else { } else {
var8 = 65533; var11 = 65533;
} }
} else { } else {
var8 = 65533; var11 = 65533;
} }
} }
String var11 = new String(var5, 0, var6); String var3 = new String(var6, 0, var7);
this.index += var2; this.index += var2;
return var11; return var3;
} }
} }
} }
@@ -725,7 +757,6 @@ public class Buffer extends Node {
byte[] var7 = var6.toByteArray(); byte[] var7 = var6.toByteArray();
this.index = 0; this.index = 0;
this.writeShort(var7.length); this.writeShort(var7.length);
Logger.getAnonymousLogger().warning("unsigned short " + var7.length);
this.__s_297(var7, 0, var7.length); this.__s_297(var7, 0, var7.length);
} }
@@ -736,17 +767,17 @@ public class Buffer extends Node {
) )
@Export("__aa_312") @Export("__aa_312")
public int __aa_312(int var1) { public int __aa_312(int var1) {
byte[] var2 = this.array; byte[] var3 = this.array;
int var3 = this.index; int var4 = this.index;
int var4 = -1; int var5 = -1;
for(int var5 = var1; var5 < var3; ++var5) { for(int var6 = var1; var6 < var4; ++var6) {
var4 = var4 >>> 8 ^ __gr_q[(var4 ^ var2[var5]) & 255]; var5 = var5 >>> 8 ^ __gr_q[(var5 ^ var3[var6]) & 255];
} }
var4 = ~var4; var5 = ~var5;
this.writeInt(var4); this.writeInt(var5);
return var4; return var5;
} }
@ObfuscatedName("ax") @ObfuscatedName("ax")
@@ -757,18 +788,18 @@ public class Buffer extends Node {
@Export("__ax_313") @Export("__ax_313")
public boolean __ax_313() { public boolean __ax_313() {
this.index -= 4; this.index -= 4;
byte[] var1 = this.array; byte[] var2 = this.array;
int var2 = this.index; int var3 = this.index;
int var3 = -1; int var4 = -1;
int var4; int var5;
for(var4 = 0; var4 < var2; ++var4) { for(var5 = 0; var5 < var3; ++var5) {
var3 = var3 >>> 8 ^ __gr_q[(var3 ^ var1[var4]) & 255]; var4 = var4 >>> 8 ^ __gr_q[(var4 ^ var2[var5]) & 255];
} }
var3 = ~var3; var4 = ~var4;
var4 = this.readInt(); var5 = this.readInt();
return var4 == var3; return var5 == var4;
} }
@ObfuscatedName("af") @ObfuscatedName("af")
@@ -1064,40 +1095,4 @@ public class Buffer extends Node {
HealthBarDefinition.HealthBarDefinition_cached.clear(); HealthBarDefinition.HealthBarDefinition_cached.clear();
HealthBarDefinition.HealthBarDefinition_cachedSprites.clear(); HealthBarDefinition.HealthBarDefinition_cachedSprites.clear();
} }
static {
__gr_q = new int[256];
int var0;
for(int var1 = 0; var1 < 256; ++var1) {
int var2 = var1;
for(var0 = 0; var0 < 8; ++var0) {
if((var2 & 1) == 1) {
var2 = var2 >>> 1 ^ -306674912;
} else {
var2 >>>= 1;
}
}
__gr_q[var1] = var2;
}
__gr_o = new long[256];
for(var0 = 0; var0 < 256; ++var0) {
long var4 = (long)var0;
for(int var3 = 0; var3 < 8; ++var3) {
if((var4 & 1L) == 1L) {
var4 = var4 >>> 1 ^ -3932672073523589310L;
} else {
var4 >>>= 1;
}
}
__gr_o[var0] = var4;
}
}
} }

92
runescape-client/src/main/java/BufferedFile.java
View File

@@ -145,86 +145,86 @@ public class BufferedFile {
} }
long var4 = this.__l; long var4 = this.__l;
int var6 = var3; int var7 = var3;
int var7; int var8;
if(this.__l >= this.__q && this.__l < this.__q + (long)this.__w) { if(this.__l >= this.__q && this.__l < this.__q + (long)this.__w) {
var7 = (int)((long)this.__w - (this.__l - this.__q)); var8 = (int)((long)this.__w - (this.__l - this.__q));
if(var7 > var3) { if(var8 > var3) {
var7 = var3; var8 = var3;
} }
System.arraycopy(this.readBuffer, (int)(this.__l - this.__q), var1, var2, var7); System.arraycopy(this.readBuffer, (int)(this.__l - this.__q), var1, var2, var8);
this.__l += (long)var7; this.__l += (long)var8;
var2 += var7; var2 += var8;
var3 -= var7; var3 -= var8;
} }
if(var3 > this.readBuffer.length) { if(var3 > this.readBuffer.length) {
this.accessFile.seek(this.__l); this.accessFile.seek(this.__l);
for(this.__d = this.__l; var3 > 0; var3 -= var7) { for(this.__d = this.__l; var3 > 0; var3 -= var8) {
var7 = this.accessFile.read(var1, var2, var3); var8 = this.accessFile.read(var1, var2, var3);
if(var7 == -1) { if(var8 == -1) {
break; break;
} }
this.__d += (long)var7; this.__d += (long)var8;
this.__l += (long)var7; this.__l += (long)var8;
var2 += var7; var2 += var8;
} }
} else if(var3 > 0) { } else if(var3 > 0) {
this.load(); this.load();
var7 = var3; var8 = var3;
if(var3 > this.__w) { if(var3 > this.__w) {
var7 = this.__w; var8 = this.__w;
} }
System.arraycopy(this.readBuffer, 0, var1, var2, var7); System.arraycopy(this.readBuffer, 0, var1, var2, var8);
var2 += var7; var2 += var8;
var3 -= var7; var3 -= var8;
this.__l += (long)var7; this.__l += (long)var8;
} }
if(-1L != this.__u) { if(-1L != this.__u) {
if(this.__u > this.__l && var3 > 0) { if(this.__u > this.__l && var3 > 0) {
var7 = var2 + (int)(this.__u - this.__l); var8 = var2 + (int)(this.__u - this.__l);
if(var7 > var3 + var2) { if(var8 > var3 + var2) {
var7 = var3 + var2; var8 = var3 + var2;
} }
while(var2 < var7) { while(var2 < var8) {
var1[var2++] = 0; var1[var2++] = 0;
--var3; --var3;
++this.__l; ++this.__l;
} }
} }
long var8 = -1L; long var13 = -1L;
long var10 = -1L; long var10 = -1L;
if(this.__u >= var4 && this.__u < var4 + (long)var6) { if(this.__u >= var4 && this.__u < var4 + (long)var7) {
var8 = this.__u; var13 = this.__u;
} else if(var4 >= this.__u && var4 < this.__u + (long)this.__g) { } else if(var4 >= this.__u && var4 < this.__u + (long)this.__g) {
var8 = var4; var13 = var4;
} }
if((long)this.__g + this.__u > var4 && this.__u + (long)this.__g <= var4 + (long)var6) { if((long)this.__g + this.__u > var4 && this.__u + (long)this.__g <= var4 + (long)var7) {
var10 = (long)this.__g + this.__u; var10 = (long)this.__g + this.__u;
} else if((long)var6 + var4 > this.__u && (long)var6 + var4 <= this.__u + (long)this.__g) { } else if((long)var7 + var4 > this.__u && (long)var7 + var4 <= this.__u + (long)this.__g) {
var10 = (long)var6 + var4; var10 = (long)var7 + var4;
} }
if(var8 > -1L && var10 > var8) { if(var13 > -1L && var10 > var13) {
int var12 = (int)(var10 - var8); int var12 = (int)(var10 - var13);
System.arraycopy(this.writeBuffer, (int)(var8 - this.__u), var1, (int)(var8 - var4) + var2, var12); System.arraycopy(this.writeBuffer, (int)(var13 - this.__u), var1, (int)(var13 - var4) + var2, var12);
if(var10 > this.__l) { if(var10 > this.__l) {
var3 = (int)((long)var3 - (var10 - this.__l)); var3 = (int)((long)var3 - (var10 - this.__l));
this.__l = var10; this.__l = var10;
} }
} }
} }
} catch (IOException var13) { } catch (IOException var16) {
this.__d = -1L; this.__d = -1L;
throw var13; throw var16;
} }
if(var3 > 0) { if(var3 > 0) {
@@ -294,6 +294,7 @@ public class BufferedFile {
if(this.__l - this.__u > (long)this.__g) { if(this.__l - this.__u > (long)this.__g) {
this.__g = (int)(this.__l - this.__u); this.__g = (int)(this.__l - this.__u);
} }
} }
} else { } else {
if(this.__d != this.__l) { if(this.__d != this.__l) {
@@ -307,12 +308,12 @@ public class BufferedFile {
this.__e = this.__d; this.__e = this.__d;
} }
long var10 = -1L; long var9 = -1L;
long var6 = -1L; long var6 = -1L;
if(this.__l >= this.__q && this.__l < (long)this.__w + this.__q) { if(this.__l >= this.__q && this.__l < (long)this.__w + this.__q) {
var10 = this.__l; var9 = this.__l;
} else if(this.__q >= this.__l && this.__q < (long)var3 + this.__l) { } else if(this.__q >= this.__l && this.__q < (long)var3 + this.__l) {
var10 = this.__q; var9 = this.__q;
} }
if(this.__l + (long)var3 > this.__q && (long)var3 + this.__l <= (long)this.__w + this.__q) { if(this.__l + (long)var3 > this.__q && (long)var3 + this.__l <= (long)this.__w + this.__q) {
@@ -321,17 +322,16 @@ public class BufferedFile {
var6 = (long)this.__w + this.__q; var6 = (long)this.__w + this.__q;
} }
if(var10 > -1L && var6 > var10) { if(var9 > -1L && var6 > var9) {
int var8 = (int)(var6 - var10); int var8 = (int)(var6 - var9);
System.arraycopy(var1, (int)(var10 + (long)var2 - this.__l), this.readBuffer, (int)(var10 - this.__q), var8); System.arraycopy(var1, (int)(var9 + (long)var2 - this.__l), this.readBuffer, (int)(var9 - this.__q), var8);
} }
this.__l += (long)var3; this.__l += (long)var3;
} }
} catch (IOException var12) {
} catch (IOException var9) {
this.__d = -1L; this.__d = -1L;
throw var9; throw var12;
} }
} }

113
runescape-client/src/main/java/BufferedSink.java
View File

@@ -142,15 +142,10 @@ public class BufferedSink implements Runnable {
@Export("run") @Export("run")
@ObfuscatedName("run") @ObfuscatedName("run")
public void run() { public void run() {
while(true) { do {
synchronized(this){} int var1;
synchronized(this) {
while(true) { while(true) {
boolean var13 = false;
int var1;
try {
var13 = true;
if(this.exception != null) { if(this.exception != null) {
return; return;
} }
@@ -161,60 +156,50 @@ public class BufferedSink implements Runnable {
var1 = this.capacity - this.position + this.limit; var1 = this.capacity - this.position + this.limit;
} }
if(var1 <= 0) { if(var1 > 0) {
try { break;
this.outputStream.flush();
} catch (IOException var17) {
this.exception = var17;
return;
}
if(this.isClosed()) {
return;
}
try {
this.wait();
} catch (InterruptedException var18) {
;
}
continue;
} }
var13 = false; try {
} finally { this.outputStream.flush();
if(var13) { } catch (IOException var11) {
this.exception = var11;
return;
}
if(this.isClosed()) {
return;
}
try {
this.wait();
} catch (InterruptedException var12) {
; ;
} }
} }
try {
if(var1 + this.position <= this.capacity) {
this.outputStream.write(this.buffer, this.position, var1);
} else {
int var2 = this.capacity - this.position;
this.outputStream.write(this.buffer, this.position, var2);
this.outputStream.write(this.buffer, 0, var1 - var2);
}
} catch (IOException var16) {
IOException var3 = var16;
synchronized(this) {
this.exception = var3;
return;
}
}
synchronized(this) {
this.position = (var1 + this.position) % this.capacity;
}
if(!this.isClosed()) {
break;
}
return;
} }
}
try {
if(var1 + this.position <= this.capacity) {
this.outputStream.write(this.buffer, this.position, var1);
} else {
int var7 = this.capacity - this.position;
this.outputStream.write(this.buffer, this.position, var7);
this.outputStream.write(this.buffer, 0, var1 - var7);
}
} catch (IOException var10) {
IOException var2 = var10;
synchronized(this) {
this.exception = var2;
return;
}
}
synchronized(this) {
this.position = (var1 + this.position) % this.capacity;
}
} while(!this.isClosed());
} }
@ObfuscatedName("m") @ObfuscatedName("m")
@@ -223,13 +208,13 @@ public class BufferedSink implements Runnable {
garbageValue = "449588720" garbageValue = "449588720"
) )
static void method3603() { static void method3603() {
Tiles.__bq_w = (byte[][][])null; Tiles.__bq_w = null;
Fonts.__kz_o = (byte[][][])null; Fonts.__kz_o = null;
class32.__ay_u = (byte[][][])null; class32.__ay_u = null;
class307.__kc_g = (byte[][][])null; class307.__kc_g = null;
Tiles.__bq_a = (int[][][])null; Tiles.__bq_a = null;
Tiles.__bq_l = (byte[][][])null; Tiles.__bq_l = null;
Huffman.__gd_e = (int[][])null; Huffman.__gd_e = null;
class13.__i_x = null; class13.__i_x = null;
Formatting.__cy_d = null; Formatting.__cy_d = null;
class214.__hf_k = null; class214.__hf_k = null;

14
runescape-client/src/main/java/BufferedSource.java
View File

@@ -234,22 +234,22 @@ public class BufferedSource implements Runnable {
} }
} }
int var2; int var7;
try { try {
var2 = this.inputStream.read(this.buffer, this.limit, var1); var7 = this.inputStream.read(this.buffer, this.limit, var1);
if(var2 == -1) { if(var7 == -1) {
throw new EOFException(); throw new EOFException();
} }
} catch (IOException var11) { } catch (IOException var11) {
IOException var4 = var11; IOException var3 = var11;
synchronized(this) { synchronized(this) {
this.exception = var4; this.exception = var3;
return; return;
} }
} }
synchronized(this) { synchronized(this) {
this.limit = (var2 + this.limit) % this.capacity; this.limit = (var7 + this.limit) % this.capacity;
} }
} }
} }
@@ -261,7 +261,7 @@ public class BufferedSource implements Runnable {
) )
static final void method3423(boolean var0) { static final void method3423(boolean var0) {
for(int var1 = 0; var1 < Client.npcCount; ++var1) { for(int var1 = 0; var1 < Client.npcCount; ++var1) {
NPC var2 = Client.npcs[Client.npcIndices[var1]]; Npc var2 = Client.npcs[Client.npcIndices[var1]];
if(var2 != null && var2.isVisible() && var2.definition.isVisible == var0 && var2.definition.__e_435()) { if(var2 != null && var2.isVisible() && var2.definition.isVisible == var0 && var2.definition.__e_435()) {
int var3 = var2.x >> 7; int var3 = var2.x >> 7;
int var4 = var2.y >> 7; int var4 = var2.y >> 7;

60
runescape-client/src/main/java/ByteArrayPool.java
View File

@@ -44,6 +44,15 @@ public class ByteArrayPool {
@Export("indexCache13") @Export("indexCache13")
static IndexCache indexCache13; static IndexCache indexCache13;
static {
ByteArrayPool_smallCount = 0;
ByteArrayPool_mediumCount = 0;
ByteArrayPool_largeCount = 0;
ByteArrayPool_small = new byte[1000][];
ByteArrayPool_medium = new byte[250][];
ByteArrayPool_large = new byte[50][];
}
@ObfuscatedName("f") @ObfuscatedName("f")
@ObfuscatedSignature( @ObfuscatedSignature(
signature = "(IZI)[B", signature = "(IZI)[B",
@@ -83,15 +92,15 @@ public class ByteArrayPool {
} }
if(class179.__fe_e != null) { if(class179.__fe_e != null) {
for(int var3 = 0; var3 < __gi_g.length; ++var3) { for(int var4 = 0; var4 < __gi_g.length; ++var4) {
if(__gi_g[var3] != var0) { if(__gi_g[var4] != var0) {
if(var0 < __gi_g[var3]) { if(var0 < __gi_g[var4]) {
; ;
} }
} else if(WorldMapSection2.__ah_l[var3] > 0) { } else if(WorldMapSection2.__ah_l[var4] > 0) {
byte[] var4 = class179.__fe_e[var3][--WorldMapSection2.__ah_l[var3]]; byte[] var3 = class179.__fe_e[var4][--WorldMapSection2.__ah_l[var4]];
class179.__fe_e[var3][WorldMapSection2.__ah_l[var3]] = null; class179.__fe_e[var4][WorldMapSection2.__ah_l[var4]] = null;
return var4; return var3;
} }
} }
} }
@@ -106,8 +115,8 @@ public class ByteArrayPool {
) )
public static String method4001(int var0, boolean var1) { public static String method4001(int var0, boolean var1) {
if(var1 && var0 >= 0) { if(var1 && var0 >= 0) {
int var2 = var0; int var3 = var0;
String var3; String var2;
if(var1 && var0 >= 0) { if(var1 && var0 >= 0) {
int var4 = 2; int var4 = 2;
@@ -115,37 +124,28 @@ public class ByteArrayPool {
var5 /= 10; var5 /= 10;
} }
char[] var9 = new char[var4]; char[] var6 = new char[var4];
var9[0] = '+'; var6[0] = '+';
for(int var6 = var4 - 1; var6 > 0; --var6) { for(int var7 = var4 - 1; var7 > 0; --var7) {
int var7 = var2; int var8 = var3;
var2 /= 10; var3 /= 10;
int var8 = var7 - var2 * 10; int var9 = var8 - var3 * 10;
if(var8 >= 10) { if(var9 >= 10) {
var9[var6] = (char)(var8 + 87); var6[var7] = (char)(var9 + 87);
} else { } else {
var9[var6] = (char)(var8 + 48); var6[var7] = (char)(var9 + 48);
} }
} }
var3 = new String(var9); var2 = new String(var6);
} else { } else {
var3 = Integer.toString(var0, 10); var2 = Integer.toString(var0, 10);
} }
return var3; return var2;
} else { } else {
return Integer.toString(var0); return Integer.toString(var0);
} }
} }
static {
ByteArrayPool_smallCount = 0;
ByteArrayPool_mediumCount = 0;
ByteArrayPool_largeCount = 0;
ByteArrayPool_small = new byte[1000][];
ByteArrayPool_medium = new byte[250][];
ByteArrayPool_large = new byte[50][];
}
} }

607
runescape-client/src/main/java/Bzip2Decompressor.java
View File

@@ -13,11 +13,14 @@ public final class Bzip2Decompressor {
@Export("Bzip2Decompressor_state") @Export("Bzip2Decompressor_state")
static Bzip2State Bzip2Decompressor_state; static Bzip2State Bzip2Decompressor_state;
static {
Bzip2Decompressor_state = new Bzip2State();
}
@ObfuscatedName("m") @ObfuscatedName("m")
@Export("Bzip2Decompressor_decompress") @Export("Bzip2Decompressor_decompress")
public static int Bzip2Decompressor_decompress(byte[] var0, int var1, byte[] var2, int var3, int var4) { public static int Bzip2Decompressor_decompress(byte[] var0, int var1, byte[] var2, int var3, int var4) {
Bzip2State var5 = Bzip2Decompressor_state; Bzip2State var5 = Bzip2Decompressor_state;
Bzip2State var6 = Bzip2Decompressor_state;
synchronized(Bzip2Decompressor_state) { synchronized(Bzip2Decompressor_state) {
Bzip2Decompressor_state.__g = var2; Bzip2Decompressor_state.__g = var2;
Bzip2Decompressor_state.__l = var4; Bzip2Decompressor_state.__l = var4;
@@ -27,7 +30,7 @@ public final class Bzip2Decompressor {
Bzip2Decompressor_state.__j = 0; Bzip2Decompressor_state.__j = 0;
Bzip2Decompressor_state.__z = 0; Bzip2Decompressor_state.__z = 0;
Bzip2Decompressor_state.__e = 0; Bzip2Decompressor_state.__e = 0;
Bzip2Decompressor_state.surfaceOffsetY = 0; Bzip2Decompressor_state.__n = 0;
method3725(Bzip2Decompressor_state); method3725(Bzip2Decompressor_state);
var1 -= Bzip2Decompressor_state.__k; var1 -= Bzip2Decompressor_state.__k;
Bzip2Decompressor_state.__g = null; Bzip2Decompressor_state.__g = null;
@@ -41,131 +44,131 @@ public final class Bzip2Decompressor {
signature = "(Lgt;)V" signature = "(Lgt;)V"
) )
static void method3705(Bzip2State var0) { static void method3705(Bzip2State var0) {
byte var1 = var0.__i; byte var2 = var0.__i;
int var2 = var0.__a; int var3 = var0.__a;
int var3 = var0.__c; int var4 = var0.__c;
int var4 = var0.__h; int var5 = var0.__h;
int[] var5 = WorldMapSection0.__y_p; int[] var6 = WorldMapSection0.__y_p;
int var6 = var0.__y; int var7 = var0.__y;
byte[] var7 = var0.__x; byte[] var8 = var0.__x;
int var8 = var0.__d; int var9 = var0.__d;
int var9 = var0.__k; int var10 = var0.__k;
int var10 = var0.__ae + 1; int var12 = var0.__ae + 1;
label65: label65:
while(true) { while(true) {
if(var2 > 0) { if(var3 > 0) {
while(true) { while(true) {
if(var9 == 0) { if(var10 == 0) {
break label65; break label65;
} }
if(var2 == 1) { if(var3 == 1) {
if(var9 == 0) { if(var10 == 0) {
var2 = 1; var3 = 1;
break label65; break label65;
} }
var7[var8] = var1; var8[var9] = var2;
++var8; ++var9;
--var9; --var10;
break; break;
} }
var7[var8] = var1; var8[var9] = var2;
--var2; --var3;
++var8; ++var9;
--var9; --var10;
} }
} }
boolean var11 = true; boolean var14 = true;
byte var12; byte var1;
while(var11) { while(var14) {
var11 = false; var14 = false;
if(var3 == var10) { if(var4 == var12) {
var2 = 0; var3 = 0;
break label65; break label65;
} }
var1 = (byte)var4; var2 = (byte)var5;
var6 = var5[var6]; var7 = var6[var7];
var12 = (byte)(var6 & 255); var1 = (byte)(var7 & 255);
var6 >>= 8; var7 >>= 8;
++var3; ++var4;
if(var12 != var4) { if(var1 != var5) {
var4 = var12; var5 = var1;
if(var9 == 0) { if(var10 == 0) {
var2 = 1; var3 = 1;
break label65; break label65;
} }
var7[var8] = var1; var8[var9] = var2;
++var8; ++var9;
--var9; --var10;
var11 = true; var14 = true;
} else if(var3 == var10) { } else if(var4 == var12) {
if(var9 == 0) { if(var10 == 0) {
var2 = 1; var3 = 1;
break label65; break label65;
} }
var7[var8] = var1; var8[var9] = var2;
++var8; ++var9;
--var9; --var10;
var11 = true; var14 = true;
} }
} }
var2 = 2; var3 = 2;
var6 = var5[var6]; var7 = var6[var7];
var12 = (byte)(var6 & 255); var1 = (byte)(var7 & 255);
var6 >>= 8; var7 >>= 8;
++var3; ++var4;
if(var3 != var10) { if(var4 != var12) {
if(var12 != var4) { if(var1 != var5) {
var4 = var12; var5 = var1;
} else { } else {
var2 = 3; var3 = 3;
var6 = var5[var6]; var7 = var6[var7];
var12 = (byte)(var6 & 255); var1 = (byte)(var7 & 255);
var6 >>= 8; var7 >>= 8;
++var3; ++var4;
if(var3 != var10) { if(var4 != var12) {
if(var12 != var4) { if(var1 != var5) {
var4 = var12; var5 = var1;
} else { } else {
var6 = var5[var6]; var7 = var6[var7];
var12 = (byte)(var6 & 255); var1 = (byte)(var7 & 255);
var6 >>= 8; var7 >>= 8;
++var3; ++var4;
var2 = (var12 & 255) + 4; var3 = (var1 & 255) + 4;
var6 = var5[var6]; var7 = var6[var7];
var4 = (byte)(var6 & 255); var5 = (byte)(var7 & 255);
var6 >>= 8; var7 >>= 8;
++var3; ++var4;
} }
} }
} }
} }
} }
int var13 = var0.surfaceOffsetY; int var13 = var0.__n;
var0.surfaceOffsetY += var9 - var9; var0.__n += var10 - var10;
if(var0.surfaceOffsetY < var13) { if(var0.__n < var13) {
; ;
} }
var0.__i = var1; var0.__i = var2;
var0.__a = var2; var0.__a = var3;
var0.__c = var3; var0.__c = var4;
var0.__h = var4; var0.__h = var5;
WorldMapSection0.__y_p = var5; WorldMapSection0.__y_p = var6;
var0.__y = var6; var0.__y = var7;
var0.__x = var7; var0.__x = var8;
var0.__d = var8; var0.__d = var9;
var0.__k = var9; var0.__k = var10;
} }
@ObfuscatedName("q") @ObfuscatedName("q")
@@ -173,9 +176,6 @@ public final class Bzip2Decompressor {
signature = "(Lgt;)V" signature = "(Lgt;)V"
) )
static void method3725(Bzip2State var0) { static void method3725(Bzip2State var0) {
boolean var1 = false;
boolean var2 = false;
boolean var3 = false;
boolean var4 = false; boolean var4 = false;
boolean var5 = false; boolean var5 = false;
boolean var6 = false; boolean var6 = false;
@@ -191,314 +191,314 @@ public final class Bzip2Decompressor {
boolean var16 = false; boolean var16 = false;
boolean var17 = false; boolean var17 = false;
boolean var18 = false; boolean var18 = false;
int var19 = 0; boolean var19 = false;
int[] var20 = null; boolean var20 = false;
int[] var21 = null; boolean var21 = false;
int[] var22 = null; int var22 = 0;
int[] var23 = null;
int[] var24 = null;
int[] var25 = null;
var0.__s = 1; var0.__s = 1;
if(WorldMapSection0.__y_p == null) { if(WorldMapSection0.__y_p == null) {
WorldMapSection0.__y_p = new int[var0.__s * 100000]; WorldMapSection0.__y_p = new int[var0.__s * 100000];
} }
boolean var23 = true; boolean var26 = true;
while(true) { while(true) {
while(var23) { while(var26) {
byte var24 = method3707(var0); byte var1 = method3707(var0);
if(var24 == 23) { if(var1 == 23) {
return; return;
} }
var24 = method3707(var0); var1 = method3707(var0);
var24 = method3707(var0); var1 = method3707(var0);
var24 = method3707(var0); var1 = method3707(var0);
var24 = method3707(var0); var1 = method3707(var0);
var24 = method3707(var0); var1 = method3707(var0);
var24 = method3707(var0); var1 = method3707(var0);
var24 = method3707(var0); var1 = method3707(var0);
var24 = method3707(var0); var1 = method3707(var0);
var24 = method3707(var0); var1 = method3707(var0);
var24 = method3711(var0); var1 = method3711(var0);
if(var24 != 0) { if(var1 != 0) {
; ;
} }
var0.__t = 0; var0.__t = 0;
var24 = method3707(var0); var1 = method3707(var0);
var0.__t = var0.__t << 8 | var24 & 255; var0.__t = var0.__t << 8 | var1 & 255;
var24 = method3707(var0); var1 = method3707(var0);
var0.__t = var0.__t << 8 | var24 & 255; var0.__t = var0.__t << 8 | var1 & 255;
var24 = method3707(var0); var1 = method3707(var0);
var0.__t = var0.__t << 8 | var24 & 255; var0.__t = var0.__t << 8 | var1 & 255;
int var25; int var36;
for(var25 = 0; var25 < 16; ++var25) { for(var36 = 0; var36 < 16; ++var36) {
var24 = method3711(var0); var1 = method3711(var0);
if(var24 == 1) { if(var1 == 1) {
var0.__aq[var25] = true; var0.__aq[var36] = true;
} else { } else {
var0.__aq[var25] = false; var0.__aq[var36] = false;
} }
} }
for(var25 = 0; var25 < 256; ++var25) { for(var36 = 0; var36 < 256; ++var36) {
var0.__ag[var25] = false; var0.__ag[var36] = false;
} }
int var26; int var37;
for(var25 = 0; var25 < 16; ++var25) { for(var36 = 0; var36 < 16; ++var36) {
if(var0.__aq[var25]) { if(var0.__aq[var36]) {
for(var26 = 0; var26 < 16; ++var26) { for(var37 = 0; var37 < 16; ++var37) {
var24 = method3711(var0); var1 = method3711(var0);
if(var24 == 1) { if(var1 == 1) {
var0.__ag[var26 + var25 * 16] = true; var0.__ag[var37 + var36 * 16] = true;
} }
} }
} }
} }
method3710(var0); method3710(var0);
int var27 = var0.__v + 2; int var39 = var0.__v + 2;
int var28 = method3708(3, var0); int var40 = method3708(3, var0);
int var29 = method3708(15, var0); int var41 = method3708(15, var0);
for(var25 = 0; var25 < var29; ++var25) { for(var36 = 0; var36 < var41; ++var36) {
var26 = 0; var37 = 0;
while(true) { while(true) {
var24 = method3711(var0); var1 = method3711(var0);
if(var24 == 0) { if(var1 == 0) {
var0.__ay[var25] = (byte)var26; var0.__ay[var36] = (byte)var37;
break; break;
} }
++var26; ++var37;
} }
} }
byte[] var30 = new byte[6]; byte[] var27 = new byte[6];
byte var31; byte var29;
for(var31 = 0; var31 < var28; var30[var31] = var31++) { for(var29 = 0; var29 < var40; var27[var29] = var29++) {
; ;
} }
for(var25 = 0; var25 < var29; ++var25) { for(var36 = 0; var36 < var41; ++var36) {
var31 = var0.__ay[var25]; var29 = var0.__ay[var36];
byte var32; byte var28;
for(var32 = var30[var31]; var31 > 0; --var31) { for(var28 = var27[var29]; var29 > 0; --var29) {
var30[var31] = var30[var31 - 1]; var27[var29] = var27[var29 - 1];
} }
var30[0] = var32; var27[0] = var28;
var0.__ac[var25] = var32; var0.__ac[var36] = var28;
} }
int var33; int var38;
int var50; for(var38 = 0; var38 < var40; ++var38) {
for(var50 = 0; var50 < var28; ++var50) { int var50 = method3708(5, var0);
var33 = method3708(5, var0);
for(var25 = 0; var25 < var27; ++var25) { for(var36 = 0; var36 < var39; ++var36) {
while(true) { while(true) {
var24 = method3711(var0); var1 = method3711(var0);
if(var24 == 0) { if(var1 == 0) {
var0.__ah[var50][var25] = (byte)var33; var0.__ah[var38][var36] = (byte)var50;
break; break;
} }
var24 = method3711(var0); var1 = method3711(var0);
if(var24 == 0) { if(var1 == 0) {
++var33; ++var50;
} else { } else {
--var33; --var50;
} }
} }
} }
} }
for(var50 = 0; var50 < var28; ++var50) { for(var38 = 0; var38 < var40; ++var38) {
byte var51 = 32; byte var2 = 32;
byte var34 = 0; byte var3 = 0;
for(var25 = 0; var25 < var27; ++var25) { for(var36 = 0; var36 < var39; ++var36) {
if(var0.__ah[var50][var25] > var34) { if(var0.__ah[var38][var36] > var3) {
var34 = var0.__ah[var50][var25]; var3 = var0.__ah[var38][var36];
} }
if(var0.__ah[var50][var25] < var51) { if(var0.__ah[var38][var36] < var2) {
var51 = var0.__ah[var50][var25]; var2 = var0.__ah[var38][var36];
} }
} }
method3706(var0.__ak[var50], var0.__aw[var50], var0.__al[var50], var0.__ah[var50], var51, var34, var27); method3706(var0.__ak[var38], var0.__aw[var38], var0.__al[var38], var0.__ah[var38], var2, var3, var39);
var0.__ab[var50] = var51; var0.__ab[var38] = var2;
} }
var33 = var0.__v + 1; int var42 = var0.__v + 1;
int var52 = -1; int var43 = -1;
byte var35 = 0; byte var44 = 0;
for(var25 = 0; var25 <= 255; ++var25) { for(var36 = 0; var36 <= 255; ++var36) {
var0.__b[var25] = 0; var0.__b[var36] = 0;
} }
int var36 = 4095; int var56 = 4095;
int var37; int var35;
int var38; int var55;
for(var37 = 15; var37 >= 0; --var37) { for(var35 = 15; var35 >= 0; --var35) {
for(var38 = 15; var38 >= 0; --var38) { for(var55 = 15; var55 >= 0; --var55) {
var0.__av[var36] = (byte)(var38 + var37 * 16); var0.__av[var56] = (byte)(var55 + var35 * 16);
--var36; --var56;
} }
var0.__ar[var37] = var36 + 1; var0.__ar[var35] = var56 + 1;
} }
int var39 = 0; int var47 = 0;
byte var40; byte var54;
if(var35 == 0) { if(var44 == 0) {
++var52; ++var43;
var35 = 50; var44 = 50;
var40 = var0.__ac[var52]; var54 = var0.__ac[var43];
var19 = var0.__ab[var40]; var22 = var0.__ab[var54];
var20 = var0.__ak[var40]; var23 = var0.__ak[var54];
var22 = var0.__al[var40]; var25 = var0.__al[var54];
var21 = var0.__aw[var40]; var24 = var0.__aw[var54];
} }
int var41 = var35 - 1; int var45 = var44 - 1;
int var42 = var19; int var51 = var22;
int var43; int var52;
byte var44; byte var53;
for(var43 = method3708(var19, var0); var43 > var20[var42]; var43 = var43 << 1 | var44) { for(var52 = method3708(var22, var0); var52 > var23[var51]; var52 = var52 << 1 | var53) {
++var42; ++var51;
var44 = method3711(var0); var53 = method3711(var0);
} }
int var45 = var22[var43 - var21[var42]]; int var46 = var25[var52 - var24[var51]];
while(true) { while(true) {
while(var45 != var33) { while(var46 != var42) {
int var46; if(var46 != 0 && var46 != 1) {
int var47; int var33 = var46 - 1;
if(var45 != 0 && var45 != 1) { int var30;
var46 = var45 - 1; if(var33 < 16) {
int var48; var30 = var0.__ar[0];
if(var46 < 16) {
var47 = var0.__ar[0];
for(var24 = var0.__av[var47 + var46]; var46 > 3; var46 -= 4) { for(var1 = var0.__av[var30 + var33]; var33 > 3; var33 -= 4) {
var48 = var47 + var46; int var34 = var30 + var33;
var0.__av[var48] = var0.__av[var48 - 1]; var0.__av[var34] = var0.__av[var34 - 1];
var0.__av[var48 - 1] = var0.__av[var48 - 2]; var0.__av[var34 - 1] = var0.__av[var34 - 2];
var0.__av[var48 - 2] = var0.__av[var48 - 3]; var0.__av[var34 - 2] = var0.__av[var34 - 3];
var0.__av[var48 - 3] = var0.__av[var48 - 4]; var0.__av[var34 - 3] = var0.__av[var34 - 4];
} }
while(var46 > 0) { while(var33 > 0) {
var0.__av[var47 + var46] = var0.__av[var47 + var46 - 1]; var0.__av[var30 + var33] = var0.__av[var30 + var33 - 1];
--var46; --var33;
} }
var0.__av[var47] = var24; var0.__av[var30] = var1;
} else { } else {
var48 = var46 / 16; int var31 = var33 / 16;
int var49 = var46 % 16; int var32 = var33 % 16;
var47 = var0.__ar[var48] + var49; var30 = var0.__ar[var31] + var32;
for(var24 = var0.__av[var47]; var47 > var0.__ar[var48]; --var47) { for(var1 = var0.__av[var30]; var30 > var0.__ar[var31]; --var30) {
var0.__av[var47] = var0.__av[var47 - 1]; var0.__av[var30] = var0.__av[var30 - 1];
} }
++var0.__ar[var48]; ++var0.__ar[var31];
while(var48 > 0) { while(var31 > 0) {
--var0.__ar[var48]; --var0.__ar[var31];
var0.__av[var0.__ar[var48]] = var0.__av[var0.__ar[var48 - 1] + 16 - 1]; var0.__av[var0.__ar[var31]] = var0.__av[var0.__ar[var31 - 1] + 16 - 1];
--var48; --var31;
} }
--var0.__ar[0]; --var0.__ar[0];
var0.__av[var0.__ar[0]] = var24; var0.__av[var0.__ar[0]] = var1;
if(var0.__ar[0] == 0) { if(var0.__ar[0] == 0) {
var36 = 4095; var56 = 4095;
for(var37 = 15; var37 >= 0; --var37) { for(var35 = 15; var35 >= 0; --var35) {
for(var38 = 15; var38 >= 0; --var38) { for(var55 = 15; var55 >= 0; --var55) {
var0.__av[var36] = var0.__av[var0.__ar[var37] + var38]; var0.__av[var56] = var0.__av[var0.__ar[var35] + var55];
--var36; --var56;
} }
var0.__ar[var37] = var36 + 1; var0.__ar[var35] = var56 + 1;
} }
} }
} }
++var0.__b[var0.__aj[var24 & 255] & 255]; ++var0.__b[var0.__aj[var1 & 255] & 255];
WorldMapSection0.__y_p[var39] = var0.__aj[var24 & 255] & 255; WorldMapSection0.__y_p[var47] = var0.__aj[var1 & 255] & 255;
++var39; ++var47;
if(var41 == 0) { if(var45 == 0) {
++var52; ++var43;
var41 = 50; var45 = 50;
var40 = var0.__ac[var52]; var54 = var0.__ac[var43];
var19 = var0.__ab[var40]; var22 = var0.__ab[var54];
var20 = var0.__ak[var40]; var23 = var0.__ak[var54];
var22 = var0.__al[var40]; var25 = var0.__al[var54];
var21 = var0.__aw[var40]; var24 = var0.__aw[var54];
} }
--var41; --var45;
var42 = var19; var51 = var22;
for(var43 = method3708(var19, var0); var43 > var20[var42]; var43 = var43 << 1 | var44) { for(var52 = method3708(var22, var0); var52 > var23[var51]; var52 = var52 << 1 | var53) {
++var42; ++var51;
var44 = method3711(var0); var53 = method3711(var0);
} }
var45 = var22[var43 - var21[var42]]; var46 = var25[var52 - var24[var51]];
} else { } else {
var46 = -1; int var48 = -1;
var47 = 1; int var49 = 1;
do { do {
if(var46 == 0) {
var48 += var49;
} else if(var46 == 1) {
var48 += var49 * 2;
}
var49 *= 2;
if(var45 == 0) { if(var45 == 0) {
var46 += var47; ++var43;
} else if(var45 == 1) { var45 = 50;
var46 += var47 * 2; var54 = var0.__ac[var43];
var22 = var0.__ab[var54];
var23 = var0.__ak[var54];
var25 = var0.__al[var54];
var24 = var0.__aw[var54];
} }
var47 *= 2; --var45;
if(var41 == 0) { var51 = var22;
++var52;
var41 = 50; for(var52 = method3708(var22, var0); var52 > var23[var51]; var52 = var52 << 1 | var53) {
var40 = var0.__ac[var52]; ++var51;
var19 = var0.__ab[var40]; var53 = method3711(var0);
var20 = var0.__ak[var40];
var22 = var0.__al[var40];
var21 = var0.__aw[var40];
} }
--var41; var46 = var25[var52 - var24[var51]];
var42 = var19; } while(var46 == 0 || var46 == 1);
for(var43 = method3708(var19, var0); var43 > var20[var42]; var43 = var43 << 1 | var44) { ++var48;
++var42; var1 = var0.__aj[var0.__av[var0.__ar[0]] & 255];
var44 = method3711(var0);
}
var45 = var22[var43 - var21[var42]]; for(var0.__b[var1 & 255] += var48; var48 > 0; --var48) {
} while(var45 == 0 || var45 == 1); WorldMapSection0.__y_p[var47] = var1 & 255;
++var47;
++var46;
var24 = var0.__aj[var0.__av[var0.__ar[0]] & 255];
for(var0.__b[var24 & 255] += var46; var46 > 0; --var46) {
WorldMapSection0.__y_p[var39] = var24 & 255;
++var39;
} }
} }
} }
@@ -507,18 +507,18 @@ public final class Bzip2Decompressor {
var0.__i = 0; var0.__i = 0;
var0.__r[0] = 0; var0.__r[0] = 0;
for(var25 = 1; var25 <= 256; ++var25) { for(var36 = 1; var36 <= 256; ++var36) {
var0.__r[var25] = var0.__b[var25 - 1]; var0.__r[var36] = var0.__b[var36 - 1];
} }
for(var25 = 1; var25 <= 256; ++var25) { for(var36 = 1; var36 <= 256; ++var36) {
var0.__r[var25] += var0.__r[var25 - 1]; var0.__r[var36] += var0.__r[var36 - 1];
} }
for(var25 = 0; var25 < var39; ++var25) { for(var36 = 0; var36 < var47; ++var36) {
var24 = (byte)(WorldMapSection0.__y_p[var25] & 255); var1 = (byte)(WorldMapSection0.__y_p[var36] & 255);
WorldMapSection0.__y_p[var0.__r[var24 & 255]] |= var25 << 8; WorldMapSection0.__y_p[var0.__r[var1 & 255]] |= var36 << 8;
++var0.__r[var24 & 255]; ++var0.__r[var1 & 255];
} }
var0.__y = WorldMapSection0.__y_p[var0.__t] >> 8; var0.__y = WorldMapSection0.__y_p[var0.__t] >> 8;
@@ -527,14 +527,14 @@ public final class Bzip2Decompressor {
var0.__h = (byte)(var0.__y & 255); var0.__h = (byte)(var0.__y & 255);
var0.__y >>= 8; var0.__y >>= 8;
++var0.__c; ++var0.__c;
var0.__ae = var39; var0.__ae = var47;
method3705(var0); method3705(var0);
if(var0.__ae + 1 == var0.__c && var0.__a == 0) { if(var0.__ae + 1 == var0.__c && var0.__a == 0) {
var23 = true; var26 = true;
break; break;
} }
var23 = false; var26 = false;
break; break;
} }
} }
@@ -574,9 +574,9 @@ public final class Bzip2Decompressor {
} }
} }
int var2 = var1.__z >> var1.__j - var0 & (1 << var0) - 1; int var3 = var1.__z >> var1.__j - var0 & (1 << var0) - 1;
var1.__j -= var0; var1.__j -= var0;
return var2; return var3;
} }
@ObfuscatedName("g") @ObfuscatedName("g")
@@ -600,9 +600,8 @@ public final class Bzip2Decompressor {
int var7 = 0; int var7 = 0;
int var8; int var8;
int var9;
for(var8 = var4; var8 <= var5; ++var8) { for(var8 = var4; var8 <= var5; ++var8) {
for(var9 = 0; var9 < var6; ++var9) { for(int var9 = 0; var9 < var6; ++var9) {
if(var8 == var3[var9]) { if(var8 == var3[var9]) {
var2[var7] = var9; var2[var7] = var9;
++var7; ++var7;
@@ -626,12 +625,12 @@ public final class Bzip2Decompressor {
var0[var8] = 0; var0[var8] = 0;
} }
var9 = 0; int var10 = 0;
for(var8 = var4; var8 <= var5; ++var8) { for(var8 = var4; var8 <= var5; ++var8) {
var9 += var1[var8 + 1] - var1[var8]; var10 += var1[var8 + 1] - var1[var8];
var0[var8] = var9 - 1; var0[var8] = var10 - 1;
var9 <<= 1; var10 <<= 1;
} }
for(var8 = var4 + 1; var8 <= var5; ++var8) { for(var8 = var4 + 1; var8 <= var5; ++var8) {
@@ -639,8 +638,4 @@ public final class Bzip2Decompressor {
} }
} }
static {
Bzip2Decompressor_state = new Bzip2State();
}
} }

2
runescape-client/src/main/java/Bzip2State.java
View File

@@ -59,7 +59,7 @@ public final class Bzip2State {
intValue = 1860254567 intValue = 1860254567
) )
@Export("surfaceOffsetY") @Export("surfaceOffsetY")
int surfaceOffsetY; int __n;
@ObfuscatedName("i") @ObfuscatedName("i")
@Export("__i") @Export("__i")
byte __i; byte __i;

63
runescape-client/src/main/java/Canvas.java
View File

@@ -119,22 +119,21 @@ public final class Canvas extends java.awt.Canvas {
static int method861(int var0, Script var1, boolean var2) { static int method861(int var0, Script var1, boolean var2) {
int var3; int var3;
int var4; int var4;
Widget var6;
if(var0 == 100) { if(var0 == 100) {
class179.Interpreter_intStackSize -= 3; class179.Interpreter_intStackSize -= 3;
var3 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize]; var3 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize];
var4 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]; var4 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1];
int var9 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 2]; int var5 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 2];
if(var4 == 0) { if(var4 == 0) {
throw new RuntimeException(); throw new RuntimeException();
} else { } else {
var6 = Huffman.getWidget(var3); Widget var6 = Huffman.getWidget(var3);
if(var6.children == null) { if(var6.children == null) {
var6.children = new Widget[var9 + 1]; var6.children = new Widget[var5 + 1];
} }
if(var6.children.length <= var9) { if(var6.children.length <= var5) {
Widget[] var7 = new Widget[var9 + 1]; Widget[] var7 = new Widget[var5 + 1];
for(int var8 = 0; var8 < var6.children.length; ++var8) { for(int var8 = 0; var8 < var6.children.length; ++var8) {
var7[var8] = var6.children[var8]; var7[var8] = var6.children[var8];
@@ -143,19 +142,19 @@ public final class Canvas extends java.awt.Canvas {
var6.children = var7; var6.children = var7;
} }
if(var9 > 0 && var6.children[var9 - 1] == null) { if(var5 > 0 && var6.children[var5 - 1] == null) {
throw new RuntimeException("" + (var9 - 1)); throw new RuntimeException("" + (var5 - 1));
} else { } else {
Widget var10 = new Widget(); Widget var12 = new Widget();
var10.type = var4; var12.type = var4;
var10.parentId = var10.id = var6.id; var12.parentId = var12.id = var6.id;
var10.childIndex = var9; var12.childIndex = var5;
var10.isIf3 = true; var12.isIf3 = true;
var6.children[var9] = var10; var6.children[var5] = var12;
if(var2) { if(var2) {
WorldMapIcon1.__t_i = var10; WorldMapIcon1.__t_i = var12;
} else { } else {
class12.__n_n = var10; class12.__n_n = var12;
} }
class22.method295(var6); class22.method295(var6);
@@ -163,27 +162,27 @@ public final class Canvas extends java.awt.Canvas {
} }
} }
} else { } else {
Widget var5; Widget var9;
if(var0 == 101) { if(var0 == 101) {
var5 = var2?WorldMapIcon1.__t_i:class12.__n_n; var9 = var2?WorldMapIcon1.__t_i:class12.__n_n;
var6 = Huffman.getWidget(var5.id); Widget var10 = Huffman.getWidget(var9.id);
var6.children[var5.childIndex] = null; var10.children[var9.childIndex] = null;
class22.method295(var6); class22.method295(var10);
return 1; return 1;
} else if(var0 == 102) { } else if(var0 == 102) {
var5 = Huffman.getWidget(Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]); var9 = Huffman.getWidget(Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]);
var5.children = null; var9.children = null;
class22.method295(var5); class22.method295(var9);
return 1; return 1;
} else if(var0 != 200) { } else if(var0 != 200) {
if(var0 == 201) { if(var0 == 201) {
var5 = Huffman.getWidget(Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]); var9 = Huffman.getWidget(Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]);
if(var5 != null) { if(var9 != null) {
Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = 1; Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = 1;
if(var2) { if(var2) {
WorldMapIcon1.__t_i = var5; WorldMapIcon1.__t_i = var9;
} else { } else {
class12.__n_n = var5; class12.__n_n = var9;
} }
} else { } else {
Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = 0; Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = 0;
@@ -197,13 +196,13 @@ public final class Canvas extends java.awt.Canvas {
class179.Interpreter_intStackSize -= 2; class179.Interpreter_intStackSize -= 2;
var3 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize]; var3 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize];
var4 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]; var4 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1];
var6 = class204.getWidgetChild(var3, var4); Widget var11 = class204.getWidgetChild(var3, var4);
if(var6 != null && var4 != -1) { if(var11 != null && var4 != -1) {
Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = 1; Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = 1;
if(var2) { if(var2) {
WorldMapIcon1.__t_i = var6; WorldMapIcon1.__t_i = var11;
} else { } else {
class12.__n_n = var6; class12.__n_n = var11;
} }
} else { } else {
Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = 0; Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = 0;

123
runescape-client/src/main/java/ChatChannel.java
View File

@@ -117,18 +117,18 @@ public class ChatChannel {
var0.spotAnimationFrame = 0; var0.spotAnimationFrame = 0;
} }
int var2 = class50.getSpotAnimationDefinition(var0.spotAnimation).sequence; int var3 = class50.getSpotAnimationDefinition(var0.spotAnimation).sequence;
if(var2 != -1) { if(var3 != -1) {
SequenceDefinition var3 = WorldMapAreaData.getSequenceDefinition(var2); SequenceDefinition var2 = WorldMapAreaData.getSequenceDefinition(var3);
if(var3 != null && var3.frameIds != null) { if(var2 != null && var2.frameIds != null) {
++var0.spotAnimationFrameCycle; ++var0.spotAnimationFrameCycle;
if(var0.spotAnimationFrame < var3.frameIds.length && var0.spotAnimationFrameCycle > var3.frameLengths[var0.spotAnimationFrame]) { if(var0.spotAnimationFrame < var2.frameIds.length && var0.spotAnimationFrameCycle > var2.frameLengths[var0.spotAnimationFrame]) {
var0.spotAnimationFrameCycle = 1; var0.spotAnimationFrameCycle = 1;
++var0.spotAnimationFrame; ++var0.spotAnimationFrame;
Script.method2201(var3, var0.spotAnimationFrame, var0.x, var0.y); Script.method2201(var2, var0.spotAnimationFrame, var0.x, var0.y);
} }
if(var0.spotAnimationFrame >= var3.frameIds.length && (var0.spotAnimationFrame < 0 || var0.spotAnimationFrame >= var3.frameIds.length)) { if(var0.spotAnimationFrame >= var2.frameIds.length && (var0.spotAnimationFrame < 0 || var0.spotAnimationFrame >= var2.frameIds.length)) {
var0.spotAnimation = -1; var0.spotAnimation = -1;
} }
} else { } else {
@@ -217,100 +217,100 @@ public class ChatChannel {
int var4; int var4;
int var5; int var5;
int var6; int var13;
if(var0.type == 2) { if(var0.type == 2) {
var6 = 0; var13 = 0;
for(var4 = 0; var4 < var0.height; ++var4) { for(var4 = 0; var4 < var0.height; ++var4) {
for(var5 = 0; var5 < var0.width; ++var5) { for(var5 = 0; var5 < var0.width; ++var5) {
int var7 = (var0.paddingX + 32) * var5; int var6 = (var0.paddingX + 32) * var5;
int var8 = (var0.paddingY + 32) * var4; int var7 = (var0.paddingY + 32) * var4;
if(var6 < 20) { if(var13 < 20) {
var7 += var0.inventoryXOffsets[var6]; var6 += var0.inventoryXOffsets[var13];
var8 += var0.inventoryYOffsets[var6]; var7 += var0.inventoryYOffsets[var13];
} }
if(var1 >= var7 && var2 >= var8 && var1 < var7 + 32 && var2 < var8 + 32) { if(var1 >= var6 && var2 >= var7 && var1 < var6 + 32 && var2 < var7 + 32) {
Client.dragItemSlotDestination = var6; Client.dragItemSlotDestination = var13;
UserComparator6.__fg_jh = var0; UserComparator6.__fg_jh = var0;
if(var0.itemIds[var6] > 0) { if(var0.itemIds[var13] > 0) {
ItemDefinition var9 = Skills.getItemDefinition(var0.itemIds[var6] - 1); ItemDefinition var8 = Skills.getItemDefinition(var0.itemIds[var13] - 1);
if(Client.isItemSelected == 1 && WorldMapAreaData.method708(class1.getWidgetClickMask(var0))) { if(Client.isItemSelected == 1 && WorldMapAreaData.method708(class1.getWidgetClickMask(var0))) {
if(var0.id != ServerPacket.selectedItemWidget || var6 != HealthBarDefinition.selectedItemSlot) { if(var0.id != ServerPacket.selectedItemWidget || var13 != HealthBarDefinition.selectedItemSlot) {
Tiles.method1106("Use", Client.selectedItemName + " -> " + BufferedFile.colorStartTag(16748608) + var9.name, 31, var9.id, var6, var0.id); Tiles.method1106("Use", Client.selectedItemName + " " + "->" + " " + BufferedFile.colorStartTag(16748608) + var8.name, 31, var8.id, var13, var0.id);
} }
} else if(Client.isSpellSelected && WorldMapAreaData.method708(class1.getWidgetClickMask(var0))) { } else if(Client.isSpellSelected && WorldMapAreaData.method708(class1.getWidgetClickMask(var0))) {
if((FloorDecoration.selectedSpellFlags & 16) == 16) { if((FloorDecoration.selectedSpellFlags & 16) == 16) {
Tiles.method1106(Client.selectedSpellActionName, Client.selectedSpellName + " -> " + BufferedFile.colorStartTag(16748608) + var9.name, 32, var9.id, var6, var0.id); Tiles.method1106(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + BufferedFile.colorStartTag(16748608) + var8.name, 32, var8.id, var13, var0.id);
} }
} else { } else {
String[] var10 = var9.inventoryActions; String[] var9 = var8.inventoryActions;
int var11 = -1; int var10 = -1;
if(Client.shiftClickDrop && WorldMapEvent.method779()) { if(Client.shiftClickDrop && WorldMapEvent.method779()) {
var11 = var9.getShiftClickIndex(); var10 = var8.getShiftClickIndex();
} }
int var12; int var11;
if(WorldMapAreaData.method708(class1.getWidgetClickMask(var0))) { if(WorldMapAreaData.method708(class1.getWidgetClickMask(var0))) {
for(var12 = 4; var12 >= 3; --var12) { for(var11 = 4; var11 >= 3; --var11) {
if(var11 != var12) { if(var10 != var11) {
AccessFile.method2726(var0, var9, var6, var12, false); AccessFile.method2726(var0, var8, var13, var11, false);
} }
} }
} }
if(SecureRandomFuture.method2101(class1.getWidgetClickMask(var0))) { if(SecureRandomFuture.method2101(class1.getWidgetClickMask(var0))) {
Tiles.method1106("Use", BufferedFile.colorStartTag(16748608) + var9.name, 38, var9.id, var6, var0.id); Tiles.method1106("Use", BufferedFile.colorStartTag(16748608) + var8.name, 38, var8.id, var13, var0.id);
} }
if(WorldMapAreaData.method708(class1.getWidgetClickMask(var0))) { if(WorldMapAreaData.method708(class1.getWidgetClickMask(var0))) {
for(var12 = 2; var12 >= 0; --var12) { for(var11 = 2; var11 >= 0; --var11) {
if(var12 != var11) { if(var11 != var10) {
AccessFile.method2726(var0, var9, var6, var12, false); AccessFile.method2726(var0, var8, var13, var11, false);
} }
} }
if(var11 >= 0) { if(var10 >= 0) {
AccessFile.method2726(var0, var9, var6, var11, true); AccessFile.method2726(var0, var8, var13, var10, true);
} }
} }
var10 = var0.itemActions; var9 = var0.itemActions;
if(var10 != null) { if(var9 != null) {
for(var12 = 4; var12 >= 0; --var12) { for(var11 = 4; var11 >= 0; --var11) {
if(var10[var12] != null) { if(var9[var11] != null) {
byte var13 = 0; byte var12 = 0;
if(var12 == 0) { if(var11 == 0) {
var13 = 39; var12 = 39;
} }
if(var12 == 1) { if(var11 == 1) {
var13 = 40; var12 = 40;
} }
if(var12 == 2) { if(var11 == 2) {
var13 = 41; var12 = 41;
} }
if(var12 == 3) { if(var11 == 3) {
var13 = 42; var12 = 42;
} }
if(var12 == 4) { if(var11 == 4) {
var13 = 43; var12 = 43;
} }
Tiles.method1106(var10[var12], BufferedFile.colorStartTag(16748608) + var9.name, var13, var9.id, var6, var0.id); Tiles.method1106(var9[var11], BufferedFile.colorStartTag(16748608) + var8.name, var12, var8.id, var13, var0.id);
} }
} }
} }
Tiles.method1106("Examine", BufferedFile.colorStartTag(16748608) + var9.name, 1005, var9.id, var6, var0.id); Tiles.method1106("Examine", BufferedFile.colorStartTag(16748608) + var8.name, 1005, var8.id, var13, var0.id);
} }
} }
} }
++var6; ++var13;
} }
} }
} }
@@ -318,14 +318,13 @@ public class ChatChannel {
if(var0.isIf3) { if(var0.isIf3) {
if(Client.isSpellSelected) { if(Client.isSpellSelected) {
if(WorldComparator.method58(class1.getWidgetClickMask(var0)) && (FloorDecoration.selectedSpellFlags & 32) == 32) { if(WorldComparator.method58(class1.getWidgetClickMask(var0)) && (FloorDecoration.selectedSpellFlags & 32) == 32) {
Tiles.method1106(Client.selectedSpellActionName, Client.selectedSpellName + " -> " + var0.dataText, 58, 0, var0.childIndex, var0.id); Tiles.method1106(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + var0.dataText, 58, 0, var0.childIndex, var0.id);
} }
} else { } else {
String var14; for(var13 = 9; var13 >= 5; --var13) {
for(var6 = 9; var6 >= 5; --var6) { String var14 = GameShell.method1060(var0, var13);
var14 = GameShell.method1060(var0, var6);
if(var14 != null) { if(var14 != null) {
Tiles.method1106(var14, var0.dataText, 1007, var6 + 1, var0.childIndex, var0.id); Tiles.method1106(var14, var0.dataText, 1007, var13 + 1, var0.childIndex, var0.id);
} }
} }
@@ -335,15 +334,15 @@ public class ChatChannel {
} }
for(var4 = 4; var4 >= 0; --var4) { for(var4 = 4; var4 >= 0; --var4) {
var14 = GameShell.method1060(var0, var4); String var15 = GameShell.method1060(var0, var4);
if(var14 != null) { if(var15 != null) {
class16.insertMenuItem(var14, var0.dataText, 57, var4 + 1, var0.childIndex, var0.id, var0.__fz); class16.insertMenuItem(var15, var0.dataText, 57, var4 + 1, var0.childIndex, var0.id, var0.__fz);
} }
} }
var5 = class1.getWidgetClickMask(var0); var5 = class1.getWidgetClickMask(var0);
boolean var15 = (var5 & 1) != 0; boolean var16 = (var5 & 1) != 0;
if(var15) { if(var16) {
Tiles.method1106("Continue", "", 30, 0, var0.childIndex, var0.id); Tiles.method1106("Continue", "", 30, 0, var0.childIndex, var0.id);
} }
} }

36
runescape-client/src/main/java/ClanChat.java
View File

@@ -100,49 +100,49 @@ public class ClanChat extends UserList {
public final void readUpdate(Buffer var1) { public final void readUpdate(Buffer var1) {
this.__x_473(var1.readStringCp1252NullTerminated()); this.__x_473(var1.readStringCp1252NullTerminated());
long var2 = var1.readLong(); long var2 = var1.readLong();
long var4 = var2; long var5 = var2;
String var6; String var4;
int var7; int var7;
if(var2 > 0L && var2 < 6582952005840035281L) { if(var2 > 0L && var2 < 6582952005840035281L) {
if(var2 % 37L == 0L) { if(var2 % 37L == 0L) {
var6 = null; var4 = null;
} else { } else {
var7 = 0; var7 = 0;
for(long var8 = var2; var8 != 0L; var8 /= 37L) { for(long var13 = var2; var13 != 0L; var13 /= 37L) {
++var7; ++var7;
} }
StringBuilder var11 = new StringBuilder(var7); StringBuilder var15 = new StringBuilder(var7);
while(var4 != 0L) { while(var5 != 0L) {
long var9 = var4; long var11 = var5;
var4 /= 37L; var5 /= 37L;
var11.append(class306.base37Table[(int)(var9 - 37L * var4)]); var15.append(class306.base37Table[(int)(var11 - 37L * var5)]);
} }
var6 = var11.reverse().toString(); var4 = var15.reverse().toString();
} }
} else { } else {
var6 = null; var4 = null;
} }
this.__q_472(var6); this.__q_472(var4);
this.__k = var1.readByte(); this.__k = var1.readByte();
var7 = var1.readUnsignedByte(); var7 = var1.readUnsignedByte();
if(var7 != 255) { if(var7 != 255) {
this.clear(); this.clear();
for(int var12 = 0; var12 < var7; ++var12) { for(int var8 = 0; var8 < var7; ++var8) {
ClanMate var13 = (ClanMate)this.addLastNoPreviousUsername(new Username(var1.readStringCp1252NullTerminated(), this.loginType)); ClanMate var9 = (ClanMate)this.addLastNoPreviousUsername(new Username(var1.readStringCp1252NullTerminated(), this.loginType));
int var10 = var1.__ag_302(); int var10 = var1.__ag_302();
var13.set(var10, ++this.__i - 1); var9.set(var10, ++this.__i - 1);
var13.rank = var1.readByte(); var9.rank = var1.readByte();
var1.readStringCp1252NullTerminated(); var1.readStringCp1252NullTerminated();
this.__cp_475(var13); this.__cp_475(var9);
} }
}
}
} }
@ObfuscatedName("a") @ObfuscatedName("a")

9979
runescape-client/src/main/java/Client.java
View File

File diff suppressed because it is too large Load Diff

46
runescape-client/src/main/java/ClientPacket.java
View File

@@ -626,29 +626,6 @@ public class ClientPacket implements ClientPacketMarker {
@Export("length") @Export("length")
final int length; final int length;
ClientPacket(int var1, int var2) {
this.id = var1;
this.length = var2;
}
@ObfuscatedName("m")
@ObfuscatedSignature(
signature = "(B)[Lis;",
garbageValue = "-26"
)
public static StudioGame[] method3664() {
return new StudioGame[]{StudioGame.__is_q, StudioGame.__is_m, StudioGame.__is_o, StudioGame.__is_u, StudioGame.__is_f, StudioGame.__is_w};
}
@ObfuscatedName("m")
@ObfuscatedSignature(
signature = "(B)[Lcj;",
garbageValue = "-43"
)
static AttackOption[] method3665() {
return new AttackOption[]{AttackOption.AttackOption_hidden, AttackOption.AttackOption_leftClickWhereAvailable, AttackOption.AttackOption_alwaysRightClick, AttackOption.AttackOption_dependsOnCombatLevels};
}
static { static {
__gs_m = new ClientPacket(0, 8); __gs_m = new ClientPacket(0, 8);
__gs_f = new ClientPacket(1, 3); __gs_f = new ClientPacket(1, 3);
@@ -751,4 +728,27 @@ public class ClientPacket implements ClientPacketMarker {
__gs_cc = new ClientPacket(98, 8); __gs_cc = new ClientPacket(98, 8);
__gs_ci = new ClientPacket(99, 7); __gs_ci = new ClientPacket(99, 7);
} }
ClientPacket(int var1, int var2) {
this.id = var1;
this.length = var2;
}
@ObfuscatedName("m")
@ObfuscatedSignature(
signature = "(B)[Lis;",
garbageValue = "-26"
)
public static StudioGame[] method3664() {
return new StudioGame[]{StudioGame.__is_q, StudioGame.__is_m, StudioGame.__is_o, StudioGame.__is_u, StudioGame.__is_f, StudioGame.__is_w};
}
@ObfuscatedName("m")
@ObfuscatedSignature(
signature = "(B)[Lcj;",
garbageValue = "-43"
)
static AttackOption[] method3665() {
return new AttackOption[]{AttackOption.AttackOption_hidden, AttackOption.AttackOption_leftClickWhereAvailable, AttackOption.AttackOption_alwaysRightClick, AttackOption.AttackOption_dependsOnCombatLevels};
}
} }

88
runescape-client/src/main/java/ClientParameter.java
View File

@@ -136,50 +136,6 @@ public class ClientParameter {
@Export("id") @Export("id")
public final String id; public final String id;
ClientParameter(String var1, String var2) {
this.id = var2;
}
@ObfuscatedName("m")
@ObfuscatedSignature(
signature = "(I)Z",
garbageValue = "-1723515140"
)
@Export("loadWorlds")
static boolean loadWorlds() {
try {
if(FriendLoginUpdate.__kn_x == null) {
FriendLoginUpdate.__kn_x = TriBool.urlRequester.request(new URL(ServerBuild.worldsUrl));
} else if(FriendLoginUpdate.__kn_x.isDone()) {
byte[] var0 = FriendLoginUpdate.__kn_x.getResponse();
Buffer var1 = new Buffer(var0);
var1.readInt();
World.worldsCount = var1.__ag_302();
ItemContainer.worlds = new World[World.worldsCount];
World var2;
for(int var3 = 0; var3 < World.worldsCount; var2.index = var3++) {
var2 = ItemContainer.worlds[var3] = new World();
var2.id = var1.__ag_302();
var2.properties = var1.readInt();
var2.host = var1.readStringCp1252NullTerminated();
var2.activity = var1.readStringCp1252NullTerminated();
var2.location = var1.readUnsignedByte();
var2.population = var1.__aq_303();
}
MilliClock.method3400(ItemContainer.worlds, 0, ItemContainer.worlds.length - 1, World.__bt_e, World.__bt_l);
FriendLoginUpdate.__kn_x = null;
return true;
}
} catch (Exception var4) {
var4.printStackTrace();
FriendLoginUpdate.__kn_x = null;
}
return false;
}
static { static {
__ji_m = new ClientParameter("8", "8"); __ji_m = new ClientParameter("8", "8");
__ji_f = new ClientParameter("15", "15"); __ji_f = new ClientParameter("15", "15");
@@ -201,4 +157,48 @@ public class ClientParameter {
__ji_s = new ClientParameter("2", "2"); __ji_s = new ClientParameter("2", "2");
__ji_t = new ClientParameter("19", "19"); __ji_t = new ClientParameter("19", "19");
} }
ClientParameter(String var1, String var2) {
this.id = var2;
}
@ObfuscatedName("m")
@ObfuscatedSignature(
signature = "(I)Z",
garbageValue = "-1723515140"
)
@Export("loadWorlds")
static boolean loadWorlds() {
try {
if(FriendLoginUpdate.__kn_x == null) {
FriendLoginUpdate.__kn_x = TriBool.urlRequester.request(new URL(ServerBuild.worldsUrl));
} else if(FriendLoginUpdate.__kn_x.isDone()) {
byte[] var0 = FriendLoginUpdate.__kn_x.getResponse();
Buffer var1 = new Buffer(var0);
var1.readInt();
World.worldsCount = var1.__ag_302();
ItemContainer.worlds = new World[World.worldsCount];
World var3;
for(int var2 = 0; var2 < World.worldsCount; var3.index = var2++) {
var3 = ItemContainer.worlds[var2] = new World();
var3.id = var1.__ag_302();
var3.properties = var1.readInt();
var3.host = var1.readStringCp1252NullTerminated();
var3.activity = var1.readStringCp1252NullTerminated();
var3.location = var1.readUnsignedByte();
var3.population = var1.__aq_303();
}
MilliClock.method3400(ItemContainer.worlds, 0, ItemContainer.worlds.length - 1, World.__bt_e, World.__bt_l);
FriendLoginUpdate.__kn_x = null;
return true;
}
} catch (Exception var4) {
var4.printStackTrace();
FriendLoginUpdate.__kn_x = null;
}
return false;
}
} }

9
runescape-client/src/main/java/ClientPreferences.java
View File

@@ -44,6 +44,10 @@ public class ClientPreferences {
@Export("parameters") @Export("parameters")
LinkedHashMap parameters; LinkedHashMap parameters;
static {
__bf_m = 6;
}
ClientPreferences() { ClientPreferences() {
this.windowMode = 1; this.windowMode = 1;
this.rememberedUsername = null; this.rememberedUsername = null;
@@ -154,10 +158,5 @@ public class ClientPreferences {
if(GroundItemPile.loadWidgetGroup(var0)) { if(GroundItemPile.loadWidgetGroup(var0)) {
NetFileRequest.method4555(Widget.widgets[var0], -1); NetFileRequest.method4555(Widget.widgets[var0], -1);
} }
}
static {
__bf_m = 6;
} }
} }

24
runescape-client/src/main/java/Clock.java
View File

@@ -41,22 +41,22 @@ public abstract class Clock {
++var2; ++var2;
} }
char var4; StringBuilder var5;
StringBuilder var8; char var8;
for(var8 = new StringBuilder(var2); var0 != 0L; var8.append(var4)) { for(var5 = new StringBuilder(var2); var0 != 0L; var5.append(var8)) {
long var5 = var0; long var6 = var0;
var0 /= 37L; var0 /= 37L;
var4 = class306.base37Table[(int)(var5 - 37L * var0)]; var8 = class306.base37Table[(int)(var6 - 37L * var0)];
if(var4 == '_') { if(var8 == '_') {
int var7 = var8.length() - 1; int var9 = var5.length() - 1;
var8.setCharAt(var7, Character.toUpperCase(var8.charAt(var7))); var5.setCharAt(var9, Character.toUpperCase(var5.charAt(var9)));
var4 = 160; var8 = 160;
} }
} }
var8.reverse(); var5.reverse();
var8.setCharAt(0, Character.toUpperCase(var8.charAt(0))); var5.setCharAt(0, Character.toUpperCase(var5.charAt(0)));
return var8.toString(); return var5.toString();
} }
} else { } else {
return null; return null;

116
runescape-client/src/main/java/Decimator.java
View File

@@ -25,52 +25,51 @@ public class Decimator {
public Decimator(int var1, int var2) { public Decimator(int var1, int var2) {
if(var2 != var1) { if(var2 != var1) {
int var3 = var1; int var4 = var1;
int var4 = var2; int var5 = var2;
if(var2 > var1) { if(var2 > var1) {
var3 = var2; var4 = var2;
var4 = var1; var5 = var1;
} }
int var5; while(var5 != 0) {
while(var4 != 0) { int var6 = var4 % var5;
var5 = var3 % var4;
var3 = var4;
var4 = var5; var4 = var5;
var5 = var6;
} }
var1 /= var3; var1 /= var4;
var2 /= var3; var2 /= var4;
this.inputRate = var1; this.inputRate = var1;
this.outputRate = var2; this.outputRate = var2;
this.table = new int[var1][14]; this.table = new int[var1][14];
for(var5 = 0; var5 < var1; ++var5) { for(int var7 = 0; var7 < var1; ++var7) {
int[] var6 = this.table[var5]; int[] var8 = this.table[var7];
double var7 = (double)var5 / (double)var1 + 6.0D; double var9 = (double)var7 / (double)var1 + 6.0D;
int var9 = (int)Math.floor(var7 - 7.0D + 1.0D); int var11 = (int)Math.floor(var9 - 7.0D + 1.0D);
if(var9 < 0) { if(var11 < 0) {
var9 = 0; var11 = 0;
} }
int var10 = (int)Math.ceil(var7 + 7.0D); int var12 = (int)Math.ceil(var9 + 7.0D);
if(var10 > 14) { if(var12 > 14) {
var10 = 14; var12 = 14;
} }
for(double var11 = (double)var2 / (double)var1; var9 < var10; ++var9) { for(double var13 = (double)var2 / (double)var1; var11 < var12; ++var11) {
double var13 = ((double)var9 - var7) * 3.141592653589793D; double var15 = ((double)var11 - var9) * 3.141592653589793D;
double var15 = var11; double var17 = var13;
if(var13 < -1.0E-4D || var13 > 1.0E-4D) { if(var15 < -1.0E-4D || var15 > 1.0E-4D) {
var15 = var11 * (Math.sin(var13) / var13); var17 = var13 * (Math.sin(var15) / var15);
} }
var15 *= 0.54D + 0.46D * Math.cos(((double)var9 - var7) * 0.2243994752564138D); var17 *= 0.54D + 0.46D * Math.cos(((double)var11 - var9) * 0.2243994752564138D);
var6[var9] = (int)Math.floor(0.5D + var15 * 65536.0D); var8[var11] = (int)Math.floor(0.5D + var17 * 65536.0D);
} }
} }
}
}
} }
@ObfuscatedName("m") @ObfuscatedName("m")
@@ -154,7 +153,6 @@ public class Decimator {
) )
public static final boolean method2490() { public static final boolean method2490() {
KeyHandler var0 = KeyHandler.KeyHandler_instance; KeyHandler var0 = KeyHandler.KeyHandler_instance;
KeyHandler var1 = KeyHandler.KeyHandler_instance;
synchronized(KeyHandler.KeyHandler_instance) { synchronized(KeyHandler.KeyHandler_instance) {
if(KeyHandler.__an_ct == KeyHandler.__an_cc) { if(KeyHandler.__an_ct == KeyHandler.__an_cc) {
return false; return false;
@@ -181,39 +179,39 @@ public class Decimator {
int var6; int var6;
int var7; int var7;
int var8; int var8;
int var9;
int var10;
int var11; int var11;
int var12; int var12;
int var13; int var13;
int var16;
int var17;
if(!ViewportMouse.ViewportMouse_false0) { if(!ViewportMouse.ViewportMouse_false0) {
var5 = Scene.Scene_cameraPitchSine; var5 = Scene.Scene_cameraPitchSine;
var6 = Scene.Scene_cameraPitchCosine; var6 = Scene.Scene_cameraPitchCosine;
var7 = Scene.Scene_cameraYawSine; var7 = Scene.Scene_cameraYawSine;
var8 = Scene.Scene_cameraYawCosine; var8 = Scene.Scene_cameraYawCosine;
byte var14 = 50; byte var9 = 50;
short var15 = 3500; short var10 = 3500;
var9 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var14 / Rasterizer3D.Rasterizer3D_zoom; var11 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var9 / Rasterizer3D.Rasterizer3D_zoom;
var10 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var14 / Rasterizer3D.Rasterizer3D_zoom; var12 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var9 / Rasterizer3D.Rasterizer3D_zoom;
var11 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var15 / Rasterizer3D.Rasterizer3D_zoom; var13 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var10 / Rasterizer3D.Rasterizer3D_zoom;
int var16 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var15 / Rasterizer3D.Rasterizer3D_zoom; int var14 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var10 / Rasterizer3D.Rasterizer3D_zoom;
int var17 = Rasterizer3D.method3007(var10, var14, var6, var5); int var15 = Rasterizer3D.method3007(var12, var9, var6, var5);
var12 = Rasterizer3D.method3008(var10, var14, var6, var5); var16 = Rasterizer3D.method3008(var12, var9, var6, var5);
var10 = var17; var12 = var15;
var17 = Rasterizer3D.method3007(var16, var15, var6, var5); var15 = Rasterizer3D.method3007(var14, var10, var6, var5);
var13 = Rasterizer3D.method3008(var16, var15, var6, var5); var17 = Rasterizer3D.method3008(var14, var10, var6, var5);
var16 = var17; var14 = var15;
var17 = Rasterizer3D.method3005(var9, var12, var8, var7); var15 = Rasterizer3D.method3005(var11, var16, var8, var7);
var12 = Rasterizer3D.method3006(var9, var12, var8, var7); var16 = Rasterizer3D.method3006(var11, var16, var8, var7);
var9 = var17; var11 = var15;
var17 = Rasterizer3D.method3005(var11, var13, var8, var7); var15 = Rasterizer3D.method3005(var13, var17, var8, var7);
var13 = Rasterizer3D.method3006(var11, var13, var8, var7); var17 = Rasterizer3D.method3006(var13, var17, var8, var7);
AccessFile.__dk_o = (var9 + var17) / 2; AccessFile.__dk_o = (var11 + var15) / 2;
ViewportMouse.__dm_u = (var16 + var10) / 2; ViewportMouse.__dm_u = (var14 + var12) / 2;
ViewportMouse.__dm_g = (var13 + var12) / 2; ViewportMouse.__dm_g = (var17 + var16) / 2;
ViewportMouse.__dm_l = (var17 - var9) / 2; ViewportMouse.__dm_l = (var15 - var11) / 2;
class311.__ka_e = (var16 - var10) / 2; class311.__ka_e = (var14 - var12) / 2;
Skeleton.__ek_x = (var13 - var12) / 2; Skeleton.__ek_x = (var17 - var16) / 2;
GraphicsObject.__bw_d = Math.abs(ViewportMouse.__dm_l); GraphicsObject.__bw_d = Math.abs(ViewportMouse.__dm_l);
ViewportMouse.__dm_k = Math.abs(class311.__ka_e); ViewportMouse.__dm_k = Math.abs(class311.__ka_e);
class248.__iu_n = Math.abs(Skeleton.__ek_x); class248.__iu_n = Math.abs(Skeleton.__ek_x);
@@ -223,12 +221,12 @@ public class Decimator {
var6 = var2 + var0.yMid; var6 = var2 + var0.yMid;
var7 = var3 + var0.zMid; var7 = var3 + var0.zMid;
var8 = var0.xMidOffset; var8 = var0.xMidOffset;
var12 = var0.yMidOffset; var16 = var0.yMidOffset;
var13 = var0.zMidOffset; var17 = var0.zMidOffset;
var9 = AccessFile.__dk_o - var5; var11 = AccessFile.__dk_o - var5;
var10 = ViewportMouse.__dm_u - var6; var12 = ViewportMouse.__dm_u - var6;
var11 = ViewportMouse.__dm_g - var7; var13 = ViewportMouse.__dm_g - var7;
return Math.abs(var9) > var8 + GraphicsObject.__bw_d?false:(Math.abs(var10) > var12 + ViewportMouse.__dm_k?false:(Math.abs(var11) > var13 + class248.__iu_n?false:(Math.abs(var11 * class311.__ka_e - var10 * Skeleton.__ek_x) > var13 * ViewportMouse.__dm_k + var12 * class248.__iu_n?false:(Math.abs(var9 * Skeleton.__ek_x - var11 * ViewportMouse.__dm_l) > var8 * class248.__iu_n + var13 * GraphicsObject.__bw_d?false:Math.abs(var10 * ViewportMouse.__dm_l - var9 * class311.__ka_e) <= var8 * ViewportMouse.__dm_k + var12 * GraphicsObject.__bw_d)))); return Math.abs(var11) > var8 + GraphicsObject.__bw_d?false:(Math.abs(var12) > var16 + ViewportMouse.__dm_k?false:(Math.abs(var13) > var17 + class248.__iu_n?false:(Math.abs(var13 * class311.__ka_e - var12 * Skeleton.__ek_x) > var17 * ViewportMouse.__dm_k + var16 * class248.__iu_n?false:(Math.abs(var11 * Skeleton.__ek_x - var13 * ViewportMouse.__dm_l) > var8 * class248.__iu_n + var17 * GraphicsObject.__bw_d?false:Math.abs(var12 * ViewportMouse.__dm_l - var11 * class311.__ka_e) <= var8 * ViewportMouse.__dm_k + var16 * GraphicsObject.__bw_d))));
} }
} }

42
runescape-client/src/main/java/DesktopPlatformInfoProvider.java
View File

@@ -26,14 +26,14 @@ public class DesktopPlatformInfoProvider implements PlatformInfoProvider {
String var2; String var2;
try { try {
var2 = System.getProperty("os.arch").toLowerCase(); var2 = System.getProperty("os.arch").toLowerCase();
} catch (Exception var25) { } catch (Exception var35) {
var2 = ""; var2 = "";
} }
String var3; String var3;
try { try {
var3 = System.getProperty("os.version").toLowerCase(); var3 = System.getProperty("os.version").toLowerCase();
} catch (Exception var24) { } catch (Exception var34) {
var3 = ""; var3 = "";
} }
@@ -43,15 +43,15 @@ public class DesktopPlatformInfoProvider implements PlatformInfoProvider {
try { try {
var4 = System.getProperty("java.vendor"); var4 = System.getProperty("java.vendor");
var5 = System.getProperty("java.version"); var5 = System.getProperty("java.version");
} catch (Exception var23) { } catch (Exception var33) {
; ;
} }
boolean var6; boolean var29;
if(!var2.startsWith("amd64") && !var2.startsWith("x86_64")) { if(!var2.startsWith("amd64") && !var2.startsWith("x86_64")) {
var6 = false; var29 = false;
} else { } else {
var6 = true; var29 = true;
} }
byte var7 = 0; byte var7 = 0;
@@ -129,11 +129,11 @@ public class DesktopPlatformInfoProvider implements PlatformInfoProvider {
var10 = var10 * 10 + (var11 - '0'); var10 = var10 * 10 + (var11 - '0');
++var9; ++var9;
} }
} catch (Exception var28) { } catch (Exception var38) {
; ;
} }
int var29 = var10; int var39 = var10;
var9 = var5.indexOf(46, 2) + 1; var9 = var5.indexOf(46, 2) + 1;
var10 = 0; var10 = 0;
@@ -147,11 +147,11 @@ public class DesktopPlatformInfoProvider implements PlatformInfoProvider {
var10 = var12 - '0' + var10 * 10; var10 = var12 - '0' + var10 * 10;
++var9; ++var9;
} }
} catch (Exception var27) { } catch (Exception var37) {
; ;
} }
int var30 = var10; int var40 = var10;
var9 = var5.indexOf(95, 4) + 1; var9 = var5.indexOf(95, 4) + 1;
var10 = 0; var10 = 0;
@@ -165,27 +165,27 @@ public class DesktopPlatformInfoProvider implements PlatformInfoProvider {
var10 = var13 - '0' + var10 * 10; var10 = var13 - '0' + var10 * 10;
++var9; ++var9;
} }
} catch (Exception var26) { } catch (Exception var36) {
; ;
} }
Runtime.getRuntime(); Runtime.getRuntime();
int var31 = (int)((long)((new Random()).nextInt(31457280) + 230686720) / 1048576L) + 1; int var15 = (int)((long)((new Random()).nextInt(31457280) + 230686720) / 1048576L) + 1;
int var14; int var16;
if(var29 > 3) { if(var39 > 3) {
var14 = Runtime.getRuntime().availableProcessors(); var16 = Runtime.getRuntime().availableProcessors();
} else { } else {
var14 = 0; var16 = 0;
} }
byte var15 = 0; byte var17 = 0;
String var16 = "";
String var17 = "";
String var18 = ""; String var18 = "";
String var19 = ""; String var19 = "";
String var20 = ""; String var20 = "";
String var21 = ""; String var21 = "";
int[] var22 = new int[3]; String var22 = "";
return new PlatformInfo(var1, var6, var7, var8, var29, var30, var10, false, var31, var14, var15, 0, var16, var17, var18, var19, 0, 0, 0, 0, var20, var21, var22, 0, ""); String var23 = "";
int[] var28 = new int[3];
return new PlatformInfo(var1, var29, var7, var8, var39, var40, var10, false, var15, var16, var17, 0, var18, var19, var20, var21, 0, 0, 0, 0, var22, var23, var28, 0, "");
} }
} }

21
runescape-client/src/main/java/DevicePcmPlayer.java
View File

@@ -1,8 +1,8 @@
import javax.sound.sampled.AudioFormat; import javax.sound.sampled.AudioFormat;
import javax.sound.sampled.AudioSystem; import javax.sound.sampled.AudioSystem;
import javax.sound.sampled.DataLine.Info;
import javax.sound.sampled.LineUnavailableException; import javax.sound.sampled.LineUnavailableException;
import javax.sound.sampled.SourceDataLine; import javax.sound.sampled.SourceDataLine;
import javax.sound.sampled.DataLine.Info;
import net.runelite.mapping.Export; import net.runelite.mapping.Export;
import net.runelite.mapping.Implements; import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedGetter;
@@ -53,20 +53,19 @@ public class DevicePcmPlayer extends PcmPlayer {
this.line.start(); this.line.start();
this.capacity2 = var1; this.capacity2 = var1;
} catch (LineUnavailableException var5) { } catch (LineUnavailableException var5) {
int var3 = (var1 >>> 1 & 1431655765) + (var1 & 1431655765); int var4 = (var1 >>> 1 & 1431655765) + (var1 & 1431655765);
var3 = (var3 >>> 2 & 858993459) + (var3 & 858993459); var4 = (var4 >>> 2 & 858993459) + (var4 & 858993459);
var3 = (var3 >>> 4) + var3 & 252645135; var4 = (var4 >>> 4) + var4 & 252645135;
var3 += var3 >>> 8; var4 += var4 >>> 8;
var3 += var3 >>> 16; var4 += var4 >>> 16;
int var4 = var3 & 255; int var3 = var4 & 255;
if(var4 == 1) { if(var3 != 1) {
this.open(World.method1759(var1));
} else {
this.line = null; this.line = null;
throw var5; throw var5;
} }
this.open(World.method1759(var1));
} }
} }
@ObfuscatedName("q") @ObfuscatedName("q")

412
runescape-client/src/main/java/DevicePcmPlayerProvider.java
View File

@@ -219,43 +219,43 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider {
int var17; int var17;
int var18; int var18;
int var19;
int var20; int var20;
int var21; int var21;
int var22; int var22;
int var30;
if(var10.type == 2) { if(var10.type == 2) {
var15 = var2; var15 = var2;
var16 = var3; var16 = var3;
var17 = var4; var17 = var4;
var18 = var5; var18 = var5;
} else if(var10.type == 9) { } else if(var10.type == 9) {
var22 = var12; var30 = var12;
var19 = var13; var20 = var13;
var20 = var12 + var10.width; var21 = var12 + var10.width;
var21 = var13 + var10.height; var22 = var13 + var10.height;
if(var20 < var12) { if(var21 < var12) {
var22 = var20; var30 = var21;
var20 = var12; var21 = var12;
} }
if(var21 < var13) { if(var22 < var13) {
var19 = var21; var20 = var22;
var21 = var13; var22 = var13;
} }
++var20;
++var21; ++var21;
var15 = var22 > var2?var22:var2; ++var22;
var16 = var19 > var3?var19:var3; var15 = var30 > var2?var30:var2;
var17 = var20 < var4?var20:var4; var16 = var20 > var3?var20:var3;
var18 = var21 < var5?var21:var5; var17 = var21 < var4?var21:var4;
var18 = var22 < var5?var22:var5;
} else { } else {
var22 = var12 + var10.width; var30 = var12 + var10.width;
var19 = var13 + var10.height; var20 = var13 + var10.height;
var15 = var12 > var2?var12:var2; var15 = var12 > var2?var12:var2;
var16 = var13 > var3?var13:var3; var16 = var13 > var3?var13:var3;
var17 = var22 < var4?var22:var4; var17 = var30 < var4?var30:var4;
var18 = var19 < var5?var19:var5; var18 = var20 < var5?var20:var5;
} }
if(!var10.isIf3 || var15 < var17 && var16 < var18) { if(!var10.isIf3 || var15 < var17 && var16 < var18) {
@@ -265,14 +265,14 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider {
var13 += 15; var13 += 15;
fontPlain12.drawRightAligned("Fps:" + GameShell.fps, var12 + var10.width, var13, 16776960, -1); fontPlain12.drawRightAligned("Fps:" + GameShell.fps, var12 + var10.width, var13, 16776960, -1);
var13 += 15; var13 += 15;
Runtime var34 = Runtime.getRuntime(); Runtime var38 = Runtime.getRuntime();
var19 = (int)((var34.totalMemory() - var34.freeMemory()) / 1024L); var20 = (int)((var38.totalMemory() - var38.freeMemory()) / 1024L);
var20 = 16776960; var21 = 16776960;
if(var19 > 327680 && !Client.isLowDetail) { if(var20 > 327680 && !Client.isLowDetail) {
var20 = 16711680; var21 = 16711680;
} }
fontPlain12.drawRightAligned("Mem:" + var19 + "k", var12 + var10.width, var13, var20, -1); fontPlain12.drawRightAligned("Mem:" + var20 + "k", var12 + var10.width, var13, var21, -1);
var13 += 15; var13 += 15;
} }
continue; continue;
@@ -332,9 +332,9 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider {
drawWidgetGroup(var10.children, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11); drawWidgetGroup(var10.children, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11);
} }
WidgetGroupParent var23 = (WidgetGroupParent)Client.widgetGroupParents.get((long)var10.id); WidgetGroupParent var19 = (WidgetGroupParent)Client.widgetGroupParents.get((long)var10.id);
if(var23 != null) { if(var19 != null) {
Interpreter.drawWidgets(var23.group, var15, var16, var17, var18, var12, var13, var11); Interpreter.drawWidgets(var19.group, var15, var16, var17, var18, var12, var13, var11);
} }
Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5);
@@ -347,45 +347,45 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider {
} }
if(var10.type != 1) { if(var10.type != 1) {
int var23;
int var24; int var24;
int var25; int var25;
int var26; int var26;
int var33;
if(var10.type == 2) { if(var10.type == 2) {
var22 = 0; var30 = 0;
for(var19 = 0; var19 < var10.rawHeight; ++var19) { for(var20 = 0; var20 < var10.rawHeight; ++var20) {
for(var20 = 0; var20 < var10.rawWidth; ++var20) { for(var21 = 0; var21 < var10.rawWidth; ++var21) {
var21 = var12 + var20 * (var10.paddingX + 32); var22 = var12 + var21 * (var10.paddingX + 32);
var33 = var13 + var19 * (var10.paddingY + 32); var23 = var13 + var20 * (var10.paddingY + 32);
if(var22 < 20) { if(var30 < 20) {
var21 += var10.inventoryXOffsets[var22]; var22 += var10.inventoryXOffsets[var30];
var33 += var10.inventoryYOffsets[var22]; var23 += var10.inventoryYOffsets[var30];
} }
if(var10.itemIds[var22] <= 0) { if(var10.itemIds[var30] <= 0) {
if(var10.inventorySprites != null && var22 < 20) { if(var10.inventorySprites != null && var30 < 20) {
Sprite var36 = var10.getInventorySprite(var22); Sprite var42 = var10.getInventorySprite(var30);
if(var36 != null) { if(var42 != null) {
var36.drawAt2(var21, var33); var42.drawAt2(var22, var23);
} else if(Widget.__ho_j) { } else if(Widget.__ho_j) {
class22.method295(var10); class22.method295(var10);
} }
} }
} else { } else {
boolean var35 = false; boolean var39 = false;
boolean var46 = false; boolean var40 = false;
var26 = var10.itemIds[var22] - 1; var26 = var10.itemIds[var30] - 1;
if(var21 + 32 > var2 && var21 < var4 && var33 + 32 > var3 && var33 < var5 || var10 == dragInventoryWidget && var22 == Client.dragItemSlotSource) { if(var22 + 32 > var2 && var22 < var4 && var23 + 32 > var3 && var23 < var5 || var10 == dragInventoryWidget && var30 == Client.dragItemSlotSource) {
Sprite var42; Sprite var27;
if(Client.isItemSelected == 1 && var22 == HealthBarDefinition.selectedItemSlot && var10.id == ServerPacket.selectedItemWidget) { if(Client.isItemSelected == 1 && var30 == HealthBarDefinition.selectedItemSlot && var10.id == ServerPacket.selectedItemWidget) {
var42 = class226.getItemSprite(var26, var10.itemQuantities[var22], 2, 0, 2, false); var27 = class226.getItemSprite(var26, var10.itemQuantities[var30], 2, 0, 2, false);
} else { } else {
var42 = class226.getItemSprite(var26, var10.itemQuantities[var22], 1, 3153952, 2, false); var27 = class226.getItemSprite(var26, var10.itemQuantities[var30], 1, 3153952, 2, false);
} }
if(var42 != null) { if(var27 != null) {
if(var10 == dragInventoryWidget && var22 == Client.dragItemSlotSource) { if(var10 == dragInventoryWidget && var30 == Client.dragItemSlotSource) {
var24 = MouseHandler.MouseHandler_x - Client.__client_ja; var24 = MouseHandler.MouseHandler_x - Client.__client_ja;
var25 = MouseHandler.MouseHandler_y - Client.__client_je; var25 = MouseHandler.MouseHandler_y - Client.__client_je;
if(var24 < 5 && var24 > -5) { if(var24 < 5 && var24 > -5) {
@@ -401,44 +401,44 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider {
var25 = 0; var25 = 0;
} }
var42.__h_508(var21 + var24, var33 + var25, 128); var27.__h_508(var22 + var24, var23 + var25, 128);
if(var1 != -1) { if(var1 != -1) {
Widget var47 = var0[var1 & 65535]; Widget var28 = var0[var1 & 65535];
int var45; int var29;
if(var33 + var25 < Rasterizer2D.Rasterizer2D_yClipStart && var47.scrollY > 0) { if(var23 + var25 < Rasterizer2D.Rasterizer2D_yClipStart && var28.scrollY > 0) {
var45 = (Rasterizer2D.Rasterizer2D_yClipStart - var33 - var25) * Client.__client_gy / 3; var29 = (Rasterizer2D.Rasterizer2D_yClipStart - var23 - var25) * Client.__client_gy / 3;
if(var45 > Client.__client_gy * 10) { if(var29 > Client.__client_gy * 10) {
var45 = Client.__client_gy * 10; var29 = Client.__client_gy * 10;
} }
if(var45 > var47.scrollY) { if(var29 > var28.scrollY) {
var45 = var47.scrollY; var29 = var28.scrollY;
} }
var47.scrollY -= var45; var28.scrollY -= var29;
Client.__client_je += var45; Client.__client_je += var29;
class22.method295(var47); class22.method295(var28);
} }
if(var25 + var33 + 32 > Rasterizer2D.Rasterizer2D_yClipEnd && var47.scrollY < var47.scrollHeight - var47.height) { if(var25 + var23 + 32 > Rasterizer2D.Rasterizer2D_yClipEnd && var28.scrollY < var28.scrollHeight - var28.height) {
var45 = (var33 + var25 + 32 - Rasterizer2D.Rasterizer2D_yClipEnd) * Client.__client_gy / 3; var29 = (var23 + var25 + 32 - Rasterizer2D.Rasterizer2D_yClipEnd) * Client.__client_gy / 3;
if(var45 > Client.__client_gy * 10) { if(var29 > Client.__client_gy * 10) {
var45 = Client.__client_gy * 10; var29 = Client.__client_gy * 10;
} }
if(var45 > var47.scrollHeight - var47.height - var47.scrollY) { if(var29 > var28.scrollHeight - var28.height - var28.scrollY) {
var45 = var47.scrollHeight - var47.height - var47.scrollY; var29 = var28.scrollHeight - var28.height - var28.scrollY;
} }
var47.scrollY += var45; var28.scrollY += var29;
Client.__client_je -= var45; Client.__client_je -= var29;
class22.method295(var47); class22.method295(var28);
} }
} }
} else if(var10 == BoundaryObject.__ej_jv && var22 == Client.__client_jz) { } else if(var10 == BoundaryObject.__ej_jv && var30 == Client.__client_jz) {
var42.__h_508(var21, var33, 128); var27.__h_508(var22, var23, 128);
} else { } else {
var42.drawAt2(var21, var33); var27.drawAt2(var22, var23);
} }
} else { } else {
class22.method295(var10); class22.method295(var10);
@@ -446,19 +446,19 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider {
} }
} }
++var22; ++var30;
} }
} }
} else if(var10.type == 3) { } else if(var10.type == 3) {
if(class238.runCs1(var10)) { if(class238.runCs1(var10)) {
var22 = var10.color2; var30 = var10.color2;
if(var10 == Clock.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { if(var10 == Clock.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) {
var22 = var10.mouseOverColor2; var30 = var10.mouseOverColor2;
} }
} else { } else {
var22 = var10.color; var30 = var10.color;
if(var10 == Clock.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { if(var10 == Clock.mousedOverWidgetIf1 && var10.mouseOverColor != 0) {
var22 = var10.mouseOverColor; var30 = var10.mouseOverColor;
} }
} }
@@ -472,64 +472,64 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider {
break; break;
default: default:
if(var14 == 0) { if(var14 == 0) {
Rasterizer2D.Rasterizer2D_fillRectangle(var12, var13, var10.width, var10.height, var22); Rasterizer2D.Rasterizer2D_fillRectangle(var12, var13, var10.width, var10.height, var30);
} else { } else {
Rasterizer2D.Rasterizer2D_fillRectangleAlpha(var12, var13, var10.width, var10.height, var22, 256 - (var14 & 255)); Rasterizer2D.Rasterizer2D_fillRectangleAlpha(var12, var13, var10.width, var10.height, var30, 256 - (var14 & 255));
} }
} }
} else if(var14 == 0) { } else if(var14 == 0) {
Rasterizer2D.Rasterizer2D_drawRectangle(var12, var13, var10.width, var10.height, var22); Rasterizer2D.Rasterizer2D_drawRectangle(var12, var13, var10.width, var10.height, var30);
} else { } else {
Rasterizer2D.Rasterizer2D_drawRectangleAlpha(var12, var13, var10.width, var10.height, var22, 256 - (var14 & 255)); Rasterizer2D.Rasterizer2D_drawRectangleAlpha(var12, var13, var10.width, var10.height, var30, 256 - (var14 & 255));
} }
} else { } else {
Font var27; Font var36;
if(var10.type == 4) { if(var10.type == 4) {
var27 = var10.getFont(); var36 = var10.getFont();
if(var27 == null) { if(var36 == null) {
if(Widget.__ho_j) { if(Widget.__ho_j) {
class22.method295(var10); class22.method295(var10);
} }
} else { } else {
String var38 = var10.text; String var45 = var10.text;
if(class238.runCs1(var10)) { if(class238.runCs1(var10)) {
var19 = var10.color2; var20 = var10.color2;
if(var10 == Clock.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { if(var10 == Clock.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) {
var19 = var10.mouseOverColor2; var20 = var10.mouseOverColor2;
} }
if(var10.text2.length() > 0) { if(var10.text2.length() > 0) {
var38 = var10.text2; var45 = var10.text2;
} }
} else { } else {
var19 = var10.color; var20 = var10.color;
if(var10 == Clock.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { if(var10 == Clock.mousedOverWidgetIf1 && var10.mouseOverColor != 0) {
var19 = var10.mouseOverColor; var20 = var10.mouseOverColor;
} }
} }
if(var10.isIf3 && var10.itemId != -1) { if(var10.isIf3 && var10.itemId != -1) {
ItemDefinition var41 = Skills.getItemDefinition(var10.itemId); ItemDefinition var46 = Skills.getItemDefinition(var10.itemId);
var38 = var41.name; var45 = var46.name;
if(var38 == null) { if(var45 == null) {
var38 = "null"; var45 = "null";
} }
if((var41.isStackable == 1 || var10.itemQuantity != 1) && var10.itemQuantity != -1) { if((var46.isStackable == 1 || var10.itemQuantity != 1) && var10.itemQuantity != -1) {
var38 = BufferedFile.colorStartTag(16748608) + var38 + "</col> " + 'x' + GrandExchangeEvent.method88(var10.itemQuantity); var45 = BufferedFile.colorStartTag(16748608) + var45 + "</col>" + " " + 'x' + GrandExchangeEvent.method88(var10.itemQuantity);
} }
} }
if(var10 == Client.__client_mo) { if(var10 == Client.__client_mo) {
var38 = "Please wait..."; var45 = "Please wait...";
var19 = var10.color; var20 = var10.color;
} }
if(!var10.isIf3) { if(!var10.isIf3) {
var38 = MouseRecorder.method1194(var38, var10); var45 = MouseRecorder.method1194(var45, var10);
} }
var27.drawLines(var38, var12, var13, var10.width, var10.height, var19, var10.textShadowed?0:-1, var10.textXAlignment, var10.textYAlignment, var10.textLineHeight); var36.drawLines(var45, var12, var13, var10.width, var10.height, var20, var10.textShadowed?0:-1, var10.textXAlignment, var10.textYAlignment, var10.textLineHeight);
} }
} else if(var10.type == 5) { } else if(var10.type == 5) {
Sprite var37; Sprite var37;
@@ -552,32 +552,32 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider {
class22.method295(var10); class22.method295(var10);
} }
} else { } else {
var19 = var37.width; var20 = var37.width;
var20 = var37.height; var21 = var37.height;
if(!var10.spriteTiling) { if(!var10.spriteTiling) {
var21 = var10.width * 4096 / var19; var22 = var10.width * 4096 / var20;
if(var10.spriteAngle != 0) { if(var10.spriteAngle != 0) {
var37.__ak_515(var10.width / 2 + var12, var10.height / 2 + var13, var10.spriteAngle, var21); var37.__ak_515(var10.width / 2 + var12, var10.height / 2 + var13, var10.spriteAngle, var22);
} else if(var14 != 0) { } else if(var14 != 0) {
var37.__c_509(var12, var13, var10.width, var10.height, 256 - (var14 & 255)); var37.__c_509(var12, var13, var10.width, var10.height, 256 - (var14 & 255));
} else if(var19 == var10.width && var20 == var10.height) { } else if(var20 == var10.width && var21 == var10.height) {
var37.drawAt2(var12, var13); var37.drawAt2(var12, var13);
} else { } else {
var37.__j_506(var12, var13, var10.width, var10.height); var37.__j_506(var12, var13, var10.width, var10.height);
} }
} else { } else {
Rasterizer2D.Rasterizer2D_expandClip(var12, var13, var12 + var10.width, var13 + var10.height); Rasterizer2D.Rasterizer2D_expandClip(var12, var13, var12 + var10.width, var13 + var10.height);
var21 = (var19 - 1 + var10.width) / var19; var22 = (var20 - 1 + var10.width) / var20;
var33 = (var20 - 1 + var10.height) / var20; var23 = (var21 - 1 + var10.height) / var21;
for(var24 = 0; var24 < var21; ++var24) { for(var24 = 0; var24 < var22; ++var24) {
for(var25 = 0; var25 < var33; ++var25) { for(var25 = 0; var25 < var23; ++var25) {
if(var10.spriteAngle != 0) { if(var10.spriteAngle != 0) {
var37.__ak_515(var19 / 2 + var12 + var19 * var24, var20 / 2 + var13 + var25 * var20, var10.spriteAngle, 4096); var37.__ak_515(var20 / 2 + var12 + var20 * var24, var21 / 2 + var13 + var25 * var21, var10.spriteAngle, 4096);
} else if(var14 != 0) { } else if(var14 != 0) {
var37.__h_508(var12 + var19 * var24, var13 + var20 * var25, 256 - (var14 & 255)); var37.__h_508(var12 + var20 * var24, var13 + var21 * var25, 256 - (var14 & 255));
} else { } else {
var37.drawAt2(var12 + var19 * var24, var13 + var25 * var20); var37.drawAt2(var12 + var20 * var24, var13 + var25 * var21);
} }
} }
} }
@@ -587,60 +587,60 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider {
} }
} }
} else { } else {
ItemDefinition var28; ItemDefinition var34;
if(var10.type == 6) { if(var10.type == 6) {
boolean var40 = class238.runCs1(var10); boolean var43 = class238.runCs1(var10);
if(var40) { if(var43) {
var19 = var10.sequenceId2; var20 = var10.sequenceId2;
} else { } else {
var19 = var10.sequenceId; var20 = var10.sequenceId;
} }
Model var43 = null; Model var41 = null;
var21 = 0; var22 = 0;
if(var10.itemId != -1) { if(var10.itemId != -1) {
var28 = Skills.getItemDefinition(var10.itemId); var34 = Skills.getItemDefinition(var10.itemId);
if(var28 != null) { if(var34 != null) {
var28 = var28.__x_430(var10.itemQuantity); var34 = var34.__x_430(var10.itemQuantity);
var43 = var28.getModel(1); var41 = var34.getModel(1);
if(var43 != null) { if(var41 != null) {
var43.calculateBoundsCylinder(); var41.calculateBoundsCylinder();
var21 = var43.height / 2; var22 = var41.height / 2;
} else { } else {
class22.method295(var10); class22.method295(var10);
} }
} }
} else if(var10.modelType == 5) { } else if(var10.modelType == 5) {
if(var10.modelId == 0) { if(var10.modelId == 0) {
var43 = Client.__client_ru.getModel((SequenceDefinition)null, -1, (SequenceDefinition)null, -1); var41 = Client.__client_ru.getModel((SequenceDefinition)null, -1, (SequenceDefinition)null, -1);
} else { } else {
var43 = Canvas.localPlayer.getModel(); var41 = Canvas.localPlayer.getModel();
} }
} else if(var19 == -1) { } else if(var20 == -1) {
var43 = var10.getModel((SequenceDefinition)null, -1, var40, Canvas.localPlayer.appearance); var41 = var10.getModel((SequenceDefinition)null, -1, var43, Canvas.localPlayer.appearance);
if(var43 == null && Widget.__ho_j) { if(var41 == null && Widget.__ho_j) {
class22.method295(var10); class22.method295(var10);
} }
} else { } else {
SequenceDefinition var44 = WorldMapAreaData.getSequenceDefinition(var19); SequenceDefinition var47 = WorldMapAreaData.getSequenceDefinition(var20);
var43 = var10.getModel(var44, var10.modelFrame, var40, Canvas.localPlayer.appearance); var41 = var10.getModel(var47, var10.modelFrame, var43, Canvas.localPlayer.appearance);
if(var43 == null && Widget.__ho_j) { if(var41 == null && Widget.__ho_j) {
class22.method295(var10); class22.method295(var10);
} }
} }
Rasterizer3D.method2989(var10.width / 2 + var12, var10.height / 2 + var13); Rasterizer3D.method2989(var10.width / 2 + var12, var10.height / 2 + var13);
var33 = Rasterizer3D.Rasterizer3D_sine[var10.modelAngleX] * var10.modelZoom >> 16; var23 = Rasterizer3D.Rasterizer3D_sine[var10.modelAngleX] * var10.modelZoom >> 16;
var24 = Rasterizer3D.Rasterizer3D_cosine[var10.modelAngleX] * var10.modelZoom >> 16; var24 = Rasterizer3D.Rasterizer3D_cosine[var10.modelAngleX] * var10.modelZoom >> 16;
if(var43 != null) { if(var41 != null) {
if(!var10.isIf3) { if(!var10.isIf3) {
var43.__c_234(0, var10.modelAngleY, 0, var10.modelAngleX, 0, var33, var24); var41.__c_234(0, var10.modelAngleY, 0, var10.modelAngleX, 0, var23, var24);
} else { } else {
var43.calculateBoundsCylinder(); var41.calculateBoundsCylinder();
if(var10.modelOrthog) { if(var10.modelOrthog) {
var43.__p_235(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var21 + var33 + var10.modelOffsetY, var24 + var10.modelOffsetY, var10.modelZoom); var41.__p_235(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var22 + var23 + var10.modelOffsetY, var24 + var10.modelOffsetY, var10.modelZoom);
} else { } else {
var43.__c_234(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var33 + var21 + var10.modelOffsetY, var24 + var10.modelOffsetY); var41.__c_234(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var23 + var22 + var10.modelOffsetY, var24 + var10.modelOffsetY);
} }
} }
} }
@@ -648,118 +648,118 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider {
Rasterizer3D.Rasterizer3D_method3(); Rasterizer3D.Rasterizer3D_method3();
} else { } else {
if(var10.type == 7) { if(var10.type == 7) {
var27 = var10.getFont(); var36 = var10.getFont();
if(var27 == null) { if(var36 == null) {
if(Widget.__ho_j) { if(Widget.__ho_j) {
class22.method295(var10); class22.method295(var10);
} }
continue; continue;
} }
var19 = 0; var20 = 0;
for(var20 = 0; var20 < var10.rawHeight; ++var20) { for(var21 = 0; var21 < var10.rawHeight; ++var21) {
for(var21 = 0; var21 < var10.rawWidth; ++var21) { for(var22 = 0; var22 < var10.rawWidth; ++var22) {
if(var10.itemIds[var19] > 0) { if(var10.itemIds[var20] > 0) {
var28 = Skills.getItemDefinition(var10.itemIds[var19] - 1); var34 = Skills.getItemDefinition(var10.itemIds[var20] - 1);
String var29; String var31;
if(var28.isStackable != 1 && var10.itemQuantities[var19] == 1) { if(var34.isStackable != 1 && var10.itemQuantities[var20] == 1) {
var29 = BufferedFile.colorStartTag(16748608) + var28.name + "</col>"; var31 = BufferedFile.colorStartTag(16748608) + var34.name + "</col>";
} else { } else {
var29 = BufferedFile.colorStartTag(16748608) + var28.name + "</col> " + 'x' + GrandExchangeEvent.method88(var10.itemQuantities[var19]); var31 = BufferedFile.colorStartTag(16748608) + var34.name + "</col>" + " " + 'x' + GrandExchangeEvent.method88(var10.itemQuantities[var20]);
} }
var25 = var21 * (var10.paddingX + 115) + var12; var25 = var22 * (var10.paddingX + 115) + var12;
var26 = var20 * (var10.paddingY + 12) + var13; var26 = var21 * (var10.paddingY + 12) + var13;
if(var10.textXAlignment == 0) { if(var10.textXAlignment == 0) {
var27.draw(var29, var25, var26, var10.color, var10.textShadowed?0:-1); var36.draw(var31, var25, var26, var10.color, var10.textShadowed?0:-1);
} else if(var10.textXAlignment == 1) { } else if(var10.textXAlignment == 1) {
var27.drawCentered(var29, var10.width / 2 + var25, var26, var10.color, var10.textShadowed?0:-1); var36.drawCentered(var31, var10.width / 2 + var25, var26, var10.color, var10.textShadowed?0:-1);
} else { } else {
var27.drawRightAligned(var29, var25 + var10.width - 1, var26, var10.color, var10.textShadowed?0:-1); var36.drawRightAligned(var31, var25 + var10.width - 1, var26, var10.color, var10.textShadowed?0:-1);
} }
} }
++var19; ++var20;
} }
} }
} }
if(var10.type == 8 && var10 == AccessFile.__dk_lm && Client.__client_ls == Client.__client_lb) { if(var10.type == 8 && var10 == AccessFile.__dk_lm && Client.__client_ls == Client.__client_lb) {
var22 = 0; var30 = 0;
var19 = 0; var20 = 0;
Font var39 = fontPlain12; Font var32 = fontPlain12;
String var30 = var10.text; String var33 = var10.text;
String var31; String var44;
for(var30 = MouseRecorder.method1194(var30, var10); var30.length() > 0; var19 = var19 + var39.ascent + 1) { for(var33 = MouseRecorder.method1194(var33, var10); var33.length() > 0; var20 = var20 + var32.ascent + 1) {
var24 = var30.indexOf("<br>"); var24 = var33.indexOf("<br>");
if(var24 != -1) { if(var24 != -1) {
var31 = var30.substring(0, var24); var44 = var33.substring(0, var24);
var30 = var30.substring(var24 + 4); var33 = var33.substring(var24 + 4);
} else { } else {
var31 = var30; var44 = var33;
var30 = ""; var33 = "";
} }
var25 = var39.stringWidth(var31); var25 = var32.stringWidth(var44);
if(var25 > var22) { if(var25 > var30) {
var22 = var25; var30 = var25;
} }
} }
var22 += 6; var30 += 6;
var19 += 7; var20 += 7;
var24 = var12 + var10.width - 5 - var22; var24 = var12 + var10.width - 5 - var30;
var25 = var13 + var10.height + 5; var25 = var13 + var10.height + 5;
if(var24 < var12 + 5) { if(var24 < var12 + 5) {
var24 = var12 + 5; var24 = var12 + 5;
} }
if(var22 + var24 > var4) { if(var30 + var24 > var4) {
var24 = var4 - var22; var24 = var4 - var30;
} }
if(var25 + var19 > var5) { if(var25 + var20 > var5) {
var25 = var5 - var19; var25 = var5 - var20;
} }
Rasterizer2D.Rasterizer2D_fillRectangle(var24, var25, var22, var19, 16777120); Rasterizer2D.Rasterizer2D_fillRectangle(var24, var25, var30, var20, 16777120);
Rasterizer2D.Rasterizer2D_drawRectangle(var24, var25, var22, var19, 0); Rasterizer2D.Rasterizer2D_drawRectangle(var24, var25, var30, var20, 0);
var30 = var10.text; var33 = var10.text;
var26 = var25 + var39.ascent + 2; var26 = var25 + var32.ascent + 2;
for(var30 = MouseRecorder.method1194(var30, var10); var30.length() > 0; var26 = var26 + var39.ascent + 1) { for(var33 = MouseRecorder.method1194(var33, var10); var33.length() > 0; var26 = var26 + var32.ascent + 1) {
int var32 = var30.indexOf("<br>"); int var35 = var33.indexOf("<br>");
if(var32 != -1) { if(var35 != -1) {
var31 = var30.substring(0, var32); var44 = var33.substring(0, var35);
var30 = var30.substring(var32 + 4); var33 = var33.substring(var35 + 4);
} else { } else {
var31 = var30; var44 = var33;
var30 = ""; var33 = "";
} }
var39.draw(var31, var24 + 3, var26, 0, -1); var32.draw(var44, var24 + 3, var26, 0, -1);
} }
} }
if(var10.type == 9) { if(var10.type == 9) {
if(var10.__ba) { if(var10.__ba) {
var22 = var12; var30 = var12;
var19 = var13 + var10.height; var20 = var13 + var10.height;
var20 = var12 + var10.width; var21 = var12 + var10.width;
var21 = var13; var22 = var13;
} else { } else {
var22 = var12; var30 = var12;
var19 = var13; var20 = var13;
var20 = var12 + var10.width; var21 = var12 + var10.width;
var21 = var13 + var10.height; var22 = var13 + var10.height;
} }
if(var10.lineWid == 1) { if(var10.lineWid == 1) {
Rasterizer2D.Rasterizer2D_drawLine(var22, var19, var20, var21, var10.color); Rasterizer2D.Rasterizer2D_drawLine(var30, var20, var21, var22, var10.color);
} else { } else {
class190.method3669(var22, var19, var20, var21, var10.color, var10.lineWid); class190.method3669(var30, var20, var21, var22, var10.color, var10.lineWid);
} }
} }
} }
@@ -790,7 +790,7 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider {
var3.modelFrameCycle = 0; var3.modelFrameCycle = 0;
} }
} }
}
}
} }
} }

1
runescape-client/src/main/java/DualNode.java
View File

@@ -31,6 +31,5 @@ public class DualNode extends Node {
this.previousDual = null; this.previousDual = null;
this.nextDual = null; this.nextDual = null;
} }
} }
} }

500
runescape-client/src/main/java/DynamicObject.java
View File

@@ -114,11 +114,11 @@ public class DynamicObject extends Entity {
var1 = 100; var1 = 100;
} }
label47: { label55: {
do { do {
do { do {
if(var1 <= this.sequenceDefinition.frameLengths[this.frame]) { if(var1 <= this.sequenceDefinition.frameLengths[this.frame]) {
break label47; break label55;
} }
var1 -= this.sequenceDefinition.frameLengths[this.frame]; var1 -= this.sequenceDefinition.frameLengths[this.frame];
@@ -219,42 +219,41 @@ public class DynamicObject extends Entity {
} }
Client.__client_pl = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 2]; Client.__client_pl = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 2];
PacketBufferNode var15 = Interpreter.method1915(ClientPacket.__gs_z, Client.packetWriter.isaacCipher); PacketBufferNode var18 = Interpreter.method1915(ClientPacket.__gs_z, Client.packetWriter.isaacCipher);
var15.packetBuffer.writeByte(Client.publicChatMode); var18.packetBuffer.writeByte(Client.publicChatMode);
var15.packetBuffer.writeByte(IndexCacheLoader.field512.field3804); var18.packetBuffer.writeByte(IndexCacheLoader.field512.field3804);
var15.packetBuffer.writeByte(Client.__client_pl); var18.packetBuffer.writeByte(Client.__client_pl);
Client.packetWriter.__q_167(var15); Client.packetWriter.__q_167(var18);
return 1; return 1;
} else { } else {
String var3; String var3;
int var4; int var4;
int var5;
if(var0 == 5002) { if(var0 == 5002) {
var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
class179.Interpreter_intStackSize -= 2; class179.Interpreter_intStackSize -= 2;
var4 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize]; var4 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize];
var5 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]; int var5 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1];
PacketBufferNode var13 = Interpreter.method1915(ClientPacket.__gs_ae, Client.packetWriter.isaacCipher); PacketBufferNode var6 = Interpreter.method1915(ClientPacket.__gs_ae, Client.packetWriter.isaacCipher);
var13.packetBuffer.writeByte(WorldMapRegion.method550(var3) + 2); var6.packetBuffer.writeByte(WorldMapRegion.method550(var3) + 2);
var13.packetBuffer.writeStringCp1252NullTerminated(var3); var6.packetBuffer.writeStringCp1252NullTerminated(var3);
var13.packetBuffer.writeByte(var4 - 1); var6.packetBuffer.writeByte(var4 - 1);
var13.packetBuffer.writeByte(var5); var6.packetBuffer.writeByte(var5);
Client.packetWriter.__q_167(var13); Client.packetWriter.__q_167(var6);
return 1; return 1;
} else { } else {
Message var11; int var10;
if(var0 == 5003) { if(var0 == 5003) {
class179.Interpreter_intStackSize -= 2; class179.Interpreter_intStackSize -= 2;
var5 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize]; var10 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize];
var4 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]; var4 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1];
var11 = Message.method1226(var5, var4); Message var15 = Message.method1226(var10, var4);
if(var11 != null) { if(var15 != null) {
Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var11.count; Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var15.count;
Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var11.cycle; Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var15.cycle;
Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var11.sender != null?var11.sender:""; Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var15.sender != null?var15.sender:"";
Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var11.prefix != null?var11.prefix:""; Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var15.prefix != null?var15.prefix:"";
Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var11.text != null?var11.text:""; Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var15.text != null?var15.text:"";
Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var11.isFromFriend()?1:(var11.isFromIgnored()?2:0); Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var15.isFromFriend()?1:(var15.isFromIgnored()?2:0);
} else { } else {
Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = -1; Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = -1;
Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = 0; Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = 0;
@@ -266,15 +265,15 @@ public class DynamicObject extends Entity {
return 1; return 1;
} else if(var0 == 5004) { } else if(var0 == 5004) {
var5 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; var10 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
var11 = NetCache.method4708(var5); Message var16 = NetCache.method4708(var10);
if(var11 != null) { if(var16 != null) {
Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var11.type; Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var16.type;
Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var11.cycle; Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var16.cycle;
Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var11.sender != null?var11.sender:""; Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var16.sender != null?var16.sender:"";
Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var11.prefix != null?var11.prefix:""; Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var16.prefix != null?var16.prefix:"";
Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var11.text != null?var11.text:""; Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var16.text != null?var16.text:"";
Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var11.isFromFriend()?1:(var11.isFromIgnored()?2:0); Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var16.isFromFriend()?1:(var16.isFromIgnored()?2:0);
} else { } else {
Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = -1; Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = -1;
Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = 0; Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = 0;
@@ -293,190 +292,187 @@ public class DynamicObject extends Entity {
} }
return 1; return 1;
} else { } else if(var0 == 5008) {
String var6; var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
if(var0 == 5008) { var4 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; String var14 = var3.toLowerCase();
var4 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; byte var17 = 0;
var6 = var3.toLowerCase(); if(var14.startsWith("yellow:")) {
byte var12 = 0; var17 = 0;
if(var6.startsWith("yellow:")) { var3 = var3.substring("yellow:".length());
var12 = 0; } else if(var14.startsWith("red:")) {
var17 = 1;
var3 = var3.substring("red:".length());
} else if(var14.startsWith("green:")) {
var17 = 2;
var3 = var3.substring("green:".length());
} else if(var14.startsWith("cyan:")) {
var17 = 3;
var3 = var3.substring("cyan:".length());
} else if(var14.startsWith("purple:")) {
var17 = 4;
var3 = var3.substring("purple:".length());
} else if(var14.startsWith("white:")) {
var17 = 5;
var3 = var3.substring("white:".length());
} else if(var14.startsWith("flash1:")) {
var17 = 6;
var3 = var3.substring("flash1:".length());
} else if(var14.startsWith("flash2:")) {
var17 = 7;
var3 = var3.substring("flash2:".length());
} else if(var14.startsWith("flash3:")) {
var17 = 8;
var3 = var3.substring("flash3:".length());
} else if(var14.startsWith("glow1:")) {
var17 = 9;
var3 = var3.substring("glow1:".length());
} else if(var14.startsWith("glow2:")) {
var17 = 10;
var3 = var3.substring("glow2:".length());
} else if(var14.startsWith("glow3:")) {
var17 = 11;
var3 = var3.substring("glow3:".length());
} else if(Client.language != 0) {
if(var14.startsWith("yellow:")) {
var17 = 0;
var3 = var3.substring("yellow:".length()); var3 = var3.substring("yellow:".length());
} else if(var6.startsWith("red:")) { } else if(var14.startsWith("red:")) {
var12 = 1; var17 = 1;
var3 = var3.substring("red:".length()); var3 = var3.substring("red:".length());
} else if(var6.startsWith("green:")) { } else if(var14.startsWith("green:")) {
var12 = 2; var17 = 2;
var3 = var3.substring("green:".length()); var3 = var3.substring("green:".length());
} else if(var6.startsWith("cyan:")) { } else if(var14.startsWith("cyan:")) {
var12 = 3; var17 = 3;
var3 = var3.substring("cyan:".length()); var3 = var3.substring("cyan:".length());
} else if(var6.startsWith("purple:")) { } else if(var14.startsWith("purple:")) {
var12 = 4; var17 = 4;
var3 = var3.substring("purple:".length()); var3 = var3.substring("purple:".length());
} else if(var6.startsWith("white:")) { } else if(var14.startsWith("white:")) {
var12 = 5; var17 = 5;
var3 = var3.substring("white:".length()); var3 = var3.substring("white:".length());
} else if(var6.startsWith("flash1:")) { } else if(var14.startsWith("flash1:")) {
var12 = 6; var17 = 6;
var3 = var3.substring("flash1:".length()); var3 = var3.substring("flash1:".length());
} else if(var6.startsWith("flash2:")) { } else if(var14.startsWith("flash2:")) {
var12 = 7; var17 = 7;
var3 = var3.substring("flash2:".length()); var3 = var3.substring("flash2:".length());
} else if(var6.startsWith("flash3:")) { } else if(var14.startsWith("flash3:")) {
var12 = 8; var17 = 8;
var3 = var3.substring("flash3:".length()); var3 = var3.substring("flash3:".length());
} else if(var6.startsWith("glow1:")) { } else if(var14.startsWith("glow1:")) {
var12 = 9; var17 = 9;
var3 = var3.substring("glow1:".length()); var3 = var3.substring("glow1:".length());
} else if(var6.startsWith("glow2:")) { } else if(var14.startsWith("glow2:")) {
var12 = 10; var17 = 10;
var3 = var3.substring("glow2:".length()); var3 = var3.substring("glow2:".length());
} else if(var6.startsWith("glow3:")) { } else if(var14.startsWith("glow3:")) {
var12 = 11; var17 = 11;
var3 = var3.substring("glow3:".length()); var3 = var3.substring("glow3:".length());
} else if(Client.language != 0) {
if(var6.startsWith("yellow:")) {
var12 = 0;
var3 = var3.substring("yellow:".length());
} else if(var6.startsWith("red:")) {
var12 = 1;
var3 = var3.substring("red:".length());
} else if(var6.startsWith("green:")) {
var12 = 2;
var3 = var3.substring("green:".length());
} else if(var6.startsWith("cyan:")) {
var12 = 3;
var3 = var3.substring("cyan:".length());
} else if(var6.startsWith("purple:")) {
var12 = 4;
var3 = var3.substring("purple:".length());
} else if(var6.startsWith("white:")) {
var12 = 5;
var3 = var3.substring("white:".length());
} else if(var6.startsWith("flash1:")) {
var12 = 6;
var3 = var3.substring("flash1:".length());
} else if(var6.startsWith("flash2:")) {
var12 = 7;
var3 = var3.substring("flash2:".length());
} else if(var6.startsWith("flash3:")) {
var12 = 8;
var3 = var3.substring("flash3:".length());
} else if(var6.startsWith("glow1:")) {
var12 = 9;
var3 = var3.substring("glow1:".length());
} else if(var6.startsWith("glow2:")) {
var12 = 10;
var3 = var3.substring("glow2:".length());
} else if(var6.startsWith("glow3:")) {
var12 = 11;
var3 = var3.substring("glow3:".length());
}
} }
var6 = var3.toLowerCase();
byte var14 = 0;
if(var6.startsWith("wave:")) {
var14 = 1;
var3 = var3.substring("wave:".length());
} else if(var6.startsWith("wave2:")) {
var14 = 2;
var3 = var3.substring("wave2:".length());
} else if(var6.startsWith("shake:")) {
var14 = 3;
var3 = var3.substring("shake:".length());
} else if(var6.startsWith("scroll:")) {
var14 = 4;
var3 = var3.substring("scroll:".length());
} else if(var6.startsWith("slide:")) {
var14 = 5;
var3 = var3.substring("slide:".length());
} else if(Client.language != 0) {
if(var6.startsWith("wave:")) {
var14 = 1;
var3 = var3.substring("wave:".length());
} else if(var6.startsWith("wave2:")) {
var14 = 2;
var3 = var3.substring("wave2:".length());
} else if(var6.startsWith("shake:")) {
var14 = 3;
var3 = var3.substring("shake:".length());
} else if(var6.startsWith("scroll:")) {
var14 = 4;
var3 = var3.substring("scroll:".length());
} else if(var6.startsWith("slide:")) {
var14 = 5;
var3 = var3.substring("slide:".length());
}
}
PacketBufferNode var9 = Interpreter.method1915(ClientPacket.__gs_cz, Client.packetWriter.isaacCipher);
var9.packetBuffer.writeByte(0);
int var10 = var9.packetBuffer.index;
var9.packetBuffer.writeByte(var4);
var9.packetBuffer.writeByte(var12);
var9.packetBuffer.writeByte(var14);
TextureProvider.method2777(var9.packetBuffer, var3);
var9.packetBuffer.__h_300(var9.packetBuffer.index - var10);
Client.packetWriter.__q_167(var9);
return 1;
} else if(var0 == 5009) {
Interpreter.Interpreter_stringStackSize -= 2;
var3 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize];
var6 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1];
PacketBufferNode var7 = Interpreter.method1915(ClientPacket.__gs_v, Client.packetWriter.isaacCipher);
var7.packetBuffer.writeShort(0);
int var8 = var7.packetBuffer.index;
var7.packetBuffer.writeStringCp1252NullTerminated(var3);
TextureProvider.method2777(var7.packetBuffer, var6);
var7.packetBuffer.__y_299(var7.packetBuffer.index - var8);
Client.packetWriter.__q_167(var7);
return 1;
} else if(var0 != 5015) {
if(var0 == 5016) {
Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = Client.__client_pl;
return 1;
} else if(var0 == 5017) {
var5 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = WidgetGroupParent.method1174(var5);
return 1;
} else if(var0 == 5018) {
var5 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = class12.method161(var5);
return 1;
} else if(var0 == 5019) {
var5 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = SpriteMask.method4391(var5);
return 1;
} else if(var0 == 5020) {
var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
BoundaryObject.method3235(var3);
return 1;
} else if(var0 == 5021) {
Client.__client_pz = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize].toLowerCase().trim();
return 1;
} else if(var0 == 5022) {
Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Client.__client_pz;
return 1;
} else if(var0 == 5023) {
var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
System.out.println(var3);
return 1;
} else {
return 2;
}
} else {
if(Canvas.localPlayer != null && Canvas.localPlayer.username != null) {
var3 = Canvas.localPlayer.username.getName();
} else {
var3 = "";
}
Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3;
return 1;
} }
var14 = var3.toLowerCase();
byte var7 = 0;
if(var14.startsWith("wave:")) {
var7 = 1;
var3 = var3.substring("wave:".length());
} else if(var14.startsWith("wave2:")) {
var7 = 2;
var3 = var3.substring("wave2:".length());
} else if(var14.startsWith("shake:")) {
var7 = 3;
var3 = var3.substring("shake:".length());
} else if(var14.startsWith("scroll:")) {
var7 = 4;
var3 = var3.substring("scroll:".length());
} else if(var14.startsWith("slide:")) {
var7 = 5;
var3 = var3.substring("slide:".length());
} else if(Client.language != 0) {
if(var14.startsWith("wave:")) {
var7 = 1;
var3 = var3.substring("wave:".length());
} else if(var14.startsWith("wave2:")) {
var7 = 2;
var3 = var3.substring("wave2:".length());
} else if(var14.startsWith("shake:")) {
var7 = 3;
var3 = var3.substring("shake:".length());
} else if(var14.startsWith("scroll:")) {
var7 = 4;
var3 = var3.substring("scroll:".length());
} else if(var14.startsWith("slide:")) {
var7 = 5;
var3 = var3.substring("slide:".length());
}
}
PacketBufferNode var8 = Interpreter.method1915(ClientPacket.__gs_cz, Client.packetWriter.isaacCipher);
var8.packetBuffer.writeByte(0);
int var9 = var8.packetBuffer.index;
var8.packetBuffer.writeByte(var4);
var8.packetBuffer.writeByte(var17);
var8.packetBuffer.writeByte(var7);
TextureProvider.method2777(var8.packetBuffer, var3);
var8.packetBuffer.__h_300(var8.packetBuffer.index - var9);
Client.packetWriter.__q_167(var8);
return 1;
} else if(var0 == 5009) {
Interpreter.Interpreter_stringStackSize -= 2;
var3 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize];
String var12 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1];
PacketBufferNode var11 = Interpreter.method1915(ClientPacket.__gs_v, Client.packetWriter.isaacCipher);
var11.packetBuffer.writeShort(0);
int var13 = var11.packetBuffer.index;
var11.packetBuffer.writeStringCp1252NullTerminated(var3);
TextureProvider.method2777(var11.packetBuffer, var12);
var11.packetBuffer.__y_299(var11.packetBuffer.index - var13);
Client.packetWriter.__q_167(var11);
return 1;
} else if(var0 != 5015) {
if(var0 == 5016) {
Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = Client.__client_pl;
return 1;
} else if(var0 == 5017) {
var10 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = WidgetGroupParent.method1174(var10);
return 1;
} else if(var0 == 5018) {
var10 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = class12.method161(var10);
return 1;
} else if(var0 == 5019) {
var10 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = SpriteMask.method4391(var10);
return 1;
} else if(var0 == 5020) {
var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
BoundaryObject.method3235(var3);
return 1;
} else if(var0 == 5021) {
Client.__client_pz = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize].toLowerCase().trim();
return 1;
} else if(var0 == 5022) {
Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Client.__client_pz;
return 1;
} else if(var0 == 5023) {
var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
System.out.println(var3);
return 1;
} else {
return 2;
}
} else {
if(Canvas.localPlayer != null && Canvas.localPlayer.username != null) {
var3 = Canvas.localPlayer.username.getName();
} else {
var3 = "";
}
Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3;
return 1;
} }
} }
} }
@@ -501,24 +497,24 @@ public class DynamicObject extends Entity {
GameShell.garbageCollectorLastCollectionTime = -1L; GameShell.garbageCollectorLastCollectionTime = -1L;
} }
} }
} catch (Throwable var9) { } catch (Throwable var11) {
; ;
} }
} }
if(AbstractIndexCache.garbageCollector != null) { if(AbstractIndexCache.garbageCollector != null) {
long var10 = class203.currentTimeMs(); long var9 = class203.currentTimeMs();
long var3 = AbstractIndexCache.garbageCollector.getCollectionTime(); long var3 = AbstractIndexCache.garbageCollector.getCollectionTime();
if(GameShell.garbageCollectorLastCollectionTime != -1L) { if(GameShell.garbageCollectorLastCollectionTime != -1L) {
long var5 = var3 - GameShell.garbageCollectorLastCollectionTime; long var5 = var3 - GameShell.garbageCollectorLastCollectionTime;
long var7 = var10 - GameShell.garbageCollectorLastCheckTimeMs; long var7 = var9 - GameShell.garbageCollectorLastCheckTimeMs;
if(0L != var7) { if(0L != var7) {
var0 = (int)(var5 * 100L / var7); var0 = (int)(var5 * 100L / var7);
} }
} }
GameShell.garbageCollectorLastCollectionTime = var3; GameShell.garbageCollectorLastCollectionTime = var3;
GameShell.garbageCollectorLastCheckTimeMs = var10; GameShell.garbageCollectorLastCheckTimeMs = var9;
} }
return var0; return var0;
@@ -545,72 +541,72 @@ public class DynamicObject extends Entity {
var4 = GraphicsObject.baseY; var4 = GraphicsObject.baseY;
int var7; int var7;
int var8; int var9;
for(var7 = 0; var7 < 32768; ++var7) { for(var7 = 0; var7 < 32768; ++var7) {
NPC var9 = Client.npcs[var7]; Npc var8 = Client.npcs[var7];
if(var9 != null) { if(var8 != null) {
for(var8 = 0; var8 < 10; ++var8) { for(var9 = 0; var9 < 10; ++var9) {
var9.pathX[var8] -= var5; var8.pathX[var9] -= var5;
var9.pathY[var8] -= var6; var8.pathY[var9] -= var6;
} }
var9.x -= var5 * 128; var8.x -= var5 * 128;
var9.y -= var6 * 128; var8.y -= var6 * 128;
} }
} }
for(var7 = 0; var7 < 2048; ++var7) { for(var7 = 0; var7 < 2048; ++var7) {
Player var20 = Client.players[var7]; Player var21 = Client.players[var7];
if(var20 != null) { if(var21 != null) {
for(var8 = 0; var8 < 10; ++var8) { for(var9 = 0; var9 < 10; ++var9) {
var20.pathX[var8] -= var5; var21.pathX[var9] -= var5;
var20.pathY[var8] -= var6; var21.pathY[var9] -= var6;
} }
var20.x -= var5 * 128; var21.x -= var5 * 128;
var20.y -= var6 * 128; var21.y -= var6 * 128;
} }
} }
byte var21 = 0; byte var20 = 0;
byte var10 = 104; byte var18 = 104;
byte var11 = 1; byte var22 = 1;
if(var5 < 0) { if(var5 < 0) {
var21 = 103; var20 = 103;
var10 = -1; var18 = -1;
var11 = -1; var22 = -1;
} }
byte var12 = 0; byte var10 = 0;
byte var13 = 104; byte var11 = 104;
byte var14 = 1; byte var12 = 1;
if(var6 < 0) { if(var6 < 0) {
var12 = 103; var10 = 103;
var13 = -1; var11 = -1;
var14 = -1; var12 = -1;
} }
int var15; int var14;
for(int var16 = var21; var16 != var10; var16 += var11) { for(int var13 = var20; var13 != var18; var13 += var22) {
for(var15 = var12; var13 != var15; var15 += var14) { for(var14 = var10; var11 != var14; var14 += var12) {
int var17 = var16 + var5; int var15 = var13 + var5;
int var18 = var15 + var6; int var16 = var14 + var6;
for(int var19 = 0; var19 < 4; ++var19) { for(int var17 = 0; var17 < 4; ++var17) {
if(var17 >= 0 && var18 >= 0 && var17 < 104 && var18 < 104) { if(var15 >= 0 && var16 >= 0 && var15 < 104 && var16 < 104) {
Client.groundItems[var19][var16][var15] = Client.groundItems[var19][var17][var18]; Client.groundItems[var17][var13][var14] = Client.groundItems[var17][var15][var16];
} else { } else {
Client.groundItems[var19][var16][var15] = null; Client.groundItems[var17][var13][var14] = null;
} }
} }
} }
} }
for(class68 var22 = (class68)Client.__client_kh.last(); var22 != null; var22 = (class68)Client.__client_kh.previous()) { for(class68 var19 = (class68)Client.__client_kh.last(); var19 != null; var19 = (class68)Client.__client_kh.previous()) {
var22.field913 -= var5; var19.field913 -= var5;
var22.field901 -= var6; var19.field901 -= var6;
if(var22.field913 < 0 || var22.field901 < 0 || var22.field913 >= 104 || var22.field901 >= 104) { if(var19.field913 < 0 || var19.field901 < 0 || var19.field913 >= 104 || var19.field901 >= 104) {
var22.remove(); var19.remove();
} }
} }
@@ -629,10 +625,10 @@ public class DynamicObject extends Entity {
Client.graphicsObjects.clear(); Client.graphicsObjects.clear();
Client.projectiles.clear(); Client.projectiles.clear();
for(var15 = 0; var15 < 4; ++var15) { for(var14 = 0; var14 < 4; ++var14) {
Client.collisionMaps[var15].clear(); Client.collisionMaps[var14].clear();
} }
}
}
} }
} }

8
runescape-client/src/main/java/EnumDefinition.java
View File

@@ -50,6 +50,10 @@ public class EnumDefinition extends DualNode {
@Export("stringVals") @Export("stringVals")
public String[] stringVals; public String[] stringVals;
static {
EnumDefinition_cached = new EvictingDualNodeHashTable(64);
}
EnumDefinition() { EnumDefinition() {
this.defaultString = "null"; this.defaultString = "null";
this.size0 = 0; this.size0 = 0;
@@ -121,8 +125,4 @@ public class EnumDefinition extends DualNode {
public int size() { public int size() {
return this.size0; return this.size0;
} }
static {
EnumDefinition_cached = new EvictingDualNodeHashTable(64);
}
} }

2
runescape-client/src/main/java/Enumerated.java
View File

@@ -10,5 +10,5 @@ public interface Enumerated {
signature = "(B)I", signature = "(B)I",
garbageValue = "83" garbageValue = "83"
) )
int ordinal(); int rsOrdinal();
} }

24
runescape-client/src/main/java/FaceNormal.java
View File

@@ -71,10 +71,10 @@ public class FaceNormal {
} else if(!var0.startsWith("http://") && !var0.startsWith("https://")) { } else if(!var0.startsWith("http://") && !var0.startsWith("https://")) {
throw new Exception(); throw new Exception();
} else { } else {
String var11 = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789?&=,.%+-_#:/*"; String var13 = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789?&=,.%+-_#:/*";
for(int var12 = 0; var12 < var0.length(); ++var12) { for(int var4 = 0; var4 < var0.length(); ++var4) {
if(var11.indexOf(var0.charAt(var12)) == -1) { if(var13.indexOf(var0.charAt(var4)) == -1) {
throw new Exception(); throw new Exception();
} }
} }
@@ -82,36 +82,36 @@ public class FaceNormal {
Runtime.getRuntime().exec("cmd /c start \"j\" \"" + var0 + "\""); Runtime.getRuntime().exec("cmd /c start \"j\" \"" + var0 + "\"");
return true; return true;
} }
} catch (Throwable var6) { } catch (Throwable var8) {
return false; return false;
} }
} else if(var1 == 1) { } else if(var1 == 1) {
try { try {
Applet var3 = class50.__af_m; Applet var7 = class50.__af_m;
Object[] var4 = new Object[]{(new URL(class50.__af_m.getCodeBase(), var0)).toString()}; Object[] var5 = new Object[]{(new URL(class50.__af_m.getCodeBase(), var0)).toString()};
Object var5 = JSObject.getWindow(var3).call(var2, var4); Object var3 = JSObject.getWindow(var7).call(var2, var5);
return var5 != null; return var3 != null;
} catch (Throwable var7) { } catch (Throwable var9) {
return false; return false;
} }
} else if(var1 == 2) { } else if(var1 == 2) {
try { try {
class50.__af_m.getAppletContext().showDocument(new URL(class50.__af_m.getCodeBase(), var0), "_blank"); class50.__af_m.getAppletContext().showDocument(new URL(class50.__af_m.getCodeBase(), var0), "_blank");
return true; return true;
} catch (Exception var8) { } catch (Exception var10) {
return false; return false;
} }
} else if(var1 == 3) { } else if(var1 == 3) {
try { try {
class46.method851(class50.__af_m, "loggedout"); class46.method851(class50.__af_m, "loggedout");
} catch (Throwable var10) { } catch (Throwable var12) {
; ;
} }
try { try {
class50.__af_m.getAppletContext().showDocument(new URL(class50.__af_m.getCodeBase(), var0), "_top"); class50.__af_m.getAppletContext().showDocument(new URL(class50.__af_m.getCodeBase(), var0), "_top");
return true; return true;
} catch (Exception var9) { } catch (Exception var11) {
return false; return false;
} }
} else { } else {

2
runescape-client/src/main/java/Font.java
View File

@@ -51,7 +51,6 @@ public final class Font extends AbstractFont {
if(var4 > 0 && var5 > 0) { if(var4 > 0 && var5 > 0) {
AbstractFont.AbstractFont_placeGlyph(Rasterizer2D.Rasterizer2D_pixels, var1, var6, var10, var7, var4, var5, var8, var9); AbstractFont.AbstractFont_placeGlyph(Rasterizer2D.Rasterizer2D_pixels, var1, var6, var10, var7, var4, var5, var8, var9);
} }
} }
@ObfuscatedName("f") @ObfuscatedName("f")
@@ -93,6 +92,5 @@ public final class Font extends AbstractFont {
if(var4 > 0 && var5 > 0) { if(var4 > 0 && var5 > 0) {
AbstractFont.AbstractFont_placeGlyphAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, var11, var8, var4, var5, var9, var10, var7); AbstractFont.AbstractFont_placeGlyphAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, var11, var8, var4, var5, var9, var10, var7);
} }
} }
} }

172
runescape-client/src/main/java/FontName.java
View File

@@ -46,6 +46,15 @@ public class FontName {
@Export("__g") @Export("__g")
String __g; String __g;
static {
FontName_plain11 = new FontName("p11_full");
FontName_plain12 = new FontName("p12_full");
FontName_bold12 = new FontName("b12_full");
FontName_verdana11 = new FontName("verdana_11pt_regular");
FontName_verdana13 = new FontName("verdana_13pt_regular");
FontName_verdana15 = new FontName("verdana_15pt_regular");
}
FontName(String var1) { FontName(String var1) {
this.__g = var1; this.__g = var1;
} }
@@ -110,9 +119,9 @@ public class FontName {
if(var0 == 3601) { if(var0 == 3601) {
var3 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; var3 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
if(WorldMapArea.friendSystem.__m_151() && var3 >= 0 && var3 < WorldMapArea.friendSystem.friendsList.size()) { if(WorldMapArea.friendSystem.__m_151() && var3 >= 0 && var3 < WorldMapArea.friendSystem.friendsList.size()) {
Friend var6 = (Friend)WorldMapArea.friendSystem.friendsList.get(var3); Friend var8 = (Friend)WorldMapArea.friendSystem.friendsList.get(var3);
Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var6.name(); Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var8.name();
Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var6.previousName(); Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var8.previousName();
} else { } else {
Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
@@ -138,32 +147,32 @@ public class FontName {
return 1; return 1;
} else { } else {
String var4; String var5;
if(var0 == 3604) { if(var0 == 3604) {
var4 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
int var8 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; int var6 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
method5638(var4, var8); method5638(var5, var6);
return 1; return 1;
} else if(var0 == 3605) { } else if(var0 == 3605) {
var4 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
WorldMapArea.friendSystem.__l_157(var4); WorldMapArea.friendSystem.__l_157(var5);
return 1; return 1;
} else if(var0 == 3606) { } else if(var0 == 3606) {
var4 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
WorldMapArea.friendSystem.removeFriend(var4); WorldMapArea.friendSystem.removeFriend(var5);
return 1; return 1;
} else if(var0 == 3607) { } else if(var0 == 3607) {
var4 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
WorldMapArea.friendSystem.__x_159(var4); WorldMapArea.friendSystem.__x_159(var5);
return 1; return 1;
} else if(var0 == 3608) { } else if(var0 == 3608) {
var4 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
WorldMapArea.friendSystem.removeIgnore(var4); WorldMapArea.friendSystem.removeIgnore(var5);
return 1; return 1;
} else if(var0 == 3609) { } else if(var0 == 3609) {
var4 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
var4 = NPCDefinition.method5161(var4); var5 = NpcDefinition.method5161(var5);
Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = WorldMapArea.friendSystem.isFriended(new Username(var4, KeyHandler.loginType), false)?1:0; Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = WorldMapArea.friendSystem.isFriended(new Username(var5, KeyHandler.loginType), false)?1:0;
return 1; return 1;
} else if(var0 == 3611) { } else if(var0 == 3611) {
if(PacketWriter.clanChat != null) { if(PacketWriter.clanChat != null) {
@@ -212,15 +221,15 @@ public class FontName {
Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = PacketWriter.clanChat != null?PacketWriter.clanChat.__k:0; Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = PacketWriter.clanChat != null?PacketWriter.clanChat.__k:0;
return 1; return 1;
} else if(var0 == 3617) { } else if(var0 == 3617) {
var4 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
IndexStoreActionHandler.method4655(var4); IndexStoreActionHandler.method4655(var5);
return 1; return 1;
} else if(var0 == 3618) { } else if(var0 == 3618) {
Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = PacketWriter.clanChat != null?PacketWriter.clanChat.rank:0; Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = PacketWriter.clanChat != null?PacketWriter.clanChat.rank:0;
return 1; return 1;
} else if(var0 == 3619) { } else if(var0 == 3619) {
var4 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
class31.method574(var4); class31.method574(var5);
return 1; return 1;
} else if(var0 == 3620) { } else if(var0 == 3620) {
class12.method158(); class12.method158();
@@ -236,9 +245,9 @@ public class FontName {
} else if(var0 == 3622) { } else if(var0 == 3622) {
var3 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; var3 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
if(WorldMapArea.friendSystem.__m_151() && var3 >= 0 && var3 < WorldMapArea.friendSystem.ignoreList.size()) { if(WorldMapArea.friendSystem.__m_151() && var3 >= 0 && var3 < WorldMapArea.friendSystem.ignoreList.size()) {
Ignored var7 = (Ignored)WorldMapArea.friendSystem.ignoreList.get(var3); Ignored var4 = (Ignored)WorldMapArea.friendSystem.ignoreList.get(var3);
Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var7.name(); Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.name();
Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var7.previousName(); Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.previousName();
} else { } else {
Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
@@ -246,9 +255,9 @@ public class FontName {
return 1; return 1;
} else if(var0 == 3623) { } else if(var0 == 3623) {
var4 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
var4 = NPCDefinition.method5161(var4); var5 = NpcDefinition.method5161(var5);
Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = WorldMapArea.friendSystem.isIgnored(new Username(var4, KeyHandler.loginType))?1:0; Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = WorldMapArea.friendSystem.isIgnored(new Username(var5, KeyHandler.loginType))?1:0;
return 1; return 1;
} else if(var0 == 3624) { } else if(var0 == 3624) {
var3 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; var3 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
@@ -281,46 +290,46 @@ public class FontName {
WorldMapArea.friendSystem.friendsList.removeComparator(); WorldMapArea.friendSystem.friendsList.removeComparator();
return 1; return 1;
} else { } else {
boolean var5; boolean var7;
if(var0 == 3629) { if(var0 == 3629) {
var5 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1; var7 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator1(var5)); WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator1(var7));
return 1; return 1;
} else if(var0 == 3630) { } else if(var0 == 3630) {
var5 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1; var7 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator2(var5)); WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator2(var7));
return 1; return 1;
} else if(var0 == 3631) { } else if(var0 == 3631) {
var5 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1; var7 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator3(var5)); WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator3(var7));
return 1; return 1;
} else if(var0 == 3632) { } else if(var0 == 3632) {
var5 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1; var7 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator4(var5)); WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator4(var7));
return 1; return 1;
} else if(var0 == 3633) { } else if(var0 == 3633) {
var5 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1; var7 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator5(var5)); WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator5(var7));
return 1; return 1;
} else if(var0 == 3634) { } else if(var0 == 3634) {
var5 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1; var7 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator6(var5)); WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator6(var7));
return 1; return 1;
} else if(var0 == 3635) { } else if(var0 == 3635) {
var5 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1; var7 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator7(var5)); WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator7(var7));
return 1; return 1;
} else if(var0 == 3636) { } else if(var0 == 3636) {
var5 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1; var7 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator8(var5)); WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator8(var7));
return 1; return 1;
} else if(var0 == 3637) { } else if(var0 == 3637) {
var5 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1; var7 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator9(var5)); WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator9(var7));
return 1; return 1;
} else if(var0 == 3638) { } else if(var0 == 3638) {
var5 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1; var7 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator10(var5)); WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator10(var7));
return 1; return 1;
} else if(var0 == 3639) { } else if(var0 == 3639) {
WorldMapArea.friendSystem.friendsList.sort(); WorldMapArea.friendSystem.friendsList.sort();
@@ -329,12 +338,12 @@ public class FontName {
WorldMapArea.friendSystem.ignoreList.removeComparator(); WorldMapArea.friendSystem.ignoreList.removeComparator();
return 1; return 1;
} else if(var0 == 3641) { } else if(var0 == 3641) {
var5 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1; var7 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
WorldMapArea.friendSystem.ignoreList.addComparator(new UserComparator1(var5)); WorldMapArea.friendSystem.ignoreList.addComparator(new UserComparator1(var7));
return 1; return 1;
} else if(var0 == 3642) { } else if(var0 == 3642) {
var5 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1; var7 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
WorldMapArea.friendSystem.ignoreList.addComparator(new UserComparator2(var5)); WorldMapArea.friendSystem.ignoreList.addComparator(new UserComparator2(var7));
return 1; return 1;
} else if(var0 == 3643) { } else if(var0 == 3643) {
WorldMapArea.friendSystem.ignoreList.sort(); WorldMapArea.friendSystem.ignoreList.sort();
@@ -346,72 +355,72 @@ public class FontName {
return 1; return 1;
} else if(var0 == 3645) { } else if(var0 == 3645) {
var5 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1; var7 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
if(PacketWriter.clanChat != null) { if(PacketWriter.clanChat != null) {
PacketWriter.clanChat.addComparator(new UserComparator1(var5)); PacketWriter.clanChat.addComparator(new UserComparator1(var7));
} }
return 1; return 1;
} else if(var0 == 3646) { } else if(var0 == 3646) {
var5 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1; var7 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
if(PacketWriter.clanChat != null) { if(PacketWriter.clanChat != null) {
PacketWriter.clanChat.addComparator(new UserComparator2(var5)); PacketWriter.clanChat.addComparator(new UserComparator2(var7));
} }
return 1; return 1;
} else if(var0 == 3647) { } else if(var0 == 3647) {
var5 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1; var7 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
if(PacketWriter.clanChat != null) { if(PacketWriter.clanChat != null) {
PacketWriter.clanChat.addComparator(new UserComparator3(var5)); PacketWriter.clanChat.addComparator(new UserComparator3(var7));
} }
return 1; return 1;
} else if(var0 == 3648) { } else if(var0 == 3648) {
var5 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1; var7 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
if(PacketWriter.clanChat != null) { if(PacketWriter.clanChat != null) {
PacketWriter.clanChat.addComparator(new UserComparator4(var5)); PacketWriter.clanChat.addComparator(new UserComparator4(var7));
} }
return 1; return 1;
} else if(var0 == 3649) { } else if(var0 == 3649) {
var5 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1; var7 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
if(PacketWriter.clanChat != null) { if(PacketWriter.clanChat != null) {
PacketWriter.clanChat.addComparator(new UserComparator5(var5)); PacketWriter.clanChat.addComparator(new UserComparator5(var7));
} }
return 1; return 1;
} else if(var0 == 3650) { } else if(var0 == 3650) {
var5 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1; var7 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
if(PacketWriter.clanChat != null) { if(PacketWriter.clanChat != null) {
PacketWriter.clanChat.addComparator(new UserComparator6(var5)); PacketWriter.clanChat.addComparator(new UserComparator6(var7));
} }
return 1; return 1;
} else if(var0 == 3651) { } else if(var0 == 3651) {
var5 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1; var7 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
if(PacketWriter.clanChat != null) { if(PacketWriter.clanChat != null) {
PacketWriter.clanChat.addComparator(new UserComparator7(var5)); PacketWriter.clanChat.addComparator(new UserComparator7(var7));
} }
return 1; return 1;
} else if(var0 == 3652) { } else if(var0 == 3652) {
var5 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1; var7 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
if(PacketWriter.clanChat != null) { if(PacketWriter.clanChat != null) {
PacketWriter.clanChat.addComparator(new UserComparator8(var5)); PacketWriter.clanChat.addComparator(new UserComparator8(var7));
} }
return 1; return 1;
} else if(var0 == 3653) { } else if(var0 == 3653) {
var5 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1; var7 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
if(PacketWriter.clanChat != null) { if(PacketWriter.clanChat != null) {
PacketWriter.clanChat.addComparator(new UserComparator9(var5)); PacketWriter.clanChat.addComparator(new UserComparator9(var7));
} }
return 1; return 1;
} else if(var0 == 3654) { } else if(var0 == 3654) {
var5 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1; var7 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
if(PacketWriter.clanChat != null) { if(PacketWriter.clanChat != null) {
PacketWriter.clanChat.addComparator(new UserComparator10(var5)); PacketWriter.clanChat.addComparator(new UserComparator10(var7));
} }
return 1; return 1;
@@ -422,13 +431,13 @@ public class FontName {
return 1; return 1;
} else if(var0 == 3656) { } else if(var0 == 3656) {
var5 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1; var7 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
WorldMapArea.friendSystem.friendsList.addComparator(new class157(var5)); WorldMapArea.friendSystem.friendsList.addComparator(new class157(var7));
return 1; return 1;
} else if(var0 == 3657) { } else if(var0 == 3657) {
var5 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1; var7 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1;
if(PacketWriter.clanChat != null) { if(PacketWriter.clanChat != null) {
PacketWriter.clanChat.addComparator(new class157(var5)); PacketWriter.clanChat.addComparator(new class157(var7));
} }
return 1; return 1;
@@ -576,13 +585,4 @@ public class FontName {
} }
} }
static {
FontName_plain11 = new FontName("p11_full");
FontName_plain12 = new FontName("p12_full");
FontName_bold12 = new FontName("b12_full");
FontName_verdana11 = new FontName("verdana_11pt_regular");
FontName_verdana13 = new FontName("verdana_13pt_regular");
FontName_verdana15 = new FontName("verdana_15pt_regular");
}
} }

18
runescape-client/src/main/java/Fonts.java
View File

@@ -62,15 +62,15 @@ public class Fonts {
if(this.map.containsKey(var5)) { if(this.map.containsKey(var5)) {
var2.put(var5, this.map.get(var5)); var2.put(var5, this.map.get(var5));
} else { } else {
AbstractIndexCache var6 = this.__m; AbstractIndexCache var7 = this.__m;
AbstractIndexCache var7 = this.__f; AbstractIndexCache var8 = this.__f;
String var8 = var5.__g; String var9 = var5.__g;
int var9 = var6.getArchiveId(var8); int var10 = var7.getArchiveId(var9);
int var10 = var6.getRecordId(var9, ""); int var11 = var7.getRecordId(var10, "");
Font var11 = SpriteIds.method5823(var6, var7, var9, var10); Font var6 = SpriteIds.method5823(var7, var8, var10, var11);
if(var11 != null) { if(var6 != null) {
this.map.put(var5, var11); this.map.put(var5, var6);
var2.put(var5, var11); var2.put(var5, var6);
} }
} }
} }

31
runescape-client/src/main/java/Formatting.java
View File

@@ -50,35 +50,34 @@ public class Formatting {
static int method2022(int var0, Script var1, boolean var2) { static int method2022(int var0, Script var1, boolean var2) {
int var3; int var3;
int var4; int var4;
int var5; int var6;
EnumDefinition var9;
if(var0 == 3400) { if(var0 == 3400) {
class179.Interpreter_intStackSize -= 2; class179.Interpreter_intStackSize -= 2;
var3 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize]; var3 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize];
var4 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]; var4 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1];
var9 = Interpreter.getEnum(var3); EnumDefinition var5 = Interpreter.getEnum(var3);
if(var9.valType != 's') { if(var5.valType != 's') {
; ;
} }
for(var5 = 0; var5 < var9.size0; ++var5) { for(var6 = 0; var6 < var5.size0; ++var6) {
if(var4 == var9.keys[var5]) { if(var4 == var5.keys[var6]) {
Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var9.stringVals[var5]; Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var5.stringVals[var6];
var9 = null; var5 = null;
break; break;
} }
} }
if(var9 != null) { if(var5 != null) {
Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var9.defaultString; Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var5.defaultString;
} }
return 1; return 1;
} else if(var0 != 3408) { } else if(var0 != 3408) {
if(var0 == 3411) { if(var0 == 3411) {
var3 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; var3 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
var9 = Interpreter.getEnum(var3); EnumDefinition var10 = Interpreter.getEnum(var3);
Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var9.size(); Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var10.size();
return 1; return 1;
} else { } else {
return 2; return 2;
@@ -87,12 +86,12 @@ public class Formatting {
class179.Interpreter_intStackSize -= 4; class179.Interpreter_intStackSize -= 4;
var3 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize]; var3 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize];
var4 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]; var4 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1];
int var6 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 2]; int var9 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 2];
var5 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 3]; var6 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 3];
EnumDefinition var7 = Interpreter.getEnum(var6); EnumDefinition var7 = Interpreter.getEnum(var9);
if(var3 == var7.keyType && var4 == var7.valType) { if(var3 == var7.keyType && var4 == var7.valType) {
for(int var8 = 0; var8 < var7.size0; ++var8) { for(int var8 = 0; var8 < var7.size0; ++var8) {
if(var5 == var7.keys[var8]) { if(var6 == var7.keys[var8]) {
if(var4 == 115) { if(var4 == 115) {
Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var7.stringVals[var8]; Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var7.stringVals[var8];
} else { } else {

67
runescape-client/src/main/java/FriendSystem.java
View File

@@ -139,40 +139,39 @@ public class FriendSystem {
if(var1 != null) { if(var1 != null) {
Username var2 = new Username(var1, this.loginType); Username var2 = new Username(var1, this.loginType);
if(var2.hasCleanName()) { if(var2.hasCleanName()) {
StringBuilder var3; StringBuilder var10000;
String var4; String var4;
if(this.__e_158()) { if(this.__e_158()) {
var3 = null; var10000 = null;
var4 = "Your friend list is full. Max of 200 for free users, and 400 for members"; var4 = "Your friend list is full. Max of 200 for free users, and 400 for members";
WorldMapIcon1.method219(30, "", var4); WorldMapIcon1.method219(30, "", var4);
} else if(Canvas.localPlayer.username.__equals_466(var2)) { } else if(Canvas.localPlayer.username.__equals_466(var2)) {
var3 = null; var10000 = null;
var4 = "You can\'t add yourself to your own friend list"; var4 = "You can\'t add yourself to your own friend list";
WorldMapIcon1.method219(30, "", var4); WorldMapIcon1.method219(30, "", var4);
} else { } else {
Object var5; Object var10001;
if(this.isFriended(var2, false)) { if(this.isFriended(var2, false)) {
var3 = (new StringBuilder()).append(var1); var10000 = (new StringBuilder()).append(var1);
var5 = null; var10001 = null;
var4 = var3.append(" is already on your friend list").toString(); var4 = var10000.append(" is already on your friend list").toString();
WorldMapIcon1.method219(30, "", var4); WorldMapIcon1.method219(30, "", var4);
} else if(this.isIgnored(var2)) { } else if(this.isIgnored(var2)) {
var3 = new StringBuilder(); var10000 = new StringBuilder();
var5 = null; var10001 = null;
var3 = var3.append("Please remove ").append(var1); var10000 = var10000.append("Please remove ").append(var1);
var5 = null; var10001 = null;
var4 = var3.append(" from your ignore list first").toString(); var4 = var10000.append(" from your ignore list first").toString();
WorldMapIcon1.method219(30, "", var4); WorldMapIcon1.method219(30, "", var4);
} else { } else {
PacketBufferNode var6 = Interpreter.method1915(ClientPacket.__gs_cn, Client.packetWriter.isaacCipher); PacketBufferNode var3 = Interpreter.method1915(ClientPacket.__gs_cn, Client.packetWriter.isaacCipher);
var6.packetBuffer.writeByte(WorldMapRegion.method550(var1)); var3.packetBuffer.writeByte(WorldMapRegion.method550(var1));
var6.packetBuffer.writeStringCp1252NullTerminated(var1); var3.packetBuffer.writeStringCp1252NullTerminated(var1);
Client.packetWriter.__q_167(var6); Client.packetWriter.__q_167(var3);
} }
} }
} }
} }
} }
@ObfuscatedName("e") @ObfuscatedName("e")
@@ -195,37 +194,33 @@ public class FriendSystem {
if(var1 != null) { if(var1 != null) {
Username var2 = new Username(var1, this.loginType); Username var2 = new Username(var1, this.loginType);
if(var2.hasCleanName()) { if(var2.hasCleanName()) {
StringBuilder var3; StringBuilder var10000;
String var4; String var4;
if(this.__a_160()) { if(this.__a_160()) {
var3 = null; var10000 = null;
var4 = "Your ignore list is full. Max of 100 for free users, and 400 for members"; var4 = "Your ignore list is full. Max of 100 for free users, and 400 for members";
WorldMapIcon1.method219(30, "", var4); WorldMapIcon1.method219(30, "", var4);
} else if(Canvas.localPlayer.username.__equals_466(var2)) { } else if(Canvas.localPlayer.username.__equals_466(var2)) {
var3 = null; var10000 = null;
var4 = "You can\'t add yourself to your own ignore list"; var4 = "You can\'t add yourself to your own ignore list";
WorldMapIcon1.method219(30, "", var4); WorldMapIcon1.method219(30, "", var4);
} else if(this.isIgnored(var2)) { } else if(this.isIgnored(var2)) {
class22.method294(var1); class22.method294(var1);
} else if(this.isFriended(var2, false)) {
var10000 = new StringBuilder();
Object var10001 = null;
var10000 = var10000.append("Please remove ").append(var1);
var10001 = null;
var4 = var10000.append(" from your friend list first").toString();
WorldMapIcon1.method219(30, "", var4);
} else { } else {
PacketBufferNode var5; PacketBufferNode var3 = Interpreter.method1915(ClientPacket.__gs_ch, Client.packetWriter.isaacCipher);
if(this.isFriended(var2, false)) { var3.packetBuffer.writeByte(WorldMapRegion.method550(var1));
var3 = new StringBuilder(); var3.packetBuffer.writeStringCp1252NullTerminated(var1);
var5 = null; Client.packetWriter.__q_167(var3);
var3 = var3.append("Please remove ").append(var1);
var5 = null;
var4 = var3.append(" from your friend list first").toString();
WorldMapIcon1.method219(30, "", var4);
} else {
var5 = Interpreter.method1915(ClientPacket.__gs_ch, Client.packetWriter.isaacCipher);
var5.packetBuffer.writeByte(WorldMapRegion.method550(var1));
var5.packetBuffer.writeStringCp1252NullTerminated(var1);
Client.packetWriter.__q_167(var5);
}
} }
} }
} }
} }
@ObfuscatedName("a") @ObfuscatedName("a")
@@ -259,7 +254,6 @@ public class FriendSystem {
GrandExchangeOffer.method121(); GrandExchangeOffer.method121();
} }
} }
} }
@ObfuscatedName("j") @ObfuscatedName("j")
@@ -283,7 +277,6 @@ public class FriendSystem {
class229.method4512(); class229.method4512();
} }
} }
} }
@ObfuscatedName("t") @ObfuscatedName("t")

68
runescape-client/src/main/java/GameShell.java
View File

@@ -202,6 +202,22 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
@Export("eventQueue") @Export("eventQueue")
final EventQueue eventQueue; final EventQueue eventQueue;
static {
gameShell = null;
__ba_q = 0;
stopTimeMs = 0L;
isKilled = false;
__ba_e = 20;
__ba_d = 1;
fps = 0;
__ba_a = new long[32];
__ba_j = new long[32];
__ba_aw = 500;
hasFocus = true;
garbageCollectorLastCollectionTime = -1L;
garbageCollectorLastCheckTimeMs = -1L;
}
protected GameShell() { protected GameShell() {
this.hasErrored = false; this.hasErrored = false;
this.canvasX = 0; this.canvasX = 0;
@@ -253,8 +269,8 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
if(var1 != null) { if(var1 != null) {
this.eventQueue.postEvent(new ActionEvent(var1, 1001, "dummy")); this.eventQueue.postEvent(new ActionEvent(var1, 1001, "dummy"));
} }
}
}
} }
@ObfuscatedName("l") @ObfuscatedName("l")
@@ -382,7 +398,6 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
this.__ah = true; this.__ah = true;
this.__j_113(); this.__j_113();
} }
} }
@ObfuscatedName("j") @ObfuscatedName("j")
@@ -505,7 +520,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
taskHandler.newThreadTask(this, 1); taskHandler.newThreadTask(this, 1);
} catch (Exception var5) { } catch (Exception var5) {
NPCDefinition.sendStackTrace((String)null, var5); NpcDefinition.sendStackTrace((String)null, var5);
this.error("crash"); this.error("crash");
} }
@@ -723,7 +738,6 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
this.__au_110(); this.__au_110();
} }
} }
@ObfuscatedName("aw") @ObfuscatedName("aw")
@@ -842,8 +856,8 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
} catch (Exception var3) { } catch (Exception var3) {
; ;
} }
}
}
} }
@ObfuscatedName("as") @ObfuscatedName("as")
@@ -901,7 +915,6 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
class203.method4010(5000L); class203.method4010(5000L);
this.kill(); this.kill();
} }
} }
@Export("paint") @Export("paint")
@@ -915,8 +928,8 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
this.isCanvasInvalid = true; this.isCanvasInvalid = true;
} }
} }
}
}
} }
@Export("run") @Export("run")
@@ -953,27 +966,27 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
this.addCanvas(); this.addCanvas();
this.setUp(); this.setUp();
Object var7; Object var8;
try { try {
var7 = new NanoClock(); var8 = new NanoClock();
} catch (Throwable var5) { } catch (Throwable var6) {
var7 = new MilliClock(); var8 = new MilliClock();
} }
UserComparator6.clock = (Clock)var7; UserComparator6.clock = (Clock)var8;
while(0L == stopTimeMs || class203.currentTimeMs() < stopTimeMs) { while(0L == stopTimeMs || class203.currentTimeMs() < stopTimeMs) {
__ba_l = UserComparator6.clock.wait(__ba_e, __ba_d); __ba_l = UserComparator6.clock.wait(__ba_e, __ba_d);
for(int var8 = 0; var8 < __ba_l; ++var8) { for(int var5 = 0; var5 < __ba_l; ++var5) {
this.__av_93(); this.__av_93();
} }
this.__ar_94(); this.__ar_94();
this.post(this.canvas); this.post(this.canvas);
} }
} catch (Exception var6) { } catch (Exception var7) {
NPCDefinition.sendStackTrace((String)null, var6); NpcDefinition.sendStackTrace((String)null, var7);
this.error("crash"); this.error("crash");
} }
@@ -986,7 +999,6 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
if(this == gameShell && !isKilled) { if(this == gameShell && !isKilled) {
stopTimeMs = 0L; stopTimeMs = 0L;
} }
} }
@Export("update") @Export("update")
@@ -1038,7 +1050,6 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
if(this == gameShell && !isKilled) { if(this == gameShell && !isKilled) {
stopTimeMs = class203.currentTimeMs() + 4000L; stopTimeMs = class203.currentTimeMs() + 4000L;
} }
} }
@Export("windowIconified") @Export("windowIconified")
@@ -1106,7 +1117,6 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
Client.gameState = var0; Client.gameState = var0;
} }
} }
@ObfuscatedName("kv") @ObfuscatedName("kv")
@@ -1115,24 +1125,8 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
garbageValue = "2016931356" garbageValue = "2016931356"
) )
static String method1060(Widget var0, int var1) { static String method1060(Widget var0, int var1) {
int var2 = class1.getWidgetClickMask(var0); int var3 = class1.getWidgetClickMask(var0);
boolean var3 = (var2 >> var1 + 1 & 1) != 0; boolean var2 = (var3 >> var1 + 1 & 1) != 0;
return !var3 && var0.onOp == null?null:(var0.actions != null && var0.actions.length > var1 && var0.actions[var1] != null && var0.actions[var1].trim().length() != 0?var0.actions[var1]:null); return !var2 && var0.onOp == null?null:(var0.actions != null && var0.actions.length > var1 && var0.actions[var1] != null && var0.actions[var1].trim().length() != 0?var0.actions[var1]:null);
}
static {
gameShell = null;
__ba_q = 0;
stopTimeMs = 0L;
isKilled = false;
__ba_e = 20;
__ba_d = 1;
fps = 0;
__ba_a = new long[32];
__ba_j = new long[32];
__ba_aw = 500;
hasFocus = true;
garbageCollectorLastCollectionTime = -1L;
garbageCollectorLastCheckTimeMs = -1L;
} }
} }

296
runescape-client/src/main/java/GrandExchangeEvent.java
View File

@@ -81,39 +81,39 @@ public class GrandExchangeEvent {
static void runScript0(ScriptEvent var0, int var1) { static void runScript0(ScriptEvent var0, int var1) {
Object[] var2 = var0.args0; Object[] var2 = var0.args0;
Script var3; Script var3;
int var4; int var17;
if(class12.method162(var0.type0)) { if(class12.method162(var0.type0)) {
class15.worldMapEvent = (WorldMapEvent)var2[0]; class15.worldMapEvent = (WorldMapEvent)var2[0];
WorldMapElement var5 = ViewportMouse.getWorldMapElement(class15.worldMapEvent.mapElement); WorldMapElement var4 = ViewportMouse.getWorldMapElement(class15.worldMapEvent.mapElement);
var3 = FaceNormal.method3236(var0.type0, var5.__o, var5.category); var3 = FaceNormal.method3236(var0.type0, var4.__o, var4.category);
} else { } else {
var4 = ((Integer)var2[0]).intValue(); var17 = ((Integer)var2[0]).intValue();
var3 = SoundSystem.method2451(var4); var3 = SoundSystem.method2451(var17);
} }
if(var3 != null) { if(var3 != null) {
class179.Interpreter_intStackSize = 0; class179.Interpreter_intStackSize = 0;
Interpreter.Interpreter_stringStackSize = 0; Interpreter.Interpreter_stringStackSize = 0;
var4 = -1; var17 = -1;
int[] var25 = var3.opcodes; int[] var5 = var3.opcodes;
int[] var6 = var3.intOperands; int[] var6 = var3.intOperands;
byte var7 = -1; byte var7 = -1;
Interpreter.Interpreter_frameDepth = 0; Interpreter.Interpreter_frameDepth = 0;
Interpreter.__bv_s = false; Interpreter.__bv_s = false;
try { try {
int var8; int var10;
try { try {
Username.Interpreter_intLocals = new int[var3.localIntCount]; Username.Interpreter_intLocals = new int[var3.localIntCount];
int var9 = 0; int var8 = 0;
Interpreter.Interpreter_stringLocals = new String[var3.localStringCount]; Interpreter.Interpreter_stringLocals = new String[var3.localStringCount];
int var26 = 0; int var9 = 0;
int var11; int var11;
String var12; String var18;
for(var8 = 1; var8 < var2.length; ++var8) { for(var10 = 1; var10 < var2.length; ++var10) {
if(var2[var8] instanceof Integer) { if(var2[var10] instanceof Integer) {
var11 = ((Integer)var2[var8]).intValue(); var11 = ((Integer)var2[var10]).intValue();
if(var11 == -2147483647) { if(var11 == -2147483647) {
var11 = var0.mouseX; var11 = var0.mouseX;
} }
@@ -150,39 +150,39 @@ public class GrandExchangeEvent {
var11 = var0.keyPressed; var11 = var0.keyPressed;
} }
Username.Interpreter_intLocals[var9++] = var11; Username.Interpreter_intLocals[var8++] = var11;
} else if(var2[var8] instanceof String) { } else if(var2[var10] instanceof String) {
var12 = (String)var2[var8]; var18 = (String)var2[var10];
if(var12.equals("event_opbase")) { if(var18.equals("event_opbase")) {
var12 = var0.targetName; var18 = var0.targetName;
} }
Interpreter.Interpreter_stringLocals[var26++] = var12; Interpreter.Interpreter_stringLocals[var9++] = var18;
} }
} }
var8 = 0; var10 = 0;
Interpreter.__bv_y = var0.__d; Interpreter.__bv_y = var0.__d;
while(true) { while(true) {
++var8; ++var10;
if(var8 > var1) { if(var10 > var1) {
throw new RuntimeException(); throw new RuntimeException();
} }
++var4; ++var17;
int var13 = var25[var4]; int var29 = var5[var17];
int var14; int var20;
if(var13 >= 100) { if(var29 >= 100) {
boolean var32; boolean var32;
if(var3.intOperands[var4] == 1) { if(var3.intOperands[var17] == 1) {
var32 = true; var32 = true;
} else { } else {
var32 = false; var32 = false;
} }
var14 = class196.method3736(var13, var3, var32); var20 = class196.method3736(var29, var3, var32);
switch(var14) { switch(var20) {
case 0: case 0:
return; return;
case 1: case 1:
@@ -191,191 +191,191 @@ public class GrandExchangeEvent {
case 2: case 2:
throw new IllegalStateException(); throw new IllegalStateException();
} }
} else if(var13 == 0) { } else if(var29 == 0) {
Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var6[var4]; Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var6[var17];
} else if(var13 == 1) { } else if(var29 == 1) {
var11 = var6[var4]; var11 = var6[var17];
Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = Varps.Varps_main[var11]; Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = Varps.Varps_main[var11];
} else if(var13 == 2) { } else if(var29 == 2) {
var11 = var6[var4]; var11 = var6[var17];
Varps.Varps_main[var11] = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; Varps.Varps_main[var11] = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
IndexCache.method4703(var11); IndexCache.method4703(var11);
} else if(var13 == 3) { } else if(var29 == 3) {
Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.stringOperands[var4]; Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.stringOperands[var17];
} else if(var13 == 6) { } else if(var29 == 6) {
var4 += var6[var4]; var17 += var6[var17];
} else if(var13 == 7) { } else if(var29 == 7) {
class179.Interpreter_intStackSize -= 2; class179.Interpreter_intStackSize -= 2;
if(Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize] != Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]) { if(Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize] != Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]) {
var4 += var6[var4]; var17 += var6[var17];
} }
} else if(var13 == 8) { } else if(var29 == 8) {
class179.Interpreter_intStackSize -= 2; class179.Interpreter_intStackSize -= 2;
if(Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize] == Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]) { if(Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize] == Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]) {
var4 += var6[var4]; var17 += var6[var17];
} }
} else if(var13 == 9) { } else if(var29 == 9) {
class179.Interpreter_intStackSize -= 2; class179.Interpreter_intStackSize -= 2;
if(Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize] < Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]) { if(Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize] < Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]) {
var4 += var6[var4]; var17 += var6[var17];
} }
} else if(var13 == 10) { } else if(var29 == 10) {
class179.Interpreter_intStackSize -= 2; class179.Interpreter_intStackSize -= 2;
if(Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize] > Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]) { if(Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize] > Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]) {
var4 += var6[var4]; var17 += var6[var17];
} }
} else if(var13 == 21) { } else if(var29 == 21) {
if(Interpreter.Interpreter_frameDepth == 0) { if(Interpreter.Interpreter_frameDepth == 0) {
return; return;
} }
ScriptFrame var30 = Interpreter.Interpreter_frames[--Interpreter.Interpreter_frameDepth]; ScriptFrame var34 = Interpreter.Interpreter_frames[--Interpreter.Interpreter_frameDepth];
var3 = var30.script; var3 = var34.script;
var25 = var3.opcodes; var5 = var3.opcodes;
var6 = var3.intOperands; var6 = var3.intOperands;
var4 = var30.pc; var17 = var34.pc;
Username.Interpreter_intLocals = var30.intLocals; Username.Interpreter_intLocals = var34.intLocals;
Interpreter.Interpreter_stringLocals = var30.stringLocals; Interpreter.Interpreter_stringLocals = var34.stringLocals;
} else if(var13 == 25) { } else if(var29 == 25) {
var11 = var6[var4]; var11 = var6[var17];
Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = WorldMapSection2.getVarbit(var11); Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = WorldMapSection2.getVarbit(var11);
} else if(var13 == 27) { } else if(var29 == 27) {
var11 = var6[var4]; var11 = var6[var17];
class68.method1695(var11, Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]); class68.method1695(var11, Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]);
} else if(var13 == 31) { } else if(var29 == 31) {
class179.Interpreter_intStackSize -= 2; class179.Interpreter_intStackSize -= 2;
if(Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize] <= Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]) { if(Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize] <= Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]) {
var4 += var6[var4]; var17 += var6[var17];
} }
} else if(var13 == 32) { } else if(var29 == 32) {
class179.Interpreter_intStackSize -= 2; class179.Interpreter_intStackSize -= 2;
if(Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize] >= Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]) { if(Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize] >= Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]) {
var4 += var6[var4]; var17 += var6[var17];
} }
} else if(var13 == 33) { } else if(var29 == 33) {
Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = Username.Interpreter_intLocals[var6[var4]]; Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = Username.Interpreter_intLocals[var6[var17]];
} else if(var13 == 34) { } else if(var29 == 34) {
Username.Interpreter_intLocals[var6[var4]] = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; Username.Interpreter_intLocals[var6[var17]] = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
} else if(var13 == 35) { } else if(var29 == 35) {
Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Interpreter.Interpreter_stringLocals[var6[var4]]; Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Interpreter.Interpreter_stringLocals[var6[var17]];
} else if(var13 == 36) { } else if(var29 == 36) {
Interpreter.Interpreter_stringLocals[var6[var4]] = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; Interpreter.Interpreter_stringLocals[var6[var17]] = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
} else if(var13 == 37) { } else if(var29 == 37) {
var11 = var6[var4]; var11 = var6[var17];
Interpreter.Interpreter_stringStackSize -= var11; Interpreter.Interpreter_stringStackSize -= var11;
String var29 = class277.method5356(Interpreter.Interpreter_stringStack, Interpreter.Interpreter_stringStackSize, var11); String var31 = class277.method5356(Interpreter.Interpreter_stringStack, Interpreter.Interpreter_stringStackSize, var11);
Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var29; Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var31;
} else if(var13 == 38) { } else if(var29 == 38) {
--class179.Interpreter_intStackSize; --class179.Interpreter_intStackSize;
} else if(var13 == 39) { } else if(var29 == 39) {
--Interpreter.Interpreter_stringStackSize; --Interpreter.Interpreter_stringStackSize;
} else { } else {
int var15; int var15;
if(var13 != 40) { if(var29 != 40) {
if(var13 == 42) { if(var29 == 42) {
Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = class196.varcs.getInt(var6[var4]); Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = class196.varcs.getInt(var6[var17]);
} else if(var13 == 43) { } else if(var29 == 43) {
class196.varcs.setInt(var6[var4], Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]); class196.varcs.setInt(var6[var17], Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]);
} else if(var13 == 44) { } else if(var29 == 44) {
var11 = var6[var4] >> 16; var11 = var6[var17] >> 16;
var14 = var6[var4] & 65535; var20 = var6[var17] & 65535;
int var28 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; int var21 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
if(var28 < 0 || var28 > 5000) { if(var21 < 0 || var21 > 5000) {
throw new RuntimeException(); throw new RuntimeException();
} }
Interpreter.Interpreter_arrayLengths[var11] = var28; Interpreter.Interpreter_arrayLengths[var11] = var21;
byte var33 = -1; byte var22 = -1;
if(var14 == 105) { if(var20 == 105) {
var33 = 0; var22 = 0;
} }
for(var15 = 0; var15 < var28; ++var15) { for(var15 = 0; var15 < var21; ++var15) {
Interpreter.Interpreter_arrays[var11][var15] = var33; Interpreter.Interpreter_arrays[var11][var15] = var22;
} }
} else if(var13 == 45) { } else if(var29 == 45) {
var11 = var6[var4]; var11 = var6[var17];
var14 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; var20 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize];
if(var14 < 0 || var14 >= Interpreter.Interpreter_arrayLengths[var11]) { if(var20 < 0 || var20 >= Interpreter.Interpreter_arrayLengths[var11]) {
throw new RuntimeException(); throw new RuntimeException();
} }
Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = Interpreter.Interpreter_arrays[var11][var14]; Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = Interpreter.Interpreter_arrays[var11][var20];
} else if(var13 == 46) { } else if(var29 == 46) {
var11 = var6[var4]; var11 = var6[var17];
class179.Interpreter_intStackSize -= 2; class179.Interpreter_intStackSize -= 2;
var14 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize]; var20 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize];
if(var14 < 0 || var14 >= Interpreter.Interpreter_arrayLengths[var11]) { if(var20 < 0 || var20 >= Interpreter.Interpreter_arrayLengths[var11]) {
throw new RuntimeException(); throw new RuntimeException();
} }
Interpreter.Interpreter_arrays[var11][var14] = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]; Interpreter.Interpreter_arrays[var11][var20] = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1];
} else if(var13 == 47) { } else if(var29 == 47) {
var12 = class196.varcs.getStringOld(var6[var4]); var18 = class196.varcs.getStringOld(var6[var17]);
if(var12 == null) { if(var18 == null) {
var12 = "null"; var18 = "null";
} }
Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var12; Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var18;
} else if(var13 == 48) { } else if(var29 == 48) {
class196.varcs.setStringOld(var6[var4], Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]); class196.varcs.setStringOld(var6[var17], Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]);
} else if(var13 == 49) { } else if(var29 == 49) {
var12 = class196.varcs.getString(var6[var4]); var18 = class196.varcs.getString(var6[var17]);
Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var12; Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var18;
} else if(var13 == 50) { } else if(var29 == 50) {
class196.varcs.setString(var6[var4], Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]); class196.varcs.setString(var6[var17], Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]);
} else { } else {
if(var13 != 60) { if(var29 != 60) {
throw new IllegalStateException(); throw new IllegalStateException();
} }
IterableNodeHashTable var27 = var3.switches[var6[var4]]; IterableNodeHashTable var33 = var3.switches[var6[var17]];
IntegerNode var31 = (IntegerNode)var27.get((long)Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]); IntegerNode var30 = (IntegerNode)var33.get((long)Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]);
if(var31 != null) { if(var30 != null) {
var4 += var31.integer; var17 += var30.integer;
} }
} }
} else { } else {
var11 = var6[var4]; var11 = var6[var17];
Script var16 = SoundSystem.method2451(var11); Script var12 = SoundSystem.method2451(var11);
int[] var17 = new int[var16.localIntCount]; int[] var13 = new int[var12.localIntCount];
String[] var18 = new String[var16.localStringCount]; String[] var14 = new String[var12.localStringCount];
for(var15 = 0; var15 < var16.intArgumentCount; ++var15) { for(var15 = 0; var15 < var12.intArgumentCount; ++var15) {
var17[var15] = Interpreter.Interpreter_intStack[var15 + (class179.Interpreter_intStackSize - var16.intArgumentCount)]; var13[var15] = Interpreter.Interpreter_intStack[var15 + (class179.Interpreter_intStackSize - var12.intArgumentCount)];
} }
for(var15 = 0; var15 < var16.stringArgumentCount; ++var15) { for(var15 = 0; var15 < var12.stringArgumentCount; ++var15) {
var18[var15] = Interpreter.Interpreter_stringStack[var15 + (Interpreter.Interpreter_stringStackSize - var16.stringArgumentCount)]; var14[var15] = Interpreter.Interpreter_stringStack[var15 + (Interpreter.Interpreter_stringStackSize - var12.stringArgumentCount)];
} }
class179.Interpreter_intStackSize -= var16.intArgumentCount; class179.Interpreter_intStackSize -= var12.intArgumentCount;
Interpreter.Interpreter_stringStackSize -= var16.stringArgumentCount; Interpreter.Interpreter_stringStackSize -= var12.stringArgumentCount;
ScriptFrame var19 = new ScriptFrame(); ScriptFrame var19 = new ScriptFrame();
var19.script = var3; var19.script = var3;
var19.pc = var4; var19.pc = var17;
var19.intLocals = Username.Interpreter_intLocals; var19.intLocals = Username.Interpreter_intLocals;
var19.stringLocals = Interpreter.Interpreter_stringLocals; var19.stringLocals = Interpreter.Interpreter_stringLocals;
Interpreter.Interpreter_frames[++Interpreter.Interpreter_frameDepth - 1] = var19; Interpreter.Interpreter_frames[++Interpreter.Interpreter_frameDepth - 1] = var19;
var3 = var16; var3 = var12;
var25 = var16.opcodes; var5 = var12.opcodes;
var6 = var16.intOperands; var6 = var12.intOperands;
var4 = -1; var17 = -1;
Username.Interpreter_intLocals = var17; Username.Interpreter_intLocals = var13;
Interpreter.Interpreter_stringLocals = var18; Interpreter.Interpreter_stringLocals = var14;
} }
} }
} }
} catch (Exception var23) { } catch (Exception var27) {
StringBuilder var10 = new StringBuilder(30); StringBuilder var24 = new StringBuilder(30);
var10.append("").append(var3.key).append(" "); var24.append("").append(var3.key).append(" ");
for(var8 = Interpreter.Interpreter_frameDepth - 1; var8 >= 0; --var8) { for(var10 = Interpreter.Interpreter_frameDepth - 1; var10 >= 0; --var10) {
var10.append("").append(Interpreter.Interpreter_frames[var8].script.key).append(" "); var24.append("").append(Interpreter.Interpreter_frames[var10].script.key).append(" ");
} }
var10.append("").append(var7); var24.append("").append(var7);
NPCDefinition.sendStackTrace(var10.toString(), var23); NpcDefinition.sendStackTrace(var24.toString(), var27);
} }
} finally { } finally {
if(Interpreter.__bv_s) { if(Interpreter.__bv_s) {
@@ -395,9 +395,9 @@ public class GrandExchangeEvent {
garbageValue = "1404" garbageValue = "1404"
) )
public static int method80(int var0) { public static int method80(int var0) {
long var1 = ViewportMouse.ViewportMouse_entityTags[var0]; long var2 = ViewportMouse.ViewportMouse_entityTags[var0];
int var3 = (int)(var1 >>> 14 & 3L); int var1 = (int)(var2 >>> 14 & 3L);
return var3; return var1;
} }
@ObfuscatedName("w") @ObfuscatedName("w")
@@ -427,6 +427,6 @@ public class GrandExchangeEvent {
var1 = var1.substring(0, var2) + "," + var1.substring(var2); var1 = var1.substring(0, var2) + "," + var1.substring(var2);
} }
return var1.length() > 9?" " + BufferedFile.colorStartTag(65408) + var1.substring(0, var1.length() - 8) + "M (" + var1 + ")</col>":(var1.length() > 6?" " + BufferedFile.colorStartTag(16777215) + var1.substring(0, var1.length() - 4) + "K (" + var1 + ")</col>":" " + BufferedFile.colorStartTag(16776960) + var1 + "</col>"); return var1.length() > 9?" " + BufferedFile.colorStartTag(65408) + var1.substring(0, var1.length() - 8) + "M" + " " + " (" + var1 + ")" + "</col>":(var1.length() > 6?" " + BufferedFile.colorStartTag(16777215) + var1.substring(0, var1.length() - 4) + "K" + " " + " (" + var1 + ")" + "</col>":" " + BufferedFile.colorStartTag(16776960) + var1 + "</col>");
} }
} }

19
runescape-client/src/main/java/GrandExchangeEvents.java
View File

@@ -39,6 +39,14 @@ public class GrandExchangeEvents {
@Export("events") @Export("events")
public final List events; public final List events;
static {
__g_f = new class12();
new WorldComparator();
__g_q = new UnitPriceComparator();
__g_w = new class11();
__g_o = new TotalQuantityComparator();
}
@ObfuscatedSignature( @ObfuscatedSignature(
signature = "(Lgr;Z)V", signature = "(Lgr;Z)V",
garbageValue = "1" garbageValue = "1"
@@ -154,7 +162,7 @@ public class GrandExchangeEvents {
Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var3.color2; Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var3.color2;
return 1; return 1;
} else if(var0 == 2613) { } else if(var0 == 2613) {
Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var3.rectangleMode.ordinal(); Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var3.rectangleMode.rsOrdinal();
return 1; return 1;
} else if(var0 == 2614) { } else if(var0 == 2614) {
Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var3.__bv?1:0; Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var3.__bv?1:0;
@@ -173,14 +181,5 @@ public class GrandExchangeEvents {
if(GroundItemPile.loadWidgetGroup(var0)) { if(GroundItemPile.loadWidgetGroup(var0)) {
class30.method570(Widget.widgets[var0], var1); class30.method570(Widget.widgets[var0], var1);
} }
}
static {
__g_f = new class12();
new WorldComparator();
__g_q = new UnitPriceComparator();
__g_w = new class11();
__g_o = new TotalQuantityComparator();
} }
} }

2
runescape-client/src/main/java/GraphicsObject.java
View File

@@ -121,8 +121,8 @@ public final class GraphicsObject extends Entity {
break; break;
} }
} }
}
}
} }
@ObfuscatedName("e") @ObfuscatedName("e")

119
runescape-client/src/main/java/HealthBar.java
View File

@@ -53,13 +53,14 @@ public class HealthBar extends Node {
if(var6 < 4) { if(var6 < 4) {
this.updates.addLast(new HealthBarUpdate(var1, var2, var3, var4)); this.updates.addLast(new HealthBarUpdate(var1, var2, var3, var4));
} }
} else { } else {
IterableNodeDeque.IterableNodeDeque_addBefore(new HealthBarUpdate(var1, var2, var3, var4), var5); IterableNodeDeque.IterableNodeDeque_addBefore(new HealthBarUpdate(var1, var2, var3, var4), var5);
if(var6 >= 4) { if(var6 >= 4) {
this.updates.last().remove(); this.updates.last().remove();
} }
}
}
} }
@ObfuscatedName("f") @ObfuscatedName("f")
@@ -105,66 +106,64 @@ public class HealthBar extends Node {
@Export("charToByteCp1252") @Export("charToByteCp1252")
public static byte charToByteCp1252(char var0) { public static byte charToByteCp1252(char var0) {
byte var1; byte var1;
if((var0 <= 0 || var0 >= 128) && (var0 < 160 || var0 > 255)) { if(var0 > 0 && var0 < 128 || var0 >= 160 && var0 <= 255) {
if(var0 == 8364) {
var1 = -128;
} else if(var0 == 8218) {
var1 = -126;
} else if(var0 == 402) {
var1 = -125;
} else if(var0 == 8222) {
var1 = -124;
} else if(var0 == 8230) {
var1 = -123;
} else if(var0 == 8224) {
var1 = -122;
} else if(var0 == 8225) {
var1 = -121;
} else if(var0 == 710) {
var1 = -120;
} else if(var0 == 8240) {
var1 = -119;
} else if(var0 == 352) {
var1 = -118;
} else if(var0 == 8249) {
var1 = -117;
} else if(var0 == 338) {
var1 = -116;
} else if(var0 == 381) {
var1 = -114;
} else if(var0 == 8216) {
var1 = -111;
} else if(var0 == 8217) {
var1 = -110;
} else if(var0 == 8220) {
var1 = -109;
} else if(var0 == 8221) {
var1 = -108;
} else if(var0 == 8226) {
var1 = -107;
} else if(var0 == 8211) {
var1 = -106;
} else if(var0 == 8212) {
var1 = -105;
} else if(var0 == 732) {
var1 = -104;
} else if(var0 == 8482) {
var1 = -103;
} else if(var0 == 353) {
var1 = -102;
} else if(var0 == 8250) {
var1 = -101;
} else if(var0 == 339) {
var1 = -100;
} else if(var0 == 382) {
var1 = -98;
} else if(var0 == 376) {
var1 = -97;
} else {
var1 = 63;
}
} else {
var1 = (byte)var0; var1 = (byte)var0;
} else if(var0 == 8364) {
var1 = -128;
} else if(var0 == 8218) {
var1 = -126;
} else if(var0 == 402) {
var1 = -125;
} else if(var0 == 8222) {
var1 = -124;
} else if(var0 == 8230) {
var1 = -123;
} else if(var0 == 8224) {
var1 = -122;
} else if(var0 == 8225) {
var1 = -121;
} else if(var0 == 710) {
var1 = -120;
} else if(var0 == 8240) {
var1 = -119;
} else if(var0 == 352) {
var1 = -118;
} else if(var0 == 8249) {
var1 = -117;
} else if(var0 == 338) {
var1 = -116;
} else if(var0 == 381) {
var1 = -114;
} else if(var0 == 8216) {
var1 = -111;
} else if(var0 == 8217) {
var1 = -110;
} else if(var0 == 8220) {
var1 = -109;
} else if(var0 == 8221) {
var1 = -108;
} else if(var0 == 8226) {
var1 = -107;
} else if(var0 == 8211) {
var1 = -106;
} else if(var0 == 8212) {
var1 = -105;
} else if(var0 == 732) {
var1 = -104;
} else if(var0 == 8482) {
var1 = -103;
} else if(var0 == 353) {
var1 = -102;
} else if(var0 == 8250) {
var1 = -101;
} else if(var0 == 339) {
var1 = -100;
} else if(var0 == 382) {
var1 = -98;
} else if(var0 == 376) {
var1 = -97;
} else {
var1 = 63;
} }
return var1; return var1;

10
runescape-client/src/main/java/HealthBarDefinition.java
View File

@@ -98,6 +98,11 @@ public class HealthBarDefinition extends DualNode {
@Export("widthPadding") @Export("widthPadding")
public int widthPadding; public int widthPadding;
static {
HealthBarDefinition_cached = new EvictingDualNodeHashTable(64);
HealthBarDefinition_cachedSprites = new EvictingDualNodeHashTable(64);
}
public HealthBarDefinition() { public HealthBarDefinition() {
this.int1 = 255; this.int1 = 255;
this.int2 = 255; this.int2 = 255;
@@ -207,9 +212,4 @@ public class HealthBarDefinition extends DualNode {
} }
} }
} }
static {
HealthBarDefinition_cached = new EvictingDualNodeHashTable(64);
HealthBarDefinition_cachedSprites = new EvictingDualNodeHashTable(64);
}
} }

36
runescape-client/src/main/java/HealthBarUpdate.java
View File

@@ -61,34 +61,34 @@ public class HealthBarUpdate extends Node {
garbageValue = "342552136" garbageValue = "342552136"
) )
public static String method1722(CharSequence var0) { public static String method1722(CharSequence var0) {
long var1 = 0L; long var3 = 0L;
int var3 = var0.length(); int var5 = var0.length();
for(int var4 = 0; var4 < var3; ++var4) { for(int var6 = 0; var6 < var5; ++var6) {
var1 *= 37L; var3 *= 37L;
char var5 = var0.charAt(var4); char var7 = var0.charAt(var6);
if(var5 >= 'A' && var5 <= 'Z') { if(var7 >= 'A' && var7 <= 'Z') {
var1 += (long)(var5 + 1 - 65); var3 += (long)(var7 + 1 - 65);
} else if(var5 >= 'a' && var5 <= 'z') { } else if(var7 >= 'a' && var7 <= 'z') {
var1 += (long)(var5 + 1 - 97); var3 += (long)(var7 + 1 - 97);
} else if(var5 >= '0' && var5 <= '9') { } else if(var7 >= '0' && var7 <= '9') {
var1 += (long)(var5 + 27 - 48); var3 += (long)(var7 + 27 - 48);
} }
if(var1 >= 177917621779460413L) { if(var3 >= 177917621779460413L) {
break; break;
} }
} }
while(0L == var1 % 37L && var1 != 0L) { while(0L == var3 % 37L && var3 != 0L) {
var1 /= 37L; var3 /= 37L;
} }
String var6 = Clock.method3534(var1); String var8 = Clock.method3534(var3);
if(var6 == null) { if(var8 == null) {
var6 = ""; var8 = "";
} }
return var6; return var8;
} }
} }

18
runescape-client/src/main/java/HitSplatDefinition.java
View File

@@ -54,7 +54,7 @@ public class HitSplatDefinition extends DualNode {
intValue = -1151968735 intValue = -1151968735
) )
@Export("surfaceOffsetY") @Export("surfaceOffsetY")
public int surfaceOffsetY; public int __n;
@ObfuscatedName("i") @ObfuscatedName("i")
@ObfuscatedGetter( @ObfuscatedGetter(
intValue = -102270561 intValue = -102270561
@@ -134,9 +134,15 @@ public class HitSplatDefinition extends DualNode {
@Export("transformVarp") @Export("transformVarp")
int transformVarp; int transformVarp;
static {
HitSplatDefinition_cached = new EvictingDualNodeHashTable(64);
__jm_o = new EvictingDualNodeHashTable(64);
HitSplatDefinition_cachedFonts = new EvictingDualNodeHashTable(20);
}
HitSplatDefinition() { HitSplatDefinition() {
this.fontId = -1; this.fontId = -1;
this.surfaceOffsetY = 16777215; this.__n = 16777215;
this.__i = 70; this.__i = 70;
this.__a = -1; this.__a = -1;
this.__z = -1; this.__z = -1;
@@ -179,7 +185,7 @@ public class HitSplatDefinition extends DualNode {
if(var2 == 1) { if(var2 == 1) {
this.fontId = var1.__ap_310(); this.fontId = var1.__ap_310();
} else if(var2 == 2) { } else if(var2 == 2) {
this.surfaceOffsetY = var1.readMedium(); this.__n = var1.readMedium();
} else if(var2 == 3) { } else if(var2 == 3) {
this.__a = var1.__ap_310(); this.__a = var1.__ap_310();
} else if(var2 == 4) { } else if(var2 == 4) {
@@ -405,10 +411,4 @@ public class HitSplatDefinition extends DualNode {
public static int method4972(long var0) { public static int method4972(long var0) {
return (int)(var0 >>> 17 & 4294967295L); return (int)(var0 >>> 17 & 4294967295L);
} }
static {
HitSplatDefinition_cached = new EvictingDualNodeHashTable(64);
__jm_o = new EvictingDualNodeHashTable(64);
HitSplatDefinition_cachedFonts = new EvictingDualNodeHashTable(20);
}
} }

18
runescape-client/src/main/java/IgnoreList.java
View File

@@ -111,33 +111,33 @@ public class IgnoreList extends UserList {
} }
} }
int var9; int var10;
if(var8 >= '0' && var8 <= '9') { if(var8 >= '0' && var8 <= '9') {
var9 = var8 - '0'; var10 = var8 - '0';
} else if(var8 >= 'A' && var8 <= 'Z') { } else if(var8 >= 'A' && var8 <= 'Z') {
var9 = var8 - '7'; var10 = var8 - '7';
} else { } else {
if(var8 < 'a' || var8 > 'z') { if(var8 < 'a' || var8 > 'z') {
throw new NumberFormatException(); throw new NumberFormatException();
} }
var9 = var8 - 'W'; var10 = var8 - 'W';
} }
if(var9 >= var1) { if(var10 >= var1) {
throw new NumberFormatException(); throw new NumberFormatException();
} }
if(var3) { if(var3) {
var9 = -var9; var10 = -var10;
} }
int var10 = var9 + var5 * var1; int var9 = var10 + var5 * var1;
if(var10 / var1 != var5) { if(var9 / var1 != var5) {
throw new NumberFormatException(); throw new NumberFormatException();
} }
var5 = var10; var5 = var9;
var4 = true; var4 = true;
} }

2
runescape-client/src/main/java/IndexCache.java
View File

@@ -340,7 +340,7 @@ public class IndexCache extends AbstractIndexCache {
for(var1 = 0; var1 < this.validArchives.length; ++var1) { for(var1 = 0; var1 < this.validArchives.length; ++var1) {
if(super.recordCounts[var1] > 0) { if(super.recordCounts[var1] > 0) {
NPC.method2009(var1, this.indexStore, this); Npc.method2009(var1, this.indexStore, this);
this.__ac = var1; this.__ac = var1;
} }
} }

886
runescape-client/src/main/java/IndexCacheLoader.java
View File

File diff suppressed because it is too large Load Diff

550
runescape-client/src/main/java/IndexStore.java
View File

@@ -37,6 +37,10 @@ public final class IndexStore {
@Export("maxEntrySize") @Export("maxEntrySize")
int maxEntrySize; int maxEntrySize;
static {
IndexStore_buffer = new byte[520];
}
@ObfuscatedSignature( @ObfuscatedSignature(
signature = "(ILdy;Ldy;I)V" signature = "(ILdy;Ldy;I)V"
) )
@@ -58,82 +62,71 @@ public final class IndexStore {
@Export("read") @Export("read")
public byte[] read(int var1) { public byte[] read(int var1) {
BufferedFile var2 = this.dataFile; BufferedFile var2 = this.dataFile;
BufferedFile var3 = this.dataFile;
synchronized(this.dataFile) { synchronized(this.dataFile) {
byte[] var10000;
try { try {
Object var4; Object var10000;
if(this.indexFile.length() < (long)(var1 * 6 + 6)) { if(this.indexFile.length() < (long)(var1 * 6 + 6)) {
var4 = null; var10000 = null;
var10000 = (byte[])((byte[])var4); return (byte[])var10000;
return var10000; } else {
} this.indexFile.seek((long)(var1 * 6));
this.indexFile.read(IndexStore_buffer, 0, 6);
int var3 = ((IndexStore_buffer[0] & 255) << 16) + (IndexStore_buffer[2] & 255) + ((IndexStore_buffer[1] & 255) << 8);
int var4 = (IndexStore_buffer[5] & 255) + ((IndexStore_buffer[3] & 255) << 16) + ((IndexStore_buffer[4] & 255) << 8);
if(var3 < 0 || var3 > this.maxEntrySize) {
var10000 = null;
return (byte[])var10000;
} else if(var4 <= 0 || (long)var4 > this.dataFile.length() / 520L) {
var10000 = null;
return (byte[])var10000;
} else {
byte[] var5 = new byte[var3];
int var6 = 0;
int var7 = 0;
this.indexFile.seek((long)(var1 * 6)); while(var6 < var3) {
this.indexFile.read(IndexStore_buffer, 0, 6); if(var4 == 0) {
int var5 = ((IndexStore_buffer[0] & 255) << 16) + (IndexStore_buffer[2] & 255) + ((IndexStore_buffer[1] & 255) << 8); var10000 = null;
int var6 = (IndexStore_buffer[5] & 255) + ((IndexStore_buffer[3] & 255) << 16) + ((IndexStore_buffer[4] & 255) << 8); return (byte[])var10000;
if(var5 < 0 || var5 > this.maxEntrySize) {
var4 = null;
var10000 = (byte[])((byte[])var4);
return var10000;
}
if(var6 > 0 && (long)var6 <= this.dataFile.length() / 520L) {
byte[] var7 = new byte[var5];
int var8 = 0;
int var9 = 0;
while(var8 < var5) {
if(var6 == 0) {
var4 = null;
var10000 = (byte[])((byte[])var4);
return var10000;
}
this.dataFile.seek((long)(var6 * 520));
int var10 = var5 - var8;
if(var10 > 512) {
var10 = 512;
}
this.dataFile.read(IndexStore_buffer, 0, var10 + 8);
int var11 = (IndexStore_buffer[1] & 255) + ((IndexStore_buffer[0] & 255) << 8);
int var12 = (IndexStore_buffer[3] & 255) + ((IndexStore_buffer[2] & 255) << 8);
int var13 = ((IndexStore_buffer[5] & 255) << 8) + ((IndexStore_buffer[4] & 255) << 16) + (IndexStore_buffer[6] & 255);
int var14 = IndexStore_buffer[7] & 255;
if(var11 == var1 && var9 == var12 && var14 == this.index) {
if(var13 >= 0 && (long)var13 <= this.dataFile.length() / 520L) {
for(int var15 = 0; var15 < var10; ++var15) {
var7[var8++] = IndexStore_buffer[var15 + 8];
}
var6 = var13;
++var9;
continue;
} }
var4 = null; this.dataFile.seek((long)(var4 * 520));
var10000 = (byte[])((byte[])var4); int var8 = var3 - var6;
return var10000; if(var8 > 512) {
var8 = 512;
}
this.dataFile.read(IndexStore_buffer, 0, var8 + 8);
int var9 = (IndexStore_buffer[1] & 255) + ((IndexStore_buffer[0] & 255) << 8);
int var10 = (IndexStore_buffer[3] & 255) + ((IndexStore_buffer[2] & 255) << 8);
int var11 = ((IndexStore_buffer[5] & 255) << 8) + ((IndexStore_buffer[4] & 255) << 16) + (IndexStore_buffer[6] & 255);
int var12 = IndexStore_buffer[7] & 255;
if(var9 == var1 && var7 == var10 && var12 == this.index) {
if(var11 >= 0 && (long)var11 <= this.dataFile.length() / 520L) {
for(int var13 = 0; var13 < var8; ++var13) {
var5[var6++] = IndexStore_buffer[var13 + 8];
}
var4 = var11;
++var7;
continue;
}
var10000 = null;
return (byte[])var10000;
}
var10000 = null;
return (byte[])var10000;
} }
var4 = null; byte[] var18 = var5;
var10000 = (byte[])((byte[])var4); return var18;
return var10000;
} }
var10000 = var7;
return var10000;
} }
} catch (IOException var16) {
var4 = null;
var10000 = (byte[])((byte[])var4);
} catch (IOException var17) {
return null; return null;
} }
return var10000;
} }
} }
@@ -145,15 +138,14 @@ public final class IndexStore {
@Export("write") @Export("write")
public boolean write(int var1, byte[] var2, int var3) { public boolean write(int var1, byte[] var2, int var3) {
BufferedFile var4 = this.dataFile; BufferedFile var4 = this.dataFile;
BufferedFile var5 = this.dataFile;
synchronized(this.dataFile) { synchronized(this.dataFile) {
if(var3 >= 0 && var3 <= this.maxEntrySize) { if(var3 >= 0 && var3 <= this.maxEntrySize) {
boolean var6 = this.write0(var1, var2, var3, true); boolean var5 = this.write0(var1, var2, var3, true);
if(!var6) { if(!var5) {
var6 = this.write0(var1, var2, var3, false); var5 = this.write0(var1, var2, var3, false);
} }
return var6; return var5;
} else { } else {
throw new IllegalArgumentException(); throw new IllegalArgumentException();
} }
@@ -168,117 +160,110 @@ public final class IndexStore {
@Export("write0") @Export("write0")
boolean write0(int var1, byte[] var2, int var3, boolean var4) { boolean write0(int var1, byte[] var2, int var3, boolean var4) {
BufferedFile var5 = this.dataFile; BufferedFile var5 = this.dataFile;
BufferedFile var6 = this.dataFile;
synchronized(this.dataFile) { synchronized(this.dataFile) {
try { try {
int var7; int var6;
boolean var8;
boolean var10000; boolean var10000;
if(var4) { if(var4) {
if(this.indexFile.length() < (long)(var1 * 6 + 6)) { if(this.indexFile.length() < (long)(var1 * 6 + 6)) {
var8 = false; var10000 = false;
var10000 = var8;
return var10000; return var10000;
} }
this.indexFile.seek((long)(var1 * 6)); this.indexFile.seek((long)(var1 * 6));
this.indexFile.read(IndexStore_buffer, 0, 6); this.indexFile.read(IndexStore_buffer, 0, 6);
var7 = (IndexStore_buffer[5] & 255) + ((IndexStore_buffer[3] & 255) << 16) + ((IndexStore_buffer[4] & 255) << 8); var6 = (IndexStore_buffer[5] & 255) + ((IndexStore_buffer[3] & 255) << 16) + ((IndexStore_buffer[4] & 255) << 8);
if(var7 <= 0 || (long)var7 > this.dataFile.length() / 520L) { if(var6 <= 0 || (long)var6 > this.dataFile.length() / 520L) {
var8 = false; var10000 = false;
var10000 = var8;
return var10000; return var10000;
} }
} else { } else {
var7 = (int)((this.dataFile.length() + 519L) / 520L); var6 = (int)((this.dataFile.length() + 519L) / 520L);
if(var7 == 0) { if(var6 == 0) {
var7 = 1; var6 = 1;
} }
} }
IndexStore_buffer[0] = (byte)(var3 >> 16); IndexStore_buffer[0] = (byte)(var3 >> 16);
IndexStore_buffer[1] = (byte)(var3 >> 8); IndexStore_buffer[1] = (byte)(var3 >> 8);
IndexStore_buffer[2] = (byte)var3; IndexStore_buffer[2] = (byte)var3;
IndexStore_buffer[3] = (byte)(var7 >> 16); IndexStore_buffer[3] = (byte)(var6 >> 16);
IndexStore_buffer[4] = (byte)(var7 >> 8); IndexStore_buffer[4] = (byte)(var6 >> 8);
IndexStore_buffer[5] = (byte)var7; IndexStore_buffer[5] = (byte)var6;
this.indexFile.seek((long)(var1 * 6)); this.indexFile.seek((long)(var1 * 6));
this.indexFile.write(IndexStore_buffer, 0, 6); this.indexFile.write(IndexStore_buffer, 0, 6);
int var9 = 0; int var7 = 0;
int var10 = 0; int var8 = 0;
while(true) { while(true) {
if(var9 < var3) { if(var7 < var3) {
label129: { label142: {
int var11 = 0; int var9 = 0;
int var12; int var14;
if(var4) { if(var4) {
this.dataFile.seek((long)(var7 * 520)); this.dataFile.seek((long)(var6 * 520));
try { try {
this.dataFile.read(IndexStore_buffer, 0, 8); this.dataFile.read(IndexStore_buffer, 0, 8);
} catch (EOFException var16) { } catch (EOFException var16) {
break label129; break label142;
} }
var12 = (IndexStore_buffer[1] & 255) + ((IndexStore_buffer[0] & 255) << 8); var14 = (IndexStore_buffer[1] & 255) + ((IndexStore_buffer[0] & 255) << 8);
int var13 = (IndexStore_buffer[3] & 255) + ((IndexStore_buffer[2] & 255) << 8); int var11 = (IndexStore_buffer[3] & 255) + ((IndexStore_buffer[2] & 255) << 8);
var11 = ((IndexStore_buffer[5] & 255) << 8) + ((IndexStore_buffer[4] & 255) << 16) + (IndexStore_buffer[6] & 255); var9 = ((IndexStore_buffer[5] & 255) << 8) + ((IndexStore_buffer[4] & 255) << 16) + (IndexStore_buffer[6] & 255);
int var14 = IndexStore_buffer[7] & 255; int var12 = IndexStore_buffer[7] & 255;
if(var12 != var1 || var13 != var10 || var14 != this.index) { if(var14 != var1 || var11 != var8 || var12 != this.index) {
var8 = false; var10000 = false;
var10000 = var8;
return var10000; return var10000;
} }
if(var11 < 0 || (long)var11 > this.dataFile.length() / 520L) { if(var9 < 0 || (long)var9 > this.dataFile.length() / 520L) {
var8 = false; var10000 = false;
var10000 = var8;
return var10000; return var10000;
} }
} }
if(var11 == 0) { if(var9 == 0) {
var4 = false; var4 = false;
var11 = (int)((this.dataFile.length() + 519L) / 520L); var9 = (int)((this.dataFile.length() + 519L) / 520L);
if(var11 == 0) { if(var9 == 0) {
++var11; ++var9;
} }
if(var7 == var11) { if(var6 == var9) {
++var11; ++var9;
} }
} }
if(var3 - var9 <= 512) { if(var3 - var7 <= 512) {
var11 = 0; var9 = 0;
} }
IndexStore_buffer[0] = (byte)(var1 >> 8); IndexStore_buffer[0] = (byte)(var1 >> 8);
IndexStore_buffer[1] = (byte)var1; IndexStore_buffer[1] = (byte)var1;
IndexStore_buffer[2] = (byte)(var10 >> 8); IndexStore_buffer[2] = (byte)(var8 >> 8);
IndexStore_buffer[3] = (byte)var10; IndexStore_buffer[3] = (byte)var8;
IndexStore_buffer[4] = (byte)(var11 >> 16); IndexStore_buffer[4] = (byte)(var9 >> 16);
IndexStore_buffer[5] = (byte)(var11 >> 8); IndexStore_buffer[5] = (byte)(var9 >> 8);
IndexStore_buffer[6] = (byte)var11; IndexStore_buffer[6] = (byte)var9;
IndexStore_buffer[7] = (byte)this.index; IndexStore_buffer[7] = (byte)this.index;
this.dataFile.seek((long)(var7 * 520)); this.dataFile.seek((long)(var6 * 520));
this.dataFile.write(IndexStore_buffer, 0, 8); this.dataFile.write(IndexStore_buffer, 0, 8);
var12 = var3 - var9; var14 = var3 - var7;
if(var12 > 512) { if(var14 > 512) {
var12 = 512; var14 = 512;
} }
this.dataFile.write(var2, var9, var12); this.dataFile.write(var2, var7, var14);
var9 += var12; var7 += var14;
var7 = var11; var6 = var9;
++var10; ++var8;
continue; continue;
} }
} }
var8 = true; var10000 = true;
var10000 = var8;
return var10000; return var10000;
} }
} catch (IOException var17) { } catch (IOException var17) {
@@ -304,195 +289,200 @@ public final class IndexStore {
byte var11 = 0; byte var11 = 0;
int var12 = 0; int var12 = 0;
class178.__fi_l[var11] = var0; class178.__fi_l[var11] = var0;
int var13 = var11 + 1; int var20 = var11 + 1;
class178.__fi_e[var11] = var1; class178.__fi_e[var11] = var1;
int[][] var14 = var4.flags; int[][] var13 = var4.flags;
label204: while(true) {
while(var13 != var12) { label300:
var5 = class178.__fi_l[var12]; while(true) {
var6 = class178.__fi_e[var12]; int var14;
var12 = var12 + 1 & 4095; int var15;
int var19 = var5 - var9; int var16;
int var20 = var6 - var10; int var17;
int var15 = var5 - var4.xInset; int var18;
int var16 = var6 - var4.yInset; int var19;
if(var3.vmethod3644(var2, var5, var6, var4)) { do {
WidgetGroupParent.__bx_o = var5; do {
UrlRequester.__eo_u = var6; do {
return true; label277:
} do {
if(var20 == var12) {
WidgetGroupParent.__bx_o = var5;
UrlRequester.__eo_u = var6;
return false;
}
int var17 = class178.__fi_w[var19][var20] + 1; var5 = class178.__fi_l[var12];
int var18; var6 = class178.__fi_e[var12];
if(var19 > 0 && class178.__fi_q[var19 - 1][var20] == 0 && (var14[var15 - 1][var16] & 19136782) == 0 && (var14[var15 - 1][var16 + var2 - 1] & 19136824) == 0) { var12 = var12 + 1 & 4095;
var18 = 1; var18 = var5 - var9;
var19 = var6 - var10;
var14 = var5 - var4.xInset;
var15 = var6 - var4.yInset;
if(var3.vmethod3644(var2, var5, var6, var4)) {
WidgetGroupParent.__bx_o = var5;
UrlRequester.__eo_u = var6;
return true;
}
while(true) { var16 = class178.__fi_w[var18][var19] + 1;
if(var18 >= var2 - 1) { if(var18 > 0 && class178.__fi_q[var18 - 1][var19] == 0 && (var13[var14 - 1][var15] & 19136782) == 0 && (var13[var14 - 1][var15 + var2 - 1] & 19136824) == 0) {
class178.__fi_l[var13] = var5 - 1; var17 = 1;
class178.__fi_e[var13] = var6;
var13 = var13 + 1 & 4095;
class178.__fi_q[var19 - 1][var20] = 2;
class178.__fi_w[var19 - 1][var20] = var17;
break;
}
if((var14[var15 - 1][var18 + var16] & 19136830) != 0) { while(true) {
break; if(var17 >= var2 - 1) {
} class178.__fi_l[var20] = var5 - 1;
class178.__fi_e[var20] = var6;
var20 = var20 + 1 & 4095;
class178.__fi_q[var18 - 1][var19] = 2;
class178.__fi_w[var18 - 1][var19] = var16;
break;
}
++var18; if((var13[var14 - 1][var17 + var15] & 19136830) != 0) {
} break;
} }
if(var19 < 128 - var2 && class178.__fi_q[var19 + 1][var20] == 0 && (var14[var15 + var2][var16] & 19136899) == 0 && (var14[var15 + var2][var16 + var2 - 1] & 19136992) == 0) { ++var17;
var18 = 1; }
}
while(true) { if(var18 < 128 - var2 && class178.__fi_q[var18 + 1][var19] == 0 && (var13[var14 + var2][var15] & 19136899) == 0 && (var13[var14 + var2][var15 + var2 - 1] & 19136992) == 0) {
if(var18 >= var2 - 1) { var17 = 1;
class178.__fi_l[var13] = var5 + 1;
class178.__fi_e[var13] = var6;
var13 = var13 + 1 & 4095;
class178.__fi_q[var19 + 1][var20] = 8;
class178.__fi_w[var19 + 1][var20] = var17;
break;
}
if((var14[var15 + var2][var16 + var18] & 19136995) != 0) { while(true) {
break; if(var17 >= var2 - 1) {
} class178.__fi_l[var20] = var5 + 1;
class178.__fi_e[var20] = var6;
var20 = var20 + 1 & 4095;
class178.__fi_q[var18 + 1][var19] = 8;
class178.__fi_w[var18 + 1][var19] = var16;
break;
}
++var18; if((var13[var14 + var2][var15 + var17] & 19136995) != 0) {
} break;
} }
if(var20 > 0 && class178.__fi_q[var19][var20 - 1] == 0 && (var14[var15][var16 - 1] & 19136782) == 0 && (var14[var15 + var2 - 1][var16 - 1] & 19136899) == 0) { ++var17;
var18 = 1; }
}
while(true) { if(var19 > 0 && class178.__fi_q[var18][var19 - 1] == 0 && (var13[var14][var15 - 1] & 19136782) == 0 && (var13[var14 + var2 - 1][var15 - 1] & 19136899) == 0) {
if(var18 >= var2 - 1) { var17 = 1;
class178.__fi_l[var13] = var5;
class178.__fi_e[var13] = var6 - 1;
var13 = var13 + 1 & 4095;
class178.__fi_q[var19][var20 - 1] = 1;
class178.__fi_w[var19][var20 - 1] = var17;
break;
}
if((var14[var18 + var15][var16 - 1] & 19136911) != 0) { while(true) {
break; if(var17 >= var2 - 1) {
} class178.__fi_l[var20] = var5;
class178.__fi_e[var20] = var6 - 1;
var20 = var20 + 1 & 4095;
class178.__fi_q[var18][var19 - 1] = 1;
class178.__fi_w[var18][var19 - 1] = var16;
break;
}
++var18; if((var13[var17 + var14][var15 - 1] & 19136911) != 0) {
} break;
} }
if(var20 < 128 - var2 && class178.__fi_q[var19][var20 + 1] == 0 && (var14[var15][var16 + var2] & 19136824) == 0 && (var14[var15 + var2 - 1][var16 + var2] & 19136992) == 0) { ++var17;
var18 = 1; }
}
while(true) { if(var19 < 128 - var2 && class178.__fi_q[var18][var19 + 1] == 0 && (var13[var14][var15 + var2] & 19136824) == 0 && (var13[var14 + var2 - 1][var15 + var2] & 19136992) == 0) {
if(var18 >= var2 - 1) { var17 = 1;
class178.__fi_l[var13] = var5;
class178.__fi_e[var13] = var6 + 1;
var13 = var13 + 1 & 4095;
class178.__fi_q[var19][var20 + 1] = 4;
class178.__fi_w[var19][var20 + 1] = var17;
break;
}
if((var14[var18 + var15][var16 + var2] & 19137016) != 0) { while(true) {
break; if(var17 >= var2 - 1) {
} class178.__fi_l[var20] = var5;
class178.__fi_e[var20] = var6 + 1;
var20 = var20 + 1 & 4095;
class178.__fi_q[var18][var19 + 1] = 4;
class178.__fi_w[var18][var19 + 1] = var16;
break;
}
++var18; if((var13[var17 + var14][var15 + var2] & 19137016) != 0) {
} break;
} }
if(var19 > 0 && var20 > 0 && class178.__fi_q[var19 - 1][var20 - 1] == 0 && (var14[var15 - 1][var16 - 1] & 19136782) == 0) { ++var17;
var18 = 1; }
}
while(true) { if(var18 > 0 && var19 > 0 && class178.__fi_q[var18 - 1][var19 - 1] == 0 && (var13[var14 - 1][var15 - 1] & 19136782) == 0) {
if(var18 >= var2) { var17 = 1;
class178.__fi_l[var13] = var5 - 1;
class178.__fi_e[var13] = var6 - 1;
var13 = var13 + 1 & 4095;
class178.__fi_q[var19 - 1][var20 - 1] = 3;
class178.__fi_w[var19 - 1][var20 - 1] = var17;
break;
}
if((var14[var15 - 1][var18 + (var16 - 1)] & 19136830) != 0 || (var14[var18 + (var15 - 1)][var16 - 1] & 19136911) != 0) { while(true) {
break; if(var17 >= var2) {
} class178.__fi_l[var20] = var5 - 1;
class178.__fi_e[var20] = var6 - 1;
var20 = var20 + 1 & 4095;
class178.__fi_q[var18 - 1][var19 - 1] = 3;
class178.__fi_w[var18 - 1][var19 - 1] = var16;
break;
}
++var18; if((var13[var14 - 1][var17 + (var15 - 1)] & 19136830) != 0 || (var13[var17 + (var14 - 1)][var15 - 1] & 19136911) != 0) {
} break;
} }
if(var19 < 128 - var2 && var20 > 0 && class178.__fi_q[var19 + 1][var20 - 1] == 0 && (var14[var15 + var2][var16 - 1] & 19136899) == 0) { ++var17;
var18 = 1; }
}
while(true) { if(var18 < 128 - var2 && var19 > 0 && class178.__fi_q[var18 + 1][var19 - 1] == 0 && (var13[var14 + var2][var15 - 1] & 19136899) == 0) {
if(var18 >= var2) { var17 = 1;
class178.__fi_l[var13] = var5 + 1;
class178.__fi_e[var13] = var6 - 1;
var13 = var13 + 1 & 4095;
class178.__fi_q[var19 + 1][var20 - 1] = 9;
class178.__fi_w[var19 + 1][var20 - 1] = var17;
break;
}
if((var14[var15 + var2][var18 + (var16 - 1)] & 19136995) != 0 || (var14[var18 + var15][var16 - 1] & 19136911) != 0) { while(true) {
break; if(var17 >= var2) {
} class178.__fi_l[var20] = var5 + 1;
class178.__fi_e[var20] = var6 - 1;
var20 = var20 + 1 & 4095;
class178.__fi_q[var18 + 1][var19 - 1] = 9;
class178.__fi_w[var18 + 1][var19 - 1] = var16;
break;
}
++var18; if((var13[var14 + var2][var17 + (var15 - 1)] & 19136995) != 0 || (var13[var17 + var14][var15 - 1] & 19136911) != 0) {
} break;
} }
if(var19 > 0 && var20 < 128 - var2 && class178.__fi_q[var19 - 1][var20 + 1] == 0 && (var14[var15 - 1][var16 + var2] & 19136824) == 0) { ++var17;
var18 = 1; }
}
while(true) { if(var18 > 0 && var19 < 128 - var2 && class178.__fi_q[var18 - 1][var19 + 1] == 0 && (var13[var14 - 1][var15 + var2] & 19136824) == 0) {
if(var18 >= var2) { for(var17 = 1; var17 < var2; ++var17) {
class178.__fi_l[var13] = var5 - 1; if((var13[var14 - 1][var15 + var17] & 19136830) != 0 || (var13[var17 + (var14 - 1)][var15 + var2] & 19137016) != 0) {
class178.__fi_e[var13] = var6 + 1; continue label277;
var13 = var13 + 1 & 4095; }
class178.__fi_q[var19 - 1][var20 + 1] = 6; }
class178.__fi_w[var19 - 1][var20 + 1] = var17;
break;
}
if((var14[var15 - 1][var16 + var18] & 19136830) != 0 || (var14[var18 + (var15 - 1)][var16 + var2] & 19137016) != 0) { class178.__fi_l[var20] = var5 - 1;
break; class178.__fi_e[var20] = var6 + 1;
} var20 = var20 + 1 & 4095;
class178.__fi_q[var18 - 1][var19 + 1] = 6;
class178.__fi_w[var18 - 1][var19 + 1] = var16;
}
} while(var18 >= 128 - var2);
} while(var19 >= 128 - var2);
} while(class178.__fi_q[var18 + 1][var19 + 1] != 0);
} while((var13[var14 + var2][var15 + var2] & 19136992) != 0);
++var18; for(var17 = 1; var17 < var2; ++var17) {
} if((var13[var14 + var17][var15 + var2] & 19137016) != 0 || (var13[var14 + var2][var17 + var15] & 19136995) != 0) {
} continue label300;
if(var19 < 128 - var2 && var20 < 128 - var2 && class178.__fi_q[var19 + 1][var20 + 1] == 0 && (var14[var15 + var2][var16 + var2] & 19136992) == 0) {
for(var18 = 1; var18 < var2; ++var18) {
if((var14[var15 + var18][var16 + var2] & 19137016) != 0 || (var14[var15 + var2][var18 + var16] & 19136995) != 0) {
continue label204;
} }
} }
class178.__fi_l[var13] = var5 + 1; class178.__fi_l[var20] = var5 + 1;
class178.__fi_e[var13] = var6 + 1; class178.__fi_e[var20] = var6 + 1;
var13 = var13 + 1 & 4095; var20 = var20 + 1 & 4095;
class178.__fi_q[var19 + 1][var20 + 1] = 12; class178.__fi_q[var18 + 1][var19 + 1] = 12;
class178.__fi_w[var19 + 1][var20 + 1] = var17; class178.__fi_w[var18 + 1][var19 + 1] = var16;
} }
} }
WidgetGroupParent.__bx_o = var5;
UrlRequester.__eo_u = var6;
return false;
}
static {
IndexStore_buffer = new byte[520];
} }
} }

16
runescape-client/src/main/java/IndexStoreAction.java
View File

@@ -87,16 +87,16 @@ public class IndexStoreAction extends Node {
if(var4 != 0) { if(var4 != 0) {
++var0.__cm; ++var0.__cm;
boolean var5; boolean var6;
if(var4 > 1024) { if(var4 > 1024) {
var0.__ac -= var0.__cj; var0.__ac -= var0.__cj;
var5 = true; var6 = true;
if(var4 < var0.__cj || var4 > 2048 - var0.__cj) { if(var4 < var0.__cj || var4 > 2048 - var0.__cj) {
var0.__ac = var0.orientation; var0.__ac = var0.orientation;
var5 = false; var6 = false;
} }
if(var0.movementSequence == var0.idleSequence && (var0.__cm > 25 || var5)) { if(var0.movementSequence == var0.idleSequence && (var0.__cm > 25 || var6)) {
if(var0.turnLeftSequence != -1) { if(var0.turnLeftSequence != -1) {
var0.movementSequence = var0.turnLeftSequence; var0.movementSequence = var0.turnLeftSequence;
} else { } else {
@@ -105,13 +105,13 @@ public class IndexStoreAction extends Node {
} }
} else { } else {
var0.__ac += var0.__cj; var0.__ac += var0.__cj;
var5 = true; var6 = true;
if(var4 < var0.__cj || var4 > 2048 - var0.__cj) { if(var4 < var0.__cj || var4 > 2048 - var0.__cj) {
var0.__ac = var0.orientation; var0.__ac = var0.orientation;
var5 = false; var6 = false;
} }
if(var0.movementSequence == var0.idleSequence && (var0.__cm > 25 || var5)) { if(var0.movementSequence == var0.idleSequence && (var0.__cm > 25 || var6)) {
if(var0.turnRightSequence != -1) { if(var0.turnRightSequence != -1) {
var0.movementSequence = var0.turnRightSequence; var0.movementSequence = var0.turnRightSequence;
} else { } else {
@@ -124,7 +124,7 @@ public class IndexStoreAction extends Node {
} else { } else {
var0.__cm = 0; var0.__cm = 0;
} }
}
}
} }
} }

56
runescape-client/src/main/java/IndexStoreActionHandler.java
View File

@@ -29,40 +29,41 @@ public class IndexStoreActionHandler implements Runnable {
@Export("IndexStoreActionHandler_lock") @Export("IndexStoreActionHandler_lock")
static Object IndexStoreActionHandler_lock; static Object IndexStoreActionHandler_lock;
static {
IndexStoreActionHandler_requestQueue = new NodeDeque();
IndexStoreActionHandler_responseQueue = new NodeDeque();
__iv_q = 0;
IndexStoreActionHandler_lock = new Object();
}
@Export("run") @Export("run")
@ObfuscatedName("run") @ObfuscatedName("run")
public void run() { public void run() {
try { try {
while(true) { while(true) {
NodeDeque var1 = IndexStoreActionHandler_requestQueue; NodeDeque var2 = IndexStoreActionHandler_requestQueue;
NodeDeque var3 = IndexStoreActionHandler_requestQueue; IndexStoreAction var1;
IndexStoreAction var2;
synchronized(IndexStoreActionHandler_requestQueue) { synchronized(IndexStoreActionHandler_requestQueue) {
var2 = (IndexStoreAction)IndexStoreActionHandler_requestQueue.last(); var1 = (IndexStoreAction)IndexStoreActionHandler_requestQueue.last();
} }
Object var4; Object var14;
Object var15; if(var1 != null) {
if(var2 != null) { if(var1.type == 0) {
NodeDeque var16; var1.indexStore.write((int)var1.key, var1.data, var1.data.length);
if(var2.type == 0) { var2 = IndexStoreActionHandler_requestQueue;
var2.indexStore.write((int)var2.key, var2.data, var2.data.length);
var1 = IndexStoreActionHandler_requestQueue;
var16 = IndexStoreActionHandler_requestQueue;
synchronized(IndexStoreActionHandler_requestQueue) { synchronized(IndexStoreActionHandler_requestQueue) {
var2.remove(); var1.remove();
} }
} else if(var2.type == 1) { } else if(var1.type == 1) {
var2.data = var2.indexStore.read((int)var2.key); var1.data = var1.indexStore.read((int)var1.key);
var1 = IndexStoreActionHandler_requestQueue; var2 = IndexStoreActionHandler_requestQueue;
var16 = IndexStoreActionHandler_requestQueue;
synchronized(IndexStoreActionHandler_requestQueue) { synchronized(IndexStoreActionHandler_requestQueue) {
IndexStoreActionHandler_responseQueue.addFirst(var2); IndexStoreActionHandler_responseQueue.addFirst(var1);
} }
} }
var15 = IndexStoreActionHandler_lock; var14 = IndexStoreActionHandler_lock;
var4 = IndexStoreActionHandler_lock;
synchronized(IndexStoreActionHandler_lock) { synchronized(IndexStoreActionHandler_lock) {
if(__iv_q <= 1) { if(__iv_q <= 1) {
__iv_q = 0; __iv_q = 0;
@@ -74,8 +75,7 @@ public class IndexStoreActionHandler implements Runnable {
} }
} else { } else {
class203.method4010(100L); class203.method4010(100L);
var15 = IndexStoreActionHandler_lock; var14 = IndexStoreActionHandler_lock;
var4 = IndexStoreActionHandler_lock;
synchronized(IndexStoreActionHandler_lock) { synchronized(IndexStoreActionHandler_lock) {
if(__iv_q <= 1) { if(__iv_q <= 1) {
__iv_q = 0; __iv_q = 0;
@@ -87,8 +87,8 @@ public class IndexStoreActionHandler implements Runnable {
} }
} }
} }
} catch (Exception var14) { } catch (Exception var13) {
NPCDefinition.sendStackTrace((String)null, var14); NpcDefinition.sendStackTrace((String)null, var13);
} }
} }
@@ -104,13 +104,5 @@ public class IndexStoreActionHandler implements Runnable {
var1.packetBuffer.writeStringCp1252NullTerminated(var0); var1.packetBuffer.writeStringCp1252NullTerminated(var0);
Client.packetWriter.__q_167(var1); Client.packetWriter.__q_167(var1);
} }
}
static {
IndexStoreActionHandler_requestQueue = new NodeDeque();
IndexStoreActionHandler_responseQueue = new NodeDeque();
__iv_q = 0;
IndexStoreActionHandler_lock = new Object();
} }
} }

2
runescape-client/src/main/java/IndexedSprite.java
View File

@@ -49,7 +49,6 @@ public final class IndexedSprite extends Rasterizer2D {
this.xOffset = 0; this.xOffset = 0;
this.yOffset = 0; this.yOffset = 0;
} }
} }
@ObfuscatedName("f") @ObfuscatedName("f")
@@ -129,7 +128,6 @@ public final class IndexedSprite extends Rasterizer2D {
if(var6 > 0 && var5 > 0) { if(var6 > 0 && var5 > 0) {
IndexedSprite_two(Rasterizer2D.Rasterizer2D_pixels, this.pixels, this.palette, var4, var3, var6, var5, var7, var8); IndexedSprite_two(Rasterizer2D.Rasterizer2D_pixels, this.pixels, this.palette, var4, var3, var6, var5, var7, var8);
} }
} }
@ObfuscatedName("o") @ObfuscatedName("o")

92
runescape-client/src/main/java/Instrument.java
View File

@@ -113,6 +113,29 @@ public class Instrument {
@Export("offset") @Export("offset")
int offset; int offset;
static {
Instrument_noise = new int['耀'];
Random var0 = new Random(0L);
int var1;
for(var1 = 0; var1 < 32768; ++var1) {
Instrument_noise[var1] = (var0.nextInt() & 2) - 1;
}
Instrument_sine = new int['耀'];
for(var1 = 0; var1 < 32768; ++var1) {
Instrument_sine[var1] = (int)(Math.sin((double)var1 / 5215.1903D) * 16384.0D);
}
Instrument_samples = new int[220500];
Instrument_phases = new int[5];
Instrument_delays = new int[5];
Instrument_volumeSteps = new int[5];
Instrument_pitchSteps = new int[5];
Instrument_pitchBaseSteps = new int[5];
}
Instrument() { Instrument() {
this.oscillatorVolume = new int[]{0, 0, 0, 0, 0}; this.oscillatorVolume = new int[]{0, 0, 0, 0, 0};
this.oscillatorPitch = new int[]{0, 0, 0, 0, 0}; this.oscillatorPitch = new int[]{0, 0, 0, 0, 0};
@@ -201,13 +224,13 @@ public class Instrument {
this.__g.reset(); this.__g.reset();
this.__l.reset(); this.__l.reset();
var11 = 0; var11 = 0;
boolean var17 = false; boolean var19 = false;
boolean var18 = true; boolean var20 = true;
for(var14 = 0; var14 < var1; ++var14) { for(var14 = 0; var14 < var1; ++var14) {
var15 = this.__g.doStep(var1); var15 = this.__g.doStep(var1);
var16 = this.__l.doStep(var1); var16 = this.__l.doStep(var1);
if(var18) { if(var20) {
var12 = (var15 * (this.__g.end - this.__g.start) >> 8) + this.__g.start; var12 = (var15 * (this.__g.end - this.__g.start) >> 8) + this.__g.start;
} else { } else {
var12 = (var16 * (this.__g.end - this.__g.start) >> 8) + this.__g.start; var12 = (var16 * (this.__g.end - this.__g.start) >> 8) + this.__g.start;
@@ -216,10 +239,10 @@ public class Instrument {
var11 += 256; var11 += 256;
if(var11 >= var12) { if(var11 >= var12) {
var11 = 0; var11 = 0;
var18 = !var18; var20 = !var20;
} }
if(var18) { if(var20) {
Instrument_samples[var14] = 0; Instrument_samples[var14] = 0;
} }
} }
@@ -245,16 +268,16 @@ public class Instrument {
var15 = var1 - var12; var15 = var1 - var12;
} }
int var19; int var17;
while(var14 < var15) { while(var14 < var15) {
var16 = (int)((long)Instrument_samples[var14 + var12] * (long)AudioFilter.__di_e >> 16); var16 = (int)((long)Instrument_samples[var14 + var12] * (long)AudioFilter.__di_e >> 16);
for(var19 = 0; var19 < var12; ++var19) { for(var17 = 0; var17 < var12; ++var17) {
var16 += (int)((long)Instrument_samples[var14 + var12 - 1 - var19] * (long)AudioFilter.__di_g[0][var19] >> 16); var16 += (int)((long)Instrument_samples[var14 + var12 - 1 - var17] * (long)AudioFilter.__di_g[0][var17] >> 16);
} }
for(var19 = 0; var19 < var14; ++var19) { for(var17 = 0; var17 < var14; ++var17) {
var16 -= (int)((long)Instrument_samples[var14 - 1 - var19] * (long)AudioFilter.__di_g[1][var19] >> 16); var16 -= (int)((long)Instrument_samples[var14 - 1 - var17] * (long)AudioFilter.__di_g[1][var17] >> 16);
} }
Instrument_samples[var14] = var16; Instrument_samples[var14] = var16;
@@ -269,36 +292,36 @@ public class Instrument {
var15 = var1 - var12; var15 = var1 - var12;
} }
int var20; int var18;
while(var14 < var15) { while(var14 < var15) {
var19 = (int)((long)Instrument_samples[var14 + var12] * (long)AudioFilter.__di_e >> 16); var17 = (int)((long)Instrument_samples[var14 + var12] * (long)AudioFilter.__di_e >> 16);
for(var20 = 0; var20 < var12; ++var20) { for(var18 = 0; var18 < var12; ++var18) {
var19 += (int)((long)Instrument_samples[var14 + var12 - 1 - var20] * (long)AudioFilter.__di_g[0][var20] >> 16); var17 += (int)((long)Instrument_samples[var14 + var12 - 1 - var18] * (long)AudioFilter.__di_g[0][var18] >> 16);
} }
for(var20 = 0; var20 < var13; ++var20) { for(var18 = 0; var18 < var13; ++var18) {
var19 -= (int)((long)Instrument_samples[var14 - 1 - var20] * (long)AudioFilter.__di_g[1][var20] >> 16); var17 -= (int)((long)Instrument_samples[var14 - 1 - var18] * (long)AudioFilter.__di_g[1][var18] >> 16);
} }
Instrument_samples[var14] = var19; Instrument_samples[var14] = var17;
var11 = this.__a.doStep(var1 + 1); var11 = this.__a.doStep(var1 + 1);
++var14; ++var14;
} }
if(var14 >= var1 - var12) { if(var14 >= var1 - var12) {
while(var14 < var1) { while(var14 < var1) {
var19 = 0; var17 = 0;
for(var20 = var14 + var12 - var1; var20 < var12; ++var20) { for(var18 = var14 + var12 - var1; var18 < var12; ++var18) {
var19 += (int)((long)Instrument_samples[var14 + var12 - 1 - var20] * (long)AudioFilter.__di_g[0][var20] >> 16); var17 += (int)((long)Instrument_samples[var14 + var12 - 1 - var18] * (long)AudioFilter.__di_g[0][var18] >> 16);
} }
for(var20 = 0; var20 < var13; ++var20) { for(var18 = 0; var18 < var13; ++var18) {
var19 -= (int)((long)Instrument_samples[var14 - 1 - var20] * (long)AudioFilter.__di_g[1][var20] >> 16); var17 -= (int)((long)Instrument_samples[var14 - 1 - var18] * (long)AudioFilter.__di_g[1][var18] >> 16);
} }
Instrument_samples[var14] = var19; Instrument_samples[var14] = var17;
this.__a.doStep(var1 + 1); this.__a.doStep(var1 + 1);
++var14; ++var14;
} }
@@ -388,27 +411,4 @@ public class Instrument {
this.__a = new SoundEnvelope(); this.__a = new SoundEnvelope();
this.filter.__o_208(var1, this.__a); this.filter.__o_208(var1, this.__a);
} }
static {
Instrument_noise = new int[32768];
Random var0 = new Random(0L);
int var1;
for(var1 = 0; var1 < 32768; ++var1) {
Instrument_noise[var1] = (var0.nextInt() & 2) - 1;
}
Instrument_sine = new int[32768];
for(var1 = 0; var1 < 32768; ++var1) {
Instrument_sine[var1] = (int)(Math.sin((double)var1 / 5215.1903D) * 16384.0D);
}
Instrument_samples = new int[220500];
Instrument_phases = new int[5];
Instrument_delays = new int[5];
Instrument_volumeSteps = new int[5];
Instrument_pitchSteps = new int[5];
Instrument_pitchBaseSteps = new int[5];
}
} }

69
runescape-client/src/main/java/Interpreter.java
View File

@@ -66,6 +66,21 @@ public class Interpreter {
@Export("__bv_r") @Export("__bv_r")
static final double __bv_r; static final double __bv_r;
static {
Interpreter_arrayLengths = new int[5];
Interpreter_arrays = new int[5][5000];
Interpreter_intStack = new int[1000];
Interpreter_stringStack = new String[1000];
Interpreter_frameDepth = 0;
Interpreter_frames = new ScriptFrame[50];
Interpreter_calendar = Calendar.getInstance();
__bv_z = new String[]{"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
__bv_s = false;
__bv_t = false;
__bv_y = 0;
__bv_r = Math.log(2.0D);
}
@ObfuscatedName("m") @ObfuscatedName("m")
@ObfuscatedSignature( @ObfuscatedSignature(
signature = "(Lgs;Lhn;I)Lgg;", signature = "(Lgs;Lhn;I)Lgg;",
@@ -154,32 +169,32 @@ public class Interpreter {
public static void method1976() { public static void method1976() {
try { try {
File var0 = new File(WorldMapSection1.userHomeDirectory, "random.dat"); File var0 = new File(WorldMapSection1.userHomeDirectory, "random.dat");
int var1; int var2;
if(var0.exists()) { if(var0.exists()) {
class168.randomDat = new BufferedFile(new AccessFile(var0, "rw", 25L), 24, 0); class168.randomDat = new BufferedFile(new AccessFile(var0, "rw", 25L), 24, 0);
} else { } else {
label34: label38:
for(int var2 = 0; var2 < Canvas.__ao_s.length; ++var2) { for(int var1 = 0; var1 < Canvas.__ao_s.length; ++var1) {
for(var1 = 0; var1 < WorldMapSection2.cacheDirectoryLocations.length; ++var1) { for(var2 = 0; var2 < WorldMapSection2.cacheDirectoryLocations.length; ++var2) {
File var3 = new File(WorldMapSection2.cacheDirectoryLocations[var1] + Canvas.__ao_s[var2] + File.separatorChar + "random.dat"); File var3 = new File(WorldMapSection2.cacheDirectoryLocations[var2] + Canvas.__ao_s[var1] + File.separatorChar + "random.dat");
if(var3.exists()) { if(var3.exists()) {
class168.randomDat = new BufferedFile(new AccessFile(var3, "rw", 25L), 24, 0); class168.randomDat = new BufferedFile(new AccessFile(var3, "rw", 25L), 24, 0);
break label34; break label38;
} }
} }
} }
} }
if(class168.randomDat == null) { if(class168.randomDat == null) {
RandomAccessFile var5 = new RandomAccessFile(var0, "rw"); RandomAccessFile var4 = new RandomAccessFile(var0, "rw");
var1 = var5.read(); var2 = var4.read();
var5.seek(0L); var4.seek(0L);
var5.write(var1); var4.write(var2);
var5.seek(0L); var4.seek(0L);
var5.close(); var4.close();
class168.randomDat = new BufferedFile(new AccessFile(var0, "rw", 25L), 24, 0); class168.randomDat = new BufferedFile(new AccessFile(var0, "rw", 25L), 24, 0);
} }
} catch (IOException var4) { } catch (IOException var5) {
; ;
} }
@@ -199,28 +214,16 @@ public class Interpreter {
DevicePcmPlayerProvider.drawWidgetGroup(class279.__jx_ne, -1412584499, var1, var2, var3, var4, class54.__bs_nb, class157.__fw_nm, var7); DevicePcmPlayerProvider.drawWidgetGroup(class279.__jx_ne, -1412584499, var1, var2, var3, var4, class54.__bs_nb, class157.__fw_nm, var7);
class279.__jx_ne = null; class279.__jx_ne = null;
} }
} else if(var7 != -1) {
Client.__client_od[var7] = true;
} else { } else {
for(int var8 = 0; var8 < 100; ++var8) { if(var7 != -1) {
Client.__client_od[var8] = true; Client.__client_od[var7] = true;
} else {
for(int var8 = 0; var8 < 100; ++var8) {
Client.__client_od[var8] = true;
}
} }
} }
}
static {
Interpreter_arrayLengths = new int[5];
Interpreter_arrays = new int[5][5000];
Interpreter_intStack = new int[1000];
Interpreter_stringStack = new String[1000];
Interpreter_frameDepth = 0;
Interpreter_frames = new ScriptFrame[50];
Interpreter_calendar = Calendar.getInstance();
__bv_z = new String[]{"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
__bv_s = false;
__bv_t = false;
__bv_y = 0;
__bv_r = Math.log(2.0D);
} }
} }

8
runescape-client/src/main/java/InvDefinition.java
View File

@@ -20,6 +20,10 @@ public class InvDefinition extends DualNode {
@Export("size") @Export("size")
public int size; public int size;
static {
__ib_f = new EvictingDualNodeHashTable(64);
}
InvDefinition() { InvDefinition() {
this.size = 0; this.size = 0;
} }
@@ -62,8 +66,4 @@ public class InvDefinition extends DualNode {
public static void method4754() { public static void method4754() {
ParamKeyDefinition.ParamKeyDefinition_cached.clear(); ParamKeyDefinition.ParamKeyDefinition_cached.clear();
} }
static {
__ib_f = new EvictingDualNodeHashTable(64);
}
} }

234
runescape-client/src/main/java/IsaacCipher.java
View File

@@ -117,127 +117,127 @@ public final class IsaacCipher {
) )
@Export("__w_339") @Export("__w_339")
final void __w_339() { final void __w_339() {
int var1 = -1640531527; int var9 = -1640531527;
int var2 = -1640531527;
int var3 = -1640531527;
int var4 = -1640531527;
int var5 = -1640531527;
int var6 = -1640531527;
int var7 = -1640531527;
int var8 = -1640531527; int var8 = -1640531527;
int var7 = -1640531527;
int var6 = -1640531527;
int var5 = -1640531527;
int var4 = -1640531527;
int var3 = -1640531527;
int var2 = -1640531527;
int var9; int var1;
for(var9 = 0; var9 < 4; ++var9) { for(var1 = 0; var1 < 4; ++var1) {
var8 ^= var7 << 11; var2 ^= var3 << 11;
var5 += var8; var5 += var2;
var7 += var6; var3 += var4;
var7 ^= var6 >>> 2; var3 ^= var4 >>> 2;
var4 += var7; var6 += var3;
var6 += var5; var4 += var5;
var6 ^= var5 << 8; var4 ^= var5 << 8;
var3 += var6; var7 += var4;
var5 += var4; var5 += var6;
var5 ^= var4 >>> 16; var5 ^= var6 >>> 16;
var2 += var5; var8 += var5;
var4 += var3; var6 += var7;
var4 ^= var3 << 10; var6 ^= var7 << 10;
var1 += var4; var9 += var6;
var3 += var2; var7 += var8;
var3 ^= var2 >>> 4; var7 ^= var8 >>> 4;
var8 += var3; var2 += var7;
var2 += var1; var8 += var9;
var2 ^= var1 << 8; var8 ^= var9 << 8;
var7 += var2; var3 += var8;
var1 += var8; var9 += var2;
var1 ^= var8 >>> 9; var9 ^= var2 >>> 9;
var6 += var1; var4 += var9;
var8 += var7; var2 += var3;
} }
for(var9 = 0; var9 < 256; var9 += 8) { for(var1 = 0; var1 < 256; var1 += 8) {
var8 += this.__o[var9]; var2 += this.__o[var1];
var7 += this.__o[var9 + 1]; var3 += this.__o[var1 + 1];
var6 += this.__o[var9 + 2]; var4 += this.__o[var1 + 2];
var5 += this.__o[var9 + 3]; var5 += this.__o[var1 + 3];
var4 += this.__o[var9 + 4]; var6 += this.__o[var1 + 4];
var3 += this.__o[var9 + 5]; var7 += this.__o[var1 + 5];
var2 += this.__o[var9 + 6]; var8 += this.__o[var1 + 6];
var1 += this.__o[var9 + 7]; var9 += this.__o[var1 + 7];
var8 ^= var7 << 11; var2 ^= var3 << 11;
var5 += var8; var5 += var2;
var7 += var6; var3 += var4;
var7 ^= var6 >>> 2; var3 ^= var4 >>> 2;
var4 += var7; var6 += var3;
var6 += var5; var4 += var5;
var6 ^= var5 << 8; var4 ^= var5 << 8;
var3 += var6; var7 += var4;
var5 += var4; var5 += var6;
var5 ^= var4 >>> 16; var5 ^= var6 >>> 16;
var2 += var5; var8 += var5;
var4 += var3; var6 += var7;
var4 ^= var3 << 10; var6 ^= var7 << 10;
var1 += var4; var9 += var6;
var3 += var2; var7 += var8;
var3 ^= var2 >>> 4; var7 ^= var8 >>> 4;
var8 += var3; var2 += var7;
var2 += var1; var8 += var9;
var2 ^= var1 << 8; var8 ^= var9 << 8;
var7 += var2; var3 += var8;
var1 += var8; var9 += var2;
var1 ^= var8 >>> 9; var9 ^= var2 >>> 9;
var6 += var1; var4 += var9;
var8 += var7; var2 += var3;
this.__u[var9] = var8; this.__u[var1] = var2;
this.__u[var9 + 1] = var7; this.__u[var1 + 1] = var3;
this.__u[var9 + 2] = var6; this.__u[var1 + 2] = var4;
this.__u[var9 + 3] = var5; this.__u[var1 + 3] = var5;
this.__u[var9 + 4] = var4; this.__u[var1 + 4] = var6;
this.__u[var9 + 5] = var3; this.__u[var1 + 5] = var7;
this.__u[var9 + 6] = var2; this.__u[var1 + 6] = var8;
this.__u[var9 + 7] = var1; this.__u[var1 + 7] = var9;
} }
for(var9 = 0; var9 < 256; var9 += 8) { for(var1 = 0; var1 < 256; var1 += 8) {
var8 += this.__u[var9]; var2 += this.__u[var1];
var7 += this.__u[var9 + 1]; var3 += this.__u[var1 + 1];
var6 += this.__u[var9 + 2]; var4 += this.__u[var1 + 2];
var5 += this.__u[var9 + 3]; var5 += this.__u[var1 + 3];
var4 += this.__u[var9 + 4]; var6 += this.__u[var1 + 4];
var3 += this.__u[var9 + 5]; var7 += this.__u[var1 + 5];
var2 += this.__u[var9 + 6]; var8 += this.__u[var1 + 6];
var1 += this.__u[var9 + 7]; var9 += this.__u[var1 + 7];
var8 ^= var7 << 11; var2 ^= var3 << 11;
var5 += var8; var5 += var2;
var7 += var6; var3 += var4;
var7 ^= var6 >>> 2; var3 ^= var4 >>> 2;
var4 += var7; var6 += var3;
var6 += var5; var4 += var5;
var6 ^= var5 << 8; var4 ^= var5 << 8;
var3 += var6; var7 += var4;
var5 += var4; var5 += var6;
var5 ^= var4 >>> 16; var5 ^= var6 >>> 16;
var2 += var5; var8 += var5;
var4 += var3; var6 += var7;
var4 ^= var3 << 10; var6 ^= var7 << 10;
var1 += var4; var9 += var6;
var3 += var2; var7 += var8;
var3 ^= var2 >>> 4; var7 ^= var8 >>> 4;
var8 += var3; var2 += var7;
var2 += var1; var8 += var9;
var2 ^= var1 << 8; var8 ^= var9 << 8;
var7 += var2; var3 += var8;
var1 += var8; var9 += var2;
var1 ^= var8 >>> 9; var9 ^= var2 >>> 9;
var6 += var1; var4 += var9;
var8 += var7; var2 += var3;
this.__u[var9] = var8; this.__u[var1] = var2;
this.__u[var9 + 1] = var7; this.__u[var1 + 1] = var3;
this.__u[var9 + 2] = var6; this.__u[var1 + 2] = var4;
this.__u[var9 + 3] = var5; this.__u[var1 + 3] = var5;
this.__u[var9 + 4] = var4; this.__u[var1 + 4] = var6;
this.__u[var9 + 5] = var3; this.__u[var1 + 5] = var7;
this.__u[var9 + 6] = var2; this.__u[var1 + 6] = var8;
this.__u[var9 + 7] = var1; this.__u[var1 + 7] = var9;
} }
this.__q_338(); this.__q_338();
@@ -250,8 +250,8 @@ public final class IsaacCipher {
garbageValue = "75867683" garbageValue = "75867683"
) )
public static void method4082(AbstractIndexCache var0, AbstractIndexCache var1) { public static void method4082(AbstractIndexCache var0, AbstractIndexCache var1) {
NPCDefinition.NpcDefinition_indexCache = var0; NpcDefinition.NpcDefinition_indexCache = var0;
NPCDefinition.NpcDefinition_modelIndexCache = var1; NpcDefinition.NpcDefinition_modelIndexCache = var1;
} }
@ObfuscatedName("fl") @ObfuscatedName("fl")

50
runescape-client/src/main/java/ItemContainer.java
View File

@@ -31,6 +31,10 @@ public class ItemContainer extends Node {
@Export("quantities") @Export("quantities")
int[] quantities; int[] quantities;
static {
itemContainers = new NodeHashTable(32);
}
ItemContainer() { ItemContainer() {
this.ids = new int[]{-1}; this.ids = new int[]{-1};
this.quantities = new int[]{0}; this.quantities = new int[]{0};
@@ -56,44 +60,40 @@ public class ItemContainer extends Node {
if(var1 != null) { if(var1 != null) {
return var1; return var1;
} else { } else {
AbstractIndexCache var2 = SequenceDefinition.__jh_f; AbstractIndexCache var3 = SequenceDefinition.__jh_f;
AbstractIndexCache var3 = SequenceDefinition.__jh_q; AbstractIndexCache var4 = SequenceDefinition.__jh_q;
boolean var4 = true; boolean var5 = true;
int[] var5 = var2.__j_395(var0); int[] var6 = var3.__j_395(var0);
for(int var6 = 0; var6 < var5.length; ++var6) { for(int var7 = 0; var7 < var6.length; ++var7) {
byte[] var7 = var2.getRecord(var0, var5[var6]); byte[] var8 = var3.getRecord(var0, var6[var7]);
if(var7 == null) { if(var8 == null) {
var4 = false; var5 = false;
} else { } else {
int var8 = (var7[0] & 255) << 8 | var7[1] & 255; int var9 = (var8[0] & 255) << 8 | var8[1] & 255;
byte[] var9 = var3.getRecord(var8, 0); byte[] var10 = var4.getRecord(var9, 0);
if(var9 == null) { if(var10 == null) {
var4 = false; var5 = false;
} }
} }
} }
Frames var11; Frames var2;
if(!var4) { if(!var5) {
var11 = null; var2 = null;
} else { } else {
try { try {
var11 = new Frames(var2, var3, var0, false); var2 = new Frames(var3, var4, var0, false);
} catch (Exception var10) { } catch (Exception var12) {
var11 = null; var2 = null;
} }
} }
if(var11 != null) { if(var2 != null) {
SequenceDefinition.__jh_o.put(var11, (long)var0); SequenceDefinition.__jh_o.put(var2, (long)var0);
} }
return var11; return var2;
} }
} }
static {
itemContainers = new NodeHashTable(32);
}
} }

50
runescape-client/src/main/java/ItemDefinition.java
View File

@@ -287,6 +287,12 @@ public class ItemDefinition extends DualNode {
@Export("placeholderTemplate") @Export("placeholderTemplate")
public int placeholderTemplate; public int placeholderTemplate;
static {
ItemDefinition_cached = new EvictingDualNodeHashTable(64);
ItemDefinition_cachedModels = new EvictingDualNodeHashTable(50);
Sprite_cached = new EvictingDualNodeHashTable(200);
}
ItemDefinition() { ItemDefinition() {
this.name = "null"; this.name = "null";
this.zoom2d = 2000; this.zoom2d = 2000;
@@ -582,18 +588,18 @@ public class ItemDefinition extends DualNode {
) )
@Export("__l_429") @Export("__l_429")
public final ModelData __l_429(int var1) { public final ModelData __l_429(int var1) {
int var2; int var3;
if(this.__az != null && var1 > 1) { if(this.__az != null && var1 > 1) {
int var3 = -1; int var2 = -1;
for(var2 = 0; var2 < 10; ++var2) { for(var3 = 0; var3 < 10; ++var3) {
if(var1 >= this.__au[var2] && this.__au[var2] != 0) { if(var1 >= this.__au[var3] && this.__au[var3] != 0) {
var3 = this.__az[var2]; var2 = this.__az[var3];
} }
} }
if(var3 != -1) { if(var2 != -1) {
return Skills.getItemDefinition(var3).__l_429(1); return Skills.getItemDefinition(var2).__l_429(1);
} }
} }
@@ -606,14 +612,14 @@ public class ItemDefinition extends DualNode {
} }
if(this.recolorFrom != null) { if(this.recolorFrom != null) {
for(var2 = 0; var2 < this.recolorFrom.length; ++var2) { for(var3 = 0; var3 < this.recolorFrom.length; ++var3) {
var4.recolor(this.recolorFrom[var2], this.recolorTo[var2]); var4.recolor(this.recolorFrom[var3], this.recolorTo[var3]);
} }
} }
if(this.retextureFrom != null) { if(this.retextureFrom != null) {
for(var2 = 0; var2 < this.retextureFrom.length; ++var2) { for(var3 = 0; var3 < this.retextureFrom.length; ++var3) {
var4.retexture(this.retextureFrom[var2], this.retextureTo[var2]); var4.retexture(this.retextureFrom[var3], this.retextureTo[var3]);
} }
} }
@@ -870,20 +876,20 @@ public class ItemDefinition extends DualNode {
) )
@Export("getIntParam") @Export("getIntParam")
public int getIntParam(int var1, int var2) { public int getIntParam(int var1, int var2) {
IterableNodeHashTable var3 = this.params; IterableNodeHashTable var4 = this.params;
int var4; int var3;
if(var3 == null) { if(var4 == null) {
var4 = var2; var3 = var2;
} else { } else {
IntegerNode var5 = (IntegerNode)var3.get((long)var1); IntegerNode var5 = (IntegerNode)var4.get((long)var1);
if(var5 == null) { if(var5 == null) {
var4 = var2; var3 = var2;
} else { } else {
var4 = var5.integer; var3 = var5.integer;
} }
} }
return var4; return var3;
} }
@ObfuscatedName("h") @ObfuscatedName("h")
@@ -905,10 +911,4 @@ public class ItemDefinition extends DualNode {
public int getShiftClickIndex() { public int getShiftClickIndex() {
return this.shiftClickIndex0 != -1 && this.inventoryActions != null?(this.shiftClickIndex0 >= 0?(this.inventoryActions[this.shiftClickIndex0] != null?this.shiftClickIndex0:-1):("Drop".equalsIgnoreCase(this.inventoryActions[4])?4:-1)):-1; return this.shiftClickIndex0 != -1 && this.inventoryActions != null?(this.shiftClickIndex0 >= 0?(this.inventoryActions[this.shiftClickIndex0] != null?this.shiftClickIndex0:-1):("Drop".equalsIgnoreCase(this.inventoryActions[4])?4:-1)):-1;
} }
static {
ItemDefinition_cached = new EvictingDualNodeHashTable(64);
ItemDefinition_cachedModels = new EvictingDualNodeHashTable(50);
Sprite_cached = new EvictingDualNodeHashTable(200);
}
} }

15
runescape-client/src/main/java/IterableNodeHashTable.java
View File

@@ -125,15 +125,16 @@ public final class IterableNodeHashTable implements Iterable {
this.current = var1.previous; this.current = var1.previous;
return var1; return var1;
} else { } else {
while(this.index < this.size) { do {
var1 = this.buckets[this.index++].previous; if(this.index >= this.size) {
if(var1 != this.buckets[this.index - 1]) { return null;
this.current = var1.previous;
return var1;
} }
}
return null; var1 = this.buckets[this.index++].previous;
} while(var1 == this.buckets[this.index - 1]);
this.current = var1.previous;
return var1;
} }
} }

17
runescape-client/src/main/java/IterableNodeHashTableIterator.java
View File

@@ -56,16 +56,17 @@ public class IterableNodeHashTableIterator implements Iterator {
this.__w = var1; this.__w = var1;
return var1; return var1;
} else { } else {
while(this.__q < this.hashTable.size) { do {
var1 = this.hashTable.buckets[this.__q++].previous; if(this.__q >= this.hashTable.size) {
if(var1 != this.hashTable.buckets[this.__q - 1]) { return null;
this.__f = var1.previous;
this.__w = var1;
return var1;
} }
}
return null; var1 = this.hashTable.buckets[this.__q++].previous;
} while(var1 == this.hashTable.buckets[this.__q - 1]);
this.__f = var1.previous;
this.__w = var1;
return var1;
} }
} }

56
runescape-client/src/main/java/KeyHandler.java
View File

@@ -109,6 +109,23 @@ public final class KeyHandler implements KeyListener, FocusListener {
@Export("crossSprites") @Export("crossSprites")
static Sprite[] crossSprites; static Sprite[] crossSprites;
static {
KeyHandler_instance = new KeyHandler();
KeyHandler_pressedKeys = new boolean[112];
__an_cq = new int[128];
__an_ch = 0;
__an_cw = 0;
__an_cg = new char[128];
__an_cf = new int[128];
__an_cp = new int[128];
__an_cl = 0;
__an_ct = 0;
__an_cz = 0;
__an_cc = 0;
KeyHandler_idleCycles = 0;
KeyHandler_keyCodes = new int[]{-1, -1, -1, -1, -1, -1, -1, -1, 85, 80, 84, -1, 91, -1, -1, -1, 81, 82, 86, -1, -1, -1, -1, -1, -1, -1, -1, 13, -1, -1, -1, -1, 83, 104, 105, 103, 102, 96, 98, 97, 99, -1, -1, -1, -1, -1, -1, -1, 25, 16, 17, 18, 19, 20, 21, 22, 23, 24, -1, -1, -1, -1, -1, -1, -1, 48, 68, 66, 50, 34, 51, 52, 53, 39, 54, 55, 56, 70, 69, 40, 41, 32, 35, 49, 36, 38, 67, 33, 65, 37, 64, -1, -1, -1, -1, -1, 228, 231, 227, 233, 224, 219, 225, 230, 226, 232, 89, 87, -1, 88, 229, 90, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, -1, -1, -1, 101, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 100, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1};
}
@Export("keyPressed") @Export("keyPressed")
@ObfuscatedName("keyPressed") @ObfuscatedName("keyPressed")
public final synchronized void keyPressed(KeyEvent var1) { public final synchronized void keyPressed(KeyEvent var1) {
@@ -196,15 +213,15 @@ public final class KeyHandler implements KeyListener, FocusListener {
if(var2 > 0 && var2 < 128 || var2 >= 160 && var2 <= 255) { if(var2 > 0 && var2 < 128 || var2 >= 160 && var2 <= 255) {
var3 = true; var3 = true;
} else { } else {
label56: { label63: {
if(var2 != 0) { if(var2 != 0) {
char[] var4 = class304.cp1252AsciiExtension; char[] var7 = class304.cp1252AsciiExtension;
for(int var5 = 0; var5 < var4.length; ++var5) { for(int var5 = 0; var5 < var7.length; ++var5) {
char var6 = var4[var5]; char var6 = var7[var5];
if(var2 == var6) { if(var2 == var6) {
var3 = true; var3 = true;
break label56; break label63;
} }
} }
} }
@@ -214,11 +231,11 @@ public final class KeyHandler implements KeyListener, FocusListener {
} }
if(var3) { if(var3) {
int var7 = __an_cz + 1 & 127; int var4 = __an_cz + 1 & 127;
if(var7 != __an_ct) { if(var4 != __an_ct) {
__an_cf[__an_cz] = -1; __an_cf[__an_cz] = -1;
__an_cg[__an_cz] = var2; __an_cg[__an_cz] = var2;
__an_cz = var7; __an_cz = var4;
} }
} }
} }
@@ -235,28 +252,11 @@ public final class KeyHandler implements KeyListener, FocusListener {
static String method839() { static String method839() {
String var0 = ""; String var0 = "";
Message var1; Message var2;
for(Iterator var2 = Messages.Messages_hashTable.iterator(); var2.hasNext(); var0 = var0 + var1.sender + ':' + var1.text + '\n') { for(Iterator var1 = Messages.Messages_hashTable.iterator(); var1.hasNext(); var0 = var0 + var2.sender + ':' + var2.text + '\n') {
var1 = (Message)var2.next(); var2 = (Message)var1.next();
} }
return var0; return var0;
} }
static {
KeyHandler_instance = new KeyHandler();
KeyHandler_pressedKeys = new boolean[112];
__an_cq = new int[128];
__an_ch = 0;
__an_cw = 0;
__an_cg = new char[128];
__an_cf = new int[128];
__an_cp = new int[128];
__an_cl = 0;
__an_ct = 0;
__an_cz = 0;
__an_cc = 0;
KeyHandler_idleCycles = 0;
KeyHandler_keyCodes = new int[]{-1, -1, -1, -1, -1, -1, -1, -1, 85, 80, 84, -1, 91, -1, -1, -1, 81, 82, 86, -1, -1, -1, -1, -1, -1, -1, -1, 13, -1, -1, -1, -1, 83, 104, 105, 103, 102, 96, 98, 97, 99, -1, -1, -1, -1, -1, -1, -1, 25, 16, 17, 18, 19, 20, 21, 22, 23, 24, -1, -1, -1, -1, -1, -1, -1, 48, 68, 66, 50, 34, 51, 52, 53, 39, 54, 55, 56, 70, 69, 40, 41, 32, 35, 49, 36, 38, 67, 33, 65, 37, 64, -1, -1, -1, -1, -1, 228, 231, 227, 233, 224, 219, 225, 230, 226, 232, 89, 87, -1, 88, 229, 90, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, -1, -1, -1, 101, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 100, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1};
}
} }

10
runescape-client/src/main/java/KitDefinition.java
View File

@@ -59,6 +59,10 @@ public class KitDefinition extends DualNode {
@Export("__k") @Export("__k")
public boolean __k; public boolean __k;
static {
KitDefinition_cached = new EvictingDualNodeHashTable(64);
}
KitDefinition() { KitDefinition() {
this.__o = -1; this.__o = -1;
this.archives = new int[]{-1, -1, -1, -1, -1}; this.archives = new int[]{-1, -1, -1, -1, -1};
@@ -258,14 +262,10 @@ public class KitDefinition extends DualNode {
var0.index += class303.huffman.__f_294(var0.array, var0.index, var3, 0, var2); var0.index += class303.huffman.__f_294(var0.array, var0.index, var3, 0, var2);
String var4 = WidgetGroupParent.decodeStringCp1252(var3, 0, var2); String var4 = WidgetGroupParent.decodeStringCp1252(var3, 0, var2);
var1 = var4; var1 = var4;
} catch (Exception var5) { } catch (Exception var6) {
var1 = "Cabbage"; var1 = "Cabbage";
} }
return var1; return var1;
} }
static {
KitDefinition_cached = new EvictingDualNodeHashTable(64);
}
} }

1
runescape-client/src/main/java/Link.java
View File

@@ -28,6 +28,5 @@ public class Link {
this.__m = null; this.__m = null;
this.__f = null; this.__f = null;
} }
} }
} }

68
runescape-client/src/main/java/Login.java
View File

@@ -150,6 +150,34 @@ public class Login {
@Export("indexCache11") @Export("indexCache11")
static IndexCache indexCache11; static IndexCache indexCache11;
static {
__cu_q = 0;
__cu_y = __cu_q + 202;
Login_loadingPercent = 10;
Login_loadingText = "";
__cu_aj = -1;
__cu_ac = 1;
loginIndex = 0;
Login_response0 = "";
Login_response1 = "";
Login_response2 = "";
Login_response3 = "";
Login_username = "";
Login_password = "";
__cu_aa = false;
__cu_ax = false;
__cu_ba = true;
currentLoginField = 0;
__cu_bk = false;
__cu_bl = -1;
__cu_br = 0;
__cu_bj = 0;
new DecimalFormat("##0.00");
new class161();
__cu_bi = -1L;
__cu_bz = -1L;
}
@ObfuscatedName("m") @ObfuscatedName("m")
@ObfuscatedSignature( @ObfuscatedSignature(
signature = "(Lir;II)Lhl;", signature = "(Lir;II)Lhl;",
@@ -170,19 +198,19 @@ public class Login {
int var0 = 0; int var0 = 0;
int var1 = 240; int var1 = 240;
int var2; int var3;
for(byte var3 = 12; var0 < 16; var1 -= var3) { for(byte var2 = 12; var0 < 16; var1 -= var2) {
var2 = class277.method5355((double)((float)var1 / 360.0F), 0.9998999834060669D, (double)((float)var0 * 0.425F / 16.0F + 0.075F)); var3 = class277.method5355((double)((float)var1 / 360.0F), 0.9998999834060669D, (double)((float)var0 * 0.425F / 16.0F + 0.075F));
class248.__iu_e[var0] = var2; class248.__iu_e[var0] = var3;
++var0; ++var0;
} }
var1 = 48; var1 = 48;
for(int var5 = var1 / 6; var0 < class248.__iu_e.length; var1 -= var5) { for(int var5 = var1 / 6; var0 < class248.__iu_e.length; var1 -= var5) {
var2 = var0 * 2; var3 = var0 * 2;
for(int var4 = class277.method5355((double)((float)var1 / 360.0F), 0.9998999834060669D, 0.5D); var0 < var2 && var0 < class248.__iu_e.length; ++var0) { for(int var4 = class277.method5355((double)((float)var1 / 360.0F), 0.9998999834060669D, 0.5D); var0 < var3 && var0 < class248.__iu_e.length; ++var0) {
class248.__iu_e[var0] = var4; class248.__iu_e[var0] = var4;
} }
} }
@@ -217,32 +245,4 @@ public class Login {
return var0 - GrandExchangeEvents.cameraY < 800 && (Tiles.Tiles_renderFlags[SoundSystem.plane][WorldMapSection1.cameraX >> 7][class11.cameraZ >> 7] & 4) != 0?SoundSystem.plane:3; return var0 - GrandExchangeEvents.cameraY < 800 && (Tiles.Tiles_renderFlags[SoundSystem.plane][WorldMapSection1.cameraX >> 7][class11.cameraZ >> 7] & 4) != 0?SoundSystem.plane:3;
} }
} }
static {
__cu_q = 0;
__cu_y = __cu_q + 202;
Login_loadingPercent = 10;
Login_loadingText = "";
__cu_aj = -1;
__cu_ac = 1;
loginIndex = 0;
Login_response0 = "";
Login_response1 = "";
Login_response2 = "";
Login_response3 = "";
Login_username = "";
Login_password = "";
__cu_aa = false;
__cu_ax = false;
__cu_ba = true;
currentLoginField = 0;
__cu_bk = false;
__cu_bl = -1;
__cu_br = 0;
__cu_bj = 0;
new DecimalFormat("##0.00");
new class161();
__cu_bi = -1L;
__cu_bz = -1L;
}
} }

40
runescape-client/src/main/java/LoginPacket.java
View File

@@ -52,6 +52,21 @@ public class LoginPacket implements ClientPacketMarker {
@Export("id") @Export("id")
public final int id; public final int id;
static {
__gl_m = new LoginPacket(14, 0);
__gl_f = new LoginPacket(15, 4);
__gl_q = new LoginPacket(16, -2);
__gl_w = new LoginPacket(18, -2);
__gl_o = new LoginPacket(27, 0);
__gl_g = new LoginPacket[32];
LoginPacket[] var0 = WorldMapIcon2.method300();
for(int var1 = 0; var1 < var0.length; ++var1) {
__gl_g[var0[var1].id] = var0[var1];
}
}
@ObfuscatedSignature( @ObfuscatedSignature(
signature = "(II)V", signature = "(II)V",
garbageValue = "0" garbageValue = "0"
@@ -70,9 +85,9 @@ public class LoginPacket implements ClientPacketMarker {
File var3 = new File(class168.__fs_o, "preferences" + var0 + ".dat"); File var3 = new File(class168.__fs_o, "preferences" + var0 + ".dat");
if(var3.exists()) { if(var3.exists()) {
try { try {
AccessFile var11 = new AccessFile(var3, "rw", 10000L); AccessFile var10 = new AccessFile(var3, "rw", 10000L);
return var11; return var10;
} catch (IOException var10) { } catch (IOException var9) {
; ;
} }
} }
@@ -90,7 +105,7 @@ public class LoginPacket implements ClientPacketMarker {
try { try {
var6 = new AccessFile(var5, "rw", 10000L); var6 = new AccessFile(var5, "rw", 10000L);
return var6; return var6;
} catch (IOException var9) { } catch (IOException var8) {
; ;
} }
} }
@@ -98,23 +113,8 @@ public class LoginPacket implements ClientPacketMarker {
try { try {
var6 = new AccessFile(var3, "rw", 10000L); var6 = new AccessFile(var3, "rw", 10000L);
return var6; return var6;
} catch (IOException var8) { } catch (IOException var7) {
throw new RuntimeException(); throw new RuntimeException();
} }
} }
static {
__gl_m = new LoginPacket(14, 0);
__gl_f = new LoginPacket(15, 4);
__gl_q = new LoginPacket(16, -2);
__gl_w = new LoginPacket(18, -2);
__gl_o = new LoginPacket(27, 0);
__gl_g = new LoginPacket[32];
LoginPacket[] var0 = WorldMapIcon2.method300();
for(int var1 = 0; var1 < var0.length; ++var1) {
__gl_g[var0[var1].id] = var0[var1];
}
}
} }

24
runescape-client/src/main/java/LoginType.java
View File

@@ -71,6 +71,18 @@ public class LoginType {
@Export("__d") @Export("__d")
final String __d; final String __d;
static {
__lx_m = new LoginType(8, 0, "", "");
__lx_f = new LoginType(3, 1, "", "");
__lx_q = new LoginType(2, 2, "", "");
__lx_w = new LoginType(6, 3, "", "");
__lx_o = new LoginType(4, 4, "", "");
__lx_u = new LoginType(7, 5, "", "");
__lx_g = new LoginType(1, 6, "", "");
__lx_l = new LoginType(5, 7, "", "");
__lx_e = new LoginType(0, -1, "", "", true, new LoginType[]{__lx_m, __lx_f, __lx_q, __lx_o, __lx_w});
}
LoginType(int var1, int var2, String var3, String var4) { LoginType(int var1, int var2, String var3, String var4) {
this.__x = var1; this.__x = var1;
this.__d = var4; this.__d = var4;
@@ -89,16 +101,4 @@ public class LoginType {
public String __toString_546() { public String __toString_546() {
return this.__d; return this.__d;
} }
static {
__lx_m = new LoginType(8, 0, "", "");
__lx_f = new LoginType(3, 1, "", "");
__lx_q = new LoginType(2, 2, "", "");
__lx_w = new LoginType(6, 3, "", "");
__lx_o = new LoginType(4, 4, "", "");
__lx_u = new LoginType(7, 5, "", "");
__lx_g = new LoginType(1, 6, "", "");
__lx_l = new LoginType(5, 7, "", "");
__lx_e = new LoginType(0, -1, "", "", true, new LoginType[]{__lx_m, __lx_f, __lx_q, __lx_o, __lx_w});
}
} }

34
runescape-client/src/main/java/MenuAction.java
View File

@@ -79,9 +79,9 @@ public class MenuAction {
} }
} }
Widget var12 = Huffman.getWidget(var3); Widget var14 = Huffman.getWidget(var3);
if(var12 != null) { if(var14 != null) {
class22.method295(var12); class22.method295(var14);
} }
int var5; int var5;
@@ -129,26 +129,26 @@ public class MenuAction {
var7 += 8; var7 += 8;
var8 = Client.menuOptionsCount * 15 + 22; var8 = Client.menuOptionsCount * 15 + 22;
int var13 = var5 - var7 / 2; int var12 = var5 - var7 / 2;
if(var7 + var13 > SoundCache.canvasWidth) { if(var7 + var12 > SoundCache.canvasWidth) {
var13 = SoundCache.canvasWidth - var7; var12 = SoundCache.canvasWidth - var7;
}
if(var12 < 0) {
var12 = 0;
}
int var13 = var6;
if(var6 + var8 > Huffman.canvasHeight) {
var13 = Huffman.canvasHeight - var8;
} }
if(var13 < 0) { if(var13 < 0) {
var13 = 0; var13 = 0;
} }
int var14 = var6; class25.menuX = var12;
if(var6 + var8 > Huffman.canvasHeight) { GameShell.menuY = var13;
var14 = Huffman.canvasHeight - var8;
}
if(var14 < 0) {
var14 = 0;
}
class25.menuX = var13;
GameShell.menuY = var14;
class214.menuWidth = var7; class214.menuWidth = var7;
AbstractWorldMapIcon.menuHeight = Client.menuOptionsCount * 15 + 22; AbstractWorldMapIcon.menuHeight = Client.menuOptionsCount * 15 + 22;
if(Client.rootWidgetGroup != -1) { if(Client.rootWidgetGroup != -1) {

118
runescape-client/src/main/java/Message.java
View File

@@ -157,7 +157,7 @@ public class Message extends DualNode {
@Export("fillSenderUsername") @Export("fillSenderUsername")
final void fillSenderUsername() { final void fillSenderUsername() {
if(this.sender != null) { if(this.sender != null) {
this.senderUsername = new Username(NPCDefinition.method5161(this.sender), KeyHandler.loginType); this.senderUsername = new Username(NpcDefinition.method5161(this.sender), KeyHandler.loginType);
} else { } else {
this.senderUsername = null; this.senderUsername = null;
} }
@@ -196,78 +196,76 @@ public class Message extends DualNode {
--var3; --var3;
} }
int var6 = var3 - var2; int var14 = var3 - var2;
if(var6 >= 1) { if(var14 >= 1) {
byte var7; byte var6;
if(var1 == null) { if(var1 == null) {
var7 = 12; var6 = 12;
} else { } else {
switch(var1.__x) { switch(var1.__x) {
case 7: case 7:
var7 = 20; var6 = 20;
break; break;
default: default:
var7 = 12; var6 = 12;
} }
} }
if(var6 <= var7) { if(var14 <= var6) {
StringBuilder var8 = new StringBuilder(var6); StringBuilder var12 = new StringBuilder(var14);
for(int var9 = var2; var9 < var3; ++var9) { for(int var15 = var2; var15 < var3; ++var15) {
char var10 = var0.charAt(var9); char var7 = var0.charAt(var15);
boolean var11; boolean var8;
if(Character.isISOControl(var10)) { if(Character.isISOControl(var7)) {
var11 = false; var8 = false;
} else if(VarcInt.method4807(var10)) { } else if(VarcInt.method4807(var7)) {
var11 = true; var8 = true;
} else { } else {
label149: { char[] var13 = class305.__kb_q;
char[] var12 = class305.__kb_q; int var10 = 0;
int var13; label118:
char var14; while(true) {
for(var13 = 0; var13 < var12.length; ++var13) { char var11;
var14 = var12[var13]; if(var10 >= var13.length) {
if(var10 == var14) { var13 = class305.__kb_w;
var11 = true;
break label149; for(var10 = 0; var10 < var13.length; ++var10) {
var11 = var13[var10];
if(var7 == var11) {
var8 = true;
break label118;
}
} }
var8 = false;
break;
} }
var12 = class305.__kb_w; var11 = var13[var10];
var13 = 0; if(var7 == var11) {
var8 = true;
while(true) { break;
if(var13 >= var12.length) {
var11 = false;
break;
}
var14 = var12[var13];
if(var10 == var14) {
var11 = true;
break;
}
++var13;
} }
++var10;
} }
} }
if(var11) { if(var8) {
char var15; char var9;
switch(var10) { switch(var7) {
case ' ': case ' ':
case '-': case '-':
case '_': case '_':
case ' ': case ' ':
var15 = '_'; var9 = '_';
break; break;
case '#': case '#':
case '[': case '[':
case ']': case ']':
var15 = var10; var9 = var7;
break; break;
case 'À': case 'À':
case 'Á': case 'Á':
@@ -279,11 +277,11 @@ public class Message extends DualNode {
case 'â': case 'â':
case 'ã': case 'ã':
case 'ä': case 'ä':
var15 = 'a'; var9 = 'a';
break; break;
case 'Ç': case 'Ç':
case 'ç': case 'ç':
var15 = 'c'; var9 = 'c';
break; break;
case 'È': case 'È':
case 'É': case 'É':
@@ -293,7 +291,7 @@ public class Message extends DualNode {
case 'é': case 'é':
case 'ê': case 'ê':
case 'ë': case 'ë':
var15 = 'e'; var9 = 'e';
break; break;
case 'Í': case 'Í':
case 'Î': case 'Î':
@@ -301,11 +299,11 @@ public class Message extends DualNode {
case 'í': case 'í':
case 'î': case 'î':
case 'ï': case 'ï':
var15 = 'i'; var9 = 'i';
break; break;
case 'Ñ': case 'Ñ':
case 'ñ': case 'ñ':
var15 = 'n'; var9 = 'n';
break; break;
case 'Ò': case 'Ò':
case 'Ó': case 'Ó':
@@ -317,7 +315,7 @@ public class Message extends DualNode {
case 'ô': case 'ô':
case 'õ': case 'õ':
case 'ö': case 'ö':
var15 = 'o'; var9 = 'o';
break; break;
case 'Ù': case 'Ù':
case 'Ú': case 'Ú':
@@ -327,30 +325,30 @@ public class Message extends DualNode {
case 'ú': case 'ú':
case 'û': case 'û':
case 'ü': case 'ü':
var15 = 'u'; var9 = 'u';
break; break;
case 'ß': case 'ß':
var15 = 'b'; var9 = 'b';
break; break;
case 'ÿ': case 'ÿ':
case 'Ÿ': case 'Ÿ':
var15 = 'y'; var9 = 'y';
break; break;
default: default:
var15 = Character.toLowerCase(var10); var9 = Character.toLowerCase(var7);
} }
if(var15 != 0) { if(var9 != 0) {
var8.append(var15); var12.append(var9);
} }
} }
} }
if(var8.length() == 0) { if(var12.length() == 0) {
return null; return null;
} }
return var8.toString(); return var12.toString();
} }
} }

16
runescape-client/src/main/java/Messages.java
View File

@@ -37,6 +37,13 @@ public class Messages {
@Export("soundSystem") @Export("soundSystem")
static SoundSystem soundSystem; static SoundSystem soundSystem;
static {
Messages_channels = new HashMap();
Messages_hashTable = new IterableNodeHashTable(1024);
Messages_queue = new IterableDualNodeQueue();
Messages_count = 0;
}
@ObfuscatedName("w") @ObfuscatedName("w")
@ObfuscatedSignature( @ObfuscatedSignature(
signature = "(I)V", signature = "(I)V",
@@ -50,14 +57,7 @@ public class Messages {
} else { } else {
Client.Login_isUsernameRemembered = false; Client.Login_isUsernameRemembered = false;
} }
} }
}
static {
Messages_channels = new HashMap();
Messages_hashTable = new IterableNodeHashTable(1024);
Messages_queue = new IterableDualNodeQueue();
Messages_count = 0;
} }
} }

70
runescape-client/src/main/java/MidiFileReader.java
View File

@@ -37,6 +37,10 @@ public class MidiFileReader {
@Export("__e") @Export("__e")
long __e; long __e;
static {
__hs_x = new byte[]{(byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)0, (byte)1, (byte)2, (byte)1, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0};
}
MidiFileReader(byte[] var1) { MidiFileReader(byte[] var1) {
this.buffer = new Buffer((byte[])null); this.buffer = new Buffer((byte[])null);
this.parse(var1); this.parse(var1);
@@ -57,11 +61,11 @@ public class MidiFileReader {
this.trackStarts = new int[var2]; this.trackStarts = new int[var2];
int var3; int var3;
int var4; int var5;
for(var3 = 0; var3 < var2; this.buffer.index += var4) { for(var3 = 0; var3 < var2; this.buffer.index += var5) {
int var5 = this.buffer.readInt(); int var4 = this.buffer.readInt();
var4 = this.buffer.readInt(); var5 = this.buffer.readInt();
if(var5 == 1297379947) { if(var4 == 1297379947) {
this.trackStarts[var3] = this.buffer.index; this.trackStarts[var3] = this.buffer.index;
++var3; ++var3;
} }
@@ -136,29 +140,29 @@ public class MidiFileReader {
@Export("readMessage0") @Export("readMessage0")
int readMessage0(int var1) { int readMessage0(int var1) {
byte var2 = this.buffer.array[this.buffer.index]; byte var2 = this.buffer.array[this.buffer.index];
int var3; int var5;
if(var2 < 0) { if(var2 < 0) {
var3 = var2 & 255; var5 = var2 & 255;
this.__u[var1] = var3; this.__u[var1] = var5;
++this.buffer.index; ++this.buffer.index;
} else { } else {
var3 = this.__u[var1]; var5 = this.__u[var1];
} }
if(var3 != 240 && var3 != 247) { if(var5 != 240 && var5 != 247) {
return this.__d_371(var1, var3); return this.__d_371(var1, var5);
} else { } else {
int var4 = this.buffer.__as_311(); int var3 = this.buffer.__as_311();
if(var3 == 247 && var4 > 0) { if(var5 == 247 && var3 > 0) {
int var5 = this.buffer.array[this.buffer.index] & 255; int var4 = this.buffer.array[this.buffer.index] & 255;
if(var5 >= 241 && var5 <= 243 || var5 == 246 || var5 == 248 || var5 >= 250 && var5 <= 252 || var5 == 254) { if(var4 >= 241 && var4 <= 243 || var4 == 246 || var4 == 248 || var4 >= 250 && var4 <= 252 || var4 == 254) {
++this.buffer.index; ++this.buffer.index;
this.__u[var1] = var5; this.__u[var1] = var4;
return this.__d_371(var1, var5); return this.__d_371(var1, var4);
} }
} }
this.buffer.index += var4; this.buffer.index += var3;
return 0; return 0;
} }
} }
@@ -166,37 +170,37 @@ public class MidiFileReader {
@ObfuscatedName("d") @ObfuscatedName("d")
@Export("__d_371") @Export("__d_371")
int __d_371(int var1, int var2) { int __d_371(int var1, int var2) {
int var3; int var4;
if(var2 == 255) { if(var2 == 255) {
int var7 = this.buffer.readUnsignedByte(); int var7 = this.buffer.readUnsignedByte();
var3 = this.buffer.__as_311(); var4 = this.buffer.__as_311();
if(var7 == 47) { if(var7 == 47) {
this.buffer.index += var3; this.buffer.index += var4;
return 1; return 1;
} else if(var7 == 81) { } else if(var7 == 81) {
int var5 = this.buffer.readMedium(); int var5 = this.buffer.readMedium();
var3 -= 3; var4 -= 3;
int var6 = this.trackLengths[var1]; int var6 = this.trackLengths[var1];
this.__e += (long)var6 * (long)(this.__g - var5); this.__e += (long)var6 * (long)(this.__g - var5);
this.__g = var5; this.__g = var5;
this.buffer.index += var3; this.buffer.index += var4;
return 2; return 2;
} else { } else {
this.buffer.index += var3; this.buffer.index += var4;
return 3; return 3;
} }
} else { } else {
byte var4 = __hs_x[var2 - 128]; byte var3 = __hs_x[var2 - 128];
var3 = var2; var4 = var2;
if(var4 >= 1) { if(var3 >= 1) {
var3 = var2 | this.buffer.readUnsignedByte() << 8; var4 = var2 | this.buffer.readUnsignedByte() << 8;
} }
if(var4 >= 2) { if(var3 >= 2) {
var3 |= this.buffer.readUnsignedByte() << 16; var4 |= this.buffer.readUnsignedByte() << 16;
} }
return var3; return var4;
} }
} }
@@ -252,8 +256,4 @@ public class MidiFileReader {
} }
} }
static {
__hs_x = new byte[]{(byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)0, (byte)1, (byte)2, (byte)1, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0};
}
} }

10
runescape-client/src/main/java/MidiPcmStream.java
View File

@@ -423,7 +423,7 @@ public class MidiPcmStream extends PcmStream {
var6.__l = var9.__o[var2] & 255; var6.__l = var9.__o[var2] & 255;
var6.__e = (var2 << 8) - (var9.__q[var2] & 32767); var6.__e = (var2 << 8) - (var9.__q[var2] & 32767);
var6.__k = 0; var6.__k = 0;
var6.__o = 0; var6.__n = 0;
var6.__i = 0; var6.__i = 0;
var6.__a = -1; var6.__a = -1;
var6.__z = 0; var6.__z = 0;
@@ -905,7 +905,7 @@ public class MidiPcmStream extends PcmStream {
int var6; int var6;
int var7; int var7;
if(var2.__m != null) { if(var2.__m != null) {
var4 = var1.__o; var4 = var1.__n;
var5 = var2.__m[var1.__i + 1]; var5 = var2.__m[var1.__i + 1];
if(var1.__i < var2.__m.length - 2) { if(var1.__i < var2.__m.length - 2) {
var6 = (var2.__m[var1.__i] & 255) << 8; var6 = (var2.__m[var1.__i] & 255) << 8;
@@ -1045,12 +1045,12 @@ public class MidiPcmStream extends PcmStream {
if(var6.__m != null) { if(var6.__m != null) {
if(var6.__w > 0) { if(var6.__w > 0) {
var1.__o += (int)(128.0D * Math.pow(2.0D, var8 * (double)var6.__w) + 0.5D); var1.__n += (int)(128.0D * Math.pow(2.0D, var8 * (double)var6.__w) + 0.5D);
} else { } else {
var1.__o += 128; var1.__n += 128;
} }
while(var1.__i < var6.__m.length - 2 && var1.__o > (var6.__m[var1.__i + 2] & 255) << 8) { while(var1.__i < var6.__m.length - 2 && var1.__n > (var6.__m[var1.__i + 2] & 255) << 8) {
var1.__i += 2; var1.__i += 2;
} }

579
runescape-client/src/main/java/Model.java
View File

@@ -205,6 +205,36 @@ public class Model extends Entity {
@Export("zMidOffset") @Export("zMidOffset")
int zMidOffset; int zMidOffset;
static {
Model_sharedSequenceModel = new Model();
Model_sharedSequenceModelFaceAlphas = new byte[1];
Model_sharedSpotAnimationModel = new Model();
Model_sharedSpotAnimationModelFaceAlphas = new byte[1];
__du_at = new boolean[4700];
__du_ad = new boolean[4700];
modelViewportXs = new int[4700];
modelViewportYs = new int[4700];
__du_am = new int[4700];
__du_an = new int[4700];
__du_az = new int[4700];
__du_au = new int[4700];
__du_aa = new int[1600];
__du_ax = new int[1600][512];
__du_af = new int[12];
__du_ai = new int[12][2000];
__du_ba = new int[2000];
__du_bb = new int[2000];
__du_bs = new int[12];
__du_bq = new int[10];
__du_bn = new int[10];
__du_bk = new int[10];
__du_bx = true;
Model_sine = Rasterizer3D.Rasterizer3D_sine;
Model_cosine = Rasterizer3D.Rasterizer3D_cosine;
__du_br = Rasterizer3D.Rasterizer3D_colorPalette;
__du_bj = Rasterizer3D.__et_p;
}
Model() { Model() {
this.verticesCount = 0; this.verticesCount = 0;
this.indicesCount = 0; this.indicesCount = 0;
@@ -599,8 +629,8 @@ public class Model extends Entity {
this.xMidOffset += 8; this.xMidOffset += 8;
this.zMidOffset += 8; this.zMidOffset += 8;
} }
}
}
} }
@ObfuscatedName("u") @ObfuscatedName("u")
@@ -634,7 +664,6 @@ public class Model extends Entity {
this.radius = (int)(Math.sqrt((double)(this.xzRadius * this.xzRadius + super.height * super.height)) + 0.99D); this.radius = (int)(Math.sqrt((double)(this.xzRadius * this.xzRadius + super.height * super.height)) + 0.99D);
this.diameter = this.radius + (int)(Math.sqrt((double)(this.xzRadius * this.xzRadius + this.bottomY * this.bottomY)) + 0.99D); this.diameter = this.radius + (int)(Math.sqrt((double)(this.xzRadius * this.xzRadius + this.bottomY * this.bottomY)) + 0.99D);
} }
} }
@ObfuscatedName("g") @ObfuscatedName("g")
@@ -658,7 +687,6 @@ public class Model extends Entity {
this.radius = this.xzRadius; this.radius = this.xzRadius;
this.diameter = this.xzRadius + this.xzRadius; this.diameter = this.xzRadius + this.xzRadius;
} }
} }
@ObfuscatedName("l") @ObfuscatedName("l")
@@ -681,21 +709,22 @@ public class Model extends Entity {
) )
@Export("animate") @Export("animate")
public void animate(Frames var1, int var2) { public void animate(Frames var1, int var2) {
if(this.vertexLabels != null && var2 != -1) { if(this.vertexLabels != null) {
Animation var3 = var1.frames[var2]; if(var2 != -1) {
Skeleton var4 = var3.skeleton; Animation var3 = var1.frames[var2];
Model_transformTempX = 0; Skeleton var4 = var3.skeleton;
Model_transformTempY = 0; Model_transformTempX = 0;
Model_transformTempZ = 0; Model_transformTempY = 0;
Model_transformTempZ = 0;
for(int var5 = 0; var5 < var3.transformCount; ++var5) { for(int var5 = 0; var5 < var3.transformCount; ++var5) {
int var6 = var3.transformSkeletonLabels[var5]; int var6 = var3.transformSkeletonLabels[var5];
this.transform(var4.transformTypes[var6], var4.labels[var6], var3.transformXs[var5], var3.transformYs[var5], var3.transformZs[var5]); this.transform(var4.transformTypes[var6], var4.labels[var6], var3.transformXs[var5], var3.transformYs[var5], var3.transformZs[var5]);
}
this.resetBounds();
} }
this.resetBounds();
} }
} }
@ObfuscatedName("a") @ObfuscatedName("a")
@@ -713,18 +742,18 @@ public class Model extends Entity {
Model_transformTempY = 0; Model_transformTempY = 0;
Model_transformTempZ = 0; Model_transformTempZ = 0;
byte var9 = 0; byte var9 = 0;
int var10 = var9 + 1; int var13 = var9 + 1;
int var11 = var5[var9]; int var10 = var5[var9];
int var11;
int var12; int var12;
int var13; for(var11 = 0; var11 < var6.transformCount; ++var11) {
for(var12 = 0; var12 < var6.transformCount; ++var12) { for(var12 = var6.transformSkeletonLabels[var11]; var12 > var10; var10 = var5[var13++]) {
for(var13 = var6.transformSkeletonLabels[var12]; var13 > var11; var11 = var5[var10++]) {
; ;
} }
if(var13 != var11 || var8.transformTypes[var13] == 0) { if(var12 != var10 || var8.transformTypes[var12] == 0) {
this.transform(var8.transformTypes[var13], var8.labels[var13], var6.transformXs[var12], var6.transformYs[var12], var6.transformZs[var12]); this.transform(var8.transformTypes[var12], var8.labels[var12], var6.transformXs[var11], var6.transformYs[var11], var6.transformZs[var11]);
} }
} }
@@ -732,16 +761,16 @@ public class Model extends Entity {
Model_transformTempY = 0; Model_transformTempY = 0;
Model_transformTempZ = 0; Model_transformTempZ = 0;
var9 = 0; var9 = 0;
var10 = var9 + 1; var13 = var9 + 1;
var11 = var5[var9]; var10 = var5[var9];
for(var12 = 0; var12 < var7.transformCount; ++var12) { for(var11 = 0; var11 < var7.transformCount; ++var11) {
for(var13 = var7.transformSkeletonLabels[var12]; var13 > var11; var11 = var5[var10++]) { for(var12 = var7.transformSkeletonLabels[var11]; var12 > var10; var10 = var5[var13++]) {
; ;
} }
if(var13 == var11 || var8.transformTypes[var13] == 0) { if(var12 == var10 || var8.transformTypes[var12] == 0) {
this.transform(var8.transformTypes[var13], var8.labels[var13], var7.transformXs[var12], var7.transformYs[var12], var7.transformZs[var12]); this.transform(var8.transformTypes[var12], var8.labels[var12], var7.transformXs[var11], var7.transformYs[var11], var7.transformZs[var11]);
} }
} }
@@ -750,7 +779,6 @@ public class Model extends Entity {
this.animate(var1, var2); this.animate(var1, var2);
} }
} }
} }
@ObfuscatedName("z") @ObfuscatedName("z")
@@ -759,8 +787,8 @@ public class Model extends Entity {
int var6 = var2.length; int var6 = var2.length;
int var7; int var7;
int var8; int var8;
int var9; int var11;
int var10; int var12;
if(var1 == 0) { if(var1 == 0) {
var7 = 0; var7 = 0;
Model_transformTempX = 0; Model_transformTempX = 0;
@@ -768,15 +796,15 @@ public class Model extends Entity {
Model_transformTempZ = 0; Model_transformTempZ = 0;
for(var8 = 0; var8 < var6; ++var8) { for(var8 = 0; var8 < var6; ++var8) {
int var11 = var2[var8]; int var9 = var2[var8];
if(var11 < this.vertexLabels.length) { if(var9 < this.vertexLabels.length) {
int[] var12 = this.vertexLabels[var11]; int[] var10 = this.vertexLabels[var9];
for(var9 = 0; var9 < var12.length; ++var9) { for(var11 = 0; var11 < var10.length; ++var11) {
var10 = var12[var9]; var12 = var10[var11];
Model_transformTempX += this.verticesX[var10]; Model_transformTempX += this.verticesX[var12];
Model_transformTempY += this.verticesY[var10]; Model_transformTempY += this.verticesY[var12];
Model_transformTempZ += this.verticesZ[var10]; Model_transformTempZ += this.verticesZ[var12];
++var7; ++var7;
} }
} }
@@ -791,6 +819,7 @@ public class Model extends Entity {
Model_transformTempY = var4; Model_transformTempY = var4;
Model_transformTempZ = var5; Model_transformTempZ = var5;
} }
} else { } else {
int[] var18; int[] var18;
int var19; int var19;
@@ -801,13 +830,14 @@ public class Model extends Entity {
var18 = this.vertexLabels[var8]; var18 = this.vertexLabels[var8];
for(var19 = 0; var19 < var18.length; ++var19) { for(var19 = 0; var19 < var18.length; ++var19) {
var9 = var18[var19]; var11 = var18[var19];
this.verticesX[var9] += var3; this.verticesX[var11] += var3;
this.verticesY[var9] += var4; this.verticesY[var11] += var4;
this.verticesZ[var9] += var5; this.verticesZ[var11] += var5;
} }
} }
} }
} else if(var1 == 2) { } else if(var1 == 2) {
for(var7 = 0; var7 < var6; ++var7) { for(var7 = 0; var7 < var6; ++var7) {
var8 = var2[var7]; var8 = var2[var7];
@@ -815,11 +845,11 @@ public class Model extends Entity {
var18 = this.vertexLabels[var8]; var18 = this.vertexLabels[var8];
for(var19 = 0; var19 < var18.length; ++var19) { for(var19 = 0; var19 < var18.length; ++var19) {
var9 = var18[var19]; var11 = var18[var19];
this.verticesX[var9] -= Model_transformTempX; this.verticesX[var11] -= Model_transformTempX;
this.verticesY[var9] -= Model_transformTempY; this.verticesY[var11] -= Model_transformTempY;
this.verticesZ[var9] -= Model_transformTempZ; this.verticesZ[var11] -= Model_transformTempZ;
var10 = (var3 & 255) * 8; var12 = (var3 & 255) * 8;
int var13 = (var4 & 255) * 8; int var13 = (var4 & 255) * 8;
int var14 = (var5 & 255) * 8; int var14 = (var5 & 255) * 8;
int var15; int var15;
@@ -828,33 +858,34 @@ public class Model extends Entity {
if(var14 != 0) { if(var14 != 0) {
var15 = Model_sine[var14]; var15 = Model_sine[var14];
var16 = Model_cosine[var14]; var16 = Model_cosine[var14];
var17 = var15 * this.verticesY[var9] + var16 * this.verticesX[var9] >> 16; var17 = var15 * this.verticesY[var11] + var16 * this.verticesX[var11] >> 16;
this.verticesY[var9] = var16 * this.verticesY[var9] - var15 * this.verticesX[var9] >> 16; this.verticesY[var11] = var16 * this.verticesY[var11] - var15 * this.verticesX[var11] >> 16;
this.verticesX[var9] = var17; this.verticesX[var11] = var17;
} }
if(var10 != 0) { if(var12 != 0) {
var15 = Model_sine[var10]; var15 = Model_sine[var12];
var16 = Model_cosine[var10]; var16 = Model_cosine[var12];
var17 = var16 * this.verticesY[var9] - var15 * this.verticesZ[var9] >> 16; var17 = var16 * this.verticesY[var11] - var15 * this.verticesZ[var11] >> 16;
this.verticesZ[var9] = var15 * this.verticesY[var9] + var16 * this.verticesZ[var9] >> 16; this.verticesZ[var11] = var15 * this.verticesY[var11] + var16 * this.verticesZ[var11] >> 16;
this.verticesY[var9] = var17; this.verticesY[var11] = var17;
} }
if(var13 != 0) { if(var13 != 0) {
var15 = Model_sine[var13]; var15 = Model_sine[var13];
var16 = Model_cosine[var13]; var16 = Model_cosine[var13];
var17 = var15 * this.verticesZ[var9] + var16 * this.verticesX[var9] >> 16; var17 = var15 * this.verticesZ[var11] + var16 * this.verticesX[var11] >> 16;
this.verticesZ[var9] = var16 * this.verticesZ[var9] - var15 * this.verticesX[var9] >> 16; this.verticesZ[var11] = var16 * this.verticesZ[var11] - var15 * this.verticesX[var11] >> 16;
this.verticesX[var9] = var17; this.verticesX[var11] = var17;
} }
this.verticesX[var9] += Model_transformTempX; this.verticesX[var11] += Model_transformTempX;
this.verticesY[var9] += Model_transformTempY; this.verticesY[var11] += Model_transformTempY;
this.verticesZ[var9] += Model_transformTempZ; this.verticesZ[var11] += Model_transformTempZ;
} }
} }
} }
} else if(var1 == 3) { } else if(var1 == 3) {
for(var7 = 0; var7 < var6; ++var7) { for(var7 = 0; var7 < var6; ++var7) {
var8 = var2[var7]; var8 = var2[var7];
@@ -862,41 +893,44 @@ public class Model extends Entity {
var18 = this.vertexLabels[var8]; var18 = this.vertexLabels[var8];
for(var19 = 0; var19 < var18.length; ++var19) { for(var19 = 0; var19 < var18.length; ++var19) {
var9 = var18[var19]; var11 = var18[var19];
this.verticesX[var9] -= Model_transformTempX; this.verticesX[var11] -= Model_transformTempX;
this.verticesY[var9] -= Model_transformTempY; this.verticesY[var11] -= Model_transformTempY;
this.verticesZ[var9] -= Model_transformTempZ; this.verticesZ[var11] -= Model_transformTempZ;
this.verticesX[var9] = var3 * this.verticesX[var9] / 128; this.verticesX[var11] = var3 * this.verticesX[var11] / 128;
this.verticesY[var9] = var4 * this.verticesY[var9] / 128; this.verticesY[var11] = var4 * this.verticesY[var11] / 128;
this.verticesZ[var9] = var5 * this.verticesZ[var9] / 128; this.verticesZ[var11] = var5 * this.verticesZ[var11] / 128;
this.verticesX[var9] += Model_transformTempX; this.verticesX[var11] += Model_transformTempX;
this.verticesY[var9] += Model_transformTempY; this.verticesY[var11] += Model_transformTempY;
this.verticesZ[var9] += Model_transformTempZ; this.verticesZ[var11] += Model_transformTempZ;
} }
} }
} }
} else if(var1 == 5 && this.faceLabelsAlpha != null && this.faceAlphas != null) {
for(var7 = 0; var7 < var6; ++var7) {
var8 = var2[var7];
if(var8 < this.faceLabelsAlpha.length) {
var18 = this.faceLabelsAlpha[var8];
for(var19 = 0; var19 < var18.length; ++var19) { } else if(var1 == 5) {
var9 = var18[var19]; if(this.faceLabelsAlpha != null && this.faceAlphas != null) {
var10 = (this.faceAlphas[var9] & 255) + var3 * 8; for(var7 = 0; var7 < var6; ++var7) {
if(var10 < 0) { var8 = var2[var7];
var10 = 0; if(var8 < this.faceLabelsAlpha.length) {
} else if(var10 > 255) { var18 = this.faceLabelsAlpha[var8];
var10 = 255;
for(var19 = 0; var19 < var18.length; ++var19) {
var11 = var18[var19];
var12 = (this.faceAlphas[var11] & 255) + var3 * 8;
if(var12 < 0) {
var12 = 0;
} else if(var12 > 255) {
var12 = 255;
}
this.faceAlphas[var11] = (byte)var12;
} }
this.faceAlphas[var9] = (byte)var10;
} }
} }
} }
} }
} }
} }
@ObfuscatedName("j") @ObfuscatedName("j")
@@ -1033,7 +1067,7 @@ public class Model extends Entity {
try { try {
this.draw0(false, false, false, 0L); this.draw0(false, false, false, 0L);
} catch (Exception var24) { } catch (Exception var25) {
; ;
} }
@@ -1099,7 +1133,7 @@ public class Model extends Entity {
try { try {
this.draw0(false, false, false, 0L); this.draw0(false, false, false, 0L);
} catch (Exception var25) { } catch (Exception var26) {
; ;
} }
@@ -1118,80 +1152,81 @@ public class Model extends Entity {
int var7; int var7;
int var8; int var8;
int var9;
int var10; int var10;
int var11; int var11;
int var12; int var12;
int var13; int var13;
int var14;
int var15; int var15;
int var16; int var16;
int var18;
int var27;
for(var7 = 0; var7 < this.indicesCount; ++var7) { for(var7 = 0; var7 < this.indicesCount; ++var7) {
if(this.faceColors3[var7] != -2) { if(this.faceColors3[var7] != -2) {
var8 = this.indices1[var7]; var8 = this.indices1[var7];
var16 = this.indices2[var7]; var27 = this.indices2[var7];
var9 = this.indices3[var7]; var10 = this.indices3[var7];
var10 = modelViewportXs[var8]; var11 = modelViewportXs[var8];
var11 = modelViewportXs[var16]; var12 = modelViewportXs[var27];
var12 = modelViewportXs[var9]; var13 = modelViewportXs[var10];
int var17; int var14;
if(!var1 || var10 != -5000 && var11 != -5000 && var12 != -5000) { if(!var1 || var11 != -5000 && var12 != -5000 && var13 != -5000) {
if(var2 && NPCDefinition.method5164(modelViewportYs[var8], modelViewportYs[var16], modelViewportYs[var9], var10, var11, var12, var6)) { if(var2 && NpcDefinition.method5164(modelViewportYs[var8], modelViewportYs[var27], modelViewportYs[var10], var11, var12, var13, var6)) {
Projectile.method2081(var4); Projectile.method2081(var4);
var2 = false; var2 = false;
} }
if((var10 - var11) * (modelViewportYs[var9] - modelViewportYs[var16]) - (var12 - var11) * (modelViewportYs[var8] - modelViewportYs[var16]) > 0) { if((var11 - var12) * (modelViewportYs[var10] - modelViewportYs[var27]) - (var13 - var12) * (modelViewportYs[var8] - modelViewportYs[var27]) > 0) {
__du_ad[var7] = false; __du_ad[var7] = false;
if(var10 >= 0 && var11 >= 0 && var12 >= 0 && var10 <= Rasterizer3D.Rasterizer3D_clipWidth && var11 <= Rasterizer3D.Rasterizer3D_clipWidth && var12 <= Rasterizer3D.Rasterizer3D_clipWidth) { if(var11 >= 0 && var12 >= 0 && var13 >= 0 && var11 <= Rasterizer3D.Rasterizer3D_clipWidth && var12 <= Rasterizer3D.Rasterizer3D_clipWidth && var13 <= Rasterizer3D.Rasterizer3D_clipWidth) {
__du_at[var7] = false; __du_at[var7] = false;
} else { } else {
__du_at[var7] = true; __du_at[var7] = true;
} }
var17 = (__du_am[var8] + __du_am[var16] + __du_am[var9]) / 3 + this.radius; var14 = (__du_am[var8] + __du_am[var27] + __du_am[var10]) / 3 + this.radius;
__du_ax[var17][__du_aa[var17]++] = var7; __du_ax[var14][__du_aa[var14]++] = var7;
} }
} else { } else {
var17 = __du_an[var8]; var14 = __du_an[var8];
var13 = __du_an[var16]; var15 = __du_an[var27];
var14 = __du_an[var9]; var16 = __du_an[var10];
int var18 = __du_az[var8]; int var17 = __du_az[var8];
var15 = __du_az[var16]; var18 = __du_az[var27];
int var19 = __du_az[var9]; int var19 = __du_az[var10];
int var20 = __du_au[var8]; int var20 = __du_au[var8];
int var21 = __du_au[var16]; int var21 = __du_au[var27];
int var22 = __du_au[var9]; int var22 = __du_au[var10];
var17 -= var13; var14 -= var15;
var14 -= var13; var16 -= var15;
var18 -= var15; var17 -= var18;
var19 -= var15; var19 -= var18;
var20 -= var21; var20 -= var21;
var22 -= var21; var22 -= var21;
int var23 = var18 * var22 - var20 * var19; int var23 = var17 * var22 - var20 * var19;
int var24 = var20 * var14 - var17 * var22; int var24 = var20 * var16 - var14 * var22;
int var25 = var17 * var19 - var18 * var14; int var25 = var14 * var19 - var17 * var16;
if(var13 * var23 + var15 * var24 + var21 * var25 > 0) { if(var15 * var23 + var18 * var24 + var21 * var25 > 0) {
__du_ad[var7] = true; __du_ad[var7] = true;
int var26 = (__du_am[var8] + __du_am[var16] + __du_am[var9]) / 3 + this.radius; int var26 = (__du_am[var8] + __du_am[var27] + __du_am[var10]) / 3 + this.radius;
__du_ax[var26][__du_aa[var26]++] = var7; __du_ax[var26][__du_aa[var26]++] = var7;
} }
} }
} }
} }
int[] var27; int[] var9;
if(this.faceRenderPriorities == null) { if(this.faceRenderPriorities == null) {
for(var7 = this.diameter - 1; var7 >= 0; --var7) { for(var7 = this.diameter - 1; var7 >= 0; --var7) {
var8 = __du_aa[var7]; var8 = __du_aa[var7];
if(var8 > 0) { if(var8 > 0) {
var27 = __du_ax[var7]; var9 = __du_ax[var7];
for(var9 = 0; var9 < var8; ++var9) { for(var10 = 0; var10 < var8; ++var10) {
this.__ag_236(var27[var9]); this.__ag_236(var9[var10]);
} }
} }
} }
} else { } else {
for(var7 = 0; var7 < 12; ++var7) { for(var7 = 0; var7 < 12; ++var7) {
__du_af[var7] = 0; __du_af[var7] = 0;
@@ -1201,19 +1236,19 @@ public class Model extends Entity {
for(var7 = this.diameter - 1; var7 >= 0; --var7) { for(var7 = this.diameter - 1; var7 >= 0; --var7) {
var8 = __du_aa[var7]; var8 = __du_aa[var7];
if(var8 > 0) { if(var8 > 0) {
var27 = __du_ax[var7]; var9 = __du_ax[var7];
for(var9 = 0; var9 < var8; ++var9) { for(var10 = 0; var10 < var8; ++var10) {
var10 = var27[var9]; var11 = var9[var10];
byte var28 = this.faceRenderPriorities[var10]; byte var31 = this.faceRenderPriorities[var11];
var12 = __du_af[var28]++; var13 = __du_af[var31]++;
__du_ai[var28][var12] = var10; __du_ai[var31][var13] = var11;
if(var28 < 10) { if(var31 < 10) {
__du_bs[var28] += var7; __du_bs[var31] += var7;
} else if(var28 == 10) { } else if(var31 == 10) {
__du_ba[var12] = var7; __du_ba[var13] = var7;
} else { } else {
__du_bb[var12] = var7; __du_bb[var13] = var7;
} }
} }
} }
@@ -1229,103 +1264,103 @@ public class Model extends Entity {
var8 = (__du_bs[3] + __du_bs[4]) / (__du_af[3] + __du_af[4]); var8 = (__du_bs[3] + __du_bs[4]) / (__du_af[3] + __du_af[4]);
} }
var16 = 0; var27 = 0;
if(__du_af[6] > 0 || __du_af[8] > 0) { if(__du_af[6] > 0 || __du_af[8] > 0) {
var16 = (__du_bs[8] + __du_bs[6]) / (__du_af[8] + __du_af[6]); var27 = (__du_bs[8] + __du_bs[6]) / (__du_af[8] + __du_af[6]);
} }
var10 = 0; var11 = 0;
var11 = __du_af[10]; var12 = __du_af[10];
int[] var29 = __du_ai[10]; int[] var28 = __du_ai[10];
int[] var30 = __du_ba; int[] var29 = __du_ba;
if(var10 == var11) { if(var11 == var12) {
var10 = 0; var11 = 0;
var11 = __du_af[11]; var12 = __du_af[11];
var29 = __du_ai[11]; var28 = __du_ai[11];
var30 = __du_bb; var29 = __du_bb;
} }
if(var10 < var11) { if(var11 < var12) {
var9 = var30[var10]; var10 = var29[var11];
} else { } else {
var9 = -1000; var10 = -1000;
} }
for(var13 = 0; var13 < 10; ++var13) { for(var15 = 0; var15 < 10; ++var15) {
while(var13 == 0 && var9 > var7) { while(var15 == 0 && var10 > var7) {
this.__ag_236(var29[var10++]); this.__ag_236(var28[var11++]);
if(var10 == var11 && var29 != __du_ai[11]) { if(var11 == var12 && var28 != __du_ai[11]) {
var10 = 0; var11 = 0;
var11 = __du_af[11]; var12 = __du_af[11];
var29 = __du_ai[11]; var28 = __du_ai[11];
var30 = __du_bb; var29 = __du_bb;
} }
if(var10 < var11) { if(var11 < var12) {
var9 = var30[var10]; var10 = var29[var11];
} else { } else {
var9 = -1000; var10 = -1000;
} }
} }
while(var13 == 3 && var9 > var8) { while(var15 == 3 && var10 > var8) {
this.__ag_236(var29[var10++]); this.__ag_236(var28[var11++]);
if(var10 == var11 && var29 != __du_ai[11]) { if(var11 == var12 && var28 != __du_ai[11]) {
var10 = 0; var11 = 0;
var11 = __du_af[11]; var12 = __du_af[11];
var29 = __du_ai[11]; var28 = __du_ai[11];
var30 = __du_bb; var29 = __du_bb;
} }
if(var10 < var11) { if(var11 < var12) {
var9 = var30[var10]; var10 = var29[var11];
} else { } else {
var9 = -1000; var10 = -1000;
} }
} }
while(var13 == 5 && var9 > var16) { while(var15 == 5 && var10 > var27) {
this.__ag_236(var29[var10++]); this.__ag_236(var28[var11++]);
if(var10 == var11 && var29 != __du_ai[11]) { if(var11 == var12 && var28 != __du_ai[11]) {
var10 = 0; var11 = 0;
var11 = __du_af[11]; var12 = __du_af[11];
var29 = __du_ai[11]; var28 = __du_ai[11];
var30 = __du_bb; var29 = __du_bb;
} }
if(var10 < var11) { if(var11 < var12) {
var9 = var30[var10]; var10 = var29[var11];
} else { } else {
var9 = -1000; var10 = -1000;
} }
} }
var14 = __du_af[var13]; var16 = __du_af[var15];
int[] var31 = __du_ai[var13]; int[] var30 = __du_ai[var15];
for(var15 = 0; var15 < var14; ++var15) { for(var18 = 0; var18 < var16; ++var18) {
this.__ag_236(var31[var15]); this.__ag_236(var30[var18]);
} }
} }
while(var9 != -1000) { while(var10 != -1000) {
this.__ag_236(var29[var10++]); this.__ag_236(var28[var11++]);
if(var10 == var11 && var29 != __du_ai[11]) { if(var11 == var12 && var28 != __du_ai[11]) {
var10 = 0; var11 = 0;
var29 = __du_ai[11]; var28 = __du_ai[11];
var11 = __du_af[11]; var12 = __du_af[11];
var30 = __du_bb; var29 = __du_bb;
} }
if(var10 < var11) { if(var11 < var12) {
var9 = var30[var10]; var10 = var29[var11];
} else { } else {
var9 = -1000; var10 = -1000;
} }
} }
} }
} }
} }
@ObfuscatedName("ag") @ObfuscatedName("ag")
@@ -1369,8 +1404,8 @@ public class Model extends Entity {
} else { } else {
Rasterizer3D.method3037(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors2[var1], this.faceColors3[var1]); Rasterizer3D.method3037(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors2[var1], this.faceColors3[var1]);
} }
}
}
} }
@ObfuscatedName("aq") @ObfuscatedName("aq")
@@ -1575,145 +1610,115 @@ public class Model extends Entity {
boolean var26 = var25 || this.__h > 0; boolean var26 = var25 || this.__h > 0;
int var27 = ViewportMouse.ViewportMouse_x; int var27 = ViewportMouse.ViewportMouse_x;
int var28 = ViewportMouse.ViewportMouse_y; int var29 = ViewportMouse.ViewportMouse_y;
boolean var29 = ViewportMouse.ViewportMouse_isInViewport; boolean var31 = ViewportMouse.ViewportMouse_isInViewport;
boolean var30 = 0L != var9; boolean var34 = 0L != var9;
boolean var31; boolean var35;
if(var30) { if(var34) {
var31 = (int)(var9 >>> 16 & 1L) == 1; var35 = (int)(var9 >>> 16 & 1L) == 1;
var30 = !var31; var34 = !var35;
} }
var31 = false; var35 = false;
int var32; int var37;
int var33; int var38;
int var34; int var39;
if(var30 && var29) { if(var34 && var31) {
boolean var35 = false; boolean var36 = false;
if(__du_bx) { if(__du_bx) {
var35 = Decimator.method2491(this, var6, var7, var8); var36 = Decimator.method2491(this, var6, var7, var8);
} else { } else {
var32 = var12 - var13; var37 = var12 - var13;
if(var32 <= 50) { if(var37 <= 50) {
var32 = 50; var37 = 50;
} }
if(var15 > 0) { if(var15 > 0) {
var16 /= var14; var16 /= var14;
var17 /= var32; var17 /= var37;
} else { } else {
var17 /= var14; var17 /= var14;
var16 /= var32; var16 /= var37;
} }
if(var18 > 0) { if(var18 > 0) {
var22 /= var14; var22 /= var14;
var20 /= var32; var20 /= var37;
} else { } else {
var20 /= var14; var20 /= var14;
var22 /= var32; var22 /= var37;
} }
var33 = var27 - Rasterizer3D.Rasterizer3D_clipMidX; var38 = var27 - Rasterizer3D.Rasterizer3D_clipMidX;
var34 = var28 - Rasterizer3D.Rasterizer3D_clipMidY; var39 = var29 - Rasterizer3D.Rasterizer3D_clipMidY;
if(var33 > var16 && var33 < var17 && var34 > var22 && var34 < var20) { if(var38 > var16 && var38 < var17 && var39 > var22 && var39 < var20) {
var35 = true; var36 = true;
} }
} }
if(var35) { if(var36) {
if(this.isSingleTile) { if(this.isSingleTile) {
Projectile.method2081(var9); Projectile.method2081(var9);
} else { } else {
var31 = true; var35 = true;
} }
} }
} }
int var42 = Rasterizer3D.Rasterizer3D_clipMidX; int var47 = Rasterizer3D.Rasterizer3D_clipMidX;
var32 = Rasterizer3D.Rasterizer3D_clipMidY; var37 = Rasterizer3D.Rasterizer3D_clipMidY;
var33 = 0; var38 = 0;
var34 = 0; var39 = 0;
if(var1 != 0) { if(var1 != 0) {
var33 = Model_sine[var1]; var38 = Model_sine[var1];
var34 = Model_cosine[var1]; var39 = Model_cosine[var1];
} }
for(int var36 = 0; var36 < this.verticesCount; ++var36) { for(int var40 = 0; var40 < this.verticesCount; ++var40) {
int var37 = this.verticesX[var36]; int var41 = this.verticesX[var40];
int var38 = this.verticesY[var36]; int var42 = this.verticesY[var40];
int var39 = this.verticesZ[var36]; int var43 = this.verticesZ[var40];
int var40; int var44;
if(var1 != 0) { if(var1 != 0) {
var40 = var39 * var33 + var37 * var34 >> 16; var44 = var43 * var38 + var41 * var39 >> 16;
var39 = var39 * var34 - var37 * var33 >> 16; var43 = var43 * var39 - var41 * var38 >> 16;
var37 = var40; var41 = var44;
} }
var37 += var6; var41 += var6;
var38 += var7; var42 += var7;
var39 += var8; var43 += var8;
var40 = var39 * var4 + var5 * var37 >> 16; var44 = var43 * var4 + var5 * var41 >> 16;
var39 = var5 * var39 - var37 * var4 >> 16; var43 = var5 * var43 - var41 * var4 >> 16;
var37 = var40; var41 = var44;
var40 = var3 * var38 - var39 * var2 >> 16; var44 = var3 * var42 - var43 * var2 >> 16;
var39 = var38 * var2 + var3 * var39 >> 16; var43 = var42 * var2 + var3 * var43 >> 16;
__du_am[var36] = var39 - var12; __du_am[var40] = var43 - var12;
if(var39 >= 50) { if(var43 >= 50) {
modelViewportXs[var36] = var37 * Rasterizer3D.Rasterizer3D_zoom / var39 + var42; modelViewportXs[var40] = var41 * Rasterizer3D.Rasterizer3D_zoom / var43 + var47;
modelViewportYs[var36] = var40 * Rasterizer3D.Rasterizer3D_zoom / var39 + var32; modelViewportYs[var40] = var44 * Rasterizer3D.Rasterizer3D_zoom / var43 + var37;
} else { } else {
modelViewportXs[var36] = -5000; modelViewportXs[var40] = -5000;
var24 = true; var24 = true;
} }
if(var26) { if(var26) {
__du_an[var36] = var37; __du_an[var40] = var41;
__du_az[var36] = var40; __du_az[var40] = var44;
__du_au[var36] = var39; __du_au[var40] = var43;
} }
} }
try { try {
this.draw0(var24, var31, this.isSingleTile, var9); this.draw0(var24, var35, this.isSingleTile, var9);
} catch (Exception var41) { } catch (Exception var46) {
; ;
} }
} }
} }
} }
} }
} }
}
static {
Model_sharedSequenceModel = new Model();
Model_sharedSequenceModelFaceAlphas = new byte[1];
Model_sharedSpotAnimationModel = new Model();
Model_sharedSpotAnimationModelFaceAlphas = new byte[1];
__du_at = new boolean[4700];
__du_ad = new boolean[4700];
modelViewportXs = new int[4700];
modelViewportYs = new int[4700];
__du_am = new int[4700];
__du_an = new int[4700];
__du_az = new int[4700];
__du_au = new int[4700];
__du_aa = new int[1600];
__du_ax = new int[1600][512];
__du_af = new int[12];
__du_ai = new int[12][2000];
__du_ba = new int[2000];
__du_bb = new int[2000];
__du_bs = new int[12];
__du_bq = new int[10];
__du_bn = new int[10];
__du_bk = new int[10];
__du_bx = true;
Model_sine = Rasterizer3D.Rasterizer3D_sine;
Model_cosine = Rasterizer3D.Rasterizer3D_cosine;
__du_br = Rasterizer3D.Rasterizer3D_colorPalette;
__du_bj = Rasterizer3D.__et_p;
} }
} }

419
runescape-client/src/main/java/ModelData.java
View File

@@ -136,6 +136,14 @@ public class ModelData extends Entity {
@Export("__ak") @Export("__ak")
int __ak; int __ak;
static {
__dw_aw = new int[10000];
__dw_al = new int[10000];
__dw_ab = 0;
ModelData_sine = Rasterizer3D.Rasterizer3D_sine;
ModelData_cosine = Rasterizer3D.Rasterizer3D_cosine;
}
ModelData() { ModelData() {
this.verticesCount = 0; this.verticesCount = 0;
this.faceCount = 0; this.faceCount = 0;
@@ -431,61 +439,61 @@ public class ModelData extends Entity {
} }
var26 = var11 + var9; var26 = var11 + var9;
int var56 = var26; int var28 = var26;
if(var12 == 1) { if(var12 == 1) {
var26 += var10; var26 += var10;
} }
int var28 = var26;
var26 += var10;
int var29 = var26; int var29 = var26;
var26 += var10;
int var30 = var26;
if(var13 == 255) { if(var13 == 255) {
var26 += var10; var26 += var10;
} }
int var30 = var26; int var31 = var26;
if(var15 == 1) { if(var15 == 1) {
var26 += var10; var26 += var10;
} }
int var31 = var26; int var32 = var26;
if(var17 == 1) { if(var17 == 1) {
var26 += var9; var26 += var9;
} }
int var32 = var26; int var33 = var26;
if(var14 == 1) { if(var14 == 1) {
var26 += var10; var26 += var10;
} }
int var33 = var26;
var26 += var21;
int var34 = var26; int var34 = var26;
var26 += var21;
int var35 = var26;
if(var16 == 1) { if(var16 == 1) {
var26 += var10 * 2; var26 += var10 * 2;
} }
int var35 = var26;
var26 += var22;
int var36 = var26; int var36 = var26;
var26 += var10 * 2; var26 += var22;
int var37 = var26; int var37 = var26;
var26 += var18; var26 += var10 * 2;
int var38 = var26; int var38 = var26;
var26 += var19; var26 += var18;
int var39 = var26; int var39 = var26;
var26 += var20; var26 += var19;
int var40 = var26; int var40 = var26;
var26 += var23 * 6; var26 += var20;
int var41 = var26; int var41 = var26;
var26 += var24 * 6; var26 += var23 * 6;
int var42 = var26; int var42 = var26;
var26 += var24 * 6; var26 += var24 * 6;
int var43 = var26; int var43 = var26;
var26 += var24 * 2; var26 += var24 * 6;
int var44 = var26; int var44 = var26;
var26 += var24; var26 += var24 * 2;
int var45 = var26; int var45 = var26;
var26 += var24;
int var46 = var26;
var26 += var24 * 2 + var25 * 2; var26 += var24 * 2 + var25 * 2;
this.verticesCount = var9; this.verticesCount = var9;
this.faceCount = var10; this.faceCount = var10;
@@ -534,151 +542,151 @@ public class ModelData extends Entity {
} }
var2.index = var11; var2.index = var11;
var3.index = var37; var3.index = var38;
var4.index = var38; var4.index = var39;
var5.index = var39; var5.index = var40;
var6.index = var31; var6.index = var32;
int var46 = 0;
int var47 = 0;
int var48 = 0; int var48 = 0;
int var49 = 0;
int var50 = 0;
int var49;
int var50;
int var51; int var51;
int var52; int var52;
int var53; int var53;
for(var49 = 0; var49 < var9; ++var49) { int var54;
var50 = var2.readUnsignedByte(); int var55;
var51 = 0; for(var51 = 0; var51 < var9; ++var51) {
if((var50 & 1) != 0) { var52 = var2.readUnsignedByte();
var51 = var3.__ab_306();
}
var52 = 0;
if((var50 & 2) != 0) {
var52 = var4.__ab_306();
}
var53 = 0; var53 = 0;
if((var50 & 4) != 0) { if((var52 & 1) != 0) {
var53 = var5.__ab_306(); var53 = var3.__ab_306();
} }
this.verticesX[var49] = var46 + var51; var54 = 0;
this.verticesY[var49] = var47 + var52; if((var52 & 2) != 0) {
this.verticesZ[var49] = var48 + var53; var54 = var4.__ab_306();
var46 = this.verticesX[var49]; }
var47 = this.verticesY[var49];
var48 = this.verticesZ[var49]; var55 = 0;
if((var52 & 4) != 0) {
var55 = var5.__ab_306();
}
this.verticesX[var51] = var48 + var53;
this.verticesY[var51] = var49 + var54;
this.verticesZ[var51] = var50 + var55;
var48 = this.verticesX[var51];
var49 = this.verticesY[var51];
var50 = this.verticesZ[var51];
if(var17 == 1) { if(var17 == 1) {
this.__h[var49] = var6.readUnsignedByte(); this.__h[var51] = var6.readUnsignedByte();
} }
} }
var2.index = var36; var2.index = var37;
var3.index = var56; var3.index = var28;
var4.index = var29; var4.index = var30;
var5.index = var32; var5.index = var33;
var6.index = var30; var6.index = var31;
var7.index = var34; var7.index = var35;
var8.index = var35; var8.index = var36;
for(var49 = 0; var49 < var10; ++var49) { for(var51 = 0; var51 < var10; ++var51) {
this.faceColors[var49] = (short)var2.__ag_302(); this.faceColors[var51] = (short)var2.__ag_302();
if(var12 == 1) { if(var12 == 1) {
this.__e[var49] = var3.readByte(); this.__e[var51] = var3.readByte();
} }
if(var13 == 255) { if(var13 == 255) {
this.__x[var49] = var4.readByte(); this.__x[var51] = var4.readByte();
} }
if(var14 == 1) { if(var14 == 1) {
this.faceAlphas[var49] = var5.readByte(); this.faceAlphas[var51] = var5.readByte();
} }
if(var15 == 1) { if(var15 == 1) {
this.__b[var49] = var6.readUnsignedByte(); this.__b[var51] = var6.readUnsignedByte();
} }
if(var16 == 1) { if(var16 == 1) {
this.faceTextures[var49] = (short)(var7.__ag_302() - 1); this.faceTextures[var51] = (short)(var7.__ag_302() - 1);
} }
if(this.textureCoords != null && this.faceTextures[var49] != -1) { if(this.textureCoords != null && this.faceTextures[var51] != -1) {
this.textureCoords[var49] = (byte)(var8.readUnsignedByte() - 1); this.textureCoords[var51] = (byte)(var8.readUnsignedByte() - 1);
} }
} }
var2.index = var33; var2.index = var34;
var3.index = var28; var3.index = var29;
var49 = 0;
var50 = 0;
var51 = 0; var51 = 0;
var52 = 0; var52 = 0;
var53 = 0;
var54 = 0;
int var54; int var56;
for(var53 = 0; var53 < var10; ++var53) { for(var55 = 0; var55 < var10; ++var55) {
var54 = var3.readUnsignedByte(); var56 = var3.readUnsignedByte();
if(var54 == 1) { if(var56 == 1) {
var49 = var2.__ab_306() + var52; var51 = var2.__ab_306() + var54;
var50 = var2.__ab_306() + var49; var52 = var2.__ab_306() + var51;
var51 = var2.__ab_306() + var50; var53 = var2.__ab_306() + var52;
var52 = var51; var54 = var53;
this.indices1[var53] = var49; this.indices1[var55] = var51;
this.indices2[var53] = var50; this.indices2[var55] = var52;
this.indices3[var53] = var51; this.indices3[var55] = var53;
} }
if(var54 == 2) { if(var56 == 2) {
var50 = var51; var52 = var53;
var51 = var2.__ab_306() + var52; var53 = var2.__ab_306() + var54;
var52 = var51; var54 = var53;
this.indices1[var53] = var49; this.indices1[var55] = var51;
this.indices2[var53] = var50; this.indices2[var55] = var52;
this.indices3[var53] = var51; this.indices3[var55] = var53;
} }
if(var54 == 3) { if(var56 == 3) {
var49 = var51; var51 = var53;
var51 = var2.__ab_306() + var52; var53 = var2.__ab_306() + var54;
var52 = var51; var54 = var53;
this.indices1[var53] = var49; this.indices1[var55] = var51;
this.indices2[var53] = var50; this.indices2[var55] = var52;
this.indices3[var53] = var51; this.indices3[var55] = var53;
} }
if(var54 == 4) { if(var56 == 4) {
int var55 = var49; int var57 = var51;
var49 = var50; var51 = var52;
var50 = var55; var52 = var57;
var51 = var2.__ab_306() + var52; var53 = var2.__ab_306() + var54;
var52 = var51; var54 = var53;
this.indices1[var53] = var49; this.indices1[var55] = var51;
this.indices2[var53] = var55; this.indices2[var55] = var57;
this.indices3[var53] = var51; this.indices3[var55] = var53;
} }
} }
var2.index = var40; var2.index = var41;
var3.index = var41; var3.index = var42;
var4.index = var42; var4.index = var43;
var5.index = var43; var5.index = var44;
var6.index = var44; var6.index = var45;
var7.index = var45; var7.index = var46;
for(var53 = 0; var53 < var11; ++var53) { for(var55 = 0; var55 < var11; ++var55) {
var54 = this.textureRenderTypes[var53] & 255; var56 = this.textureRenderTypes[var55] & 255;
if(var54 == 0) { if(var56 == 0) {
this.texTriangleX[var53] = (short)var2.__ag_302(); this.texTriangleX[var55] = (short)var2.__ag_302();
this.texTriangleY[var53] = (short)var2.__ag_302(); this.texTriangleY[var55] = (short)var2.__ag_302();
this.texTriangleZ[var53] = (short)var2.__ag_302(); this.texTriangleZ[var55] = (short)var2.__ag_302();
} }
} }
var2.index = var26; var2.index = var26;
var53 = var2.readUnsignedByte(); var55 = var2.readUnsignedByte();
if(var53 != 0) { if(var55 != 0) {
new ModelData0(); new ModelData0();
var2.__ag_302(); var2.__ag_302();
var2.__ag_302(); var2.__ag_302();
@@ -712,45 +720,45 @@ public class ModelData extends Entity {
int var19 = var4.__ag_302(); int var19 = var4.__ag_302();
int var20 = var4.__ag_302(); int var20 = var4.__ag_302();
byte var21 = 0; byte var21 = 0;
int var22 = var21 + var9; int var45 = var21 + var9;
int var23 = var22; int var23 = var45;
var22 += var10; var45 += var10;
int var24 = var22; int var24 = var45;
if(var13 == 255) { if(var13 == 255) {
var22 += var10; var45 += var10;
} }
int var25 = var22; int var25 = var45;
if(var15 == 1) { if(var15 == 1) {
var22 += var10; var45 += var10;
} }
int var26 = var22; int var26 = var45;
if(var12 == 1) { if(var12 == 1) {
var22 += var10; var45 += var10;
} }
int var27 = var22; int var27 = var45;
if(var16 == 1) { if(var16 == 1) {
var22 += var9; var45 += var9;
} }
int var28 = var22; int var28 = var45;
if(var14 == 1) { if(var14 == 1) {
var22 += var10; var45 += var10;
} }
int var29 = var22; int var29 = var45;
var22 += var20; var45 += var20;
int var30 = var22; int var30 = var45;
var22 += var10 * 2; var45 += var10 * 2;
int var31 = var22; int var31 = var45;
var22 += var11 * 6; var45 += var11 * 6;
int var32 = var22; int var32 = var45;
var22 += var17; var45 += var17;
int var33 = var22; int var33 = var45;
var22 += var18; var45 += var18;
int var10000 = var22 + var19; int var10000 = var45 + var19;
this.verticesCount = var9; this.verticesCount = var9;
this.faceCount = var10; this.faceCount = var10;
this.__z = var11; this.__z = var11;
@@ -795,7 +803,7 @@ public class ModelData extends Entity {
var4.index = var21; var4.index = var21;
var5.index = var32; var5.index = var32;
var6.index = var33; var6.index = var33;
var7.index = var22; var7.index = var45;
var8.index = var27; var8.index = var27;
int var35 = 0; int var35 = 0;
int var36 = 0; int var36 = 0;
@@ -938,7 +946,7 @@ public class ModelData extends Entity {
} }
if(this.textureCoords != null) { if(this.textureCoords != null) {
boolean var45 = false; boolean var46 = false;
for(var43 = 0; var43 < var10; ++var43) { for(var43 = 0; var43 < var10; ++var43) {
var44 = this.textureCoords[var43] & 255; var44 = this.textureCoords[var43] & 255;
@@ -946,12 +954,12 @@ public class ModelData extends Entity {
if(this.indices1[var43] == (this.texTriangleX[var44] & '\uffff') && this.indices2[var43] == (this.texTriangleY[var44] & '\uffff') && this.indices3[var43] == (this.texTriangleZ[var44] & '\uffff')) { if(this.indices1[var43] == (this.texTriangleX[var44] & '\uffff') && this.indices2[var43] == (this.texTriangleY[var44] & '\uffff') && this.indices3[var43] == (this.texTriangleZ[var44] & '\uffff')) {
this.textureCoords[var43] = -1; this.textureCoords[var43] = -1;
} else { } else {
var45 = true; var46 = true;
} }
} }
} }
if(!var45) { if(!var46) {
this.textureCoords = null; this.textureCoords = null;
} }
} }
@@ -1281,8 +1289,8 @@ public class ModelData extends Entity {
this.faceTextures[var3] = var2; this.faceTextures[var3] = var2;
} }
} }
}
}
} }
@ObfuscatedName("t") @ObfuscatedName("t")
@@ -1386,8 +1394,8 @@ public class ModelData extends Entity {
var17.__q = var13; var17.__q = var13;
} }
} }
}
}
} }
@ObfuscatedName("b") @ObfuscatedName("b")
@@ -1441,7 +1449,6 @@ public class ModelData extends Entity {
this.isBoundsCalculated = true; this.isBoundsCalculated = true;
} }
} }
@ObfuscatedName("v") @ObfuscatedName("v")
@@ -1503,113 +1510,113 @@ public class ModelData extends Entity {
} }
} }
for(int var17 = 0; var17 < this.faceCount; ++var17) { for(int var16 = 0; var16 < this.faceCount; ++var16) {
byte var18; byte var17;
if(this.__e == null) { if(this.__e == null) {
var18 = 0; var17 = 0;
} else { } else {
var18 = this.__e[var17]; var17 = this.__e[var16];
} }
byte var19; byte var18;
if(this.faceAlphas == null) { if(this.faceAlphas == null) {
var19 = 0; var18 = 0;
} else { } else {
var19 = this.faceAlphas[var17]; var18 = this.faceAlphas[var16];
} }
short var12; short var12;
if(this.faceTextures == null) { if(this.faceTextures == null) {
var12 = -1; var12 = -1;
} else { } else {
var12 = this.faceTextures[var17]; var12 = this.faceTextures[var16];
} }
if(var19 == -2) { if(var18 == -2) {
var18 = 3; var17 = 3;
} }
if(var19 == -1) { if(var18 == -1) {
var18 = 2; var17 = 2;
} }
VertexNormal var13; VertexNormal var13;
int var14; int var14;
FaceNormal var15; FaceNormal var19;
if(var12 == -1) { if(var12 == -1) {
if(var18 != 0) { if(var17 != 0) {
if(var18 == 1) { if(var17 == 1) {
var15 = this.faceNormals[var17]; var19 = this.faceNormals[var16];
var14 = (var4 * var15.__f + var5 * var15.__q + var3 * var15.__m) / (var7 / 2 + var7) + var1; var14 = (var4 * var19.__f + var5 * var19.__q + var3 * var19.__m) / (var7 / 2 + var7) + var1;
var8.faceColors1[var17] = method2802(this.faceColors[var17] & '\uffff', var14); var8.faceColors1[var16] = method2802(this.faceColors[var16] & '\uffff', var14);
var8.faceColors3[var17] = -1; var8.faceColors3[var16] = -1;
} else if(var18 == 3) { } else if(var17 == 3) {
var8.faceColors1[var17] = 128; var8.faceColors1[var16] = 128;
var8.faceColors3[var17] = -1; var8.faceColors3[var16] = -1;
} else { } else {
var8.faceColors3[var17] = -2; var8.faceColors3[var16] = -2;
} }
} else { } else {
int var16 = this.faceColors[var17] & '\uffff'; int var15 = this.faceColors[var16] & '\uffff';
if(this.__ag != null && this.__ag[this.indices1[var17]] != null) { if(this.__ag != null && this.__ag[this.indices1[var16]] != null) {
var13 = this.__ag[this.indices1[var17]]; var13 = this.__ag[this.indices1[var16]];
} else { } else {
var13 = this.__v[this.indices1[var17]]; var13 = this.__v[this.indices1[var16]];
} }
var14 = (var4 * var13.__f + var5 * var13.__q + var3 * var13.__m) / (var7 * var13.__w) + var1; var14 = (var4 * var13.__f + var5 * var13.__q + var3 * var13.__m) / (var7 * var13.__w) + var1;
var8.faceColors1[var17] = method2802(var16, var14); var8.faceColors1[var16] = method2802(var15, var14);
if(this.__ag != null && this.__ag[this.indices2[var17]] != null) { if(this.__ag != null && this.__ag[this.indices2[var16]] != null) {
var13 = this.__ag[this.indices2[var17]]; var13 = this.__ag[this.indices2[var16]];
} else { } else {
var13 = this.__v[this.indices2[var17]]; var13 = this.__v[this.indices2[var16]];
} }
var14 = (var4 * var13.__f + var5 * var13.__q + var3 * var13.__m) / (var7 * var13.__w) + var1; var14 = (var4 * var13.__f + var5 * var13.__q + var3 * var13.__m) / (var7 * var13.__w) + var1;
var8.faceColors2[var17] = method2802(var16, var14); var8.faceColors2[var16] = method2802(var15, var14);
if(this.__ag != null && this.__ag[this.indices3[var17]] != null) { if(this.__ag != null && this.__ag[this.indices3[var16]] != null) {
var13 = this.__ag[this.indices3[var17]]; var13 = this.__ag[this.indices3[var16]];
} else { } else {
var13 = this.__v[this.indices3[var17]]; var13 = this.__v[this.indices3[var16]];
} }
var14 = (var4 * var13.__f + var5 * var13.__q + var3 * var13.__m) / (var7 * var13.__w) + var1; var14 = (var4 * var13.__f + var5 * var13.__q + var3 * var13.__m) / (var7 * var13.__w) + var1;
var8.faceColors3[var17] = method2802(var16, var14); var8.faceColors3[var16] = method2802(var15, var14);
} }
} else if(var18 != 0) { } else if(var17 != 0) {
if(var18 == 1) { if(var17 == 1) {
var15 = this.faceNormals[var17]; var19 = this.faceNormals[var16];
var14 = (var4 * var15.__f + var5 * var15.__q + var3 * var15.__m) / (var7 / 2 + var7) + var1; var14 = (var4 * var19.__f + var5 * var19.__q + var3 * var19.__m) / (var7 / 2 + var7) + var1;
var8.faceColors1[var17] = method2803(var14); var8.faceColors1[var16] = method2803(var14);
var8.faceColors3[var17] = -1; var8.faceColors3[var16] = -1;
} else { } else {
var8.faceColors3[var17] = -2; var8.faceColors3[var16] = -2;
} }
} else { } else {
if(this.__ag != null && this.__ag[this.indices1[var17]] != null) { if(this.__ag != null && this.__ag[this.indices1[var16]] != null) {
var13 = this.__ag[this.indices1[var17]]; var13 = this.__ag[this.indices1[var16]];
} else { } else {
var13 = this.__v[this.indices1[var17]]; var13 = this.__v[this.indices1[var16]];
} }
var14 = (var4 * var13.__f + var5 * var13.__q + var3 * var13.__m) / (var7 * var13.__w) + var1; var14 = (var4 * var13.__f + var5 * var13.__q + var3 * var13.__m) / (var7 * var13.__w) + var1;
var8.faceColors1[var17] = method2803(var14); var8.faceColors1[var16] = method2803(var14);
if(this.__ag != null && this.__ag[this.indices2[var17]] != null) { if(this.__ag != null && this.__ag[this.indices2[var16]] != null) {
var13 = this.__ag[this.indices2[var17]]; var13 = this.__ag[this.indices2[var16]];
} else { } else {
var13 = this.__v[this.indices2[var17]]; var13 = this.__v[this.indices2[var16]];
} }
var14 = (var4 * var13.__f + var5 * var13.__q + var3 * var13.__m) / (var7 * var13.__w) + var1; var14 = (var4 * var13.__f + var5 * var13.__q + var3 * var13.__m) / (var7 * var13.__w) + var1;
var8.faceColors2[var17] = method2803(var14); var8.faceColors2[var16] = method2803(var14);
if(this.__ag != null && this.__ag[this.indices3[var17]] != null) { if(this.__ag != null && this.__ag[this.indices3[var16]] != null) {
var13 = this.__ag[this.indices3[var17]]; var13 = this.__ag[this.indices3[var16]];
} else { } else {
var13 = this.__v[this.indices3[var17]]; var13 = this.__v[this.indices3[var16]];
} }
var14 = (var4 * var13.__f + var5 * var13.__q + var3 * var13.__m) / (var7 * var13.__w) + var1; var14 = (var4 * var13.__f + var5 * var13.__q + var3 * var13.__m) / (var7 * var13.__w) + var1;
var8.faceColors3[var17] = method2803(var14); var8.faceColors3[var16] = method2803(var14);
} }
} }
@@ -1724,8 +1731,8 @@ public class ModelData extends Entity {
var1.__e[var9] = 2; var1.__e[var9] = 2;
} }
} }
}
}
} }
@ObfuscatedName("ag") @ObfuscatedName("ag")
@@ -1750,12 +1757,4 @@ public class ModelData extends Entity {
return var0; return var0;
} }
static {
__dw_aw = new int[10000];
__dw_al = new int[10000];
__dw_ab = 0;
ModelData_sine = Rasterizer3D.Rasterizer3D_sine;
ModelData_cosine = Rasterizer3D.Rasterizer3D_cosine;
}
} }

42
runescape-client/src/main/java/MouseHandler.java
View File

@@ -130,6 +130,27 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi
@Export("oculusOrbFocalPointX") @Export("oculusOrbFocalPointX")
static int oculusOrbFocalPointX; static int oculusOrbFocalPointX;
static {
MouseHandler_instance = new MouseHandler();
MouseHandler_idleCycles = 0;
MouseHandler_currentButton0 = 0;
MouseHandler_x0 = -1;
MouseHandler_y0 = -1;
MouseHandler_millis0 = -1L;
MouseHandler_currentButton = 0;
MouseHandler_x = 0;
MouseHandler_y = 0;
MouseHandler_millis = 0L;
MouseHandler_lastButton0 = 0;
MouseHandler_lastPressedX0 = 0;
MouseHandler_lastPressedY0 = 0;
MouseHandler_lastPressedTimeMillis0 = 0L;
MouseHandler_lastButton = 0;
MouseHandler_lastPressedX = 0;
MouseHandler_lastPressedY = 0;
MouseHandler_lastPressedTimeMillis = 0L;
}
@ObfuscatedName("f") @ObfuscatedName("f")
@ObfuscatedSignature( @ObfuscatedSignature(
signature = "(Ljava/awt/event/MouseEvent;I)I", signature = "(Ljava/awt/event/MouseEvent;I)I",
@@ -269,25 +290,4 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi
Messages.method2200(); Messages.method2200();
class196.method3740(); class196.method3740();
} }
static {
MouseHandler_instance = new MouseHandler();
MouseHandler_idleCycles = 0;
MouseHandler_currentButton0 = 0;
MouseHandler_x0 = -1;
MouseHandler_y0 = -1;
MouseHandler_millis0 = -1L;
MouseHandler_currentButton = 0;
MouseHandler_x = 0;
MouseHandler_y = 0;
MouseHandler_millis = 0L;
MouseHandler_lastButton0 = 0;
MouseHandler_lastPressedX0 = 0;
MouseHandler_lastPressedY0 = 0;
MouseHandler_lastPressedTimeMillis0 = 0L;
MouseHandler_lastButton = 0;
MouseHandler_lastPressedX = 0;
MouseHandler_lastPressedY = 0;
MouseHandler_lastPressedTimeMillis = 0L;
}
} }

345
runescape-client/src/main/java/MouseRecorder.java
View File

@@ -55,7 +55,6 @@ public class MouseRecorder implements Runnable {
public void run() { public void run() {
for(; this.isRunning; class203.method4010(50L)) { for(; this.isRunning; class203.method4010(50L)) {
Object var1 = this.lock; Object var1 = this.lock;
Object var2 = this.lock;
synchronized(this.lock) { synchronized(this.lock) {
if(this.index < 500) { if(this.index < 500) {
this.xs[this.index] = MouseHandler.MouseHandler_x; this.xs[this.index] = MouseHandler.MouseHandler_x;
@@ -80,138 +79,135 @@ public class MouseRecorder implements Runnable {
int var8; int var8;
int var9; int var9;
int var10; int var10;
int var11; int var14;
int var12; int var26;
int var17;
if(var5 != 0L) { if(var5 != 0L) {
var7 = class65.scene.getObjectFlags(var0, var1, var2, var5); var7 = class65.scene.getObjectFlags(var0, var1, var2, var5);
var8 = var7 >> 6 & 3; var8 = var7 >> 6 & 3;
var9 = var7 & 31; var9 = var7 & 31;
var10 = var3; var10 = var3;
boolean var13 = var5 != 0L; boolean var12 = var5 != 0L;
if(var13) { if(var12) {
boolean var14 = (int)(var5 >>> 16 & 1L) == 1; boolean var13 = (int)(var5 >>> 16 & 1L) == 1;
var13 = !var14; var12 = !var13;
} }
if(var13) { if(var12) {
var10 = var4; var10 = var4;
} }
int[] var20 = WidgetGroupParent.sceneMinimapSprite.pixels; int[] var19 = WidgetGroupParent.sceneMinimapSprite.pixels;
var12 = var1 * 4 + (103 - var2) * 2048 + 24624; var26 = var1 * 4 + (103 - var2) * 2048 + 24624;
var11 = HitSplatDefinition.method4972(var5); var14 = HitSplatDefinition.method4972(var5);
ObjectDefinition var15 = class50.getObjectDefinition(var11); ObjectDefinition var15 = class50.getObjectDefinition(var14);
if(var15.mapSceneId != -1) { if(var15.mapSceneId != -1) {
IndexedSprite var16 = class192.mapSceneSprites[var15.mapSceneId]; IndexedSprite var16 = class192.mapSceneSprites[var15.mapSceneId];
if(var16 != null) { if(var16 != null) {
var17 = (var15.sizeX * 4 - var16.subWidth) / 2; int var17 = (var15.sizeX * 4 - var16.subWidth) / 2;
int var18 = (var15.sizeY * 4 - var16.subHeight) / 2; int var18 = (var15.sizeY * 4 - var16.subHeight) / 2;
var16.__q_496(var1 * 4 + var17 + 48, (104 - var2 - var15.sizeY) * 4 + var18 + 48); var16.__q_496(var1 * 4 + var17 + 48, (104 - var2 - var15.sizeY) * 4 + var18 + 48);
} }
} else { } else {
if(var9 == 0 || var9 == 2) { if(var9 == 0 || var9 == 2) {
if(var8 == 0) { if(var8 == 0) {
var20[var12] = var10; var19[var26] = var10;
var20[var12 + 512] = var10; var19[var26 + 512] = var10;
var20[var12 + 1024] = var10; var19[var26 + 1024] = var10;
var20[var12 + 1536] = var10; var19[var26 + 1536] = var10;
} else if(var8 == 1) { } else if(var8 == 1) {
var20[var12] = var10; var19[var26] = var10;
var20[var12 + 1] = var10; var19[var26 + 1] = var10;
var20[var12 + 2] = var10; var19[var26 + 2] = var10;
var20[var12 + 3] = var10; var19[var26 + 3] = var10;
} else if(var8 == 2) { } else if(var8 == 2) {
var20[var12 + 3] = var10; var19[var26 + 3] = var10;
var20[var12 + 512 + 3] = var10; var19[var26 + 512 + 3] = var10;
var20[var12 + 1024 + 3] = var10; var19[var26 + 1024 + 3] = var10;
var20[var12 + 1536 + 3] = var10; var19[var26 + 1536 + 3] = var10;
} else if(var8 == 3) { } else if(var8 == 3) {
var20[var12 + 1536] = var10; var19[var26 + 1536] = var10;
var20[var12 + 1536 + 1] = var10; var19[var26 + 1536 + 1] = var10;
var20[var12 + 1536 + 2] = var10; var19[var26 + 1536 + 2] = var10;
var20[var12 + 1536 + 3] = var10; var19[var26 + 1536 + 3] = var10;
} }
} }
if(var9 == 3) { if(var9 == 3) {
if(var8 == 0) { if(var8 == 0) {
var20[var12] = var10; var19[var26] = var10;
} else if(var8 == 1) { } else if(var8 == 1) {
var20[var12 + 3] = var10; var19[var26 + 3] = var10;
} else if(var8 == 2) { } else if(var8 == 2) {
var20[var12 + 1536 + 3] = var10; var19[var26 + 1536 + 3] = var10;
} else if(var8 == 3) { } else if(var8 == 3) {
var20[var12 + 1536] = var10; var19[var26 + 1536] = var10;
} }
} }
if(var9 == 2) { if(var9 == 2) {
if(var8 == 3) { if(var8 == 3) {
var20[var12] = var10; var19[var26] = var10;
var20[var12 + 512] = var10; var19[var26 + 512] = var10;
var20[var12 + 1024] = var10; var19[var26 + 1024] = var10;
var20[var12 + 1536] = var10; var19[var26 + 1536] = var10;
} else if(var8 == 0) { } else if(var8 == 0) {
var20[var12] = var10; var19[var26] = var10;
var20[var12 + 1] = var10; var19[var26 + 1] = var10;
var20[var12 + 2] = var10; var19[var26 + 2] = var10;
var20[var12 + 3] = var10; var19[var26 + 3] = var10;
} else if(var8 == 1) { } else if(var8 == 1) {
var20[var12 + 3] = var10; var19[var26 + 3] = var10;
var20[var12 + 512 + 3] = var10; var19[var26 + 512 + 3] = var10;
var20[var12 + 1024 + 3] = var10; var19[var26 + 1024 + 3] = var10;
var20[var12 + 1536 + 3] = var10; var19[var26 + 1536 + 3] = var10;
} else if(var8 == 2) { } else if(var8 == 2) {
var20[var12 + 1536] = var10; var19[var26 + 1536] = var10;
var20[var12 + 1536 + 1] = var10; var19[var26 + 1536 + 1] = var10;
var20[var12 + 1536 + 2] = var10; var19[var26 + 1536 + 2] = var10;
var20[var12 + 1536 + 3] = var10; var19[var26 + 1536 + 3] = var10;
} }
} }
} }
} }
var5 = class65.scene.__ay_246(var0, var1, var2); var5 = class65.scene.__ay_246(var0, var1, var2);
ObjectDefinition var19;
IndexedSprite var21;
if(0L != var5) { if(0L != var5) {
var7 = class65.scene.getObjectFlags(var0, var1, var2, var5); var7 = class65.scene.getObjectFlags(var0, var1, var2, var5);
var8 = var7 >> 6 & 3; var8 = var7 >> 6 & 3;
var9 = var7 & 31; var9 = var7 & 31;
var10 = HitSplatDefinition.method4972(var5); var10 = HitSplatDefinition.method4972(var5);
var19 = class50.getObjectDefinition(var10); ObjectDefinition var20 = class50.getObjectDefinition(var10);
if(var19.mapSceneId != -1) { if(var20.mapSceneId != -1) {
var21 = class192.mapSceneSprites[var19.mapSceneId]; IndexedSprite var28 = class192.mapSceneSprites[var20.mapSceneId];
if(var21 != null) { if(var28 != null) {
var12 = (var19.sizeX * 4 - var21.subWidth) / 2; var26 = (var20.sizeX * 4 - var28.subWidth) / 2;
var11 = (var19.sizeY * 4 - var21.subHeight) / 2; var14 = (var20.sizeY * 4 - var28.subHeight) / 2;
var21.__q_496(var12 + var1 * 4 + 48, (104 - var2 - var19.sizeY) * 4 + var11 + 48); var28.__q_496(var26 + var1 * 4 + 48, (104 - var2 - var20.sizeY) * 4 + var14 + 48);
} }
} else if(var9 == 9) { } else if(var9 == 9) {
int var22 = 15658734; int var25 = 15658734;
boolean var23 = 0L != var5; boolean var27 = 0L != var5;
if(var23) { if(var27) {
boolean var24 = (int)(var5 >>> 16 & 1L) == 1; boolean var23 = (int)(var5 >>> 16 & 1L) == 1;
var23 = !var24; var27 = !var23;
} }
if(var23) { if(var27) {
var22 = 15597568; var25 = 15597568;
} }
int[] var26 = WidgetGroupParent.sceneMinimapSprite.pixels; int[] var24 = WidgetGroupParent.sceneMinimapSprite.pixels;
var17 = var1 * 4 + (103 - var2) * 2048 + 24624; int var29 = var1 * 4 + (103 - var2) * 2048 + 24624;
if(var8 != 0 && var8 != 2) { if(var8 != 0 && var8 != 2) {
var26[var17] = var22; var24[var29] = var25;
var26[var17 + 1 + 512] = var22; var24[var29 + 1 + 512] = var25;
var26[var17 + 1024 + 2] = var22; var24[var29 + 1024 + 2] = var25;
var26[var17 + 1536 + 3] = var22; var24[var29 + 1536 + 3] = var25;
} else { } else {
var26[var17 + 1536] = var22; var24[var29 + 1536] = var25;
var26[var17 + 1 + 1024] = var22; var24[var29 + 1 + 1024] = var25;
var26[var17 + 512 + 2] = var22; var24[var29 + 512 + 2] = var25;
var26[var17 + 3] = var22; var24[var29 + 3] = var25;
} }
} }
} }
@@ -219,13 +215,13 @@ public class MouseRecorder implements Runnable {
var5 = class65.scene.getFloorDecorationTag(var0, var1, var2); var5 = class65.scene.getFloorDecorationTag(var0, var1, var2);
if(var5 != 0L) { if(var5 != 0L) {
var7 = HitSplatDefinition.method4972(var5); var7 = HitSplatDefinition.method4972(var5);
var19 = class50.getObjectDefinition(var7); ObjectDefinition var21 = class50.getObjectDefinition(var7);
if(var19.mapSceneId != -1) { if(var21.mapSceneId != -1) {
var21 = class192.mapSceneSprites[var19.mapSceneId]; IndexedSprite var22 = class192.mapSceneSprites[var21.mapSceneId];
if(var21 != null) { if(var22 != null) {
var10 = (var19.sizeX * 4 - var21.subWidth) / 2; var10 = (var21.sizeX * 4 - var22.subWidth) / 2;
int var25 = (var19.sizeY * 4 - var21.subHeight) / 2; int var11 = (var21.sizeY * 4 - var22.subHeight) / 2;
var21.__q_496(var10 + var1 * 4 + 48, var25 + (104 - var2 - var19.sizeY) * 4 + 48); var22.__q_496(var10 + var1 * 4 + 48, var11 + (104 - var2 - var21.sizeY) * 4 + 48);
} }
} }
} }
@@ -247,15 +243,15 @@ public class MouseRecorder implements Runnable {
} }
String var4 = var0.substring(0, var3); String var4 = var0.substring(0, var3);
int var5 = class16.method187(var1, var2 - 1); int var6 = class16.method187(var1, var2 - 1);
String var6; String var5;
if(var5 < 999999999) { if(var6 < 999999999) {
var6 = Integer.toString(var5); var5 = Integer.toString(var6);
} else { } else {
var6 = "*"; var5 = "*";
} }
var0 = var4 + var6 + var0.substring(var3 + 2); var0 = var4 + var5 + var0.substring(var3 + 2);
} }
} }
} }
@@ -288,102 +284,94 @@ public class MouseRecorder implements Runnable {
NetFileRequest.method4554(var1, var2, var9, var10, Client.mapIcons[var8], var4); NetFileRequest.method4554(var1, var2, var9, var10, Client.mapIcons[var8], var4);
} }
var8 = 0; int var11;
int var12;
while(true) { for(var8 = 0; var8 < 104; ++var8) {
int var11;
int var12;
if(var8 >= 104) {
for(var8 = 0; var8 < Client.npcCount; ++var8) {
NPC var17 = Client.npcs[Client.npcIndices[var8]];
if(var17 != null && var17.isVisible()) {
NPCDefinition var14 = var17.definition;
if(var14 != null && var14.transforms != null) {
var14 = var14.transform();
}
if(var14 != null && var14.drawMapDot && var14.isInteractable) {
var11 = var17.x / 32 - Canvas.localPlayer.x / 32;
var12 = var17.y / 32 - Canvas.localPlayer.y / 32;
NetFileRequest.method4554(var1, var2, var11, var12, class39.mapDotSprites[1], var4);
}
}
}
var8 = Players.Players_count;
int[] var18 = Players.Players_indices;
Player var19;
for(var10 = 0; var10 < var8; ++var10) {
var19 = Client.players[var18[var10]];
if(var19 != null && var19.isVisible() && !var19.isHidden && var19 != Canvas.localPlayer) {
var12 = var19.x / 32 - Canvas.localPlayer.x / 32;
int var15 = var19.y / 32 - Canvas.localPlayer.y / 32;
boolean var16 = false;
if(Canvas.localPlayer.team != 0 && var19.team != 0 && var19.team == Canvas.localPlayer.team) {
var16 = true;
}
if(var19.isFriend()) {
NetFileRequest.method4554(var1, var2, var12, var15, class39.mapDotSprites[3], var4);
} else if(var16) {
NetFileRequest.method4554(var1, var2, var12, var15, class39.mapDotSprites[4], var4);
} else if(var19.isClanMember()) {
NetFileRequest.method4554(var1, var2, var12, var15, class39.mapDotSprites[5], var4);
} else {
NetFileRequest.method4554(var1, var2, var12, var15, class39.mapDotSprites[2], var4);
}
}
}
if(Client.hintArrowType != 0 && Client.cycle % 20 < 10) {
if(Client.hintArrowType == 1 && Client.hintArrowNpcIndex >= 0 && Client.hintArrowNpcIndex < Client.npcs.length) {
NPC var20 = Client.npcs[Client.hintArrowNpcIndex];
if(var20 != null) {
var11 = var20.x / 32 - Canvas.localPlayer.x / 32;
var12 = var20.y / 32 - Canvas.localPlayer.y / 32;
UserComparator5.worldToMinimap(var1, var2, var11, var12, class16.mapMarkerSprites[1], var4);
}
}
if(Client.hintArrowType == 2) {
var10 = Client.hintArrowX * 4 - class50.baseX * 4 + 2 - Canvas.localPlayer.x / 32;
var11 = Client.hintArrowY * 4 - GraphicsObject.baseY * 4 + 2 - Canvas.localPlayer.y / 32;
UserComparator5.worldToMinimap(var1, var2, var10, var11, class16.mapMarkerSprites[1], var4);
}
if(Client.hintArrowType == 10 && Client.hintArrowPlayerIndex >= 0 && Client.hintArrowPlayerIndex < Client.players.length) {
var19 = Client.players[Client.hintArrowPlayerIndex];
if(var19 != null) {
var11 = var19.x / 32 - Canvas.localPlayer.x / 32;
var12 = var19.y / 32 - Canvas.localPlayer.y / 32;
UserComparator5.worldToMinimap(var1, var2, var11, var12, class16.mapMarkerSprites[1], var4);
}
}
}
if(Client.destinationX != 0) {
var10 = Client.destinationX * 4 + 2 - Canvas.localPlayer.x / 32;
var11 = Client.destinationY * 4 + 2 - Canvas.localPlayer.y / 32;
NetFileRequest.method4554(var1, var2, var10, var11, class16.mapMarkerSprites[0], var4);
}
if(!Canvas.localPlayer.isHidden) {
Rasterizer2D.Rasterizer2D_fillRectangle(var4.width / 2 + var1 - 1, var4.height / 2 + var2 - 1, 3, 3, 16777215);
}
break;
}
for(var9 = 0; var9 < 104; ++var9) { for(var9 = 0; var9 < 104; ++var9) {
NodeDeque var13 = Client.groundItems[SoundSystem.plane][var8][var9]; NodeDeque var15 = Client.groundItems[SoundSystem.plane][var8][var9];
if(var13 != null) { if(var15 != null) {
var11 = var8 * 4 + 2 - Canvas.localPlayer.x / 32; var11 = var8 * 4 + 2 - Canvas.localPlayer.x / 32;
var12 = var9 * 4 + 2 - Canvas.localPlayer.y / 32; var12 = var9 * 4 + 2 - Canvas.localPlayer.y / 32;
NetFileRequest.method4554(var1, var2, var11, var12, class39.mapDotSprites[0], var4); NetFileRequest.method4554(var1, var2, var11, var12, class39.mapDotSprites[0], var4);
} }
} }
}
++var8; for(var8 = 0; var8 < Client.npcCount; ++var8) {
Npc var16 = Client.npcs[Client.npcIndices[var8]];
if(var16 != null && var16.isVisible()) {
NpcDefinition var18 = var16.definition;
if(var18 != null && var18.transforms != null) {
var18 = var18.transform();
}
if(var18 != null && var18.drawMapDot && var18.isInteractable) {
var11 = var16.x / 32 - Canvas.localPlayer.x / 32;
var12 = var16.y / 32 - Canvas.localPlayer.y / 32;
NetFileRequest.method4554(var1, var2, var11, var12, class39.mapDotSprites[1], var4);
}
}
}
var8 = Players.Players_count;
int[] var19 = Players.Players_indices;
for(var10 = 0; var10 < var8; ++var10) {
Player var17 = Client.players[var19[var10]];
if(var17 != null && var17.isVisible() && !var17.isHidden && var17 != Canvas.localPlayer) {
var12 = var17.x / 32 - Canvas.localPlayer.x / 32;
int var13 = var17.y / 32 - Canvas.localPlayer.y / 32;
boolean var14 = false;
if(Canvas.localPlayer.team != 0 && var17.team != 0 && var17.team == Canvas.localPlayer.team) {
var14 = true;
}
if(var17.isFriend()) {
NetFileRequest.method4554(var1, var2, var12, var13, class39.mapDotSprites[3], var4);
} else if(var14) {
NetFileRequest.method4554(var1, var2, var12, var13, class39.mapDotSprites[4], var4);
} else if(var17.isClanMember()) {
NetFileRequest.method4554(var1, var2, var12, var13, class39.mapDotSprites[5], var4);
} else {
NetFileRequest.method4554(var1, var2, var12, var13, class39.mapDotSprites[2], var4);
}
}
}
if(Client.hintArrowType != 0 && Client.cycle % 20 < 10) {
if(Client.hintArrowType == 1 && Client.hintArrowNpcIndex >= 0 && Client.hintArrowNpcIndex < Client.npcs.length) {
Npc var20 = Client.npcs[Client.hintArrowNpcIndex];
if(var20 != null) {
var11 = var20.x / 32 - Canvas.localPlayer.x / 32;
var12 = var20.y / 32 - Canvas.localPlayer.y / 32;
UserComparator5.worldToMinimap(var1, var2, var11, var12, class16.mapMarkerSprites[1], var4);
}
}
if(Client.hintArrowType == 2) {
var10 = Client.hintArrowX * 4 - class50.baseX * 4 + 2 - Canvas.localPlayer.x / 32;
var11 = Client.hintArrowY * 4 - GraphicsObject.baseY * 4 + 2 - Canvas.localPlayer.y / 32;
UserComparator5.worldToMinimap(var1, var2, var10, var11, class16.mapMarkerSprites[1], var4);
}
if(Client.hintArrowType == 10 && Client.hintArrowPlayerIndex >= 0 && Client.hintArrowPlayerIndex < Client.players.length) {
Player var21 = Client.players[Client.hintArrowPlayerIndex];
if(var21 != null) {
var11 = var21.x / 32 - Canvas.localPlayer.x / 32;
var12 = var21.y / 32 - Canvas.localPlayer.y / 32;
UserComparator5.worldToMinimap(var1, var2, var11, var12, class16.mapMarkerSprites[1], var4);
}
}
}
if(Client.destinationX != 0) {
var10 = Client.destinationX * 4 + 2 - Canvas.localPlayer.x / 32;
var11 = Client.destinationY * 4 + 2 - Canvas.localPlayer.y / 32;
NetFileRequest.method4554(var1, var2, var10, var11, class16.mapMarkerSprites[0], var4);
}
if(!Canvas.localPlayer.isHidden) {
Rasterizer2D.Rasterizer2D_fillRectangle(var4.width / 2 + var1 - 1, var4.height / 2 + var2 - 1, 3, 3, 16777215);
} }
} else { } else {
Rasterizer2D.method5948(var1, var2, 0, var4.xStarts, var4.xWidths); Rasterizer2D.method5948(var1, var2, 0, var4.xStarts, var4.xWidths);
@@ -391,6 +379,5 @@ public class MouseRecorder implements Runnable {
Client.__client_ot[var3] = true; Client.__client_ot[var3] = true;
} }
} }
} }

432
runescape-client/src/main/java/MusicPatch.java
View File

@@ -98,395 +98,395 @@ public class MusicPatch extends Node {
++var2.index; ++var2.index;
++var9; ++var9;
byte[] var42 = new byte[var9]; byte[] var38 = new byte[var9];
int var12; int var12;
int var13; int var14;
if(var9 > 1) { if(var9 > 1) {
var42[1] = 1; var38[1] = 1;
int var14 = 1; int var13 = 1;
var12 = 2; var12 = 2;
for(var13 = 2; var13 < var9; ++var13) { for(var14 = 2; var14 < var9; ++var14) {
int var15 = var2.readUnsignedByte(); int var15 = var2.readUnsignedByte();
if(var15 == 0) { if(var15 == 0) {
var14 = var12++; var13 = var12++;
} else { } else {
if(var15 <= var14) { if(var15 <= var13) {
--var15; --var15;
} }
var14 = var15; var13 = var15;
} }
var42[var13] = (byte)var14; var38[var14] = (byte)var13;
} }
} else { } else {
var12 = var9; var12 = var9;
} }
MusicPatchNode2[] var43 = new MusicPatchNode2[var12]; MusicPatchNode2[] var39 = new MusicPatchNode2[var12];
MusicPatchNode2 var44; MusicPatchNode2 var40;
for(var13 = 0; var13 < var43.length; ++var13) { for(var14 = 0; var14 < var39.length; ++var14) {
var44 = var43[var13] = new MusicPatchNode2(); var40 = var39[var14] = new MusicPatchNode2();
int var16 = var2.readUnsignedByte(); int var16 = var2.readUnsignedByte();
if(var16 > 0) { if(var16 > 0) {
var44.__m = new byte[var16 * 2]; var40.__m = new byte[var16 * 2];
} }
var16 = var2.readUnsignedByte(); var16 = var2.readUnsignedByte();
if(var16 > 0) { if(var16 > 0) {
var44.__f = new byte[var16 * 2 + 2]; var40.__f = new byte[var16 * 2 + 2];
var44.__f[1] = 64; var40.__f[1] = 64;
} }
} }
var13 = var2.readUnsignedByte(); var14 = var2.readUnsignedByte();
byte[] var45 = var13 > 0?new byte[var13 * 2]:null; byte[] var47 = var14 > 0?new byte[var14 * 2]:null;
var13 = var2.readUnsignedByte(); var14 = var2.readUnsignedByte();
byte[] var17 = var13 > 0?new byte[var13 * 2]:null; byte[] var41 = var14 > 0?new byte[var14 * 2]:null;
int var18; int var17;
for(var18 = 0; var2.array[var18 + var2.index] != 0; ++var18) { for(var17 = 0; var2.array[var17 + var2.index] != 0; ++var17) {
; ;
} }
byte[] var19 = new byte[var18]; byte[] var18 = new byte[var17];
int var20; int var19;
for(var20 = 0; var20 < var18; ++var20) { for(var19 = 0; var19 < var17; ++var19) {
var19[var20] = var2.readByte(); var18[var19] = var2.readByte();
} }
++var2.index; ++var2.index;
++var18; ++var17;
var20 = 0; var19 = 0;
int var21; int var20;
for(var21 = 0; var21 < 128; ++var21) { for(var20 = 0; var20 < 128; ++var20) {
var20 += var2.readUnsignedByte(); var19 += var2.readUnsignedByte();
this.__q[var21] = (short)var20; this.__q[var20] = (short)var19;
}
var19 = 0;
for(var20 = 0; var20 < 128; ++var20) {
var19 += var2.readUnsignedByte();
this.__q[var20] = (short)(this.__q[var20] + (var19 << 8));
} }
var20 = 0; var20 = 0;
int var21 = 0;
for(var21 = 0; var21 < 128; ++var21) {
var20 += var2.readUnsignedByte();
this.__q[var21] = (short)(this.__q[var21] + (var20 << 8));
}
var21 = 0;
int var22 = 0; int var22 = 0;
int var23 = 0;
int var23;
for(var23 = 0; var23 < 128; ++var23) {
if(var20 == 0) {
if(var21 < var18.length) {
var20 = var18[var21++];
} else {
var20 = -1;
}
var22 = var2.__as_311();
}
this.__q[var23] = (short)(this.__q[var23] + ((var22 - 1 & 2) << 14));
this.__l[var23] = var22;
--var20;
}
var20 = 0;
var21 = 0;
var23 = 0;
int var24; int var24;
for(var24 = 0; var24 < 128; ++var24) { for(var24 = 0; var24 < 128; ++var24) {
if(var21 == 0) { if(this.__l[var24] != 0) {
if(var22 < var19.length) { if(var20 == 0) {
var21 = var19[var22++]; if(var21 < var4.length) {
} else { var20 = var4[var21++];
var21 = -1; } else {
var20 = -1;
}
var23 = var2.array[var5++] - 1;
} }
var23 = var2.__as_311(); this.__g[var24] = (byte)var23;
--var20;
} }
this.__q[var24] = (short)(this.__q[var24] + ((var23 - 1 & 2) << 14));
this.__l[var24] = var23;
--var21;
} }
var20 = 0;
var21 = 0; var21 = 0;
var22 = 0;
var24 = 0; var24 = 0;
int var25; for(int var25 = 0; var25 < 128; ++var25) {
for(var25 = 0; var25 < 128; ++var25) {
if(this.__l[var25] != 0) { if(this.__l[var25] != 0) {
if(var21 == 0) { if(var20 == 0) {
if(var22 < var4.length) { if(var21 < var7.length) {
var21 = var4[var22++]; var20 = var7[var21++];
} else { } else {
var21 = -1; var20 = -1;
} }
var24 = var2.array[var5++] - 1; var24 = var2.array[var8++] + 16 << 2;
} }
this.__g[var25] = (byte)var24; this.__o[var25] = (byte)var24;
--var21; --var20;
} }
} }
var20 = 0;
var21 = 0; var21 = 0;
var22 = 0; MusicPatchNode2 var42 = null;
var25 = 0;
for(int var26 = 0; var26 < 128; ++var26) { int var26;
for(var26 = 0; var26 < 128; ++var26) {
if(this.__l[var26] != 0) { if(this.__l[var26] != 0) {
if(var21 == 0) { if(var20 == 0) {
if(var22 < var7.length) { var42 = var39[var38[var21]];
var21 = var7[var22++]; if(var21 < var10.length) {
var20 = var10[var21++];
} else { } else {
var21 = -1; var20 = -1;
} }
var25 = var2.array[var8++] + 16 << 2;
} }
this.__o[var26] = (byte)var25; this.__u[var26] = var42;
--var21; --var20;
} }
} }
var20 = 0;
var21 = 0; var21 = 0;
var22 = 0; var26 = 0;
MusicPatchNode2 var46 = null;
int var27; int var27;
for(var27 = 0; var27 < 128; ++var27) { for(var27 = 0; var27 < 128; ++var27) {
if(this.__l[var27] != 0) { if(var20 == 0) {
if(var21 == 0) { if(var21 < var18.length) {
var46 = var43[var42[var22]]; var20 = var18[var21++];
if(var22 < var10.length) {
var21 = var10[var22++];
} else {
var21 = -1;
}
}
this.__u[var27] = var46;
--var21;
}
}
var21 = 0;
var22 = 0;
var27 = 0;
int var28;
for(var28 = 0; var28 < 128; ++var28) {
if(var21 == 0) {
if(var22 < var19.length) {
var21 = var19[var22++];
} else { } else {
var21 = -1; var20 = -1;
} }
if(this.__l[var28] > 0) { if(this.__l[var27] > 0) {
var27 = var2.readUnsignedByte() + 1; var26 = var2.readUnsignedByte() + 1;
} }
} }
this.__w[var28] = (byte)var27; this.__w[var27] = (byte)var26;
--var21; --var20;
} }
this.__m = var2.readUnsignedByte() + 1; this.__m = var2.readUnsignedByte() + 1;
MusicPatchNode2 var29; MusicPatchNode2 var28;
int var30; int var29;
for(var28 = 0; var28 < var12; ++var28) { for(var27 = 0; var27 < var12; ++var27) {
var29 = var43[var28]; var28 = var39[var27];
if(var29.__m != null) { if(var28.__m != null) {
for(var30 = 1; var30 < var29.__m.length; var30 += 2) { for(var29 = 1; var29 < var28.__m.length; var29 += 2) {
var29.__m[var30] = var2.readByte(); var28.__m[var29] = var2.readByte();
} }
} }
if(var29.__f != null) { if(var28.__f != null) {
for(var30 = 3; var30 < var29.__f.length - 2; var30 += 2) { for(var29 = 3; var29 < var28.__f.length - 2; var29 += 2) {
var29.__f[var30] = var2.readByte(); var28.__f[var29] = var2.readByte();
} }
} }
} }
if(var45 != null) { if(var47 != null) {
for(var28 = 1; var28 < var45.length; var28 += 2) { for(var27 = 1; var27 < var47.length; var27 += 2) {
var45[var28] = var2.readByte(); var47[var27] = var2.readByte();
} }
} }
if(var17 != null) { if(var41 != null) {
for(var28 = 1; var28 < var17.length; var28 += 2) { for(var27 = 1; var27 < var41.length; var27 += 2) {
var17[var28] = var2.readByte(); var41[var27] = var2.readByte();
} }
} }
for(var28 = 0; var28 < var12; ++var28) { for(var27 = 0; var27 < var12; ++var27) {
var29 = var43[var28]; var28 = var39[var27];
if(var29.__f != null) { if(var28.__f != null) {
var20 = 0; var19 = 0;
for(var30 = 2; var30 < var29.__f.length; var30 += 2) { for(var29 = 2; var29 < var28.__f.length; var29 += 2) {
var20 = 1 + var20 + var2.readUnsignedByte(); var19 = 1 + var19 + var2.readUnsignedByte();
var29.__f[var30] = (byte)var20; var28.__f[var29] = (byte)var19;
} }
} }
} }
for(var28 = 0; var28 < var12; ++var28) { for(var27 = 0; var27 < var12; ++var27) {
var29 = var43[var28]; var28 = var39[var27];
if(var29.__m != null) { if(var28.__m != null) {
var20 = 0; var19 = 0;
for(var30 = 2; var30 < var29.__m.length; var30 += 2) { for(var29 = 2; var29 < var28.__m.length; var29 += 2) {
var20 = 1 + var20 + var2.readUnsignedByte(); var19 = 1 + var19 + var2.readUnsignedByte();
var29.__m[var30] = (byte)var20; var28.__m[var29] = (byte)var19;
} }
} }
} }
byte var31; byte var30;
int var32; int var32;
int var33; int var33;
int var34; int var34;
int var35; int var35;
int var36; int var36;
int var37; int var44;
byte var38; byte var46;
if(var45 != null) { if(var47 != null) {
var20 = var2.readUnsignedByte(); var19 = var2.readUnsignedByte();
var45[0] = (byte)var20; var47[0] = (byte)var19;
for(var28 = 2; var28 < var45.length; var28 += 2) { for(var27 = 2; var27 < var47.length; var27 += 2) {
var20 = 1 + var20 + var2.readUnsignedByte(); var19 = 1 + var19 + var2.readUnsignedByte();
var45[var28] = (byte)var20; var47[var27] = (byte)var19;
} }
var38 = var45[0]; var46 = var47[0];
byte var39 = var45[1]; byte var43 = var47[1];
for(var30 = 0; var30 < var38; ++var30) { for(var29 = 0; var29 < var46; ++var29) {
this.__w[var30] = (byte)(var39 * this.__w[var30] + 32 >> 6); this.__w[var29] = (byte)(var43 * this.__w[var29] + 32 >> 6);
} }
for(var30 = 2; var30 < var45.length; var30 += 2) { for(var29 = 2; var29 < var47.length; var29 += 2) {
var31 = var45[var30]; var30 = var47[var29];
byte var40 = var45[var30 + 1]; byte var31 = var47[var29 + 1];
var32 = var39 * (var31 - var38) + (var31 - var38) / 2; var32 = var43 * (var30 - var46) + (var30 - var46) / 2;
for(var33 = var38; var33 < var31; ++var33) { for(var33 = var46; var33 < var30; ++var33) {
var35 = var31 - var38; var35 = var30 - var46;
var36 = var32 >>> 31; var36 = var32 >>> 31;
var34 = (var32 + var36) / var35 - var36; var34 = (var32 + var36) / var35 - var36;
this.__w[var33] = (byte)(var34 * this.__w[var33] + 32 >> 6); this.__w[var33] = (byte)(var34 * this.__w[var33] + 32 >> 6);
var32 += var40 - var39; var32 += var31 - var43;
} }
var38 = var31; var46 = var30;
var39 = var40; var43 = var31;
} }
for(var37 = var38; var37 < 128; ++var37) { for(var44 = var46; var44 < 128; ++var44) {
this.__w[var37] = (byte)(var39 * this.__w[var37] + 32 >> 6); this.__w[var44] = (byte)(var43 * this.__w[var44] + 32 >> 6);
} }
var44 = null; var40 = null;
} }
if(var17 != null) { if(var41 != null) {
var20 = var2.readUnsignedByte(); var19 = var2.readUnsignedByte();
var17[0] = (byte)var20; var41[0] = (byte)var19;
for(var28 = 2; var28 < var17.length; var28 += 2) { for(var27 = 2; var27 < var41.length; var27 += 2) {
var20 = 1 + var20 + var2.readUnsignedByte(); var19 = 1 + var19 + var2.readUnsignedByte();
var17[var28] = (byte)var20; var41[var27] = (byte)var19;
} }
var38 = var17[0]; var46 = var41[0];
int var47 = var17[1] << 1; int var49 = var41[1] << 1;
for(var30 = 0; var30 < var38; ++var30) { for(var29 = 0; var29 < var46; ++var29) {
var37 = var47 + (this.__o[var30] & 255); var44 = var49 + (this.__o[var29] & 255);
if(var37 < 0) { if(var44 < 0) {
var37 = 0; var44 = 0;
} }
if(var37 > 128) { if(var44 > 128) {
var37 = 128; var44 = 128;
} }
this.__o[var30] = (byte)var37; this.__o[var29] = (byte)var44;
} }
int var48; int var45;
for(var30 = 2; var30 < var17.length; var30 += 2) { for(var29 = 2; var29 < var41.length; var29 += 2) {
var31 = var17[var30]; var30 = var41[var29];
var48 = var17[var30 + 1] << 1; var45 = var41[var29 + 1] << 1;
var32 = var47 * (var31 - var38) + (var31 - var38) / 2; var32 = var49 * (var30 - var46) + (var30 - var46) / 2;
for(var33 = var38; var33 < var31; ++var33) { for(var33 = var46; var33 < var30; ++var33) {
var35 = var31 - var38; var35 = var30 - var46;
var36 = var32 >>> 31; var36 = var32 >>> 31;
var34 = (var32 + var36) / var35 - var36; var34 = (var32 + var36) / var35 - var36;
int var41 = var34 + (this.__o[var33] & 255); int var37 = var34 + (this.__o[var33] & 255);
if(var41 < 0) { if(var37 < 0) {
var41 = 0; var37 = 0;
} }
if(var41 > 128) { if(var37 > 128) {
var41 = 128; var37 = 128;
} }
this.__o[var33] = (byte)var41; this.__o[var33] = (byte)var37;
var32 += var48 - var47; var32 += var45 - var49;
} }
var38 = var31; var46 = var30;
var47 = var48; var49 = var45;
} }
for(var37 = var38; var37 < 128; ++var37) { for(var44 = var46; var44 < 128; ++var44) {
var48 = var47 + (this.__o[var37] & 255); var45 = var49 + (this.__o[var44] & 255);
if(var48 < 0) { if(var45 < 0) {
var48 = 0; var45 = 0;
} }
if(var48 > 128) { if(var45 > 128) {
var48 = 128; var45 = 128;
} }
this.__o[var37] = (byte)var48; this.__o[var44] = (byte)var45;
} }
Object var49 = null; Object var48 = null;
} }
for(var28 = 0; var28 < var12; ++var28) { for(var27 = 0; var27 < var12; ++var27) {
var43[var28].__q = var2.readUnsignedByte(); var39[var27].__q = var2.readUnsignedByte();
} }
for(var28 = 0; var28 < var12; ++var28) { for(var27 = 0; var27 < var12; ++var27) {
var29 = var43[var28]; var28 = var39[var27];
if(var29.__m != null) { if(var28.__m != null) {
var29.__w = var2.readUnsignedByte(); var28.__w = var2.readUnsignedByte();
} }
if(var29.__f != null) { if(var28.__f != null) {
var29.__o = var2.readUnsignedByte(); var28.__o = var2.readUnsignedByte();
} }
if(var29.__q > 0) { if(var28.__q > 0) {
var29.__u = var2.readUnsignedByte(); var28.__u = var2.readUnsignedByte();
} }
} }
for(var28 = 0; var28 < var12; ++var28) { for(var27 = 0; var27 < var12; ++var27) {
var43[var28].__l = var2.readUnsignedByte(); var39[var27].__l = var2.readUnsignedByte();
} }
for(var28 = 0; var28 < var12; ++var28) { for(var27 = 0; var27 < var12; ++var27) {
var29 = var43[var28]; var28 = var39[var27];
if(var29.__l > 0) { if(var28.__l > 0) {
var29.__g = var2.readUnsignedByte(); var28.__g = var2.readUnsignedByte();
} }
} }
for(var28 = 0; var28 < var12; ++var28) { for(var27 = 0; var27 < var12; ++var27) {
var29 = var43[var28]; var28 = var39[var27];
if(var29.__g > 0) { if(var28.__g > 0) {
var29.__e = var2.readUnsignedByte(); var28.__e = var2.readUnsignedByte();
} }
} }

2
runescape-client/src/main/java/MusicPatchNode.java
View File

@@ -90,7 +90,7 @@ public class MusicPatchNode extends Node {
intValue = 476852577 intValue = 476852577
) )
@Export("surfaceOffsetY") @Export("surfaceOffsetY")
int surfaceOffsetY; int __n;
@ObfuscatedName("i") @ObfuscatedName("i")
@ObfuscatedGetter( @ObfuscatedGetter(
intValue = -2136855685 intValue = -2136855685

40
runescape-client/src/main/java/MusicPatchPcmStream.java
View File

@@ -156,22 +156,22 @@ public class MusicPatchPcmStream extends PcmStream {
protected void __e_172(int[] var1, int var2, int var3) { protected void __e_172(int[] var1, int var2, int var3) {
this.mixer.__e_172(var1, var2, var3); this.mixer.__e_172(var1, var2, var3);
for(MusicPatchNode var4 = (MusicPatchNode)this.queue.last(); var4 != null; var4 = (MusicPatchNode)this.queue.previous()) { for(MusicPatchNode var6 = (MusicPatchNode)this.queue.last(); var6 != null; var6 = (MusicPatchNode)this.queue.previous()) {
if(!this.superStream.__ba_368(var4)) { if(!this.superStream.__ba_368(var6)) {
int var5 = var2; int var4 = var2;
int var6 = var3; int var5 = var3;
do { do {
if(var6 <= var4.__y) { if(var5 <= var6.__y) {
this.__m_379(var4, var1, var5, var6, var6 + var5); this.__m_379(var6, var1, var4, var5, var5 + var4);
var4.__y -= var6; var6.__y -= var5;
break; break;
} }
this.__m_379(var4, var1, var5, var4.__y, var6 + var5); this.__m_379(var6, var1, var4, var6.__y, var5 + var4);
var5 += var4.__y; var4 += var6.__y;
var6 -= var4.__y; var5 -= var6.__y;
} while(!this.superStream.__bb_369(var4, var1, var5, var6)); } while(!this.superStream.__bb_369(var6, var1, var4, var5));
} }
} }
@@ -181,20 +181,20 @@ public class MusicPatchPcmStream extends PcmStream {
protected void __d_173(int var1) { protected void __d_173(int var1) {
this.mixer.__d_173(var1); this.mixer.__d_173(var1);
for(MusicPatchNode var2 = (MusicPatchNode)this.queue.last(); var2 != null; var2 = (MusicPatchNode)this.queue.previous()) { for(MusicPatchNode var3 = (MusicPatchNode)this.queue.last(); var3 != null; var3 = (MusicPatchNode)this.queue.previous()) {
if(!this.superStream.__ba_368(var2)) { if(!this.superStream.__ba_368(var3)) {
int var3 = var1; int var2 = var1;
do { do {
if(var3 <= var2.__y) { if(var2 <= var3.__y) {
this.__f_380(var2, var3); this.__f_380(var3, var2);
var2.__y -= var3; var3.__y -= var2;
break; break;
} }
this.__f_380(var2, var2.__y); this.__f_380(var3, var3.__y);
var3 -= var2.__y; var2 -= var3.__y;
} while(!this.superStream.__bb_369(var2, (int[])null, 0, var3)); } while(!this.superStream.__bb_369(var3, (int[])null, 0, var2));
} }
} }

332
runescape-client/src/main/java/MusicSample.java
View File

@@ -117,6 +117,10 @@ public class MusicSample extends Node {
@Export("__ah") @Export("__ah")
int __ah; int __ah;
static {
__cd_s = false;
}
MusicSample(byte[] var1) { MusicSample(byte[] var1) {
this.read(var1); this.read(var1);
} }
@@ -196,213 +200,213 @@ public class MusicSample extends Node {
} }
class114 var14 = field1326[__cd_j[var2]]; class114 var14 = field1326[__cd_j[var2]];
int var15 = var14.field1454; int var16 = var14.field1454;
int var16 = var14.field1452[var15]; int var17 = var14.field1452[var16];
boolean var17 = !field1324[var16].method2367(); boolean var15 = !field1324[var17].method2367();
boolean var18 = var17; boolean var45 = var15;
for(var16 = 0; var16 < var14.field1453; ++var16) { for(var17 = 0; var17 < var14.field1453; ++var17) {
class109 var19 = field1344[var14.field1455[var16]]; class109 var18 = field1344[var14.field1455[var17]];
float[] var20 = __cd_c; float[] var19 = __cd_c;
var19.method2473(var20, var4 >> 1, var18); var18.method2473(var19, var4 >> 1, var45);
} }
int var48; int var40;
if(!var17) { if(!var15) {
var16 = var14.field1454; var17 = var14.field1454;
var48 = var14.field1452[var16]; var40 = var14.field1452[var17];
field1324[var48].method2375(__cd_c, var4 >> 1); field1324[var40].method2375(__cd_c, var4 >> 1);
} }
float[] var21; int var42;
int var22; if(var15) {
int var49; for(var17 = var4 >> 1; var17 < var4; ++var17) {
if(var17) { __cd_c[var17] = 0.0F;
for(var16 = var4 >> 1; var16 < var4; ++var16) {
__cd_c[var16] = 0.0F;
} }
} else { } else {
var16 = var4 >> 1; var17 = var4 >> 1;
var48 = var4 >> 2; var40 = var4 >> 2;
var49 = var4 >> 3; var42 = var4 >> 3;
var21 = __cd_c; float[] var43 = __cd_c;
for(var22 = 0; var22 < var16; ++var22) { int var21;
var21[var22] *= 0.5F; for(var21 = 0; var21 < var17; ++var21) {
var43[var21] *= 0.5F;
} }
for(var22 = var16; var22 < var4; ++var22) { for(var21 = var17; var21 < var4; ++var21) {
var21[var22] = -var21[var4 - var22 - 1]; var43[var21] = -var43[var4 - var21 - 1];
} }
float[] var23 = var3?__cd_ag:__cd_r; float[] var44 = var3?__cd_ag:__cd_r;
float[] var24 = var3?__cd_aq:__cd_p; float[] var22 = var3?__cd_aq:__cd_p;
float[] var25 = var3?__cd_aj:__cd_v; float[] var23 = var3?__cd_aj:__cd_v;
int[] var26 = var3?__cd_ar:__cd_av; int[] var24 = var3?__cd_ar:__cd_av;
int var27; int var25;
float var26;
float var27;
float var28; float var28;
float var29; float var29;
for(var25 = 0; var25 < var40; ++var25) {
var26 = var43[var25 * 4] - var43[var4 - var25 * 4 - 1];
var27 = var43[var25 * 4 + 2] - var43[var4 - var25 * 4 - 3];
var28 = var44[var25 * 2];
var29 = var44[var25 * 2 + 1];
var43[var4 - var25 * 4 - 1] = var26 * var28 - var27 * var29;
var43[var4 - var25 * 4 - 3] = var26 * var29 + var27 * var28;
}
float var30; float var30;
float var31; float var31;
for(var27 = 0; var27 < var48; ++var27) { for(var25 = 0; var25 < var42; ++var25) {
var28 = var21[var27 * 4] - var21[var4 - var27 * 4 - 1]; var26 = var43[var17 + var25 * 4 + 3];
var29 = var21[var27 * 4 + 2] - var21[var4 - var27 * 4 - 3]; var27 = var43[var17 + var25 * 4 + 1];
var30 = var23[var27 * 2]; var28 = var43[var25 * 4 + 3];
var31 = var23[var27 * 2 + 1]; var29 = var43[var25 * 4 + 1];
var21[var4 - var27 * 4 - 1] = var28 * var30 - var29 * var31; var43[var17 + var25 * 4 + 3] = var26 + var28;
var21[var4 - var27 * 4 - 3] = var28 * var31 + var29 * var30; var43[var17 + var25 * 4 + 1] = var27 + var29;
var30 = var44[var17 - 4 - var25 * 4];
var31 = var44[var17 - 3 - var25 * 4];
var43[var25 * 4 + 3] = (var26 - var28) * var30 - (var27 - var29) * var31;
var43[var25 * 4 + 1] = (var27 - var29) * var30 + (var26 - var28) * var31;
} }
float var32; var25 = WorldMapCacheName.method634(var4 - 1);
float var33;
for(var27 = 0; var27 < var49; ++var27) {
var28 = var21[var16 + var27 * 4 + 3];
var29 = var21[var16 + var27 * 4 + 1];
var30 = var21[var27 * 4 + 3];
var31 = var21[var27 * 4 + 1];
var21[var16 + var27 * 4 + 3] = var28 + var30;
var21[var16 + var27 * 4 + 1] = var29 + var31;
var32 = var23[var16 - 4 - var27 * 4];
var33 = var23[var16 - 3 - var27 * 4];
var21[var27 * 4 + 3] = (var28 - var30) * var32 - (var29 - var31) * var33;
var21[var27 * 4 + 1] = (var29 - var31) * var32 + (var28 - var30) * var33;
}
var27 = WorldMapCacheName.method634(var4 - 1); int var47;
int var48;
int var49;
int var50;
for(var47 = 0; var47 < var25 - 3; ++var47) {
var48 = var4 >> var47 + 2;
var49 = 8 << var47;
int var34; for(var50 = 0; var50 < 2 << var47; ++var50) {
int var35; int var51 = var4 - var48 * var50 * 2;
int var36; int var52 = var4 - var48 * (var50 * 2 + 1);
int var37;
for(var34 = 0; var34 < var27 - 3; ++var34) {
var35 = var4 >> var34 + 2;
var36 = 8 << var34;
for(var37 = 0; var37 < 2 << var34; ++var37) { for(int var32 = 0; var32 < var4 >> var47 + 4; ++var32) {
int var38 = var4 - var35 * var37 * 2; int var33 = var32 * 4;
int var39 = var4 - var35 * (var37 * 2 + 1); float var34 = var43[var51 - 1 - var33];
float var35 = var43[var51 - 3 - var33];
for(int var40 = 0; var40 < var4 >> var34 + 4; ++var40) { float var36 = var43[var52 - 1 - var33];
int var41 = var40 * 4; float var37 = var43[var52 - 3 - var33];
float var42 = var21[var38 - 1 - var41]; var43[var51 - 1 - var33] = var34 + var36;
float var43 = var21[var38 - 3 - var41]; var43[var51 - 3 - var33] = var35 + var37;
float var44 = var21[var39 - 1 - var41]; float var38 = var44[var32 * var49];
float var45 = var21[var39 - 3 - var41]; float var39 = var44[var32 * var49 + 1];
var21[var38 - 1 - var41] = var42 + var44; var43[var52 - 1 - var33] = (var34 - var36) * var38 - (var35 - var37) * var39;
var21[var38 - 3 - var41] = var43 + var45; var43[var52 - 3 - var33] = (var35 - var37) * var38 + (var34 - var36) * var39;
float var46 = var23[var40 * var36];
float var47 = var23[var40 * var36 + 1];
var21[var39 - 1 - var41] = (var42 - var44) * var46 - (var43 - var45) * var47;
var21[var39 - 3 - var41] = (var43 - var45) * var46 + (var42 - var44) * var47;
} }
} }
} }
for(var34 = 1; var34 < var49 - 1; ++var34) { for(var47 = 1; var47 < var42 - 1; ++var47) {
var35 = var26[var34]; var48 = var24[var47];
if(var34 < var35) { if(var47 < var48) {
var36 = var34 * 8; var49 = var47 * 8;
var37 = var35 * 8; var50 = var48 * 8;
var32 = var21[var36 + 1]; var30 = var43[var49 + 1];
var21[var36 + 1] = var21[var37 + 1]; var43[var49 + 1] = var43[var50 + 1];
var21[var37 + 1] = var32; var43[var50 + 1] = var30;
var32 = var21[var36 + 3]; var30 = var43[var49 + 3];
var21[var36 + 3] = var21[var37 + 3]; var43[var49 + 3] = var43[var50 + 3];
var21[var37 + 3] = var32; var43[var50 + 3] = var30;
var32 = var21[var36 + 5]; var30 = var43[var49 + 5];
var21[var36 + 5] = var21[var37 + 5]; var43[var49 + 5] = var43[var50 + 5];
var21[var37 + 5] = var32; var43[var50 + 5] = var30;
var32 = var21[var36 + 7]; var30 = var43[var49 + 7];
var21[var36 + 7] = var21[var37 + 7]; var43[var49 + 7] = var43[var50 + 7];
var21[var37 + 7] = var32; var43[var50 + 7] = var30;
} }
} }
for(var34 = 0; var34 < var16; ++var34) { for(var47 = 0; var47 < var17; ++var47) {
var21[var34] = var21[var34 * 2 + 1]; var43[var47] = var43[var47 * 2 + 1];
} }
for(var34 = 0; var34 < var49; ++var34) { for(var47 = 0; var47 < var42; ++var47) {
var21[var4 - 1 - var34 * 2] = var21[var34 * 4]; var43[var4 - 1 - var47 * 2] = var43[var47 * 4];
var21[var4 - 2 - var34 * 2] = var21[var34 * 4 + 1]; var43[var4 - 2 - var47 * 2] = var43[var47 * 4 + 1];
var21[var4 - var48 - 1 - var34 * 2] = var21[var34 * 4 + 2]; var43[var4 - var40 - 1 - var47 * 2] = var43[var47 * 4 + 2];
var21[var4 - var48 - 2 - var34 * 2] = var21[var34 * 4 + 3]; var43[var4 - var40 - 2 - var47 * 2] = var43[var47 * 4 + 3];
} }
for(var34 = 0; var34 < var49; ++var34) { for(var47 = 0; var47 < var42; ++var47) {
var29 = var25[var34 * 2]; var27 = var23[var47 * 2];
var30 = var25[var34 * 2 + 1]; var28 = var23[var47 * 2 + 1];
var31 = var21[var16 + var34 * 2]; var29 = var43[var17 + var47 * 2];
var32 = var21[var16 + var34 * 2 + 1]; var30 = var43[var17 + var47 * 2 + 1];
var33 = var21[var4 - 2 - var34 * 2]; var31 = var43[var4 - 2 - var47 * 2];
float var51 = var21[var4 - 1 - var34 * 2]; float var53 = var43[var4 - 1 - var47 * 2];
float var52 = var30 * (var31 - var33) + var29 * (var32 + var51); float var54 = var28 * (var29 - var31) + var27 * (var30 + var53);
var21[var16 + var34 * 2] = (var31 + var33 + var52) * 0.5F; var43[var17 + var47 * 2] = (var29 + var31 + var54) * 0.5F;
var21[var4 - 2 - var34 * 2] = (var31 + var33 - var52) * 0.5F; var43[var4 - 2 - var47 * 2] = (var29 + var31 - var54) * 0.5F;
var52 = var30 * (var32 + var51) - var29 * (var31 - var33); var54 = var28 * (var30 + var53) - var27 * (var29 - var31);
var21[var16 + var34 * 2 + 1] = (var32 - var51 + var52) * 0.5F; var43[var17 + var47 * 2 + 1] = (var30 - var53 + var54) * 0.5F;
var21[var4 - 1 - var34 * 2] = (-var32 + var51 + var52) * 0.5F; var43[var4 - 1 - var47 * 2] = (-var30 + var53 + var54) * 0.5F;
} }
for(var34 = 0; var34 < var48; ++var34) { for(var47 = 0; var47 < var40; ++var47) {
var21[var34] = var21[var16 + var34 * 2] * var24[var34 * 2] + var21[var16 + var34 * 2 + 1] * var24[var34 * 2 + 1]; var43[var47] = var43[var17 + var47 * 2] * var22[var47 * 2] + var43[var17 + var47 * 2 + 1] * var22[var47 * 2 + 1];
var21[var16 - 1 - var34] = var21[var16 + var34 * 2] * var24[var34 * 2 + 1] - var21[var16 + var34 * 2 + 1] * var24[var34 * 2]; var43[var17 - 1 - var47] = var43[var17 + var47 * 2] * var22[var47 * 2 + 1] - var43[var17 + var47 * 2 + 1] * var22[var47 * 2];
} }
for(var34 = 0; var34 < var48; ++var34) { for(var47 = 0; var47 < var40; ++var47) {
var21[var34 + (var4 - var48)] = -var21[var34]; var43[var47 + (var4 - var40)] = -var43[var47];
} }
for(var34 = 0; var34 < var48; ++var34) { for(var47 = 0; var47 < var40; ++var47) {
var21[var34] = var21[var48 + var34]; var43[var47] = var43[var40 + var47];
} }
for(var34 = 0; var34 < var48; ++var34) { for(var47 = 0; var47 < var40; ++var47) {
var21[var48 + var34] = -var21[var48 - var34 - 1]; var43[var40 + var47] = -var43[var40 - var47 - 1];
} }
for(var34 = 0; var34 < var48; ++var34) { for(var47 = 0; var47 < var40; ++var47) {
var21[var16 + var34] = var21[var4 - var34 - 1]; var43[var17 + var47] = var43[var4 - var47 - 1];
} }
for(var34 = var8; var34 < var9; ++var34) { for(var47 = var8; var47 < var9; ++var47) {
var29 = (float)Math.sin(((double)(var34 - var8) + 0.5D) / (double)var10 * 0.5D * 3.141592653589793D); var27 = (float)Math.sin(((double)(var47 - var8) + 0.5D) / (double)var10 * 0.5D * 3.141592653589793D);
__cd_c[var34] *= (float)Math.sin(1.5707963267948966D * (double)var29 * (double)var29); __cd_c[var47] *= (float)Math.sin(1.5707963267948966D * (double)var27 * (double)var27);
} }
for(var34 = var11; var34 < var12; ++var34) { for(var47 = var11; var47 < var12; ++var47) {
var29 = (float)Math.sin(((double)(var34 - var11) + 0.5D) / (double)var13 * 0.5D * 3.141592653589793D + 1.5707963267948966D); var27 = (float)Math.sin(((double)(var47 - var11) + 0.5D) / (double)var13 * 0.5D * 3.141592653589793D + 1.5707963267948966D);
__cd_c[var34] *= (float)Math.sin(1.5707963267948966D * (double)var29 * (double)var29); __cd_c[var47] *= (float)Math.sin(1.5707963267948966D * (double)var27 * (double)var27);
} }
} }
var21 = null; float[] var41 = null;
if(this.__y > 0) { if(this.__y > 0) {
var48 = var4 + this.__y >> 2; var40 = var4 + this.__y >> 2;
var21 = new float[var48]; var41 = new float[var40];
int var20;
if(!this.__b) { if(!this.__b) {
for(var49 = 0; var49 < this.__h; ++var49) { for(var42 = 0; var42 < this.__h; ++var42) {
var22 = var49 + (this.__y >> 1); var20 = var42 + (this.__y >> 1);
var21[var49] += this.__t[var22]; var41[var42] += this.__t[var20];
} }
} }
if(!var17) { if(!var15) {
for(var49 = var8; var49 < var4 >> 1; ++var49) { for(var42 = var8; var42 < var4 >> 1; ++var42) {
var22 = var21.length - (var4 >> 1) + var49; var20 = var41.length - (var4 >> 1) + var42;
var21[var22] += __cd_c[var49]; var41[var20] += __cd_c[var42];
} }
} }
} }
float[] var50 = this.__t; float[] var46 = this.__t;
this.__t = __cd_c; this.__t = __cd_c;
__cd_c = var50; __cd_c = var46;
this.__y = var4; this.__y = var4;
this.__h = var12 - (var4 >> 1); this.__h = var12 - (var4 >> 1);
this.__b = var17; this.__b = var15;
return var21; return var41;
} }
@ObfuscatedName("x") @ObfuscatedName("x")
@@ -535,37 +539,37 @@ public class MusicSample extends Node {
var6[var7 * 2 + 1] = -((float)Math.sin((double)(var7 * 4) * 3.141592653589793D / (double)var2)); var6[var7 * 2 + 1] = -((float)Math.sin((double)(var7 * 4) * 3.141592653589793D / (double)var2));
} }
float[] var13 = new float[var3]; float[] var12 = new float[var3];
for(int var8 = 0; var8 < var4; ++var8) { for(int var8 = 0; var8 < var4; ++var8) {
var13[var8 * 2] = (float)Math.cos((double)(var8 * 2 + 1) * 3.141592653589793D / (double)(var2 * 2)); var12[var8 * 2] = (float)Math.cos((double)(var8 * 2 + 1) * 3.141592653589793D / (double)(var2 * 2));
var13[var8 * 2 + 1] = (float)Math.sin((double)(var8 * 2 + 1) * 3.141592653589793D / (double)(var2 * 2)); var12[var8 * 2 + 1] = (float)Math.sin((double)(var8 * 2 + 1) * 3.141592653589793D / (double)(var2 * 2));
} }
float[] var14 = new float[var4]; float[] var13 = new float[var4];
for(int var9 = 0; var9 < var5; ++var9) { for(int var9 = 0; var9 < var5; ++var9) {
var14[var9 * 2] = (float)Math.cos((double)(var9 * 4 + 2) * 3.141592653589793D / (double)var2); var13[var9 * 2] = (float)Math.cos((double)(var9 * 4 + 2) * 3.141592653589793D / (double)var2);
var14[var9 * 2 + 1] = -((float)Math.sin((double)(var9 * 4 + 2) * 3.141592653589793D / (double)var2)); var13[var9 * 2 + 1] = -((float)Math.sin((double)(var9 * 4 + 2) * 3.141592653589793D / (double)var2));
} }
int[] var15 = new int[var5]; int[] var14 = new int[var5];
int var10 = WorldMapCacheName.method634(var5 - 1); int var10 = WorldMapCacheName.method634(var5 - 1);
for(int var11 = 0; var11 < var5; ++var11) { for(int var11 = 0; var11 < var5; ++var11) {
var15[var11] = GrandExchangeEvent.method87(var11, var10); var14[var11] = GrandExchangeEvent.method87(var11, var10);
} }
if(var1 != 0) { if(var1 != 0) {
__cd_ag = var6; __cd_ag = var6;
__cd_aq = var13; __cd_aq = var12;
__cd_aj = var14; __cd_aj = var13;
__cd_ar = var15; __cd_ar = var14;
} else { } else {
__cd_r = var6; __cd_r = var6;
__cd_p = var13; __cd_p = var12;
__cd_v = var14; __cd_v = var13;
__cd_av = var15; __cd_av = var14;
} }
} }
@@ -607,11 +611,11 @@ public class MusicSample extends Node {
__cd_z = new boolean[var5]; __cd_z = new boolean[var5];
__cd_j = new int[var5]; __cd_j = new int[var5];
for(int var12 = 0; var12 < var5; ++var12) { for(int var15 = 0; var15 < var5; ++var15) {
__cd_z[var12] = method2338() != 0; __cd_z[var15] = method2338() != 0;
method2352(16); method2352(16);
method2352(16); method2352(16);
__cd_j[var12] = method2352(8); __cd_j[var15] = method2352(8);
} }
} }
@@ -648,8 +652,4 @@ public class MusicSample extends Node {
return var3 == null?null:new MusicSample(var3); return var3 == null?null:new MusicSample(var3);
} }
} }
static {
__cd_s = false;
}
} }

96
runescape-client/src/main/java/MusicTrack.java
View File

@@ -196,7 +196,7 @@ public class MusicTrack extends Node {
int[] var59 = new int[128]; int[] var59 = new int[128];
var28 = 0; var28 = 0;
label222: label231:
for(int var60 = 0; var60 < var2; ++var60) { for(int var60 = 0; var60 < var2; ++var60) {
var51.writeInt(1297379947); var51.writeInt(1297379947);
var51.index += 4; var51.index += 4;
@@ -218,7 +218,7 @@ public class MusicTrack extends Node {
var51.writeByte(47); var51.writeByte(47);
var51.writeByte(0); var51.writeByte(0);
var51.__t_298(var51.index - var61); var51.__t_298(var51.index - var61);
continue label222; continue label231;
} }
if(var64 == 23) { if(var64 == 23) {
@@ -344,77 +344,77 @@ public class MusicTrack extends Node {
int[] var2 = new int[16]; int[] var2 = new int[16];
var2[9] = 128; var2[9] = 128;
var1[9] = 128; var1[9] = 128;
MidiFileReader var3 = new MidiFileReader(this.midi); MidiFileReader var4 = new MidiFileReader(this.midi);
int var4 = var3.trackCount(); int var5 = var4.trackCount();
int var5; int var6;
for(var5 = 0; var5 < var4; ++var5) { for(var6 = 0; var6 < var5; ++var6) {
var3.gotoTrack(var5); var4.gotoTrack(var6);
var3.readTrackLength(var5); var4.readTrackLength(var6);
var3.markTrackPosition(var5); var4.markTrackPosition(var6);
} }
label56: label53:
do { do {
while(true) { while(true) {
var5 = var3.getPrioritizedTrack(); var6 = var4.getPrioritizedTrack();
int var6 = var3.trackLengths[var5]; int var7 = var4.trackLengths[var6];
while(var6 == var3.trackLengths[var5]) { while(var7 == var4.trackLengths[var6]) {
var3.gotoTrack(var5); var4.gotoTrack(var6);
int var7 = var3.readMessage(var5); int var8 = var4.readMessage(var6);
if(var7 == 1) { if(var8 == 1) {
var3.setTrackDone(); var4.setTrackDone();
var3.markTrackPosition(var5); var4.markTrackPosition(var6);
continue label56; continue label53;
} }
int var8 = var7 & 240; int var9 = var8 & 240;
int var9;
int var10; int var10;
int var11; int var11;
if(var8 == 176) { int var12;
var9 = var7 & 15; if(var9 == 176) {
var10 = var7 >> 8 & 127; var10 = var8 & 15;
var11 = var7 >> 16 & 127; var11 = var8 >> 8 & 127;
if(var10 == 0) { var12 = var8 >> 16 & 127;
var1[var9] = (var11 << 14) + (var1[var9] & -2080769); if(var11 == 0) {
var1[var10] = (var12 << 14) + (var1[var10] & -2080769);
} }
if(var10 == 32) { if(var11 == 32) {
var1[var9] = (var1[var9] & -16257) + (var11 << 7); var1[var10] = (var1[var10] & -16257) + (var12 << 7);
} }
} }
if(var8 == 192) { if(var9 == 192) {
var9 = var7 & 15; var10 = var8 & 15;
var10 = var7 >> 8 & 127; var11 = var8 >> 8 & 127;
var2[var9] = var10 + var1[var9]; var2[var10] = var11 + var1[var10];
} }
if(var8 == 144) { if(var9 == 144) {
var9 = var7 & 15; var10 = var8 & 15;
var10 = var7 >> 8 & 127; var11 = var8 >> 8 & 127;
var11 = var7 >> 16 & 127; var12 = var8 >> 16 & 127;
if(var11 > 0) { if(var12 > 0) {
int var12 = var2[var9]; int var13 = var2[var10];
ByteArrayNode var13 = (ByteArrayNode)this.table.get((long)var12); ByteArrayNode var14 = (ByteArrayNode)this.table.get((long)var13);
if(var13 == null) { if(var14 == null) {
var13 = new ByteArrayNode(new byte[128]); var14 = new ByteArrayNode(new byte[128]);
this.table.put(var13, (long)var12); this.table.put(var14, (long)var13);
} }
var13.byteArray[var10] = 1; var14.byteArray[var11] = 1;
} }
} }
var3.readTrackLength(var5); var4.readTrackLength(var6);
var3.markTrackPosition(var5); var4.markTrackPosition(var6);
} }
} }
} while(!var3.isDone()); } while(!var4.isDone());
}
}
} }
@ObfuscatedName("q") @ObfuscatedName("q")

18
runescape-client/src/main/java/NetCache.java
View File

@@ -117,15 +117,6 @@ public class NetCache {
@Export("NetCache_ioExceptions") @Export("NetCache_ioExceptions")
public static int NetCache_ioExceptions; public static int NetCache_ioExceptions;
@ObfuscatedName("w")
@ObfuscatedSignature(
signature = "(IB)Lbm;",
garbageValue = "31"
)
static Message method4708(int var0) {
return (Message)Messages.Messages_hashTable.get((long)var0);
}
static { static {
__iq_f = 0; __iq_f = 0;
NetCache_pendingPriorityWrites = new NodeHashTable(4096); NetCache_pendingPriorityWrites = new NodeHashTable(4096);
@@ -145,4 +136,13 @@ public class NetCache {
NetCache_crcMismatches = 0; NetCache_crcMismatches = 0;
NetCache_ioExceptions = 0; NetCache_ioExceptions = 0;
} }
@ObfuscatedName("w")
@ObfuscatedSignature(
signature = "(IB)Lbm;",
garbageValue = "31"
)
static Message method4708(int var0) {
return (Message)Messages.Messages_hashTable.get((long)var0);
}
} }

28
runescape-client/src/main/java/NetFileRequest.java
View File

@@ -42,24 +42,24 @@ public class NetFileRequest extends DualNode {
method4555(var3.children, var3.id); method4555(var3.children, var3.id);
} }
WidgetGroupParent var4 = (WidgetGroupParent)Client.widgetGroupParents.get((long)var3.id); WidgetGroupParent var7 = (WidgetGroupParent)Client.widgetGroupParents.get((long)var3.id);
if(var4 != null) { if(var7 != null) {
ClientPreferences.method1809(var4.group); ClientPreferences.method1809(var7.group);
} }
} }
if(var3.type == 6) { if(var3.type == 6) {
int var7; int var5;
if(var3.sequenceId != -1 || var3.sequenceId2 != -1) { if(var3.sequenceId != -1 || var3.sequenceId2 != -1) {
boolean var5 = class238.runCs1(var3); boolean var4 = class238.runCs1(var3);
if(var5) { if(var4) {
var7 = var3.sequenceId2; var5 = var3.sequenceId2;
} else { } else {
var7 = var3.sequenceId; var5 = var3.sequenceId;
} }
if(var7 != -1) { if(var5 != -1) {
SequenceDefinition var6 = WorldMapAreaData.getSequenceDefinition(var7); SequenceDefinition var6 = WorldMapAreaData.getSequenceDefinition(var5);
for(var3.modelFrameCycle += Client.__client_gy; var3.modelFrameCycle > var6.frameLengths[var3.modelFrame]; class22.method295(var3)) { for(var3.modelFrameCycle += Client.__client_gy; var3.modelFrameCycle > var6.frameLengths[var3.modelFrame]; class22.method295(var3)) {
var3.modelFrameCycle -= var6.frameLengths[var3.modelFrame]; var3.modelFrameCycle -= var6.frameLengths[var3.modelFrame];
@@ -76,11 +76,11 @@ public class NetFileRequest extends DualNode {
if(var3.__bh != 0 && !var3.isIf3) { if(var3.__bh != 0 && !var3.isIf3) {
int var8 = var3.__bh >> 16; int var8 = var3.__bh >> 16;
var7 = var3.__bh << 16 >> 16; var5 = var3.__bh << 16 >> 16;
var8 *= Client.__client_gy; var8 *= Client.__client_gy;
var7 *= Client.__client_gy; var5 *= Client.__client_gy;
var3.modelAngleX = var8 + var3.modelAngleX & 2047; var3.modelAngleX = var8 + var3.modelAngleX & 2047;
var3.modelAngleY = var7 + var3.modelAngleY & 2047; var3.modelAngleY = var5 + var3.modelAngleY & 2047;
class22.method295(var3); class22.method295(var3);
} }
} }
@@ -108,8 +108,8 @@ public class NetFileRequest extends DualNode {
} else { } else {
var4.drawAt2(var0 + var10 + var5.width / 2 - var4.width / 2, var5.height / 2 + var1 - var11 - var4.height / 2); var4.drawAt2(var0 + var10 + var5.width / 2 - var4.width / 2, var5.height / 2 + var1 - var11 - var4.height / 2);
} }
} }
} }
} }
} }

386
runescape-client/src/main/java/NetSocket.java
View File

@@ -181,7 +181,6 @@ public final class NetSocket extends AbstractSocket implements Runnable {
this.task = null; this.task = null;
} }
} }
@ObfuscatedName("ay") @ObfuscatedName("ay")
@@ -195,29 +194,28 @@ public final class NetSocket extends AbstractSocket implements Runnable {
if(this.exceptionWriting) { if(this.exceptionWriting) {
this.exceptionWriting = false; this.exceptionWriting = false;
throw new IOException(); throw new IOException();
} } else {
if(this.array == null) {
this.array = new byte[this.__d];
}
if(this.array == null) { synchronized(this) {
this.array = new byte[this.__d]; for(int var5 = 0; var5 < var3; ++var5) {
} this.array[this.__e] = var1[var5 + var2];
this.__e = (this.__e + 1) % this.__d;
synchronized(this) { if((this.__k + this.__l) % this.__d == this.__e) {
for(int var5 = 0; var5 < var3; ++var5) { throw new IOException();
this.array[this.__e] = var1[var5 + var2]; }
this.__e = (this.__e + 1) % this.__d;
if((this.__k + this.__l) % this.__d == this.__e) {
throw new IOException();
} }
}
if(this.task == null) { if(this.task == null) {
this.task = this.taskHandler.newThreadTask(this, 3); this.task = this.taskHandler.newThreadTask(this, 3);
} }
this.notifyAll(); this.notifyAll();
}
} }
} }
} }
@Export("run") @Export("run")
@@ -236,7 +234,7 @@ public final class NetSocket extends AbstractSocket implements Runnable {
try { try {
this.wait(); this.wait();
} catch (InterruptedException var9) { } catch (InterruptedException var10) {
; ;
} }
} }
@@ -255,7 +253,7 @@ public final class NetSocket extends AbstractSocket implements Runnable {
try { try {
this.outputStream.write(this.array, var2, var1); this.outputStream.write(this.array, var2, var1);
} catch (IOException var8) { } catch (IOException var9) {
this.exceptionWriting = true; this.exceptionWriting = true;
} }
@@ -265,7 +263,7 @@ public final class NetSocket extends AbstractSocket implements Runnable {
if(this.__e == this.__l) { if(this.__e == this.__l) {
this.outputStream.flush(); this.outputStream.flush();
} }
} catch (IOException var7) { } catch (IOException var8) {
this.exceptionWriting = true; this.exceptionWriting = true;
} }
continue; continue;
@@ -283,15 +281,15 @@ public final class NetSocket extends AbstractSocket implements Runnable {
if(this.socket != null) { if(this.socket != null) {
this.socket.close(); this.socket.close();
} }
} catch (IOException var6) { } catch (IOException var7) {
; ;
} }
this.array = null; this.array = null;
break; break;
} }
} catch (Exception var11) { } catch (Exception var12) {
NPCDefinition.sendStackTrace((String)null, var11); NpcDefinition.sendStackTrace((String)null, var12);
} }
} }
@@ -308,226 +306,226 @@ public final class NetSocket extends AbstractSocket implements Runnable {
garbageValue = "-98" garbageValue = "-98"
) )
public static int method3571(int var0, int var1, int var2, class179 var3, CollisionMap var4, boolean var5, int[] var6, int[] var7) { public static int method3571(int var0, int var1, int var2, class179 var3, CollisionMap var4, boolean var5, int[] var6, int[] var7) {
int var8;
int var9; int var9;
for(var9 = 0; var9 < 128; ++var9) { for(int var8 = 0; var8 < 128; ++var8) {
for(var8 = 0; var8 < 128; ++var8) { for(var9 = 0; var9 < 128; ++var9) {
class178.__fi_q[var9][var8] = 0; class178.__fi_q[var8][var9] = 0;
class178.__fi_w[var9][var8] = 99999999; class178.__fi_w[var8][var9] = 99999999;
} }
} }
int var10; int var10;
byte var11; int var11;
int var12; byte var13;
int var13;
int var14; int var14;
int var15; int var15;
int var16;
int var17; int var17;
boolean var18;
int var19; int var19;
int var20; int var20;
int var21; int var21;
byte var22; boolean var28;
int var30;
int var31;
int var33;
if(var2 == 1) { if(var2 == 1) {
var9 = var0; var10 = var0;
var10 = var1; var11 = var1;
var22 = 64; byte var12 = 64;
var11 = 64; var13 = 64;
var12 = var0 - var22; var14 = var0 - var12;
var13 = var1 - var11; var15 = var1 - var13;
class178.__fi_q[var22][var11] = 99; class178.__fi_q[var12][var13] = 99;
class178.__fi_w[var22][var11] = 0; class178.__fi_w[var12][var13] = 0;
byte var23 = 0; byte var16 = 0;
var14 = 0; var17 = 0;
class178.__fi_l[var23] = var0; class178.__fi_l[var16] = var0;
var21 = var23 + 1; var33 = var16 + 1;
class178.__fi_e[var23] = var1; class178.__fi_e[var16] = var1;
int[][] var24 = var4.flags; int[][] var18 = var4.flags;
boolean var25; boolean var29;
label226: { while(true) {
while(var21 != var14) { if(var33 == var17) {
var9 = class178.__fi_l[var14]; WidgetGroupParent.__bx_o = var10;
var10 = class178.__fi_e[var14]; UrlRequester.__eo_u = var11;
var14 = var14 + 1 & 4095; var29 = false;
var19 = var9 - var12; break;
var20 = var10 - var13;
var15 = var9 - var4.xInset;
var16 = var10 - var4.yInset;
if(var3.vmethod3644(1, var9, var10, var4)) {
WidgetGroupParent.__bx_o = var9;
UrlRequester.__eo_u = var10;
var25 = true;
break label226;
}
var17 = class178.__fi_w[var19][var20] + 1;
if(var19 > 0 && class178.__fi_q[var19 - 1][var20] == 0 && (var24[var15 - 1][var16] & 19136776) == 0) {
class178.__fi_l[var21] = var9 - 1;
class178.__fi_e[var21] = var10;
var21 = var21 + 1 & 4095;
class178.__fi_q[var19 - 1][var20] = 2;
class178.__fi_w[var19 - 1][var20] = var17;
}
if(var19 < 127 && class178.__fi_q[var19 + 1][var20] == 0 && (var24[var15 + 1][var16] & 19136896) == 0) {
class178.__fi_l[var21] = var9 + 1;
class178.__fi_e[var21] = var10;
var21 = var21 + 1 & 4095;
class178.__fi_q[var19 + 1][var20] = 8;
class178.__fi_w[var19 + 1][var20] = var17;
}
if(var20 > 0 && class178.__fi_q[var19][var20 - 1] == 0 && (var24[var15][var16 - 1] & 19136770) == 0) {
class178.__fi_l[var21] = var9;
class178.__fi_e[var21] = var10 - 1;
var21 = var21 + 1 & 4095;
class178.__fi_q[var19][var20 - 1] = 1;
class178.__fi_w[var19][var20 - 1] = var17;
}
if(var20 < 127 && class178.__fi_q[var19][var20 + 1] == 0 && (var24[var15][var16 + 1] & 19136800) == 0) {
class178.__fi_l[var21] = var9;
class178.__fi_e[var21] = var10 + 1;
var21 = var21 + 1 & 4095;
class178.__fi_q[var19][var20 + 1] = 4;
class178.__fi_w[var19][var20 + 1] = var17;
}
if(var19 > 0 && var20 > 0 && class178.__fi_q[var19 - 1][var20 - 1] == 0 && (var24[var15 - 1][var16 - 1] & 19136782) == 0 && (var24[var15 - 1][var16] & 19136776) == 0 && (var24[var15][var16 - 1] & 19136770) == 0) {
class178.__fi_l[var21] = var9 - 1;
class178.__fi_e[var21] = var10 - 1;
var21 = var21 + 1 & 4095;
class178.__fi_q[var19 - 1][var20 - 1] = 3;
class178.__fi_w[var19 - 1][var20 - 1] = var17;
}
if(var19 < 127 && var20 > 0 && class178.__fi_q[var19 + 1][var20 - 1] == 0 && (var24[var15 + 1][var16 - 1] & 19136899) == 0 && (var24[var15 + 1][var16] & 19136896) == 0 && (var24[var15][var16 - 1] & 19136770) == 0) {
class178.__fi_l[var21] = var9 + 1;
class178.__fi_e[var21] = var10 - 1;
var21 = var21 + 1 & 4095;
class178.__fi_q[var19 + 1][var20 - 1] = 9;
class178.__fi_w[var19 + 1][var20 - 1] = var17;
}
if(var19 > 0 && var20 < 127 && class178.__fi_q[var19 - 1][var20 + 1] == 0 && (var24[var15 - 1][var16 + 1] & 19136824) == 0 && (var24[var15 - 1][var16] & 19136776) == 0 && (var24[var15][var16 + 1] & 19136800) == 0) {
class178.__fi_l[var21] = var9 - 1;
class178.__fi_e[var21] = var10 + 1;
var21 = var21 + 1 & 4095;
class178.__fi_q[var19 - 1][var20 + 1] = 6;
class178.__fi_w[var19 - 1][var20 + 1] = var17;
}
if(var19 < 127 && var20 < 127 && class178.__fi_q[var19 + 1][var20 + 1] == 0 && (var24[var15 + 1][var16 + 1] & 19136992) == 0 && (var24[var15 + 1][var16] & 19136896) == 0 && (var24[var15][var16 + 1] & 19136800) == 0) {
class178.__fi_l[var21] = var9 + 1;
class178.__fi_e[var21] = var10 + 1;
var21 = var21 + 1 & 4095;
class178.__fi_q[var19 + 1][var20 + 1] = 12;
class178.__fi_w[var19 + 1][var20 + 1] = var17;
}
} }
WidgetGroupParent.__bx_o = var9; var10 = class178.__fi_l[var17];
UrlRequester.__eo_u = var10; var11 = class178.__fi_e[var17];
var25 = false; var17 = var17 + 1 & 4095;
var30 = var10 - var14;
var31 = var11 - var15;
var19 = var10 - var4.xInset;
var20 = var11 - var4.yInset;
if(var3.vmethod3644(1, var10, var11, var4)) {
WidgetGroupParent.__bx_o = var10;
UrlRequester.__eo_u = var11;
var29 = true;
break;
}
var21 = class178.__fi_w[var30][var31] + 1;
if(var30 > 0 && class178.__fi_q[var30 - 1][var31] == 0 && (var18[var19 - 1][var20] & 19136776) == 0) {
class178.__fi_l[var33] = var10 - 1;
class178.__fi_e[var33] = var11;
var33 = var33 + 1 & 4095;
class178.__fi_q[var30 - 1][var31] = 2;
class178.__fi_w[var30 - 1][var31] = var21;
}
if(var30 < 127 && class178.__fi_q[var30 + 1][var31] == 0 && (var18[var19 + 1][var20] & 19136896) == 0) {
class178.__fi_l[var33] = var10 + 1;
class178.__fi_e[var33] = var11;
var33 = var33 + 1 & 4095;
class178.__fi_q[var30 + 1][var31] = 8;
class178.__fi_w[var30 + 1][var31] = var21;
}
if(var31 > 0 && class178.__fi_q[var30][var31 - 1] == 0 && (var18[var19][var20 - 1] & 19136770) == 0) {
class178.__fi_l[var33] = var10;
class178.__fi_e[var33] = var11 - 1;
var33 = var33 + 1 & 4095;
class178.__fi_q[var30][var31 - 1] = 1;
class178.__fi_w[var30][var31 - 1] = var21;
}
if(var31 < 127 && class178.__fi_q[var30][var31 + 1] == 0 && (var18[var19][var20 + 1] & 19136800) == 0) {
class178.__fi_l[var33] = var10;
class178.__fi_e[var33] = var11 + 1;
var33 = var33 + 1 & 4095;
class178.__fi_q[var30][var31 + 1] = 4;
class178.__fi_w[var30][var31 + 1] = var21;
}
if(var30 > 0 && var31 > 0 && class178.__fi_q[var30 - 1][var31 - 1] == 0 && (var18[var19 - 1][var20 - 1] & 19136782) == 0 && (var18[var19 - 1][var20] & 19136776) == 0 && (var18[var19][var20 - 1] & 19136770) == 0) {
class178.__fi_l[var33] = var10 - 1;
class178.__fi_e[var33] = var11 - 1;
var33 = var33 + 1 & 4095;
class178.__fi_q[var30 - 1][var31 - 1] = 3;
class178.__fi_w[var30 - 1][var31 - 1] = var21;
}
if(var30 < 127 && var31 > 0 && class178.__fi_q[var30 + 1][var31 - 1] == 0 && (var18[var19 + 1][var20 - 1] & 19136899) == 0 && (var18[var19 + 1][var20] & 19136896) == 0 && (var18[var19][var20 - 1] & 19136770) == 0) {
class178.__fi_l[var33] = var10 + 1;
class178.__fi_e[var33] = var11 - 1;
var33 = var33 + 1 & 4095;
class178.__fi_q[var30 + 1][var31 - 1] = 9;
class178.__fi_w[var30 + 1][var31 - 1] = var21;
}
if(var30 > 0 && var31 < 127 && class178.__fi_q[var30 - 1][var31 + 1] == 0 && (var18[var19 - 1][var20 + 1] & 19136824) == 0 && (var18[var19 - 1][var20] & 19136776) == 0 && (var18[var19][var20 + 1] & 19136800) == 0) {
class178.__fi_l[var33] = var10 - 1;
class178.__fi_e[var33] = var11 + 1;
var33 = var33 + 1 & 4095;
class178.__fi_q[var30 - 1][var31 + 1] = 6;
class178.__fi_w[var30 - 1][var31 + 1] = var21;
}
if(var30 < 127 && var31 < 127 && class178.__fi_q[var30 + 1][var31 + 1] == 0 && (var18[var19 + 1][var20 + 1] & 19136992) == 0 && (var18[var19 + 1][var20] & 19136896) == 0 && (var18[var19][var20 + 1] & 19136800) == 0) {
class178.__fi_l[var33] = var10 + 1;
class178.__fi_e[var33] = var11 + 1;
var33 = var33 + 1 & 4095;
class178.__fi_q[var30 + 1][var31 + 1] = 12;
class178.__fi_w[var30 + 1][var31 + 1] = var21;
}
} }
var18 = var25; var28 = var29;
} else if(var2 == 2) { } else if(var2 == 2) {
var18 = WorldMapSection2.method593(var0, var1, var3, var4); var28 = WorldMapSection2.method593(var0, var1, var3, var4);
} else { } else {
var18 = IndexStore.method3585(var0, var1, var2, var3, var4); var28 = IndexStore.method3585(var0, var1, var2, var3, var4);
} }
var8 = var0 - 64; var9 = var0 - 64;
var9 = var1 - 64; var10 = var1 - 64;
var10 = WidgetGroupParent.__bx_o; var11 = WidgetGroupParent.__bx_o;
var19 = UrlRequester.__eo_u; var30 = UrlRequester.__eo_u;
if(!var18) { if(!var28) {
var20 = Integer.MAX_VALUE; var31 = Integer.MAX_VALUE;
var12 = Integer.MAX_VALUE; var14 = Integer.MAX_VALUE;
var22 = 10; byte var32 = 10;
var21 = var3.field2120; var33 = var3.field2120;
var14 = var3.field2121; var17 = var3.field2121;
int var29 = var3.field2122; int var27 = var3.field2122;
var15 = var3.field2123; var19 = var3.field2123;
for(var16 = var21 - var22; var16 <= var22 + var21; ++var16) { for(var20 = var33 - var32; var20 <= var32 + var33; ++var20) {
for(var17 = var14 - var22; var17 <= var14 + var22; ++var17) { for(var21 = var17 - var32; var21 <= var17 + var32; ++var21) {
int var30 = var16 - var8; int var22 = var20 - var9;
int var31 = var17 - var9; int var23 = var21 - var10;
if(var30 >= 0 && var31 >= 0 && var30 < 128 && var31 < 128 && class178.__fi_w[var30][var31] < 100) { if(var22 >= 0 && var23 >= 0 && var22 < 128 && var23 < 128 && class178.__fi_w[var22][var23] < 100) {
int var26 = 0; int var24 = 0;
if(var16 < var21) { if(var20 < var33) {
var26 = var21 - var16; var24 = var33 - var20;
} else if(var16 > var29 + var21 - 1) { } else if(var20 > var27 + var33 - 1) {
var26 = var16 - (var29 + var21 - 1); var24 = var20 - (var27 + var33 - 1);
} }
int var27 = 0; int var25 = 0;
if(var17 < var14) { if(var21 < var17) {
var27 = var14 - var17; var25 = var17 - var21;
} else if(var17 > var15 + var14 - 1) { } else if(var21 > var19 + var17 - 1) {
var27 = var17 - (var15 + var14 - 1); var25 = var21 - (var19 + var17 - 1);
} }
int var28 = var27 * var27 + var26 * var26; int var26 = var25 * var25 + var24 * var24;
if(var28 < var20 || var28 == var20 && class178.__fi_w[var30][var31] < var12) { if(var26 < var31 || var26 == var31 && class178.__fi_w[var22][var23] < var14) {
var20 = var28; var31 = var26;
var12 = class178.__fi_w[var30][var31]; var14 = class178.__fi_w[var22][var23];
var10 = var16; var11 = var20;
var19 = var17; var30 = var21;
} }
} }
} }
} }
if(var20 == Integer.MAX_VALUE) { if(var31 == Integer.MAX_VALUE) {
return -1; return -1;
} }
} }
if(var0 == var10 && var19 == var1) { if(var0 == var11 && var30 == var1) {
return 0; return 0;
} else { } else {
var11 = 0; var13 = 0;
class178.__fi_l[var11] = var10; class178.__fi_l[var13] = var11;
var20 = var11 + 1; var31 = var13 + 1;
class178.__fi_e[var11] = var19; class178.__fi_e[var13] = var30;
for(var12 = var13 = class178.__fi_q[var10 - var8][var19 - var9]; var0 != var10 || var19 != var1; var12 = class178.__fi_q[var10 - var8][var19 - var9]) { for(var14 = var15 = class178.__fi_q[var11 - var9][var30 - var10]; var0 != var11 || var30 != var1; var14 = class178.__fi_q[var11 - var9][var30 - var10]) {
if(var12 != var13) { if(var14 != var15) {
var13 = var12; var15 = var14;
class178.__fi_l[var20] = var10; class178.__fi_l[var31] = var11;
class178.__fi_e[var20++] = var19; class178.__fi_e[var31++] = var30;
} }
if((var12 & 2) != 0) { if((var14 & 2) != 0) {
++var10; ++var11;
} else if((var12 & 8) != 0) { } else if((var14 & 8) != 0) {
--var10; --var11;
} }
if((var12 & 1) != 0) { if((var14 & 1) != 0) {
++var19; ++var30;
} else if((var12 & 4) != 0) { } else if((var14 & 4) != 0) {
--var19; --var30;
} }
} }
var21 = 0; var33 = 0;
while(var20-- > 0) { while(var31-- > 0) {
var6[var21] = class178.__fi_l[var20]; var6[var33] = class178.__fi_l[var31];
var7[var21++] = class178.__fi_e[var20]; var7[var33++] = class178.__fi_e[var31];
if(var21 >= var6.length) { if(var33 >= var6.length) {
break; break;
} }
} }
return var21; return var33;
} }
} }

1
runescape-client/src/main/java/Node.java
View File

@@ -31,7 +31,6 @@ public class Node {
this.previous = null; this.previous = null;
this.next = null; this.next = null;
} }
} }
@ObfuscatedName("eg") @ObfuscatedName("eg")

15
runescape-client/src/main/java/NodeHashTable.java
View File

@@ -124,15 +124,16 @@ public final class NodeHashTable {
this.current = var1.previous; this.current = var1.previous;
return var1; return var1;
} else { } else {
while(this.index < this.size) { do {
var1 = this.buckets[this.index++].previous; if(this.index >= this.size) {
if(var1 != this.buckets[this.index - 1]) { return null;
this.current = var1.previous;
return var1;
} }
}
return null; var1 = this.buckets[this.index++].previous;
} while(var1 == this.buckets[this.index - 1]);
this.current = var1.previous;
return var1;
} }
} }
} }

10
runescape-client/src/main/java/NPC.java → runescape-client/src/main/java/Npc.java
View File

@@ -5,13 +5,13 @@ import net.runelite.mapping.ObfuscatedSignature;
@ObfuscatedName("cv") @ObfuscatedName("cv")
@Implements("NPC") @Implements("NPC")
public final class NPC extends Actor { public final class Npc extends Actor {
@ObfuscatedName("m") @ObfuscatedName("m")
@ObfuscatedSignature( @ObfuscatedSignature(
signature = "Ljz;" signature = "Ljz;"
) )
@Export("definition") @Export("definition")
NPCDefinition definition; NpcDefinition definition;
@ObfuscatedName("m") @ObfuscatedName("m")
@ObfuscatedSignature( @ObfuscatedSignature(
@@ -129,7 +129,7 @@ public final class NPC extends Actor {
return null; return null;
} else { } else {
SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0?WorldMapAreaData.getSequenceDefinition(super.sequence):null; SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0?WorldMapAreaData.getSequenceDefinition(super.sequence):null;
SequenceDefinition var2 = super.movementSequence == -1 || super.movementSequence == super.idleSequence && var1 != null?null:WorldMapAreaData.getSequenceDefinition(super.movementSequence); SequenceDefinition var2 = super.movementSequence != -1 && (super.movementSequence != super.idleSequence || var1 == null)?WorldMapAreaData.getSequenceDefinition(super.movementSequence):null;
Model var3 = this.definition.getModel(var1, super.sequenceFrame, var2, super.movementFrame); Model var3 = this.definition.getModel(var1, super.sequenceFrame, var2, super.movementFrame);
if(var3 == null) { if(var3 == null) {
return null; return null;
@@ -175,13 +175,11 @@ public final class NPC extends Actor {
var3.indexStore = var1; var3.indexStore = var1;
var3.indexCache = var2; var3.indexCache = var2;
NodeDeque var4 = IndexStoreActionHandler.IndexStoreActionHandler_requestQueue; NodeDeque var4 = IndexStoreActionHandler.IndexStoreActionHandler_requestQueue;
NodeDeque var5 = IndexStoreActionHandler.IndexStoreActionHandler_requestQueue;
synchronized(IndexStoreActionHandler.IndexStoreActionHandler_requestQueue) { synchronized(IndexStoreActionHandler.IndexStoreActionHandler_requestQueue) {
IndexStoreActionHandler.IndexStoreActionHandler_requestQueue.addFirst(var3); IndexStoreActionHandler.IndexStoreActionHandler_requestQueue.addFirst(var3);
} }
Object var10 = IndexStoreActionHandler.IndexStoreActionHandler_lock; Object var9 = IndexStoreActionHandler.IndexStoreActionHandler_lock;
Object var6 = IndexStoreActionHandler.IndexStoreActionHandler_lock;
synchronized(IndexStoreActionHandler.IndexStoreActionHandler_lock) { synchronized(IndexStoreActionHandler.IndexStoreActionHandler_lock) {
if(IndexStoreActionHandler.__iv_q == 0) { if(IndexStoreActionHandler.__iv_q == 0) {
Frames.IndexStoreActionHandler_thread = new Thread(new IndexStoreActionHandler()); Frames.IndexStoreActionHandler_thread = new Thread(new IndexStoreActionHandler());

130
runescape-client/src/main/java/NPCDefinition.java → runescape-client/src/main/java/NpcDefinition.java
View File

@@ -11,7 +11,7 @@ import net.runelite.mapping.ObfuscatedSignature;
@ObfuscatedName("jz") @ObfuscatedName("jz")
@Implements("NPCDefinition") @Implements("NPCDefinition")
public class NPCDefinition extends DualNode { public class NpcDefinition extends DualNode {
@ObfuscatedName("m") @ObfuscatedName("m")
@ObfuscatedSignature( @ObfuscatedSignature(
signature = "Lir;" signature = "Lir;"
@@ -193,7 +193,12 @@ public class NPCDefinition extends DualNode {
@Export("params") @Export("params")
IterableNodeHashTable params; IterableNodeHashTable params;
NPCDefinition() { static {
NpcDefinition_cached = new EvictingDualNodeHashTable(64);
NpcDefinition_cachedModels = new EvictingDualNodeHashTable(50);
}
NpcDefinition() {
this.name = "null"; this.name = "null";
this.size = 1; this.size = 1;
this.idleSequence = -1; this.idleSequence = -1;
@@ -379,8 +384,8 @@ public class NPCDefinition extends DualNode {
@Export("getModel") @Export("getModel")
public final Model getModel(SequenceDefinition var1, int var2, SequenceDefinition var3, int var4) { public final Model getModel(SequenceDefinition var1, int var2, SequenceDefinition var3, int var4) {
if(this.transforms != null) { if(this.transforms != null) {
NPCDefinition var11 = this.transform(); NpcDefinition var12 = this.transform();
return var11 == null?null:var11.getModel(var1, var2, var3, var4); return var12 == null?null:var12.getModel(var1, var2, var3, var4);
} else { } else {
Model var5 = (Model)NpcDefinition_cachedModels.get((long)this.id); Model var5 = (Model)NpcDefinition_cachedModels.get((long)this.id);
if(var5 == null) { if(var5 == null) {
@@ -396,33 +401,33 @@ public class NPCDefinition extends DualNode {
return null; return null;
} }
ModelData[] var12 = new ModelData[this.archives.length]; ModelData[] var8 = new ModelData[this.archives.length];
int var8; int var9;
for(var8 = 0; var8 < this.archives.length; ++var8) { for(var9 = 0; var9 < this.archives.length; ++var9) {
var12[var8] = ModelData.method2788(NpcDefinition_modelIndexCache, this.archives[var8], 0); var8[var9] = ModelData.method2788(NpcDefinition_modelIndexCache, this.archives[var9], 0);
} }
ModelData var9; ModelData var11;
if(var12.length == 1) { if(var8.length == 1) {
var9 = var12[0]; var11 = var8[0];
} else { } else {
var9 = new ModelData(var12, var12.length); var11 = new ModelData(var8, var8.length);
} }
if(this.recolorFrom != null) { if(this.recolorFrom != null) {
for(var8 = 0; var8 < this.recolorFrom.length; ++var8) { for(var9 = 0; var9 < this.recolorFrom.length; ++var9) {
var9.recolor(this.recolorFrom[var8], this.recolorTo[var8]); var11.recolor(this.recolorFrom[var9], this.recolorTo[var9]);
} }
} }
if(this.retextureFrom != null) { if(this.retextureFrom != null) {
for(var8 = 0; var8 < this.retextureFrom.length; ++var8) { for(var9 = 0; var9 < this.retextureFrom.length; ++var9) {
var9.retexture(this.retextureFrom[var8], this.retextureTo[var8]); var11.retexture(this.retextureFrom[var9], this.retextureTo[var9]);
} }
} }
var5 = var9.toModel(this.__ag + 64, this.__aq * 5 + 850, -30, -50, -30); var5 = var11.toModel(this.__ag + 64, this.__aq * 5 + 850, -30, -50, -30);
NpcDefinition_cachedModels.put(var5, (long)this.id); NpcDefinition_cachedModels.put(var5, (long)this.id);
} }
@@ -453,20 +458,20 @@ public class NPCDefinition extends DualNode {
@Export("getModelData") @Export("getModelData")
public final ModelData getModelData() { public final ModelData getModelData() {
if(this.transforms != null) { if(this.transforms != null) {
NPCDefinition var5 = this.transform(); NpcDefinition var1 = this.transform();
return var5 == null?null:var5.getModelData(); return var1 == null?null:var1.getModelData();
} else if(this.__e == null) { } else if(this.__e == null) {
return null; return null;
} else { } else {
boolean var1 = false; boolean var5 = false;
for(int var2 = 0; var2 < this.__e.length; ++var2) { for(int var2 = 0; var2 < this.__e.length; ++var2) {
if(!NpcDefinition_modelIndexCache.tryLoadRecord(this.__e[var2], 0)) { if(!NpcDefinition_modelIndexCache.tryLoadRecord(this.__e[var2], 0)) {
var1 = true; var5 = true;
} }
} }
if(var1) { if(var5) {
return null; return null;
} else { } else {
ModelData[] var6 = new ModelData[this.__e.length]; ModelData[] var6 = new ModelData[this.__e.length];
@@ -506,7 +511,7 @@ public class NPCDefinition extends DualNode {
garbageValue = "-113" garbageValue = "-113"
) )
@Export("transform") @Export("transform")
public final NPCDefinition transform() { public final NpcDefinition transform() {
int var1 = -1; int var1 = -1;
if(this.transformVarbit != -1) { if(this.transformVarbit != -1) {
var1 = WorldMapSection2.getVarbit(this.transformVarbit); var1 = WorldMapSection2.getVarbit(this.transformVarbit);
@@ -552,20 +557,20 @@ public class NPCDefinition extends DualNode {
) )
@Export("getIntParam") @Export("getIntParam")
public int getIntParam(int var1, int var2) { public int getIntParam(int var1, int var2) {
IterableNodeHashTable var3 = this.params; IterableNodeHashTable var4 = this.params;
int var4; int var3;
if(var3 == null) { if(var4 == null) {
var4 = var2; var3 = var2;
} else { } else {
IntegerNode var5 = (IntegerNode)var3.get((long)var1); IntegerNode var5 = (IntegerNode)var4.get((long)var1);
if(var5 == null) { if(var5 == null) {
var4 = var2; var3 = var2;
} else { } else {
var4 = var5.integer; var3 = var5.integer;
} }
} }
return var4; return var3;
} }
@ObfuscatedName("d") @ObfuscatedName("d")
@@ -618,8 +623,8 @@ public class NPCDefinition extends DualNode {
} catch (Exception var5) { } catch (Exception var5) {
; ;
} }
}
}
} }
@ObfuscatedName("e") @ObfuscatedName("e")
@@ -657,47 +662,47 @@ public class NPCDefinition extends DualNode {
if(Login.Login_username.length() == 0) { if(Login.Login_username.length() == 0) {
class54.method1089("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); class54.method1089("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address.");
} else { } else {
long var0; long var1;
try { try {
URL var2 = new URL(Message.method1227("services", false) + "m=accountappeal/login.ws"); URL var3 = new URL(Message.method1227("services", false) + "m=accountappeal/login.ws");
URLConnection var3 = var2.openConnection(); URLConnection var4 = var3.openConnection();
var3.setRequestProperty("connection", "close"); var4.setRequestProperty("connection", "close");
var3.setDoInput(true); var4.setDoInput(true);
var3.setDoOutput(true); var4.setDoOutput(true);
var3.setConnectTimeout(5000); var4.setConnectTimeout(5000);
OutputStreamWriter var4 = new OutputStreamWriter(var3.getOutputStream()); OutputStreamWriter var5 = new OutputStreamWriter(var4.getOutputStream());
var4.write("data1=req"); var5.write("data1=req");
var4.flush(); var5.flush();
InputStream var5 = var3.getInputStream(); InputStream var6 = var4.getInputStream();
Buffer var6 = new Buffer(new byte[1000]); Buffer var7 = new Buffer(new byte[1000]);
while(true) { while(true) {
int var7 = var5.read(var6.array, var6.index, 1000 - var6.index); int var8 = var6.read(var7.array, var7.index, 1000 - var7.index);
if(var7 == -1) { if(var8 == -1) {
var6.index = 0; var7.index = 0;
long var8 = var6.readLong(); long var10 = var7.readLong();
var0 = var8; var1 = var10;
break; break;
} }
var6.index += var7; var7.index += var8;
if(var6.index >= 1000) { if(var7.index >= 1000) {
var0 = 0L; var1 = 0L;
break; break;
} }
} }
} catch (Exception var10) { } catch (Exception var14) {
var0 = 0L; var1 = 0L;
} }
int var11; int var0;
if(var0 == 0L) { if(var1 == 0L) {
var11 = 5; var0 = 5;
} else { } else {
var11 = class72.method1778(var0, Login.Login_username); var0 = class72.method1778(var1, Login.Login_username);
} }
switch(var11) { switch(var0) {
case 2: case 2:
class54.method1089(Strings.__id_jr, Strings.__id_jv, Strings.__id_ju); class54.method1089(Strings.__id_jr, Strings.__id_jv, Strings.__id_ju);
Login.loginIndex = 6; Login.loginIndex = 6;
@@ -717,8 +722,8 @@ public class NPCDefinition extends DualNode {
case 7: case 7:
class54.method1089("You must enter a valid login to proceed. For accounts", "created after 24th November 2010, please use your", "email address. Otherwise please use your username."); class54.method1089("You must enter a valid login to proceed. For accounts", "created after 24th November 2010, please use your", "email address. Otherwise please use your username.");
} }
}
}
} }
@ObfuscatedName("kw") @ObfuscatedName("kw")
@@ -739,9 +744,4 @@ public class NPCDefinition extends DualNode {
return var0; return var0;
} }
static {
NpcDefinition_cached = new EvictingDualNodeHashTable(64);
NpcDefinition_cachedModels = new EvictingDualNodeHashTable(50);
}
} }

107
runescape-client/src/main/java/ObjectDefinition.java
View File

@@ -260,6 +260,15 @@ public class ObjectDefinition extends DualNode {
@Export("params") @Export("params")
IterableNodeHashTable params; IterableNodeHashTable params;
static {
ObjectDefinition_isLowDetail = false;
ObjectDefinition_cached = new EvictingDualNodeHashTable(4096);
__jr_o = new EvictingDualNodeHashTable(500);
__jr_u = new EvictingDualNodeHashTable(30);
ObjectDefinition_cachedModels = new EvictingDualNodeHashTable(30);
__jr_l = new ModelData[4];
}
ObjectDefinition() { ObjectDefinition() {
this.name = "null"; this.name = "null";
this.sizeX = 1; this.sizeX = 1;
@@ -695,7 +704,6 @@ public class ObjectDefinition extends DualNode {
ModelData var3 = null; ModelData var3 = null;
boolean var4; boolean var4;
int var5; int var5;
int var6;
int var7; int var7;
if(this.__d == null) { if(this.__d == null) {
if(var1 != 10) { if(var1 != 10) {
@@ -713,15 +721,15 @@ public class ObjectDefinition extends DualNode {
var5 = this.__x.length; var5 = this.__x.length;
for(var7 = 0; var7 < var5; ++var7) { for(int var6 = 0; var6 < var5; ++var6) {
var6 = this.__x[var7]; var7 = this.__x[var6];
if(var4) { if(var4) {
var6 += 65536; var7 += 65536;
} }
var3 = (ModelData)__jr_o.get((long)var6); var3 = (ModelData)__jr_o.get((long)var7);
if(var3 == null) { if(var3 == null) {
var3 = ModelData.method2788(__jr_q, var6 & 65535, 0); var3 = ModelData.method2788(__jr_q, var7 & 65535, 0);
if(var3 == null) { if(var3 == null) {
return null; return null;
} }
@@ -730,11 +738,11 @@ public class ObjectDefinition extends DualNode {
var3.__t_226(); var3.__t_226();
} }
__jr_o.put(var3, (long)var6); __jr_o.put(var3, (long)var7);
} }
if(var5 > 1) { if(var5 > 1) {
__jr_l[var7] = var3; __jr_l[var6] = var3;
} }
} }
@@ -742,22 +750,22 @@ public class ObjectDefinition extends DualNode {
var3 = new ModelData(__jr_l, var5); var3 = new ModelData(__jr_l, var5);
} }
} else { } else {
var7 = -1; int var9 = -1;
for(var5 = 0; var5 < this.__d.length; ++var5) { for(var5 = 0; var5 < this.__d.length; ++var5) {
if(this.__d[var5] == var1) { if(this.__d[var5] == var1) {
var7 = var5; var9 = var5;
break; break;
} }
} }
if(var7 == -1) { if(var9 == -1) {
return null; return null;
} }
var5 = this.__x[var7]; var5 = this.__x[var9];
boolean var8 = this.isRotated ^ var2 > 3; boolean var10 = this.isRotated ^ var2 > 3;
if(var8) { if(var10) {
var5 += 65536; var5 += 65536;
} }
@@ -768,7 +776,7 @@ public class ObjectDefinition extends DualNode {
return null; return null;
} }
if(var8) { if(var10) {
var3.__t_226(); var3.__t_226();
} }
@@ -782,49 +790,49 @@ public class ObjectDefinition extends DualNode {
var4 = true; var4 = true;
} }
boolean var10; boolean var11;
if(this.offsetX == 0 && this.offsetHeight == 0 && this.offsetY == 0) { if(this.offsetX == 0 && this.offsetHeight == 0 && this.offsetY == 0) {
var10 = false; var11 = false;
} else { } else {
var10 = true; var11 = true;
} }
ModelData var9 = new ModelData(var3, var2 == 0 && !var4 && !var10, this.recolorFrom == null, null == this.retextureFrom, true); ModelData var8 = new ModelData(var3, var2 == 0 && !var4 && !var11, this.recolorFrom == null, null == this.retextureFrom, true);
if(var1 == 4 && var2 > 3) { if(var1 == 4 && var2 > 3) {
var9.__a_224(256); var8.__a_224(256);
var9.__z_225(45, 0, -45); var8.__z_225(45, 0, -45);
} }
var2 &= 3; var2 &= 3;
if(var2 == 1) { if(var2 == 1) {
var9.__l_221(); var8.__l_221();
} else if(var2 == 2) { } else if(var2 == 2) {
var9.__x_222(); var8.__x_222();
} else if(var2 == 3) { } else if(var2 == 3) {
var9.__d_223(); var8.__d_223();
} }
if(this.recolorFrom != null) { if(this.recolorFrom != null) {
for(var6 = 0; var6 < this.recolorFrom.length; ++var6) { for(var7 = 0; var7 < this.recolorFrom.length; ++var7) {
var9.recolor(this.recolorFrom[var6], this.recolorTo[var6]); var8.recolor(this.recolorFrom[var7], this.recolorTo[var7]);
} }
} }
if(this.retextureFrom != null) { if(this.retextureFrom != null) {
for(var6 = 0; var6 < this.retextureFrom.length; ++var6) { for(var7 = 0; var7 < this.retextureFrom.length; ++var7) {
var9.retexture(this.retextureFrom[var6], this.retextureTo[var6]); var8.retexture(this.retextureFrom[var7], this.retextureTo[var7]);
} }
} }
if(var4) { if(var4) {
var9.__y_227(this.modelSizeX, this.modelHeight, this.modelSizeY); var8.__y_227(this.modelSizeX, this.modelHeight, this.modelSizeY);
} }
if(var10) { if(var11) {
var9.__z_225(this.offsetX, this.offsetHeight, this.offsetY); var8.__z_225(this.offsetX, this.offsetHeight, this.offsetY);
} }
return var9; return var8;
} }
@ObfuscatedName("a") @ObfuscatedName("a")
@@ -858,20 +866,20 @@ public class ObjectDefinition extends DualNode {
) )
@Export("getIntParam") @Export("getIntParam")
public int getIntParam(int var1, int var2) { public int getIntParam(int var1, int var2) {
IterableNodeHashTable var3 = this.params; IterableNodeHashTable var4 = this.params;
int var4; int var3;
if(var3 == null) { if(var4 == null) {
var4 = var2; var3 = var2;
} else { } else {
IntegerNode var5 = (IntegerNode)var3.get((long)var1); IntegerNode var5 = (IntegerNode)var4.get((long)var1);
if(var5 == null) { if(var5 == null) {
var4 = var2; var3 = var2;
} else { } else {
var4 = var5.integer; var3 = var5.integer;
} }
} }
return var4; return var3;
} }
@ObfuscatedName("j") @ObfuscatedName("j")
@@ -913,20 +921,20 @@ public class ObjectDefinition extends DualNode {
garbageValue = "-1284680749" garbageValue = "-1284680749"
) )
@Export("getNpcDefinition") @Export("getNpcDefinition")
public static NPCDefinition getNpcDefinition(int var0) { public static NpcDefinition getNpcDefinition(int var0) {
NPCDefinition var1 = (NPCDefinition)NPCDefinition.NpcDefinition_cached.get((long)var0); NpcDefinition var1 = (NpcDefinition)NpcDefinition.NpcDefinition_cached.get((long)var0);
if(var1 != null) { if(var1 != null) {
return var1; return var1;
} else { } else {
byte[] var2 = NPCDefinition.NpcDefinition_indexCache.takeRecord(9, var0); byte[] var2 = NpcDefinition.NpcDefinition_indexCache.takeRecord(9, var0);
var1 = new NPCDefinition(); var1 = new NpcDefinition();
var1.id = var0; var1.id = var0;
if(var2 != null) { if(var2 != null) {
var1.read(new Buffer(var2)); var1.read(new Buffer(var2));
} }
var1.init(); var1.init();
NPCDefinition.NpcDefinition_cached.put(var1, (long)var0); NpcDefinition.NpcDefinition_cached.put(var1, (long)var0);
return var1; return var1;
} }
} }
@@ -939,13 +947,4 @@ public class ObjectDefinition extends DualNode {
public static void method5041() { public static void method5041() {
ItemDefinition.Sprite_cached.clear(); ItemDefinition.Sprite_cached.clear();
} }
static {
ObjectDefinition_isLowDetail = false;
ObjectDefinition_cached = new EvictingDualNodeHashTable(4096);
__jr_o = new EvictingDualNodeHashTable(500);
__jr_u = new EvictingDualNodeHashTable(30);
ObjectDefinition_cachedModels = new EvictingDualNodeHashTable(30);
__jr_l = new ModelData[4];
}
} }

10
runescape-client/src/main/java/ObjectSound.java
View File

@@ -87,7 +87,7 @@ public final class ObjectSound extends Node {
intValue = -1041508847 intValue = -1041508847
) )
@Export("surfaceOffsetY") @Export("surfaceOffsetY")
int surfaceOffsetY; int __n;
@ObfuscatedName("i") @ObfuscatedName("i")
@ObfuscatedSignature( @ObfuscatedSignature(
signature = "Lds;" signature = "Lds;"
@@ -101,6 +101,10 @@ public final class ObjectSound extends Node {
@Export("obj") @Export("obj")
ObjectDefinition obj; ObjectDefinition obj;
static {
objectSounds = new NodeDeque();
}
@ObfuscatedName("f") @ObfuscatedName("f")
@ObfuscatedSignature( @ObfuscatedSignature(
signature = "(I)V", signature = "(I)V",
@@ -130,8 +134,4 @@ public final class ObjectSound extends Node {
} }
} }
static {
objectSounds = new NodeDeque();
}
} }

2
runescape-client/src/main/java/Occluder.java
View File

@@ -84,7 +84,7 @@ public final class Occluder {
intValue = -407777817 intValue = -407777817
) )
@Export("surfaceOffsetY") @Export("surfaceOffsetY")
int surfaceOffsetY; int __n;
@ObfuscatedName("i") @ObfuscatedName("i")
@ObfuscatedGetter( @ObfuscatedGetter(
intValue = 1324959981 intValue = 1324959981

8
runescape-client/src/main/java/OverlayDefinition.java
View File

@@ -77,6 +77,10 @@ public class OverlayDefinition extends DualNode {
@Export("lightness2") @Export("lightness2")
public int lightness2; public int lightness2;
static {
__jf_f = new EvictingDualNodeHashTable(64);
}
public OverlayDefinition() { public OverlayDefinition() {
this.rgb = 0; this.rgb = 0;
this.texture = -1; this.texture = -1;
@@ -242,8 +246,4 @@ public class OverlayDefinition extends DualNode {
} }
} }
static {
__jf_f = new EvictingDualNodeHashTable(64);
}
} }

11
runescape-client/src/main/java/PacketBuffer.java
View File

@@ -29,6 +29,10 @@ public final class PacketBuffer extends Buffer {
@Export("bitIndex") @Export("bitIndex")
int bitIndex; int bitIndex;
static {
PacketBuffer_masks = new int[]{0, 1, 3, 7, 15, 31, 63, 127, 255, 511, 1023, 2047, 4095, 8191, 16383, 32767, 65535, 131071, 262143, 524287, 1048575, 2097151, 4194303, 8388607, 16777215, 33554431, 67108863, 134217727, 268435455, 536870911, 1073741823, Integer.MAX_VALUE, -1};
}
public PacketBuffer(int var1) { public PacketBuffer(int var1) {
super(var1); super(var1);
} }
@@ -192,6 +196,7 @@ public final class PacketBuffer extends Buffer {
--NetCache.NetCache_pendingWritesCount; --NetCache.NetCache_pendingWritesCount;
++NetCache.NetCache_pendingPriorityWritesCount; ++NetCache.NetCache_pendingPriorityWritesCount;
} }
} else { } else {
if(!var5) { if(!var5) {
var8 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var6); var8 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var6);
@@ -212,10 +217,10 @@ public final class PacketBuffer extends Buffer {
NetCache.NetCache_pendingWrites.put(var8, var6); NetCache.NetCache_pendingWrites.put(var8, var6);
++NetCache.NetCache_pendingWritesCount; ++NetCache.NetCache_pendingWritesCount;
} }
} }
} }
} }
} }
@ObfuscatedName("f") @ObfuscatedName("f")
@@ -226,8 +231,4 @@ public final class PacketBuffer extends Buffer {
public static int method4081(int var0, int var1) { public static int method4081(int var0, int var1) {
return (var0 + 40000 << 8) + var1; return (var0 + 40000 << 8) + var1;
} }
static {
PacketBuffer_masks = new int[]{0, 1, 3, 7, 15, 31, 63, 127, 255, 511, 1023, 2047, 4095, 8191, 16383, 32767, 65535, 131071, 262143, 524287, 1048575, 2097151, 4194303, 8388607, 16777215, 33554431, 67108863, 134217727, 268435455, 536870911, 1073741823, Integer.MAX_VALUE, -1};
}
} }

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